Skip to content
Snippets Groups Projects
Commit 35089a18 authored by terry-norbraten's avatar terry-norbraten
Browse files

Merge origin/master

parents be6f7a12 62c4c50c
No related branches found
No related tags found
No related merge requests found
This diff is collapsed.
...@@ -55,6 +55,8 @@ ...@@ -55,6 +55,8 @@
<include name="open-dis7-pdus-classes.jar"/> <include name="open-dis7-pdus-classes.jar"/>
<include name="open-dis7-pdus-source.jar"/> <include name="open-dis7-pdus-source.jar"/>
<include name="open-dis7-pdus-javadoc.jar"/> <include name="open-dis7-pdus-javadoc.jar"/>
<include name="open-dis7-full.zip"/>
<include name="open-dis7-full.jar"/>
<!-- do not delete jar files produced by open-dis7-source-generator --> <!-- do not delete jar files produced by open-dis7-source-generator -->
<exclude name="open-dis7-enumerations-classes.jar"/> <exclude name="open-dis7-enumerations-classes.jar"/>
<exclude name="open-dis7-enumerations-source.jar"/> <exclude name="open-dis7-enumerations-source.jar"/>
...@@ -85,8 +87,8 @@ ...@@ -85,8 +87,8 @@
</target> </target>
<target name="view.javadoc.local" description="view local package javadoc in web browser (Netbeans only)"> <target name="view.javadoc.local" description="view local package javadoc in web browser (Netbeans only)">
<echo message="view local javadoc"/> <echo message="view local javadoc in dist/javadoc subdirectory"/>
<nbbrowse file="javadoc/index.html" /> <nbbrowse file="dist/javadoc/index.html" />
<!-- TODO implementation-independent approach if possible, but note that other Ant approaches usually have to be customized for each OS. --> <!-- TODO implementation-independent approach if possible, but note that other Ant approaches usually have to be customized for each OS. -->
</target> </target>
...@@ -224,12 +226,13 @@ ...@@ -224,12 +226,13 @@
<antcall target="jar-pdus-classes"/> <antcall target="jar-pdus-classes"/>
<antcall target="jar-pdus-source"/> <antcall target="jar-pdus-source"/>
<antcall target="jar-pdus-javadoc"/> <antcall target="jar-pdus-javadoc"/>
<antcall target="jar-full"/> <!--<antcall target="zip-full"/>-->
</target> </target>
<target name="jar-full" description="full set of everything, pdus and enumerations"> <target name="zip-full" description="full set of everything, pdus and enumerations">
<delete file="dist/open-dis7-full.jar"/> <!-- TODO README -->
<jar destfile="dist/open-dis7-full.jar" <delete file="dist/open-dis7-full.zip"/>
<zip destfile="dist/open-dis7-full.zip"
update="true" update="true"
zip64Mode="always"> zip64Mode="always">
<!-- zip64Mode https://stackoverflow.com/questions/39524481/error-creating-jar-archive-contains-more-than-65535-entries/ --> <!-- zip64Mode https://stackoverflow.com/questions/39524481/error-creating-jar-archive-contains-more-than-65535-entries/ -->
...@@ -258,6 +261,7 @@ ...@@ -258,6 +261,7 @@
</fileset>--> </fileset>-->
<!-- https://docs.oracle.com/javase/tutorial/deployment/jar/manifestindex.html --> <!-- https://docs.oracle.com/javase/tutorial/deployment/jar/manifestindex.html -->
<!--
<manifest> <manifest>
<attribute name="description" value="Full set of files for ${manifest.name}"/> <attribute name="description" value="Full set of files for ${manifest.name}"/>
<attribute name="Built-By" value="${Built-By}"/> <attribute name="Built-By" value="${Built-By}"/>
...@@ -272,7 +276,8 @@ ...@@ -272,7 +276,8 @@
<attribute name="Sealed" value="true"/> <attribute name="Sealed" value="true"/>
</section> </section>
</manifest> </manifest>
</jar> -->
</zip>
</target> </target>
<target name="jar-pdus-javadoc" description="full set of javadoc"> <!-- avoid performing multiple times: depends="javadoc" --> <target name="jar-pdus-javadoc" description="full set of javadoc"> <!-- avoid performing multiple times: depends="javadoc" -->
......
...@@ -473,7 +473,12 @@ public class RangeCoordinates ...@@ -473,7 +473,12 @@ public class RangeCoordinates
westALittle.DISCoordFromLocalFlat(0.0, 0.0, 0.0); westALittle.DISCoordFromLocalFlat(0.0, 0.0, 0.0);
} }
public SRF_LococentricEuclidean3D getPlatformReferenceFrame(Vector3Double rangePositionCoordinates) /**
* Get Spatial Reference Frame (SRF) for this platform at the given coordinate
* @param rangePositionCoordinates local coordinates for location of interest
* @return Spatial Reference Frame (SRF) for this platform
*/
public SRF_LococentricEuclidean3D getPlatformReferenceFrame(Vector3Double rangePositionCoordinates)
{ {
try try
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment