653 Commits

Author SHA1 Message Date
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
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_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
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
Daniel_M_Williams
aeab0c3d81 [fix] added example rockets to jarfile 2020-02-19 22:30:32 -05:00
Daniel Williams
95d497827d
Revert "Fix 525" 2020-02-15 09:23:01 -05: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
719576cc62 bunch of changes along the way to fixing length calculation 2019-06-10 17:04:08 -06: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
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
Daniel_M_Williams
e45e116b97 [graphics] adjusts line color and width in FinPointFigure 2019-02-17 11:33:56 -05:00
Wes Cravens
1abf0d3834
Merge pull request #513 from teyrana/refactor_instance_map
Refactor instance map
2019-01-26 07:14:39 -06:00
Wes Cravens
143afb0fde
Merge pull request #508 from teyrana/fix_482_fin_grid
Fixes #482 // Tweak // Adjusts FinPointFigure background grid to be more useful
2019-01-26 07:14:01 -06:00
Daniel_M_Williams
577b09c4e9 [refactor] switched 2D figure rendering over to new, simpler system 2019-01-25 22:27:23 -05:00
Daniel_M_Williams
0711cb785b [fix] re-implements RocketRenderer-tree-code 2019-01-25 22:27:23 -05:00
Daniel M Williams
3b342391b1 [fix] may now always edit a FreeformFinSet's p[0]. Again. 2019-01-02 19:23:13 -05:00
Daniel M Williams
01fd20ebcc [refactor] added code to tests for negative inertia / intersection case 2019-01-02 19:23:11 -05:00
Daniel_M_Williams
52d1a26cd8 [tweak] Adjusts the spacing between minor gridlines in FinPointFigure 2019-01-02 18:40:09 -05:00
Daniel_M_Williams
9ebf681ee1 [tweak] adds different colors for major and minor grid-lines 2019-01-02 18:40:09 -05:00
Daniel_M_Williams
5cd7f97847 [comment] delete misleading/incorrect comment 2018-12-21 14:46:46 -05:00
Daniel_M_Williams
be1aac2c66 [fixes #502] Adjust RocketFigure Bounds to include negative-coordinate components 2018-12-21 14:45:11 -05:00
Wes Cravens
1ae277bf0a
Merge pull request #501 from teyrana/fix_499_fin_convert
[fixes #499] prevents an exception after converting-to-freeform
2018-12-21 12:17:09 -06:00
Wes Cravens
bc22b49a76
Merge pull request #495 from teyrana/fix_fin_zero
[fix][minor] May correctly adjust first fin point
2018-12-21 12:16:41 -06:00
Daniel_M_Williams
b8c8237ae4 [fixes #499] prevents an exception after coneverting-to-freeform 2018-12-15 12:21:42 -05:00
Daniel_M_Williams
cff658e0ca [fix][minor] May correctly adjust first fin point, if it's within the mount's x-bounds 2018-12-09 17:05:24 -05:00
Daniel_M_Williams
2282d33c3d [fixes #329] refactors some event-handling in component config dialogs 2018-12-08 18:29:01 -05:00
Wes Cravens
ce2982e576
Merge pull request #489 from teyrana/fix_474_488
Fix 474, 488  (rendering and editing issues with free-form fins)
2018-12-08 12:30:44 -06:00
Daniel_M_Williams
dc1f2d9666 [fix 482] Adjusts colors to make fin-point-plot grid lines more visible 2018-12-01 13:56:48 -05:00
Daniel_M_Williams
fda3ae839f [fix #488] Dragging first fin point works correctly 2018-12-01 13:31:55 -05:00
Daniel_M_Williams
15c00620bc [fixes #474] Fin bounds include whole fin, even if it extends in front of the mount. 2018-12-01 12:40:16 -05:00
Wes Cravens
4bd3e4ff18
Merge pull request #487 from teyrana/fix_482_fin_shape_grid
[fixes #482] Restores grid lines
2018-11-26 15:41:37 -06:00
Daniel_M_Williams
6f0957bbc4 [fixes #482] Restores grid lines 2018-11-26 13:25:57 -05:00
Daniel_M_Williams
54af8fcad6 [fixes #454] Allows dragging of first point 2018-11-26 11:04:45 -05:00
Wes Cravens
151a4d864d
Merge pull request #465 from teyrana/feat_boattail_fins
Feat boattail fins
2018-11-03 12:13:39 -05:00
Wes Cravens
2b78647f8a
Merge pull request #466 from teyrana/fix_463_motor_display
[fixes #463] Motors now rotate in RocketFigure side-view, back-view
2018-11-03 12:13:27 -05:00
JoePfeiffer
1bf2ed2a54 Show stage names instead of stage numbers 2018-10-31 18:46:17 -06:00
Daniel_M_Williams
1768c6d83e [fixes #463] Motors now rotate in RocketFigure side-view, back-view 2018-10-27 16:23:25 -04:00
Daniel_M_Williams
6793eaaa04 [fix] FreeformFinSet now displays correctly. 2018-10-27 14:41:01 -04:00
Daniel_M_Williams
166d358c14 [Feature] Freeform Fins may not be attched to variable-shaped body components
- Fins may be attached to Transitions (and subclass NoseCones )

  [Fix] FinSet now implements the Ring-Instanceable interface
  [Refactor] Rocket inherits from ComponentAssembly instead of RocketComponent
  [Fix][Refactor] Fin tabs are now correctly validated upon change
  [Fix] Fin tabs are now corrected to be no-bigger-than their fins
  [Refactor] FinSet.getBodyRadius(..) now requires an argument
  [Fix] restricted fin tab positioning to be strictly top/middle/bottom
  [Refactor] Reimplement FreeformFinSet.setPoint(...)
  [Fix] Prevent Freeform Fins movement past parent's top/front
  [bugfix] Fins are now addable to transitions from the GUI
  [Fix] Fins, Transitions are now drawn correctly in fin-design window
  [Minor] Added makeV2 rocket to TestRockets

  [fix] getRootPoints() impl & test
2018-10-27 14:41:01 -04:00
Daniel_M_Williams
b268d3aa59 [refactor] RocketComponent positioning is now centralized in AxialMethod class
- also relaxed visibility for Component::setAxialMethod(...)
2018-10-27 14:41:01 -04:00
Daniel_M_Williams
2ac764b4c3 [fix][partial] Addresses some instances of #329 in NoseCones and Transitions 2018-10-15 21:12:04 -04:00
Daniel_M_Williams
f5d786fab6 [fix][partial] Address Some issues of TrapezoidFinSetConfig: isssue #329 2018-10-15 13:10:04 -04:00