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

461 Commits

Author SHA1 Message Date
Bill Kuker
97b2ad36bd Better texture filtering 2012-10-23 14:53:11 -05:00
Bill Kuker
3c0ad074ef Having Ambient and Diffuse sum to more than one causes inconsistencies with textures. It looks like it is clamping the color from lighting before it multiplies it with the texture. 2012-10-23 14:53:04 -05:00
Bill Kuker
68954b0ed5 Are UseSingleColor and SimpleColorModel synonyms? Hope so! 2012-10-23 14:52:57 -05:00
Bill Kuker
00ff011f4d Separate specular color 2012-10-23 14:52:50 -05:00
Bill Kuker
5dd804bed0 Trying to get material and lighting right 2012-10-23 14:52:42 -05:00
Bill Kuker
09b81a3529 Fix oneColor option 2012-10-23 14:52:36 -05:00
Bill Kuker
f582af7c95 Fix up caching - let textures in cache survive one reload. 2012-10-23 14:52:28 -05:00
Bill Kuker
3a9b843c9a Add file chooser. 2012-10-23 14:52:22 -05:00
Bill Kuker
f466729fe0 Texture rotation slider Disable color buttons when default appearance is selected 2012-10-23 14:52:15 -05:00
Bill Kuker
348db9d685 Correct component dao startup on Decal test programs 2012-10-23 14:52:08 -05:00
Bill Kuker
a0fad818de Correct component dao startup 2012-10-23 14:52:01 -05:00
Bill Kuker
d8bb8c002c 2012-10-23 14:51:55 -05:00
Bill Kuker
5665770504 Rough & Ugly appearance editor. 2012-10-23 14:51:48 -05:00
Bill Kuker
8dc76e50b7 Build component appearances on RockSim Import 2012-10-23 14:51:31 -05:00
Bill Kuker
13275be3a9 Build component appearances on RockSim Import 2012-10-23 14:51:07 -05:00
Bill Kuker
6e0379fbaf Fixed what I consider a bug: Rendering as a 3D rect uses the actual color selected as the highlighted side of the border, and the main field of the ColorIcon is a darker version of the selected color. 
Added an OpenRocket Color constructor.
 2012-10-23 14:44:18 -05:00
Bill Kuker
5531e2c3ca Added a toString for appearance logging 2012-10-23 14:44:11 -05:00
Bill Kuker
a7ee3143bb This has been moved 2012-10-23 14:44:04 -05:00
Bill Kuker
fef4c39f73 Move rules about how to render what into RenderStrategies. Implement Figure & Realistic strategies. 2012-10-23 14:43:28 -05:00
Bill Kuker
0621c1971d Some 3d test junk, to be deleted later 2012-10-23 14:24:00 -05:00
Bill Kuker
7ee423ba6d Give RocketComponents an Appearance 2012-10-23 14:23:47 -05:00
Bill Kuker
13289c423b Immutable Appearance & Decal objects. An AppearanceBuilder so they are not a pain to construct. 2012-10-23 14:14:42 -05:00
kruland2607
d305f9a952 Cleaned up imports. 2012-10-07 22:24:33 -05:00
kruland2607
ecac762940 Break up the area/cg test cases and add some documentation describing 
what they are doing.
 2012-10-07 22:20:33 -05:00
kruland2607
d8edf41355 Ignore simulation time steps <= 0 when loading ork file. 2012-10-07 22:19:59 -05:00
kruland2607
372bcae9a7 If the user selected a really small (0) timestep, the simulation gets 
into an infinite loop.  Don't use a user selected timestep smaller than
MIN_TIME_STEP.
 2012-10-07 22:19:27 -05:00
kruland2607
4d77c817d8 Merged changes fixing NaN when computing fin CG. 2012-10-07 22:18:53 -05:00
kruland2607
9c3fce4517 Added couple of simple unit tests for computing area and cg for 
Trapezoidal and Free Form FinSets.
 2012-10-07 22:18:06 -05:00
kruland
a9a1860f96 Committing Russian l10n changes provided by Ruslan Uss. 2012-09-30 20:12:37 -05:00
Sampo Niskanen
e7ba712bea Version to 12.09.1dev 2012-09-28 21:51:44 +00:00
Sampo Niskanen
8fbbb00387 Release 12.09.1 2012-09-28 21:42:20 +00:00
Bill Kuker
3b368ac270 Reverting efforts to detect & reduce 3d crashes. 
Reverting:
1073
1074
1075
1076

1078
1079
 2012-09-28 20:25:31 +00:00
Sampo Niskanen
506dc0c9b7 Unit rounding fine-tuning 2012-09-28 19:42:11 +00:00
Bill Kuker
2c6c5aa4c3 Move 3d initialization back where it was (left crash detection). Feeling was that dismissing the splash screen so early in linux felt like a crash. 2012-09-28 12:48:13 +00:00
Bill Kuker
1733ae5398 Add thread names to the danger-timer thread 2012-09-27 16:38:15 +00:00
Sampo Niskanen
bfe48265e6 Add usage instructions to preset dialog 2012-09-27 16:36:45 +00:00
Bill Kuker
22ee569d32 Add a timed check for GL Crash. Really a last resort. 2012-09-27 16:23:00 +00:00
Bill Kuker
b82be4fc02 Give a string description to each place I enter or leave the GL DangerZone 2012-09-27 16:15:45 +00:00
Bill Kuker
02360f89dd GL Init must happen after OSX init, or else the application name does not take effect. Ugh. 2012-09-27 14:55:24 +00:00
Bill Kuker
4073246388 Add a 3D enabled user preference 
Add 3d Crash detection that disables 3d if the application crashes during one of several touchy phases of JOGL / Native / display driver initialization.
Always make the 3D view button clickable, but there is an explanation and a button to turn 3d on if it has been disabled
 2012-09-27 14:44:04 +00:00
Doug Pedrick
2aa4a8d905 working directory changes. 2012-09-26 23:33:00 +00:00
Doug Pedrick
313c9d24b9 ChangeLog updates. 2012-09-26 18:18:48 +00:00
Doug Pedrick
93bfce7f70 Uncommented component preset editor menu item, but protected it with a system property: -Dopenrocket.preseteditor.menu if present, the editor will be on the menu. 2012-09-26 18:09:12 +00:00
Doug Pedrick
391d02dc66 Changes to support integrated into main application. 2012-09-26 17:24:11 +00:00
Sampo Niskanen
efb4952333 Fix crash at startup due to splash screen handling 2012-09-26 14:51:28 +00:00
Kevin Ruland
a28c99fc54 Wired in the ComponentPresetEditor into the Edit menu. It is currently disabled because of some bugs in the ComponentPresetEditor. 2012-09-26 14:45:55 +00:00
Kevin Ruland
d5d0c7f8b8 Allow yet more time for loading presets. A bug report from a really slow machine took more than 2 minutes to parse all the files. 2012-09-26 13:50:39 +00:00
Kevin Ruland
ee31d47d1d Clear out references to the handler before putting the XMLReader back in the cache. This is to promote garbage collection. 2012-09-25 16:53:53 +00:00
Kevin Ruland
6ad5458da9 Ensure that whenever DoubleModel.getSpinnerModel() is used in a JSpinner, we explicitly set the spinner editor to our own SpinnerEditor instance. The makes the text field in the spinner editable. 2012-09-25 16:37:57 +00:00
Sampo Niskanen
1fb1e7e512 Fix+enhance motor configuration edit dialog 2012-09-25 13:03:11 +00:00