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
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
plaa
532f02c391 Merge pull request #33 from bkuker/kruland-integration-simple-appearance 
Simplify the appearance UI, Model & File
 2013-01-06 07:58:43 -08:00
bkuker
26e38f80dc Add percent / permille unit selector to shine 2013-01-06 10:37:42 -05:00
bkuker
7bda0bde12 Display shine on 0-100 scale 2013-01-06 10:32:56 -05:00
bkuker
3fe7370e08 Set null selection path when nothing is clicked. 
Fix a bug that wasn't updating the 3d selection when unselecting
 2013-01-06 10:26:36 -05:00
bkuker
62cfd2730e Trigger componentClicked with an empty list if no component is picked by 
a clock on the 3d model
 2013-01-06 10:23:53 -05:00
bkuker
ab9dde913c Update Apocalypse to use Shine & Paint 2013-01-06 09:58:43 -05:00
bkuker
c7ffc442a5 Change "Shine" to a double in [0,1] 
Add shine to OR import & export
 2013-01-06 09:58:08 -05:00
Sampo Niskanen
011bcd27e2 Refactor convertStringToBytes method 2013-01-06 16:12:12 +02:00
plaa
e2e509210c Merge pull request #25 from rodinia814/watcher 
Directory/File Watcher
 2013-01-04 14:52:03 -08:00
plaa
e0738de2c0 Merge pull request #31 from bkuker/osx-undo 
Use platform default shortcut key in menus
 2013-01-04 14:49:13 -08:00
bkuker
a8e39af85d Use platform default shortcut key in menus 2013-01-03 19:31:13 -05:00
bkuker
5985dba36a Stickers Example 2013-01-03 15:24:43 -05:00
bkuker
e8bf775e56 Be more careful w/ my depth comparisons 2013-01-03 15:24:39 -05:00
bkuker
1a6c721add Render stickers 2013-01-03 15:24:35 -05:00
bkuker
143a032728 Further refactre RenderStrategies into RocketRenderer subclasses 2013-01-03 15:24:31 -05:00
bkuker
a857fb93be Moving from RenderStrategies to RocketRenderer subclasses. 2013-01-03 15:24:27 -05:00
bkuker
e8ac5d4dea Add a sticker decal option 2013-01-03 15:24:23 -05:00
bkuker
cbb78cf095 Simplified appearance. Is this really what we want? 2013-01-03 09:19:58 -05:00
plaa
e31f94ed99 Merge pull request #30 from rodinia814/printing 
Printing fixes; added Save As file to MRU
 2013-01-02 21:40:05 -08:00
kruland2607
98db1885c2 UI improvements for flight configurations. Ellipsize the ignition 
delay.  Change to using row selection instead of cell selection.  Change
the copy configuration to select the new configuration and copy the
name.
 2013-01-02 10:42:51 -06:00
Doug Pedrick
45b337b9f4 Printing fixes; added Save As file to MRU 2013-01-01 14:55:15 -06:00
plaa
583b1a78e6 Merge pull request #29 from bkuker/master 
Move System.err log capture to GuiceStartup
 2012-12-30 23:12:22 -08:00
kruland2607
177d40104e Add Edit Decal dialog available from Appearance tab. Added preference 
to control which editor is opened.
 2012-12-28 23:08:31 -06:00
bkuker
ff7e5d5d04 Move JOGL debug setup to GuiceStartup. 
Always capture System.err to log.
Also write captured System.err to STDERR if the log is NOT being written
to either STDERR or STDOUT (So it appears on the console one way or
another).
 2012-12-27 10:17:48 -05:00
soupwizard
92952316ed Merge branch 'master' of https://github.com/soupwizard/openrocket 2012-12-26 19:51:07 -08:00
soupwizard
69130292f2 fixed 4 bugs found by FindBugs plugin in Eclipse 2012-12-26 19:50:06 -08:00
plaa
02927d0f2d Merge pull request #28 from bkuker/master 
Capture JOGL debug information
 2012-12-26 11:55:58 -08:00
bkuker
77374d3992 Try to quiet JOGL down a little by classifying indented lines as 
verbose, not debug.
 2012-12-26 14:01:30 -05:00
bkuker
003e6c35f1 if openrocket.debug then redirect stderr to log.debug(). 2012-12-26 13:56:24 -05:00
bkuker
bc2e759d86 Remove some overactive logging 2012-12-26 13:52:52 -05:00
bkuker
56c6d1b714 Include JOGL implementation version in bug report 2012-12-26 09:42:13 -05:00
Bill Kuker
22c1d9938c Merge pull request #27 from bkuker/master 
Fix Classpath-Jars value in build.xml
 2012-12-24 14:24:35 -08:00