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

1141 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kruland2607
15f39a1d24 Update example with data branches for all stages. 2013-02-05 15:15:22 -06:00
kruland2607
86cda58483 Part of previous commit changing file format for ignition configuration. 2013-02-05 15:13:37 -06:00
kruland2607
055daf6786 Change ork format for ignition and motor configurations. Make them 
different xml elements preparing for an alternative api allowing them to
be more independent.
 2013-02-05 14:26:41 -06:00
kruland2607
b16917995d Change mouse button handling in simulation plot. Left click drag zooms 
area, and ctrl left click drag pans.
 2013-02-05 10:04:49 -06:00
kruland2607
06e702839f Implement clamping in while panning. Don't allow panning past the min 
or max.
 2013-02-04 14:41:02 -06:00
kruland2607
d9c0f68e64 Remove a bunch of commented out code. 2013-02-04 14:37:18 -06:00
kruland2607
cec784d77e Update ResourceDecalImage to match new DecalImage interface. 2013-02-03 20:23:24 -06:00
kruland2607
4cdf03075b Make DecalImage no longer inherit from Attachment. It seems less 
confusing since a DecalImage cannot be used in place of Attachments in
general.  Made Attachment a concrete class.
 2013-02-03 20:19:03 -06:00
Bill Kuker
405f0db1b7 Merge pull request #39 from bkuker/kruland-integration-defaults 
Add Default appearances
 2013-02-01 15:36:08 -08:00
bkuker
fd5d86744f Minor cleanup 2013-01-27 10:17:07 -05:00
bkuker
9ae80e5a84 Merge remote-tracking branch 'plaa/kruland-integration' into 
kruland-integration-defaults

Conflicts:
	core/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java
 2013-01-26 10:37:11 -05:00
kruland2607
6f0cf6826a Added edit decal with file change notifications. Added super simple 
WatchService which integrates better with our code by activly making the
callbacks.
 2013-01-18 09:34:53 -06:00
bkuker
ae191c1c49 Add default appearance checkbox text the right way. 
(So clicking the text toggles the checkbox)
 2013-01-11 19:31:07 -05:00
bkuker
5436cd1560 Put Motor Appearances into the DefaultAppearance class. 
DefaultAppearance is quite disorganized at the moment, but this at least
hides it all in one place
 2013-01-11 19:15:14 -05:00
bkuker
fe3d66cef1 Provide a toString for the resource decals. 2013-01-11 13:03:36 -05:00
bkuker
115e0b143a Add compareTo to ResourceDecalImage after merge with k-integration 2013-01-11 10:16:56 -05:00
bkuker
9ea9ed2d82 Merge remote-tracking branch 'plaa/kruland-integration' into kruland-integration-defaults 2013-01-11 10:14:27 -05:00
kruland2607
593c639a06 Rework attachment loading. Construct a DocumentLoadingContext in 
GenericLoader and pass into both OpenRocketLoader and RocksimLoader. 
the DocumentLoadingContext contains the OpenRocketDocument, MotorFinder,
and AttachmentFactory.
 2013-01-10 21:11:57 -06:00
bkuker
05263e5056 An ok reusable motor appearance 2013-01-10 20:03:31 -05:00
bkuker
c1c4f99992 Trying out an "Unfinished" view... Jury is out 2013-01-10 15:36:08 -05:00
bkuker
67c1a3c553 A new render mode. Can't access it from the UI, that dropdown is getting 
kind of ugly.
 2013-01-10 14:41:26 -05:00
bkuker
e192462201 MAke mass objects look like wadding 2013-01-10 14:34:09 -05:00
bkuker
03c9e24705 More appearances 2013-01-10 14:17:30 -05:00
bkuker
25a3fc1d05 Merge branch 'kruland-integration-motor' into 
kruland-integration-defaults

Conflicts:
	core/src/net/sf/openrocket/appearance/defaults/ResourceDecalImage.java
	core/src/net/sf/openrocket/gui/figure3d/RealisticRenderer.java
 2013-01-10 08:46:20 -05:00
kruland2607
48adc0b7bf Rework the AttachmentFactory and Attachments. Make the Attachment 
implementations stand on their own and be able to determine the location
of their bytes without needing a reference back to the
AttachmentFactory.  This required changing the loading semantics so the
OpenRocketDocument is created prior to beginning to read the xml file. 
Added an OpenRocketDocumentFactory to facilitate construction of
OpenRocketDocument objects.
 2013-01-09 21:28:53 -06:00
bkuker
28127b122d Simplify the default appearances. I am not ready to organize them into 
classes or factories or what have you, yet.
 2013-01-09 16:43:01 -05:00
bkuker
8dd0a6abc1 Initial tube & balsa default appearances 2013-01-09 14:42:38 -05:00
bkuker
88e87d5925 Re-add the default appearance checkbox, without the save default button. 2013-01-09 14:27:09 -05:00
bkuker
ceb7d16651 Render motors nicely 2013-01-09 14:11:23 -05:00
kruland2607
c59bdd31cd Push FileInfo construction down a level by having it constructed in the 
GeneralRocketLoader instead of in the OpenFileWorker.  This required a
change in the constructor args to GeneralRocketLoader.
 2013-01-09 10:43:56 -06:00
kruland2607
8ad89448df Checkpoint commit. Added AttachmentFactory interface and 
BaseAttachmentFactory.  Reimplemented DecalRegistry to implement
AttachmentFactory and contain a delegate BaseAttachmentFactory.
 2013-01-08 21:09:48 -06:00
bkuker
05ff94836f Fix width of the shine unit selector 2013-01-08 10:14:46 -05:00
bkuker
f6358ad2ba Simplify the RocketFigure3D updateFigure() method to take advantage of 
JOGL's invoke & GLRunnable, rather than using flags, to simplify the
code.
 2013-01-08 10:05:45 -05:00
Bill Kuker
fa58cb6338 Merge pull request #36 from bkuker/kruland-integration-stickers 
Sticker decal mode & decal improvements
 2013-01-08 06:46:10 -08:00
bkuker
17ea631a9f Fix corrupted image 2013-01-08 09:22:57 -05:00
kruland2607
6ff17d04e2 Extract the Attachment interface from the DecalImage. 2013-01-07 22:12:18 -06:00
bkuker
e888ce9c63 Use Sticker method to draw all decals, to allow the transparency and 
paint interaction behavior you would expect.
 2013-01-07 18:57:28 -05:00
bkuker
d1586d3d34 Format for cleaner pull request 2013-01-07 16:26:56 -05:00
bkuker
e11d48566e Import cleanup 2013-01-07 16:23:13 -05:00
bkuker
c6bdd1ab78 Fix the clamp message 2013-01-07 16:22:48 -05:00
bkuker
903564687d Better choice for zNear & zFar to fix some artifacts 2013-01-06 19:39:36 -05:00
bkuker
30562244c7 Set color to white on certain decal types 2013-01-06 19:36:06 -05:00
bkuker
7ead8bf977 Merge remote-tracking branch 'plaa/kruland-integration' into 
kruland-integration-stickers

Conflicts:
	core/src/net/sf/openrocket/appearance/SimpleAppearanceBuilder.java
	core/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java
	core/src/net/sf/openrocket/gui/figure3d/RealisticRenderStrategy.java
	core/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java
 2013-01-06 18:57:15 -05:00
kruland2607
acba62ce59 Rework Decal byte handling code and DecalRegistry. Added interface 
DecalImage which is used by the Decal object to retrieve the bytes for
the image.  The DecalRegistry now operates as a factory and registry for
DecalImage objects.  The decal handling code in the saver is now greatly
simplified because the logical decal names are updated when constructed
by the DecalRegistry.
 2013-01-06 16:58:18 -06:00
Sampo Niskanen
e4f713196c Merge branch 'master' into kruland-integration 2013-01-06 21:45:58 +02:00
Sampo Niskanen
ff83f2bad8 Project-specific code style formatting 2013-01-06 21:45:02 +02:00
Sampo Niskanen
4560b8fd26 Remove FIXME 2013-01-06 21:37:11 +02:00
Sampo Niskanen
ef7c384f58 Merge branch 'master' into kruland-integration 
Conflicts:
	core/build.xml
	core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketLoader.java
	core/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java
	core/src/net/sf/openrocket/gui/main/BasicFrame.java
	core/src/net/sf/openrocket/gui/util/SaveFileWorker.java
	core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
	core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
 2013-01-06 19:18:46 +02:00
Sampo Niskanen
e4cda1c751 Clamp shine parameter in range of 0..1 2013-01-06 18:10:17 +02:00
plaa
31f620d1bd Merge pull request #34 from bkuker/kruland-integration-unselect 
Unselect component when figure is clicked outside the rocket
 2013-01-06 08:00:04 -08:00