Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
NetworkedGraphicsMV3500
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Savage
NetworkedGraphicsMV3500
Commits
35089a18
Commit
35089a18
authored
3 years ago
by
terry-norbraten
Browse files
Options
Downloads
Plain Diff
Merge origin/master
parents
be6f7a12
62c4c50c
No related branches found
No related tags found
No related merge requests found
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
build.all.out.txt
+1310
-75
1310 additions, 75 deletions
build.all.out.txt
build.xml
+12
-7
12 additions, 7 deletions
build.xml
src/edu/nps/moves/spatial/RangeCoordinates.java
+6
-1
6 additions, 1 deletion
src/edu/nps/moves/spatial/RangeCoordinates.java
with
1328 additions
and
83 deletions
build.all.out.txt
+
1310
−
75
View file @
35089a18
This diff is collapsed.
Click to expand it.
build.xml
+
12
−
7
View file @
35089a18
...
@@ -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" -->
...
...
This diff is collapsed.
Click to expand it.
src/edu/nps/moves/spatial/RangeCoordinates.java
+
6
−
1
View file @
35089a18
...
@@ -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
{
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment