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

598 Commits

Author SHA1 Message Date
Bill Kuker
41dc9dc34b Make the test texture model work out of SVN, without paths to my desktop. 2012-10-23 14:53:17 -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
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
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
8588918452 Updated HPR Airstart example. 2012-10-19 16:01:11 -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
6d190095a7 Example HPR with airstarted cluster. 2012-10-19 14:44:51 -05:00
kruland2607
741bed3187 Have the simulation honor per-flight ignition values. 2012-10-19 14:43:36 -05:00
kruland2607
e6662b7622 Fixed bug introduced when names of methods for default ignition event 
and delay were changed on MotorMount.java.
 2012-10-19 14:40:58 -05:00
kruland2607
fb78952bc0 Persist per-motor configuration of ignition specification in ork file. 2012-10-19 14:35:43 -05:00
kruland2607
25f619aa19 Added button and dialog to select the ignition for a given motor. 2012-10-19 14:34:44 -05:00
kruland2607
1215a8c288 Preselect the deployment event combo box and use localized strings for 
button names.
 2012-10-19 14:33:19 -05:00
kruland2607
4f25b9317a Make the tab panel grow. 2012-10-18 15:25:46 -05:00
kruland2607
0e126b1b5f Fix the ignition display logic to account for default settings. 2012-10-18 15:25:03 -05:00
kruland2607
5b32242b45 Changed MotorConfiguration construction to allow distinction between 
that used for the "default" body tube and inner tube configuration, and
those used for per flight configuration.

Tightened up the access specification to methods in BaseMotorMount.

Changed names of MotorMount methods to clearly indicate they operate on
the default ignition event and delay.
 2012-10-18 14:29:11 -05:00
Sampo Niskanen
d63dc601c0 Clean up application startup 2012-10-18 08:09:42 +03:00
Sampo Niskanen
730f7b2697 Fix JRE class loader 2012-10-18 07:58:04 +03:00
kruland2607
8c56b7b793 Added MotorConfiguration object and made MotorMount interface extend 
SupportsFlightConfiguration<MotorConfiguration>.  Created a class
BaseMotorMount which implements
SupportsFlightConfiguration<MotorConfiguration> and provides a place to
unify the common code in InnerTube and BodyTube.
 2012-10-17 20:36:32 -05:00
kruland2607
a0b3ccae08 Fix some ui update and data entry issues. 2012-10-17 20:22:58 -05:00
kruland2607
9d44df1af3 The chute and streamer config dialogs were refering to MotorIgnition 
events.. Hmm.
 2012-10-17 16:55:49 -05:00
kruland2607
dfd36f5374 Added persistence of RecoveryDevice DeploymentConfiguration in ork 
files.
 2012-10-17 15:29:19 -05:00
kruland2607
e364c10026 Added SupportsFlightConfiguration interface and implemented it by 
RecoveryDevice.
 2012-10-17 12:31:31 -05:00
kruland2607
759facf9dd Fix bug in deployment configuration. 2012-10-17 11:37:25 -05:00
kruland2607
a094b30c1d Major renaming of methods and members changing "MotorConfig" to 
"FlightConfig".
 2012-10-17 11:15:01 -05:00
kruland2607
6e66aeac31 Pulled the setup of the Motor Configuration panel out of 
FlightConfigurationDialog in to its own class.
 2012-10-17 10:50:29 -05:00
kruland2607
1f445b2268 Wired in remove deployment configuration. 2012-10-17 09:26:18 -05:00
kruland2607
3a8d2d5560 Implemented a DeploymentConfiguration object which includes the values 
used to determine the deployment of a recovery device.  The DeployEvent
enum was moved into this class.  Added a map of configuration id strings
to DeploymentConfiguration objects in the RecoveryDevice.  Modified
various setter/getters in RecoveryDevice to support a "default"
configuration defined in the device's configuration dialog.  Modified
BasicSimulationEngine to use the DeploymentConfiguration based on the
selected configuration.

Added to the FlightConfiguration dialogs to support editing these
configuration.

Missing are serialization of the map in ork files.
 2012-10-16 22:13:37 -05:00