2436 Commits

Author SHA1 Message Date
Daniel_M_Williams
f6ea1fc35d [fix] Sets Fins to be created with 3 instances instead of one 2020-03-21 19:02:39 -04:00
JoePfeiffer
efe0d9e28d Added missing instanceNumber parameter to String.format() call in toString()
Added explicit call to component.toString() so intellij can print component name
2020-03-19 19:28:47 -04:00
Daniel_M_Williams
b620360da0 [fix] runs jar with default jdk 2020-03-19 19:07:54 -04:00
Daniel_M_Williams
5a1347aafb [fix] Sets Intellij compiler to simply be '11'-- the default, included one 2020-03-19 19:01:24 -04:00
Daniel_M_Williams
cc1e39900a [fix] updates the Boosters example rocket 2020-03-19 18:20:15 -04:00
Daniel_M_Williams
154df7bb34 [fix] updates the Pods example rocket 2020-03-19 18:20:15 -04:00
Neil
0f01a9c437 Address Integer().toString() and Double().toString() warnings. 2020-03-19 18:19:07 -04:00
Daniel_M_Williams
65a4698d37 [fix][Intellij] Intellij now correctly builds jars and tests with all the new libraries 2020-03-19 18:19:07 -04:00
Daniel_M_Williams
3f2017782c [test] Change CI jdks; move to Ubuntu 18.04 LTS / Bionic Beaver 2020-03-14 16:07:57 -04:00
Daniel Williams
d7f0fcb91c
Merge pull request #589 from itshanney/feature/fix-macos-after-java11-upgrade
Fix macOS after java11 upgrade
2020-03-14 16:05:35 -04:00
Justin Hanney
b78b07e76e Merge branch 'unstable' into feature/fix-macos-after-java11-upgrade 2020-03-14 12:34:45 -04:00
Daniel Williams
cc8f0caaab
Merge pull request #575 from wolsen/issue-553
Notify all event listeners when DoubleModel.setValue called
2020-03-14 00:21:45 -04:00
Daniel Williams
59a01b3877
Merge pull request #577 from wolsen/issue-576
Fix ground hit velocity calculation
2020-03-14 00:14:54 -04:00
Daniel Williams
c84fd74be2
Merge pull request #585 from teyrana/upgrade/slf4j
[upgrade][jar] upgrades slf4j logging libraries from 1.7.5 => 1.7.30
2020-03-13 23:31:39 -04:00
Daniel_M_Williams
630b5eca58 [upgrade][jar] upgrades slf4j logging libraries from 1.7.5 => 1.7.30
- updates ant build
- updates Intellij build
- updates Eclipse build
2020-03-13 23:27:34 -04:00
Billy Olsen
a2168ed84f Notify all event listeners when DoubleModel.setValue called
Previous refactoring of the event listeners lost notifications
to classes which care about changes to the DoubleModel. One
such example is the UnitSelector. Ensure that all the
ChangeEventListeners and StateChangeEventListeners are called
when the setValue method is invoked.

Closes #553

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
2020-03-12 19:48:35 -07:00
Justin Hanney
de2ed1a4a1 Remove openjdk8 after switching to newer macOS java libs 2020-03-11 20:53:40 -04:00
Justin Hanney
3d3d9cca90 Revert build.xml source/target back to 1.8 2020-03-11 20:22:10 -04:00
Justin Hanney
a7c0cb2b8a Fix OSXSetup after migration to Java9+ 2020-03-11 20:16:46 -04:00
Daniel Williams
d9a3cbb39c
Merge pull request #574 from wolsen/issue-573
Use AWTTextureIO for creating textures from jpegs
2020-03-11 08:30:32 -04:00
Daniel Williams
7251a63086
Merge pull request #583 from wolsen/fix-eclipse-classpaths
Update eclipse .classpath files
2020-03-11 08:12:33 -04:00
Daniel Williams
c631d2c9cc
Merge pull request #581 from teyrana/fix/ant-build
Minimal change to re-enable ant builds -- add "script-api-1.0.jar"
2020-03-11 08:07:24 -04:00
Billy Olsen
51fd9d47dc Update eclipse .classpath files
Update the eclipse .classpath files to point to the new and updated
jar files that were merged as part of the recent upgrade to Java 11/
Java 13 commits.

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
2020-03-10 19:25:44 -07:00
Billy Olsen
ddfe7c5c90 Add unit tests for FlightData
Add unit tests to cover some of the FlightData object and
some of the calculations. This specifically covers the bits
for FlightData.getGroundHitVelocity() where the ground hit
velocity is calculated from a FlightDataBranch consisting
of a series of data points and events occuring during flight.

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
2020-03-10 19:14:24 -07:00
Daniel Williams
52a4022f2c
[rollback] disables broken upload.sh in .travis.yml (#582) 2020-03-08 17:40:31 -04:00
Daniel_M_Williams
92308c7665 [fix][build][ant] Fixes ant builds 2020-03-07 20:27:37 -05:00
Billy Olsen
a82d4085e2 Fix typo in method name
Fix the spelling of 'interesting' in the method
FlightData.calculateInterestingValues.

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
2020-03-06 07:37:46 -07:00
Billy Olsen
97c1112c56 Fix ground hit velocity calculation
The ground hit velocity is calculated by taking the last recorded
total velocity for the flight data and using that as the ground
hit velocity if the last altitude measurement is less than 10 m.

This method worked until commit f11a3e4 introduced the ability to
track and report all events that happened after a GROUND_HIT event.
That commit introduced a GroundStepper that will step between the
GROUND_HIT event and the SIMULATION_END event and will always
add a measurement to the flight data to record the rocket being on
the ground.

A better way of measuring the ground hit velocity is to interpolate
the velocity at the time the GROUND_HIT event, as that would actually
be the appropriate ground hit velocity.

Closes #576

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
2020-03-06 07:33:33 -07:00
Daniel Williams
84203b014b
Travis CI now builds for Java 13 -- and fixed some issues for Java 13 (#572)
* [jar][Upgrade] Upgrade lib-tests libraries

* [fix][jar/upgrade] Upgraded jars in core/lib.  -- fixed Junit Failures due to missing jaxb bindings.

* [fix] Added openjdk 13 to travis auto-builds

* [fix][unittest][java8] fixes automated java8 unittests

* [fix][build][jar] Upgraded logback libraries; moved to core/lib

* [fix][build][jar] removes unused jars: jaxb-jxc.*.jar

* [upgrade][build][jar] Upgrade the guice .jar libraries
2020-03-06 08:52:20 -05:00
Billy Olsen
57b928575f Use AWTTextureIO for creating textures from jpegs
The switch to using JOGL uses the current JPEGs, but these textures
cannot be read using the GL.GL_RGBA format which is eventually
propigated to the user by an error dialog showing a NullPointerException
for the texture which failed to load. Using GL.GL_RGB as the format when
loading the textures will resolve the texture loading issue, but the
images are inverted due to differences between AWT and JOGL
interpretation of where the image starts (top left vs bottom left).

Change instead to use the AWTTextureIO class to create the textures
which solves both problems - the loading of the texture as well as
presenting the image in the appropriate orientation.

Closes #573

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
2020-03-04 19:35:46 -07:00
Daniel Williams
3aaf8c6802
Merge pull request #556 from neilbalch/java11-upgrade
Upgrade to Java 11/Java 13 and retire Android app
2020-03-03 21:36:44 -05:00
Daniel Williams
e51545d7f3
Merge pull request #570 from wolsen/add-railbutton-presets
Add railbutton presets
2020-03-03 18:44:53 -05:00
Neil
c0203b9267
Merge pull request #3 from teyrana/fix_java11_3d
[fix] Restores 3d Views to PR #556 -- Java 11 upgrade
2020-03-03 11:21:17 -08:00
Billy Olsen
e0983c05cc Add back instance panel dropped in previous commit
Adds back the instance options in the previous commit for specifying
instance details about rail buttons. This change adds it back but
slightly tweaks the layout and location in order to keep the config
panel in a 2 column arrangement.

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
2020-03-03 09:37:56 -07:00
Billy Olsen
3995a330da Add new material types for rail buttons
Add two new material types for rail buttons, delrin and nylon.
The material densities are pulled from wikipedia and cross-referenced
with Dupont's material database.

Additionally, set Delrin as the default material for RailButtons.

Closes #554

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
2020-03-02 20:33:56 -07:00
Billy Olsen
f8993e89db Add rail button presets options
Allow rail buttons to define presets. This change doesn't actually add
any default presets to the library, but enables the ability to add some
preset options for rail buttons.

Partially Closes #554

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
2020-03-01 18:32:32 -07:00
Billy Olsen
232b363712 Fix large rail button default size.
The default values assigned to RailButton sizes were configured with
a 1.0 meter outer diameter and 0.8 meter internal diameter (for 1010
rail buttons) which resulted in overly large rail buttons when added
using the default values.

Presuming that 1010 rail buttons are the common and an acceptable
default, change the default button sizes to align with the 1010 size.

Additionally, this change fixes some of the layout issues present in
add railbutton dialog.

Closes #554

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
2020-03-01 18:26:30 -07:00
Daniel_M_Williams
5e3dbb6575 [fix] Restores 3d Views to PR #556 -- Java 11 upgrade 2020-02-29 20:44:42 -05:00
Neil
cea5229fbf
Merge pull request #2 from teyrana/retire_android
Due to lack of interest, the Android client is being retired.
2020-02-23 09:13:06 -08:00
Daniel_M_Williams
9a33599428 [Retire Android Client] Due to lack of interest, the Android client is being retired. 2020-02-23 08:54:22 -05:00
Neil
df8aee842b
Merge pull request #1 from teyrana/java11-upgrade
Changed SDK name; Added Resource directories
2020-02-20 20:49:39 -08:00
Daniel_M_Williams
aeab0c3d81 [fix] added example rockets to jarfile 2020-02-19 22:30:32 -05:00
Daniel Williams
da5dcca83d
Revert PR#543 -- Change causes a stack overflow while during simulation of certain rockets.
Revert "Fix 525" -- PR causes Stack Overflow when simulating other rockets.
2020-02-15 10:40:39 -05:00
Daniel Williams
95d497827d
Revert "Fix 525" 2020-02-15 09:23:01 -05:00
Daniel_M_Williams
c12e405467 [fix] local JDK pathing fixes to make branch work on my machine 2020-02-15 08:42:40 -05:00
Daniel Williams
64514ed514
Merge pull request #521 from JoePfeiffer/fix-361 -- Extend simulation until last motor burns out
Fix 361
2020-02-14 21:58:10 -05:00
Daniel Williams
be02f99f7e
Merge pull request #543 from JoePfeiffer/fix-525
90% of this is just refactoring APIs, and I think those are migrating to a clearer, more succinct form. 👍 +1
2020-02-10 22:21:36 -05:00
Neil Balch
f26e3afcf3 Upgrade codebase to Java 11 2019-10-28 08:56:05 -07:00
Wes Cravens
0509f9e8ec
Merge pull request #545 from bweissinger/unstable
[Fix #544] InnerTube.getInstanceOffsets() returning Coordinate.ZERO for single inner tube
2019-09-01 11:26:13 -05:00
bweissinger
778413c882 Correct InnerTube.getInstanceOffsets() returning Coordinate.ZERO instead of actual offset values 2019-09-01 00:42:39 -05:00