forked from openrocket/openrocket
-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge dev branch into master #2
Open
mishaturnbull
wants to merge
523
commits into
master
Choose a base branch
from
unstable
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[fix] fixed deprecated method reflection references.
- thrust now counts motors on InnerTubes AND BodyTubes.
…ComponentAssemblyConfig' class
- update ParallelStage#update to use the parent-class which contains 'getOuterRadius'
Bugfix Aggregation: release-candidate-0
…le class (and implementations)
…ed+rotated components - introduced interfaces for different types of positionable components: -- AnglePositionable -- AxialPositionable -- RadiusPositionable - RingInstanceable now includes these other interfaces, making explicit the expectations of any implementing subclass. - RingInstanceable now indicates its angles as an array instead of returning angles one-at-a-time -- commit includes updates to match this new API - Added getAssembly() method to RocketComponent, to simplify instancing code
Fixes Issues: - openrocket#366 - openrocket#323 - RocketFigure no longer draws specific stages: Starts drawing rocket, and then propogates location, angle/transformation downwards - fixed active/inactive visibility toggling - Fixed Drowing Bounds for RocketFigure - Fix: FlightConfiguration#getBounds() - Fix: FinSet#getComponentBounds() - Fix: InnerTube#getInstanceCount() - Add: Coordinate#MIN, Coordinate#MAX - Add: net.sf.openrocket.util.BoundingBox - RocketComponent: - implement: #getInstanceLocations() // relative to parent component - implement #getInstanceAngles() - implement: #getComponentLocations() (Refactor/rename of #getLocations() ) - Implement <x>#getInstanceOffsets() // relative to component-reference-point - FinSet - PodSet - ParallelStage - RailButton - InnerTube: - fixed drawing shapes: - TubeShapes - BodyTube - Launch Lug - RingComponent (InnerTube, EngineBlock, Coupler) - Finset - Transition - Rail Button
…s for 'FinSet', 'LineInstanceable' Components - PodSet may save/load auto-radial-offset - Fins now save/load - 'instancecount' - 'angularoffset' - 'radialoffset' = 'auto' - RadiusPositionable interface now enforces 'setAutoRadialOffset(...)' - implemented RockeComponentSaver#emitInteger - all LineInstanceable implementers read/write 'instanceseparation' - [fix] RocketComponentSaver now saves 'instancecount' even if 1==instancecount
…ctly (add buttons are greyed-out)
…Configuration change - added check in MassCalculator against last-used FlightConfiguration - removed dead code
- Adjusted masscalculater code to not double-count instances (when mass > 0, and instance > 1 ) - RingComponents now correctly calculate their mass again
- moved 'instancecount' and 'instanceseparation' loading from CenteringRing to RadiusRingComponent - enables both Bulkhead and CenteringRing to load those tags from .ork file
…onfiguration Tab - Actual Fix is at MotorMountTableModel:102: re-added callback to the MotorMount component - cleaned up unused variables in the other panels - Tightened up variable re-use in GUIUtil class -- made several intermediate variables separate, uniquely-named, and final.
…available if motor mounts are present.
This is a relatively major refactor / rewrite of the 3d rendering code. - components geometries are rendered recursively - components inherit parents' transformations ( translation, rotation) - implemented Transformation#toGLMatrix() -- openrocket transformations can be directly fed into Java OpenGL - added: FinSet#getBoundingBox() - improved documentation on RocketComponent Location methods - Refactor RocketRenderer: - render component trees recursively - removed RocketRendere#isDrawn(c) -- return true in all implementations - Refactor ComponentRenderer - renamed variables to be more descriptive - changed RocketComponent#toAbsolute(...) => RocketComponent#getComponentLocations() - Adjust FinRender Code: - Render Single Fin Instance at-a-time - takes in an angle for the instance - assumes the fin is already at it's desired position. - renames 'fs' -> 'finSet'
Signed-off-by: Misha Turnbull <mishaturnbull@gmail.com>
May be worth noting the issues currently in the OpenRocket repo and keeping in mind that most of those issues are currently on the |
Signed-off-by: Misha Turnbull <mishaturnbull@gmail.com>
Fixes openrocket#498 - Refactor of FreeformFinSet[Test]
Increase accuracy of Center-Of-Pressure calculations
Fixes openrocket#482 // Tweak // Adjusts FinPointFigure background grid to be more useful
[fixes openrocket#510] Fin tab now saves the correct offset
Refactor instance map
Signed-off-by: Misha Turnbull <mishaturnbull@gmail.com>
Signed-off-by: Misha Turnbull <mishaturnbull@gmail.com>
Signed-off-by: Misha Turnbull <mishaturnbull@gmail.com>
This reverts commit 116335c.
Signed-off-by: Misha Turnbull <mishaturnbull@gmail.com>
Signed-off-by: Misha Turnbull <mishaturnbull@gmail.com>
Signed-off-by: Misha Turnbull <mishaturnbull@gmail.com>
Signed-off-by: Misha Turnbull <mishaturnbull@gmail.com>
Signed-off-by: Misha Turnbull <mishaturnbull@gmail.com>
…tanks Signed-off-by: Misha Turnbull <mishaturnbull@gmail.com>
Signed-off-by: Misha Turnbull <mishaturnbull@gmail.com>
Signed-off-by: Misha Turnbull <mishaturnbull@gmail.com>
Signed-off-by: Misha Turnbull <mishaturnbull@gmail.com>
Signed-off-by: Misha Turnbull <mishaturnbull@gmail.com>
Add fuel tank part base
Update from original source
Putting PR on hold while issue #9 is sorted out. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR to merge the previously unstable changes into the master branch. Worth some discussion. Almost 500(?) commits to merge -- not sure if this is worth the added effort for testing.