2643 Commits

Author SHA1 Message Date
Billy Olsen
cf66aed22c Center rocket in side-view 2d renderings
Center the rocket within the side-view 2d renderings. This is similar to
how the side-view is rendered in 15.03 version.

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
2020-07-26 20:45:22 -07:00
Daniel Williams
9a0ef5f8ed
Merge pull request #708 from wolsen/snap/adjust-interfaces
Adjustments to snap stuff
2020-07-26 19:31:34 -04:00
Billy Olsen
82fea89bf0 Adjustments to snap stuff
Drop gcc as a build-dependency as LP#1883392 was fixed and delivered.
Additionally, change personal-files interfaces to be more explicit which
should allow for the snap store assertions which will possibly allow the
auto-connecting of the interfaces upon install for the OpenRocket app.

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
2020-07-26 10:06:10 -07:00
Daniel Williams
bbc22e19b7
Merge pull request #707 from teyrana/fix/696-zoom-jitter
[fixes #696] Fixes occassional zitter when auto-zooming at some sizes
2020-07-26 10:06:06 -04:00
Daniel_M_Williams
0c1029ac1d [fix] RocketFigure always shows scrollbars -- and compensates for this size when zooming to fit. 2020-07-26 10:01:04 -04:00
Daniel_M_Williams
0f3f5fe944 [fixes #696] Fixes occassional zitter when auto-zooming at some sizes
Ultimate cause is some very odd behavior from JViewPort.

This code is in effect, a workaround for that odd behavior.  It IS therefore 2/3 ugly hack :(

Also, refined some of the zoom calculations to be more exact.
2020-07-25 23:16:05 -04:00
Daniel Williams
6b609809e0
Merge pull request #621 from wolsen/fix-tube-fin-display
Fix TubeFinSet 2D rendering
2020-07-25 23:15:22 -04:00
Billy Olsen
908e6359ff Add BoxBounded interface to TubeFinSet
TubeFinSets cause rocket size within the panel to be a bit off. Add
the BoxBounded interface to provide a tight BoundingBox.

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
2020-07-25 18:28:54 -07:00
Billy Olsen
ec40b20ae0 Fix 3D rendering of TubeFinSet.
Changes to the TubeFinSet instanceable caused extra rotations of the
TubeFinSet around body tubes and podsets. Remove the extra rotation from
the 3D renderer.

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
2020-07-25 18:28:54 -07:00
Daniel_M_Williams
ac7d606423 [fix] fixes rotation issues in TubeFinSet 2d rendering. 2020-07-25 18:28:54 -07:00
Billy Olsen
74ec0be340 Make TubeFinSet RingInstanceable
Make the TubeFinSet RingInstanceable. This change updates the rendering
of both the 2D and 3D views to handle the RingInstanceable shapes. This
also updates the DocumentConfig to parse the new XML formats properly.

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
2020-07-25 18:26:07 -07:00
Billy Olsen
1bb64d45d3 Remove System.out.println in ComponentRenderer
Removes an unnecessary System.out.println to avoid extra printouts on
the console.

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
2020-07-25 18:26:07 -07:00
Billy Olsen
486a7f94e1 Fix TubeFinSet 2D rendering
The TubeFinSetShapes were applying the supplied transform too many
times, resulting in the the shapes being offset off the viewing area.
The offset transform is already applied to the component instance
that is provided to the TubeFinSetShapes methods, so applying the
transform resulted in the offset being moved to the right.

This change removes the transform being applied to the component
locations when retrieved and only applies a linear transformation
to the component locations when applying the base rotational
transform. Using the linear transform avoids applying the offset
in addition to the rest of the transform.

The problem existed in both the side view and the back view, however
the back view was not as obvious due to the nature of the view. The
common code between both functions applying the transform is
refactored into a common location to reduce the amount of code.
Additionally, documentation was added explaining the transform process
that is being applied to the component locations for the final shapes.

Fixes #605

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
2020-07-25 18:26:07 -07:00
Daniel Williams
0f2edc0024
Merge pull request #703 from teyrana/385/3d-select
[fixes #385] Restores ability to select components in the 3d views
2020-07-21 18:35:42 -04:00
Daniel_M_Williams
c6984309d2 [refactor] changed function names: 'reduce360' to 'reduce2PI' because the numbers are in radians 2020-07-19 16:06:51 -04:00
Daniel_M_Williams
02e935d6f7 [rm] remove duplicate jogl jar 2020-07-19 16:05:24 -04:00
Daniel_M_Williams
257e635937 [refactor] RocketFigure3D converted to use 'util.BoundingBox' 2020-07-19 14:44:55 -04:00
Daniel_M_Williams
56c60a0013 [debug] removed excess/redundant debug output in GUIUtil 2020-07-19 11:49:07 -04:00
Daniel_M_Williams
e9981aff28 [debug] removed excess debug output in FinSet 2020-07-19 11:30:54 -04:00
Daniel_M_Williams
12b299c25a [fix] enabled select of 3d components in the general case 2020-07-19 11:06:10 -04:00
Daniel_M_Williams
ae93141a21 [fix] enabled selection of 3d components ... in some cases 2020-07-18 17:29:56 -04:00
Daniel Williams
99f758c744
Merge pull request #686 from teyrana/476/fff-auto-scroll
[fixes #502][Fixes #476] Fixes auto-scrolling of FinPointFigure bounds.
2020-07-18 12:00:51 -04:00
Daniel_M_Williams
724f42a096 [fix] fixes remaining FinPointFigure auto-zoom-bounds behavior 2020-07-12 15:39:34 -04:00
Daniel_M_Williams
5696ad910b [fix] adjusted scroll increment in FinPointFigure to a reasonable number 2020-07-12 15:39:34 -04:00
Daniel_M_Williams
8162e81ac0 [fix] ff fin autozoom now works on tail transitions 2020-07-12 15:39:34 -04:00
Daniel_M_Williams
9890c33ef5 [fix][IDE][Intellij] running the jar will now auto-build it 2020-07-12 15:39:34 -04:00
Daniel_M_Williams
6561394f24 [fix][refactor] Added ability for AbstractScaleFigure to auto-zoom to something besides its entire bounds 2020-07-12 15:39:34 -04:00
Daniel_M_Williams
f0269b5d91 [refactor] Changed Dimension to Point display Figures 2020-07-12 15:39:33 -04:00
Daniel_M_Williams
6e2ab642e5 [fix] fixes variable name typo in FinPointFigure 2020-07-12 15:39:33 -04:00
Daniel_M_Williams
7c20b64135 [fix] fixed stack overflow in RocketFigure 2020-07-12 15:39:33 -04:00
Daniel_M_Williams
04476ecc98 [fix][refactor] Fixes and simplifies the bounds calculations in FinPointFigure 2020-07-12 15:39:33 -04:00
Daniel_M_Williams
69a338f440 [feat] Add a return value to BoundingBox.update(Coordinate) 2020-07-12 15:39:33 -04:00
Daniel_M_Williams
3d9938640f [whitespace] harmonized mixed spaces + tabs => tabs 2020-07-12 15:39:32 -04:00
Daniel_M_Williams
45fdb55dc4 [fix] prevents users from adjusting FreeformFins into intersecting (non-physical) positions 2020-07-12 15:39:24 -04:00
Daniel_M_Williams
358b3dc527 [fix] Added new BoundingBox tests; adjusted Falcon 9H Properties 2020-07-12 15:39:20 -04:00
Daniel_M_Williams
22160dbe5d [refactor] BodyTube now implements the BoxBounded interface 2020-07-12 15:22:23 -04:00
Daniel_M_Williams
7b81f763c7 [refactor] ComponentAssembly components no longer have bounds -- it's calculated from individual components, on a per-instance basis. 2020-07-12 15:17:51 -04:00
Daniel_M_Williams
0a9df5cc64 [refactor] Refactored FlightConfiguration.calculateBounds to be clearer 2020-07-12 15:16:42 -04:00
Joe Pfeiffer
056c6b2b39
Merge pull request #688 from JoePfeiffer/fin-moi
fixes Fin MOI calculations
2020-07-11 11:33:48 -06:00
JoePfeiffer
e30eb4b523 clarify comments 2020-07-09 10:14:28 -06:00
JoePfeiffer
69e45029a2 Adjust expected unit test results to account for modified longitudinal MOI calculation 2020-07-08 14:36:28 -06:00
JoePfeiffer
e1f59d7dc8 bit more comment cleanup 2020-07-07 10:52:32 -06:00
JoePfeiffer
224e0ea3fd In getLongitudinalUnitInertia(), modify so parallel axis theorem is only applied to Izz (yaw), not Iyy (pitch).
Modify code for getLongitudinalUnitInertia() and getRotationalUnitInertia() so similar functions have more similar code.

Add comments to clarify getLongitudinalUnitInertia() and getRotationalUnitInertia()
2020-07-06 19:16:55 -06:00
Daniel Williams
123732a878
Merge pull request #691 from teyrana/fix/doc
[fix] made string -> hashcode conversion explicit, to placate IDE warnings
2020-07-04 12:43:13 -04:00
Daniel_M_Williams
53ec830919 [fix] made string -> hashcode conversion explicit, to placate IDE warnings 2020-07-04 12:42:37 -04:00
Daniel Williams
673a246b8b
Merge pull request #690 from teyrana/hotfix
[fix] removes excess debugging lines from PR #676
2020-07-04 12:31:24 -04:00
Daniel_M_Williams
c0541386b6 [fix] removes excess debugging lines from PR #676 2020-07-04 12:29:53 -04:00
Daniel Williams
8c129dcc10
Merge pull request #676 from teyrana/509-fix-component-analysis
[fixes #509] Fix Component Analysis Dialog
2020-07-04 12:28:12 -04:00
Daniel_M_Williams
9f5d4a2d27 [enable] Re-enables, fixes ComponentAnalysisDialog 2020-07-03 10:05:09 -04:00
JoePfeiffer
87c26cccf4 Modified unit test expected results to match corrected fin MOI.
testAlphaIIIStructure
    Three fins in finset, so Ixx and Iyy are reduced by a factor of 3
    Ixx reduced from 5.2771946530250825E-5 to 1.7590648843416942E-5
    Iyy reduced from 1.3580770106050167E-4 to 4.526923368683389E-5

    Total rocket MOI changed to Ir=1.8763734635622462E-5 and
    It=2.1238394331365588E-4

testFalcon9HComponentMOI
    Three fins in finset, so
    finset rotational MOI  changed from 0.00413298 to 0.001377661595723823
    finset longitudinal MOI changed from 0.01215133 to 0.004050443797127646

testFalcon9HeavyBoosterLaunchMOIs
    Two finsets, each three fins.  Each finset's MOI are reduced as in
    testFalcon9HComponentMOI, resulting in change to totals
    Ir=0.013480523485489424, It=0.07017476021288252

testFalcon9HeavyBoosterSpentMOIs
    Two finsets, each three fins, as above
    Ir=0.010420016485489425, It=0.06398514917026163

testFalcon9HeavyBoosterStageMassOverride
    Two finsets, each three fins, as above
    Ir=0.007100144485489424, It=16.030625168315694

testFalcon9HeavyComponentCMxOverride
    Two finsets, each three fins, as above
    Ir=0.007100144485489424, It=0.047289449862727435

testFalcon9HeavyComponentMassOverride
    Two finsets, each three fins, as above
    Ir=0.026027963480146098, It=0.35928666329363634
2020-06-29 15:02:34 -06:00