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

1420 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
kruland2607
dcacae5e75 Fix arguments to ant's tempfile task. 2013-03-26 15:19:48 -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
d6c4a0948d Updated database source files for presets and thrustcurves. 2013-03-13 23:31:50 -05:00
kruland2607
3d17930bc8 Updated motor thrust curve files from thrustcurve.org. 2013-03-13 23:30:16 -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
kruland2607
c19a12b3b5 Rerun simulations on Three-stage rocket example so it the boosters use 
tumble recovery.
 2013-03-13 16:29:14 -05:00
kruland2607
faf5f12d27 Clean up imports. 2013-03-13 16:22:40 -05:00
Bill Kuker
db286c3293 Merge pull request #47 from bkuker/kruland-integration-examples 
Add some paint and decals to most of the examples.
 2013-03-13 13:48:18 -07:00
bkuker
4d9b691a39 Update all of the examples with some nice decals & paint. 2013-03-13 16:44:20 -04:00
kruland2607
3eb96ee04d Merge branch 'tumble-recovery' into kruland-integration 
Conflicts:
	core/resources/datafiles/examples/Three-stage rocket.ork
	core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java

Ignored changes to Three-stage rocket.ork since that will need to be
reproduced after the cool 3d view enhancements to the example.

The BasicEventSimulationEngine conflicts were trivial and manually
resolved.
 2013-03-13 14:34:11 -05:00
plaa
db7acc057f Merge pull request #44 from bkuker/latest-jogl 
JOGL 2.0-rc11
 2013-03-02 11:34:34 -08:00
bkuker
00a17eb0e2 Merge remote-tracking branch 'plaa/master' into latest-jogl 
Conflicts:
	core/.classpath
 2013-03-02 11:08:49 -05:00
Sampo Niskanen
d27a394813 Flight config dialog refactoring 2013-03-01 23:21:58 +02:00
kruland2607
4ff2eb11ec Removed ExampleDesignDialog which was replaced by the Open Example 
cascading menu.
 2013-03-01 10:56:08 -06:00
Sampo Niskanen
170ce13c05 Data model refactoring 2013-03-01 08:41:47 +02:00
Sampo Niskanen
4c48ec48c9 Merge branch 'kruland-integration' of github.com:plaa/openrocket into 
kruland-integration-ui

Conflicts:
	core/src/net/sf/openrocket/file/openrocket/importt/MotorHandler.java
 2013-02-23 08:51:22 +02:00
Sampo Niskanen
0e2ee6a566 Refactoring data model 2013-02-23 08:47:21 +02:00
kruland2607
0cfc8e6d28 Fixed AOA tumble condition. AOA is stored in radians not degrees. 2013-02-18 12:17:30 -06:00
kruland2607
526131a64c Implement tumbling based on the mathematics in techdoc.pdf. Change the 
conditions to transistion to tumbling to include aoa>30.
 2013-02-18 12:09:15 -06:00
kruland2607
f7def169ef Updated translation files from Boris du Reau. 2013-02-14 13:17:48 -06:00
kruland2607
31d6baffd4 Back out directory watcher code since we aren't using it yet. 2013-02-13 10:21:14 -06:00