2416 Commits

Author SHA1 Message Date
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
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
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
JoePfeiffer
ffef415ed5 Added an emacs work file by accident. Removing it here 2019-06-17 15:31:09 -06:00
JoePfeiffer
934cccb811 Was thinking about getting rid of RocketUtils since it's only used by android app; there's no harm in leaving it... 2019-06-17 15:28:50 -06:00
JoePfeiffer
85c21e5812 This is a much bigger commit than I like to make, and will result in a much bigger
PR than I like as well.  All I can do is apologize...

Fixes length calculation in RocketPanel.

(1) Finished switching over from deprecated getBounds() function to getBoundingBox().
getBounds() function is removed.

(2) 3D rendering code had its own getBounds().  Switched this over to
RocketComponent:getBoundingBox() as well

(3) Made getBoundingBox() consistently get the bounding box relative to the component.
Implementations for some components were calculating box relative to start of rocket

(4) Used InstanceMap to iterate through all instances of components in creating bounding box.
2019-06-17 15:25:27 -06:00
JoePfeiffer
1b188e20be finished first draft of fixing lengths 2019-06-10 17:04:09 -06:00
JoePfeiffer
719576cc62 bunch of changes along the way to fixing length calculation 2019-06-10 17:04:08 -06:00
Wes Cravens
b5cde10824
Merge pull request #519 from JoePfeiffer/fix-516
fix issue 516
2019-05-29 10:25:33 -05:00
Wes Cravens
7acaaf18d5
Merge pull request #535 from teyrana/fix_497
[fix #497] Disables Fin-Thickness-Warnings on Phantom Fins
2019-05-29 10:25:24 -05:00
Wes Cravens
02634fef6f
Merge pull request #533 from teyrana/fix_525_zero_diameter
Fixes #525; Main Figure display rocket diameter again.
2019-04-10 10:47:46 -05:00
Wes Cravens
ef08041802
Merge pull request #530 from JoePfeiffer/fix-527
Fix #527
2019-04-10 10:47:26 -05:00
Wes Cravens
48adb703d3
Merge pull request #523 from JoePfeiffer/fix-522
Fix 522
2019-04-10 10:46:44 -05:00
Wes Cravens
5a0338515c
Merge pull request #520 from teyrana/fix_482_grid
[Fixes #482][graphics] adjusts line color and width in FinPointFigure
2019-04-10 10:46:25 -05:00
Daniel_M_Williams
0823de5e2a [fix #497] Disables Fin-Thickness-Warnings on Phantom Fins 2019-04-04 19:08:45 -04:00
Daniel_M_Williams
93a60c94f7 [fixes #525] main window (again) displays max diameter of centerline components
-- added FlightConfiguration::getCoreComponents() method
2019-03-31 09:34:08 -04:00
JoePfeiffer
d635ed4c74 Remove validation when modifying fin tab 2019-03-19 14:35:45 -06:00
JoePfeiffer
f51ce5e931 oops, that shouldn't have been in there 2019-03-13 14:51:06 -06:00
JoePfeiffer
18ce41d9e7 Modified setTabHeight, setTabLength, and setTabOffset to take a second
parameter, determining whether to validate fin tab, and made them
private.

Created two public wrappers for each, one calling for validation
(which has the same signature as the original three methods), and the
other not.

Called NoValidate versions of the three in file loading functions so
validation doesn't interfere with tab length when tab is read before
fin.

Tried to make the coding of the three more consistent with each
other.
2019-03-13 14:45:30 -06:00
JoePfeiffer
efacebf5d8 Refactored MassCalculation.calculateAssembly() to separate calculation
of structure from calculation of motors, so mass and CG overrides
don't affect motors

Modified structure calculation so that when an override is in effect
and children are also being overridden, don't include root of tree as
an element in its own right when computing MOI.

Modified MassCalculatorTest to look for correct MOI value.
2019-03-07 18:05:44 -07:00
JoePfeiffer
fc5ef54d9d Modify comments on public accessors to match code 2019-03-04 11:23:49 -07:00
Wes Cravens
6efc7e42a1
Merge pull request #518 from ChrisMickelson/unstable
Spashscreen update for 2019
2019-03-04 11:45:55 -06:00
Wes Cravens
85fba669cd
Merge pull request #515 from teyrana/alpha12
[version] bump to alpha-12
2019-03-04 11:45:41 -06:00