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

2335 Commits

Author SHA1 Message Date
Kevin Ruland
82679233f9 Rework GeneralRocketSaver to allow for proper behavior when overwriting container files. The problem was that the SaveFileWorker was opening the container file for writing before the saver was able to extract all the decals contained in it. This resulted in a failure and the output file had zero length. To fix this issue, the saver will first write to a new temporary file, then if the write is successful, it will copy the old file out of the way, copy the temporary file over it, then finally remove the old file. This results in a much more failure resistant writing process in all scenarios (even when not saving with decals). 
In order to make this change, the SaveFileWorker could no longer pass in an OutputStream (since it shouldn't have to worry about all the file copies).  The progress update mechanism had to be reworked to use an explict callback object instead of being built into the OutputStream.
 2012-10-23 16:23:47 -05:00
Kevin Ruland
d40a36d09b We need to pull the bytes out of the input stream so we can close the input stream. It seems the Jogl Texture loader does not close the input stream. When loading textures from a zip file, this leaves the zip file open and prevents saving/ moving the file. 2012-10-23 16:23:40 -05:00
Kevin Ruland
3195b8d5df If reading from an ork container format, change the StorageOptions to reflect IncludeDecals = true. 2012-10-23 16:23:31 -05:00
Kevin Ruland
4757ce82f2 Update comments in saveAsRocksim(File) method noting that the saved state flag in OpenRocketDocument should not be switched to true after a successful save. 2012-10-23 16:23:23 -05:00
Kevin Ruland
3c7afcc2fb Update the state of the Include Decals button based on the current StorageOptions. 2012-10-23 16:23:16 -05:00
Kevin Ruland
f92cb2c8d6 Some refactoring: changed name of variable "filename" to "displayName" in BasicFrame to indicate that the string is used for presentation in the opening dialog and not as the name of a File to option. Moved the call to OpenRocketDocument.setFile() and setSaved() into OpenFileWorker instead of BasicFrame so the File object doesn't need to get passed around so much. Modified the RocketSaver interface to not require the filename since it doesn't need it anymore. 2012-10-23 16:22:47 -05:00
Kevin Ruland
e9060272e4 Created a GeneralRocketSaver object which is analogous to GeneralRocketLoader. Based on the StorageOptions, it determines how to save the file using a RocksimSaver or OpenRocketSaver as appropriate. Modified RocksimSaver and OpenRocketSaver so they only operate on OutputStreams. Removed methods from RocketSaver interface which operated on File. Fixed bug in DecalRegistry where it wouldn't handle absolute filenames. Fixed bug in BasicFrame where it would display ugly stuff for the filename. 2012-10-23 16:19:37 -05:00
Kevin Ruland
d0569e5759 Fixed loading decals from example file. Added FileInfo class which is used to describe data about the file - what the URL is to it and it's parent directory (if appropriate). The FileInfo class is pushed into the DecalRegistry to facilitate loading decals from the correct location. Added the Apocalypse with decals as an example file. 2012-10-23 16:13:35 -05:00
Kevin Ruland
05d1b91d90 Sizable commit with lots of changes to support decals in openrocket files. Added support for zip container support. Changed Decal to hold a String instead of URL. Refactored GeneralRocketLoader out of the RocketLoader hierarchy so the GeneralRocketLoader knows about files and RocketLoader only knows about streams. Changed the OpenRocket file format to 1.6 and added <appearance> and it's children for ambient light and decals. Implemented a DecalRegistry which is a member of the OpenRocketDocument. This class is used to get InputStreams for decals by their names. 2012-10-23 15:54:45 -05:00
Kevin Ruland
49c9329fde Added option to include decals when saving a file. 2012-10-23 15:12:49 -05:00
Kevin Ruland
1490f48f29 Switch to use the GeneralRocketLoader. It loads rkt files just fine and in a few commits, RocksimLoader won't know what to do with a File. 2012-10-23 15:12:42 -05:00
Bill Kuker
4ab28bbf54 Make the default checkbox text work the right way: check box's text, not a separate label 2012-10-23 15:12:35 -05:00
Bill Kuker
6a2ebb6851 Add translatable text names to the texture wrap mode enum 2012-10-23 15:12:28 -05:00
Bill Kuker
74783afe3f Cache model bounds for performance 2012-10-23 15:12:21 -05:00
Bill Kuker
d1d6e3c2a3 Repaint on render type change. 2012-10-23 15:12:14 -05:00
Bill Kuker
b8cd9dab42 Remove figure tab from RocketComponentConfig 2012-10-23 15:12:06 -05:00
Bill Kuker
a2afb106d5 Add ability to change RenderStrategy on the fly. 2012-10-23 15:08:36 -05:00
Bill Kuker
f5c309d2cc Move lighting setup into RenderStrategies 2012-10-23 15:08:18 -05:00
Bill Kuker
fc848db00e Null out appearance when default for material is selected 2012-10-23 15:04:47 -05:00
Bill Kuker
1b55457636 Repeat texture along length, not just circumference. 2012-10-23 15:04:39 -05:00
Bill Kuker
1bf7cc32b9 Honor RockSim flipS & flipT. 2012-10-23 15:04:32 -05:00
Bill Kuker
40cac0f8fd Use a single static JColorChooser instance to keep recent colors populated. 2012-10-23 15:04:25 -05:00
Bill Kuker
d22cefa248 Carry init & dispose methods down into RenderStrategy, so that textures can be disposed of and reloaded. 2012-10-23 15:04:04 -05:00
Bill Kuker
dc66d2a93e English l10n on appearance config 2012-10-23 14:53:38 -05:00
Bill Kuker
d47101676b Give a better indication that the button this colorIcon is on is disabled: Draw an empty outline rectangle if disabled, a filled rectangle if enabled. 2012-10-23 14:53:31 -05:00
Bill Kuker
8ceaa74666 Brighten up the figure 2012-10-23 14:53:25 -05:00
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
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
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
a5d87244a4 Implemented flight data branches for stage recovery. Updated jfreechart 
to 1.0.14 and jcommon to 1.0.17.  Added primitive support for plotting
all databranches.
 2012-10-23 10:57:00 -05:00
Sampo Niskanen
8c49d33731 Add Guice injector to Application 2012-10-23 07:32:20 +03:00
kruland2607
2d6f3ba8a1 Wire in copy configuration button using CopyFlightConfigurationVisitor. 2012-10-19 16:05:05 -05:00
kruland2607
4625ca94b6 Fix implementation of copyFlightConfiguration to account for copying a 
configuration which doesn't exist for this component.
 2012-10-19 16:04:36 -05:00
kruland2607
30ffb12d7f Wire in visitors to RocketComponent. Added some abstract 
implementations of RocketComponentVisitior which provide for recursive
actions.
 2012-10-19 16:00:11 -05:00
kruland2607
741bed3187 Have the simulation honor per-flight ignition values. 2012-10-19 14:43:36 -05:00