hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,217 Commits 2 Branches 43 Tags
Commit Graph

1217 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kruland2607
af7ef8360f Decorate the bottoms of all examples. 2013-03-29 00:22:18 -05:00
kruland2607
e254ff0e94 Make the appearance dialog work better when switching between default 
texture and custom.  Also ensure that default texture names do not
appear in the texture drop down.
 2013-03-29 00:18:40 -05:00
kruland2607
fe8cc22f6b Have Simulation.duplicateSimulation copy the configuration id as well. 2013-03-27 22:12:54 -05:00
kruland2607
ea3aeedf1b Make SimulationOptions.copyFrom prefer matches based on exact match of 
the configuration id.
 2013-03-27 22:12:09 -05:00
kruland2607
4cc3485fa0 Have Rocket.setFlightConfigurationName honor the DEFAULT_NAME. 2013-03-27 09:58:31 -05:00
kruland2607
161caceba0 Removed FlightConfigurationModelRemoveMe. 2013-03-27 09:30:49 -05:00
kruland2607
e7189bd415 Added localization to remove FIXME. 2013-03-27 09:28:49 -05:00
Sampo Niskanen
2db59086dd Merge branch 'kruland-integration-ui' into kruland-integration 
Conflicts:
	core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorConfigurationPanel.java
	core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationConfigurationPanel.java
	core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationSelectionDialog.java
 2013-03-27 08:48:17 +02:00
Sampo Niskanen
5b93c923f5 Flight configuration dialogs 2013-03-27 07:55:42 +02:00
kruland2607
8bd5098b73 Added default/override buttons to SeparationSelectionDialog. In 
SeparationSelectionDialog, IgnitionSelectionDialog, and
DeploymentSelectionDialog, added code which selects the default or
override radio buttons based on if the the configuration already
overrides the parameters.
 2013-03-27 00:28:27 -05:00
kruland2607
4362896139 Fixed the deployment of the booster chute and named the recovery 
devices.
 2013-03-27 00:24:57 -05:00
kruland2607
96cba8ed02 Removed FIXME comment since the localization issue was resolved in 
previous commit.
 2013-03-26 22:26:25 -05:00
kruland2607
7db0c17c56 Added some localized messages when exporting and editing decals. 2013-03-26 22:24:21 -05:00
kruland2607
9bf9e55428 More fixes to displayed text when default has delay. 2013-03-26 17:44:23 -05:00
kruland2607
31241bc0b9 When the selected configuration changes, update all the panel contents. 2013-03-26 17:38:12 -05:00
kruland2607
5dbb723736 Update button states with every selection and corrected display of 
separation configuration.
 2013-03-26 17:37:31 -05:00
kruland2607
9916a98ccb Double clicking on ignition cell opens select ignition dialog. Removed 
FIXME.
 2013-03-26 17:20:00 -05:00
kruland2607
594638bf02 Removed the FIXME comment since it's not so important to change the 
names of the methods.
 2013-03-26 17:09:31 -05:00
kruland2607
56edaeff77 Corrected implementation of reset motor ignition to default. 2013-03-26 16:48:32 -05:00
kruland2607
f6d4ce4a9b Forgot to remove comment when correcting fixme. 2013-03-26 16:11:10 -05:00
kruland2607
b034eccd43 Corrected FIXME for localization. 2013-03-26 16:10:26 -05:00
kruland2607
05b43a2f41 Change FIXME - compute deal size to a TODO. It would be nice but not 
necessary.  Fixed FIXME to test for flight configurations while
determining file format version.
 2013-03-26 16:09:48 -05:00
kruland2607
8dea8f9395 Added size() method to FlightConfiguration and FlightConfigurationImpl 
to determine if a component has any flight configurations other than
default.
 2013-03-26 16:08:30 -05:00
kruland2607
8b6541284c Removed fixme comment since it was unreachable. 2013-03-26 16:03:53 -05:00
Sampo Niskanen
525869c3e7 Refactoring or rocket configuration description 2013-03-22 18:12:58 +02:00
Sampo Niskanen
dd5a16802b Merge branch 'master' into kruland-integration-ui 
Conflicts:
	core/.classpath
 2013-03-21 09:16:35 +02:00
Sampo Niskanen
bfa609ebbe UI refactoring 2013-03-21 09:00:34 +02:00
kruland2607
3904fe74d7 Merge pull request #51 from bkuker/kruland-integration-3d-improvements 
3d Rendering Improvements
 2013-03-20 19:14:21 -07:00
Sampo Niskanen
f8d742408e Document property openrocket.plugins 2013-03-17 19:46:11 +02:00
bkuker
42bff6192b Fix visual problem in unfinished view by making inner tubes opaque. 2013-03-17 10:18:37 -04:00
bkuker
fe61fc4b7d Improved Transition & Cone Rendering 
Smooth normals better.
Take better care of the tip normals.

Use TransitionRenderer for cones too

Use higher LOD near tip of cones

Reduce the LOD smartly in a couple places
 2013-03-17 10:18:36 -04:00
bkuker
9a8b4852a3 Draw inside & outside correctly in figure mode 
Make the inside a little brighter
 2013-03-17 10:18:30 -04:00
bkuker
dd730a5ed9 Give the rear end of the motors a little shape 2013-03-17 10:18:27 -04:00
bkuker
befd3bfb96 Re-introduce display lists. 
I should really just push everything into a single one, but I would
have to re-factor to pre-load all the textures, not load them while
rendering.
This isn't Doom III :)
 2013-03-17 10:18:27 -04:00
bkuker
9eaca6c30c Improved Mass Object rendering 2013-03-17 10:18:26 -04:00
bkuker
145fe35393 Transition shoulder thickness & factor out tube rendering. 2013-03-17 10:18:25 -04:00
bkuker
a05e60b78c Add cross-sectional shape to fins 
Move fin rendering into separate class

Add cross product to Coordinate class

Honor cross section setting
Make the bevel on the edge a set percentage of the fin length, not a set
value.

Some pretty subtle differences between rounded and airfoil, and a
smooth edge on elipsoidal fins.

base rounded fin inset on shorter of length or height so high aspect
ratio fins, like the little red guys on Apocalypse, do not mis-render
 2013-03-17 10:18:24 -04:00
bkuker
b2320cf8e7 Clean out some commented cruft 2013-03-17 10:18:23 -04:00
bkuker
554e4129e9 Fix the normals on the insides of tubes, lugs & rings. 2013-03-17 10:18:22 -04:00
bkuker
958e098884 Remove backface material & property settings 2013-03-17 10:18:21 -04:00
bkuker
cc8db8cc96 Fix alpha issues 
Fix selection bug
 2013-03-17 10:18:17 -04:00
bkuker
701aa4b151 Add thickness to a few components. 
Add an ALL surface
 2013-03-17 10:08:50 -04:00
bkuker
8b633bcd95 Refactor rendering a little, separating inside, outside and edge surfaces 
push geometry into a sub-package

Remove display lists

Force all calls to render geometry through a callback object

Switch to a design where I get individual Geometry callbacks. Easier to
deal with
 2013-03-17 10:07:55 -04:00
Sampo Niskanen
83fcf0894e Merge branch 'kruland-integration' of github.com:plaa/openrocket into kruland-integration-ui 2013-03-17 11:13:50 +02:00
Sampo Niskanen
b2776f5e92 UI refactoring 2013-03-17 11:13:32 +02:00
kruland2607
f4dce54312 Correct handling of ejectionCharges in getter and clone. 2013-03-16 20:49:02 -05:00
kruland2607
e8b9efd1d0 Merge remote-tracking branch 'upstream/kruland-integration-ui' into 
kruland-integration

Conflicts:
	core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java
 2013-03-16 18:35:31 -05:00
kruland2607
ed693edd00 Updated some documentation on file format. 2013-03-16 18:27:11 -05:00
kruland2607
c882ff2e19 Added fixme in version check. Need to add test for flight 
configurations.
 2013-03-16 18:21:27 -05:00
kruland2607
2cfd46760d Since it was decaled like a patriot, the dimensions were changed to more 
closely match a 1/2 scale rocket.
 2013-03-13 23:12:14 -05:00