github.com/openrocket/openrocket commits | Ecosyste.ms: OpenCollective

Added simulation of tumble recovery. Has pretty major FIXME which needs

addressing.

b99a704eb6b1b35878b827046c927d81f2e348f6 authored about 12 years ago

Replaced the alternate example menu item for consideration.

fab85c2918d193e3bff54ef28be5bf55fb4a265e authored about 12 years ago

removed unnecessary @SupressWarnings, to fix some build warnings

dd0a9a12d9b8ec54d30182111dd0003719cc08a4 authored about 12 years ago

Merge pull request #10 from bkuker/kruland-integration

RocketRenderer fix

c98f4ad21da381b88f35733d03ebf55983daaf81 authored about 12 years ago

Remove stencil based drawing (from bkuker)

041ec3b836f166fa61de6d848cb19ff5fc183fc6 authored about 12 years ago

Do not perform the stencil based drawing, it has been replaced by the Z

version.

5786cd1c4990840a97f4bdc7f860e889ce0f285c authored about 12 years ago

Merge branch 'integration' of github.com:kruland2607/openrocket

Conflicts:
core/.classpath
core/3d-Test-Junk/net/sf/openrocket/startup/Quick3dMain.java
core/...

5412b8255b29cb779c506fce9230b82f189df601 authored about 12 years ago

Updated changelog.

011c21f54eb245460adbb2e44fdacdd634ba1d3f authored about 12 years ago

Update thrust curve files

49858f589f9beb684199cac6121dad30b4e22fc5 authored about 12 years ago

Refactor motor serialization/loading code

ff22040df0a880d48c5620cf94f84e5984f71d63 authored about 12 years ago

Merge branch 'master' of ssh://[email protected]/plaa/openrocket.git

cffb77530eaa8221e9238b1a688782871d8b855f authored about 12 years ago

Merge pull request #8 from bkuker/no-stencil

Replace stencil buffer with z-buffer to draw outline of selected items

399fa4e0a76d37f9e59e018ab9698d07b77fd5fa authored about 12 years ago

Merge branch 'feature-improvepresetloading' of

github.com:kruland2607/openrocket

Conflicts:
core/build.xml

Optimize motor loading further

42b4eeac317dd7984954510f20c7b863c3392e94 authored about 12 years ago

Reorder the zoom buttons. Added zoom reset icon and button. Fixed

spacer in SimulationPlotDialog so close button is always properly
located.

6a073af40b11be8c4e2da296bc1f875db247cf80 authored about 12 years ago

Added right-click & drag zoom control contributed by Richard.

e6fe93c2acf875c62d1f025ab84a98a11530ef5c authored about 12 years ago

Clean up imports.

14ae26dda8cd09382d2ef4c0d1c10100c4a300d5 authored about 12 years ago

Modified event display logic so only events for the selected stage are

displayed.

809113740bc954583db087e1b6da80a6df4e89df authored about 12 years ago

Fix condition used to display the stage combo box.

45cabaaddf1d75960877993ed438f2c48114938b authored about 12 years ago

Change time limit used to make events show on the same line from .01s to

.05s.

a06acb7b4300cd8beb67ba7df806a487ee91fa8a authored about 12 years ago

Always have the delay spinner enabled just like in the recovery tab of

the component configuration.

c2ac8204b15a4d49a738be523a3e0a5990104eaa authored about 12 years ago

Refactored lots of code out of SimulationPlotDialog into SimulationPlot

and EventGraphics to allow for easier maintenance. Added stage
selection combo box to Simulation...

b98802ebee2ec7a3ca640e9f1c3351f8c1c40cb5 authored about 12 years ago

Usability enhancements to the simulation plot.

- Made mouse wheel zoom. alt mouse wheel zooms only domain.
- added explicit zoom buttons. alt ...

4de4d0d72877473a9a94437c923bc0e5270e107c authored about 12 years ago

Add stage number to series labels to ensure uniqueness.

4035e711c596efd783b557f4328817ce67fc5eb8 authored about 12 years ago

Fix bug in GeneralOptimizationDialog related to sorting the optimization

parameters. Switched to using a table row sorter instead of manually
sorting the array.

c9827cd5c1636fe9ede689524206847929394845 authored over 12 years ago

Change the optimization modifiers to manipulate the "default" values.

1d686c88e53ef096c55affe1cc54c38913708659 authored over 12 years ago

Fix whitespace and add SuppressWarnings.

89ff50d60c3bb5292d86a6bf252a89fe7a734a9f authored over 12 years ago

Use Serializable representation of system supplied motors in jar file.

this greatly improves startup performance.

bd66cc93383881aabdcb10193c7289d95ac6e59f authored over 12 years ago

Replace all client calls with SLF calls

657592e11917a6b72d7648cff7202747370d7300 authored over 12 years ago

Remove unused Application imports

a1fe1adf06636665eecd9a540bf3fd0b5177363c authored over 12 years ago

Change calls to log.user() to log.info().

Use the USER_MARKER for any log.user() calls.
Now you'll be able to log.error(USER_MARKER, "whate...

e1457ca2a177f512e264a3afa14a71f5c608130f authored over 12 years ago

Replace calls to verbose() with trace()

7fb5a7ad81e874178bed467ed8f9c919b5e7e86b authored over 12 years ago

Provide Markers class

4c84b3dad76420cfd663448e1bc5f751adb9e5a2 authored over 12 years ago

Replace LogHelper with SLF4J Logger anywhere it is possible without an

error.

d58c089673f3e346bc49ca69e73a370d4e3ff30b authored over 12 years ago

Include SLF libs, Logback libs, and Logback config

ee3aae6c8b356f288731e77514864ea26c3d73d5 authored over 12 years ago

Reimplement Example menu item as Action List just like the MRU menu

item. Both the old dialog and new submenu are available in BasicFrame
to see what looks & works ...

3b65c1d9701fd36ee1b4d27eac8e69c2f5985265 authored over 12 years ago

Removed unused import.

02c04f2bf9770c0fbc2e5e8eabf6990d6018cc71 authored over 12 years ago

Fix localization, dialog placement, and prepopulated fields in flight

config dialogs.

4179b0d6e68cfae34ae209ff0e6cf85260fcf59e authored over 12 years ago

Added descriptions, author and rocket names to new examples.

eb20d0e72e376d9cfca5af41913a57b1d5f01938 authored over 12 years ago

Fixed but motor selected label was not changing when the combo box value

changed. I don't know when this was introduced.

e73211e2cf1a077b21f522e4b570b68ed98c20d9 authored over 12 years ago

Fix implementation of BredthFirstRecursiveVisitor.

dbf8fa77d1373249907972125a72a47c2a7b85be authored over 12 years ago

Change labels and add explicit Edit buttons to all places where the

flight configuration list is presented.

87e968690b4a0117da87b624083090c4784b9394 authored over 12 years ago

Changed the management of the SimulationStatus WarningSet so it is not

copied by the copy constructor. Management of the warning set is
controlled by the BasicEventSim...

cda428147525f68e543b06a6ab5aeeedfe33f1d6 authored over 12 years ago

RK4SimulationStatus needs to implement Cloneable.

ee11816828a43ecace0e13ddae2ffe9be92d7cb1 authored over 12 years ago

Updated the Boosted Dart example to have two different stage

separations.

36558e60a2e93160f53a9b62c9ade0136e5cc290 authored over 12 years ago

Refactored the initialization and copying of SimulationStatus objects.

Initialization is now done in the constructor instead of
BasicEventSimulationEngine. Copying Sim...

27d6322f09d796272e00579238bbadd5d1cd114f authored over 12 years ago

Clean up warnings.

6d8b27068f2951e0744b68299f4131ab0ba53527 authored over 12 years ago

Refactor OpenRocketLoader moving all the internal classes to their own

files.

f161a2dca6c139588c92dca42ab17a68441360ab authored over 12 years ago

Merge branch 'feature-rocketconfig' into integration

Conflicts:
core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketLoader.java

564010974bf4419fb25646a9f11b4ef8eee4db19 authored over 12 years ago

Added full support for per flight-config stage separation: simulation,

ork file, and gui configuration.

b32be42092f76f2facd0c774173bab5c132ac68b authored over 12 years ago

Prepare stages to be configurable by creating a

StageSeparationConfiguration object and renaming the current methods on
Stage to be for the defau...

4490a6c1cb7e28bded88f01eb468d743b0ec1149 authored over 12 years ago

Change name of class SupportsFlightConfiguration to FlightConfigurable.

d45b68a78e4783bf04c8985402eb03439d0f9a80 authored over 12 years ago

Replace stencil buffer with z-buffer to draw outline of selected items

0569ca17bfb9a410c22e5e40740c7a57f376d9d8 authored over 12 years ago

Merge branch 'feature-stagerecovery' into integration

Conflicts:
core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java

fc2fd2a0113639005569912c95a789abfca62e1d authored over 12 years ago

Merge branch 'feature-rocketconfig' into integration

Conflicts:
core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketLoader.java
core/src/n...

5d65b591e15a81316ae344fc6a8713cc067bfc0b authored over 12 years ago

Found the missing pieces to make decals work.

5deae1d3dba5284ed702565ace900ad32e5bd075 authored over 12 years ago

Fix up failures from the previous merges.

04ee758e6a8e4969cb6731caddda016ba5c4ca24 authored over 12 years ago

Added FIXME for overwriting. Fixed warnings.

4466bc3f8a73191c83e69c55a47f5b46d15ee25c authored over 12 years ago

If the exported file can no longer be found, fall back to other means of loading the decal.

207a768ded27ee87a29941d0c88ba0497e0f2b80 authored over 12 years ago

Implement simple export mechanism for decals. The 3d view will pull from the exported file for the duration of the editing session.

03bc001bbd5471fc44effd1bd9ab05ae3e527836 authored over 12 years ago

Added isExportable which tests if a decal is currently available from the container file. Refactored the code some. Use the FileUtils readBytes[] method.

a73358bd27ae6ccc5efaa58df24d6b6ef6b25f50 authored over 12 years ago

Added a couple of handy stream utilities. copy copies the contents of an InputStream to an OutputStream. readBytes returns the contents of an InputStream as a byte[].

c9212c2b40f2f01e2a16b5d1832b220f7bf2c0b0 authored over 12 years ago

Fix bug in base function - need to use the StorageOptions passed in instead of those stored in the OpenRocketDocument.

6cf525467ca2629ff2f477968ceca88727c78512 authored over 12 years ago

Modified the AppearancePanel decal selector to have a combo box which follows the ComponentPreset pattern. The first entry in the combo box contains "none" entry which clears the decal associated with the component. The last entry in the combo box is "choose from file" which opens a file picker to select an image from the file system. The entries in between contain all the decals currently used by components in the document which facilitates reusing decals on the model.

fddf6cc0c7bde0e518717d5c37abd83db8601f62 authored over 12 years ago

Modified the AppearancePanel decal selector to have a combo box which follows the ComponentPreset pattern. The first entry in the combo box contains "none" entry which clears the decal associated with the component. The last entry in the combo box is "choose from file" which opens a file picker to select an image from the file system. The entries in between contain all the decals currently used by components in the document which facilitates reusing decals on the model.

4cdf1e8e878fedd82fb19b64abe701e0a45f9e9c authored over 12 years ago

Added method to list all the decals currently used by the components in the document.

bdca67fb7a457391fc8aca9bb559c06673cbbc88 authored over 12 years ago

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 ...

82679233f91429ddff7de06c1dad2d57a22b8cfc authored over 12 years ago

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.

d40a36d09b72785c398d5df44d77ea3ad29eeaa2 authored over 12 years ago

If reading from an ork container format, change the StorageOptions to reflect IncludeDecals = true.

3195b8d5dfe38858d28f5af9d5cd9a7ab44c30f5 authored over 12 years ago

Update comments in saveAsRocksim(File) method noting that the saved state flag in OpenRocketDocument should not be switched to true after a successful save.

4757ce82f24ba4b6fa6c6a7fd2da3bff719cef13 authored over 12 years ago

Update the state of the Include Decals button based on the current StorageOptions.

3c7afcc2fbfd9f665ed2bd723d42cb4e7f66e9d9 authored over 12 years ago

Added example file with decals.

e78f5b27f1d2a2e497489b47b9cb187b62315ef0 authored over 12 years ago

Change name of output file.

26370cd416c0abb070ca0fff03f65f5c8e4eace6 authored over 12 years ago

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.

f92cb2c8d6257071151e6f47af5e8bd3bb2b51f6 authored over 12 years ago

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.

e9060272e401d3d9872db01afc06202f5483586e authored over 12 years ago

Fix to provide a FileInfo to the GeneralRocketLoader

4fe9dc4eefd59767cf9b6a717807847cd450a32e authored over 12 years ago

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.

d0569e57594a2528df9ddf2aafc125f0a69a09d4 authored over 12 years ago

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.

05d1b91d90a0715da3b4f7ac786821ae1fbd6d8f authored over 12 years ago

Added option to include decals when saving a file.

49c9329fde5e171aafa8d6a9259734ee185fd31a authored over 12 years ago

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.

1490f48f29c1e4977c8b4829d024bfe8cb808fa4 authored over 12 years ago

Make the default checkbox text work the right way: check box's text, not a separate label

4ab28bbf54221a8e46d3a6becb89f16ff3eadaf3 authored over 12 years ago

Add translatable text names to the texture wrap mode enum

6a2ebb6851357389a87153d8e15e51eef8a697f4 authored over 12 years ago

Cache model bounds for performance

74783afe3ffa66bab567de0ff29fbfbdb0dfb507 authored over 12 years ago

Repaint on render type change.

d1d6e3c2a3373d42f677a208073ff2487df496d8 authored over 12 years ago

Remove figure tab from RocketComponentConfig

b8cd9dab4230a230e1f7e8bacc8d2d82d6adb217 authored over 12 years ago

Change view type from buttons to drop-down, include 3d figure & realistic

4f28eea758912a05208e1083cd905ff364881c41 authored over 12 years ago

Add ability to change RenderStrategy on the fly.

a2afb106d5253c7d7df1da5ef3a0945f45f5f244 authored over 12 years ago

Move lighting setup into RenderStrategies

f5c309d2cc4925ddaed6da36c542ef22a43a6552 authored over 12 years ago

Null out appearance when default for material is selected

fc848db00e560cf1b71af0871066c819b9503052 authored over 12 years ago

Repeat texture along length, not just circumference.

1b554576363a633a816f334c832e3747ee99fd69 authored over 12 years ago

Honor RockSim flipS & flipT.

1bf7cc32b9816da3394440abe716fadbbc910069 authored over 12 years ago

Use a single static JColorChooser instance to keep recent colors populated.

40cac0f8fd687cbd90618c073e02d1df781cfdb9 authored over 12 years ago

Fix backwards textures

0cd27951e1f54738920ea3acd8ebafcb6895ac35 authored over 12 years ago

Carry init & dispose methods down into RenderStrategy, so that textures can be disposed of and reloaded.

d22cefa2481279d94ecfbca2d72d66e82c790f93 authored over 12 years ago

English l10n on appearance config

dc66d2a93e8a164f317e887a575030c261ea13da authored over 12 years ago

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.

d47101676b538d72d8943bd32fe356ceb5b45222 authored over 12 years ago

Brighten up the figure

8ceaa74666799dd9be33f7ff50a38bbaa316acae authored over 12 years ago

Make the test texture model work out of SVN, without paths to my desktop.

41dc9dc34be01228b9d13dc7bb3f39785c170e94 authored over 12 years ago

Better texture filtering

97b2ad36bdbd8043b05fa48597eaf67bd32eea16 authored over 12 years ago

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.

3c0ad074ef4635b6e999867767122bb78143d257 authored over 12 years ago

Are UseSingleColor and SimpleColorModel synonyms? Hope so!

68954b0ed56405cbb68d197a045a32dd0a068122 authored over 12 years ago