Commit Graph

130 Commits

Author SHA1 Message Date
Matt Feemster
ad7d4a3b4f Merge pull request #22 from gh2k/opencl-hole
Fix opencl crash in 'hole' variation
2015-07-24 06:41:42 -07:00
Simon Detheridge
328a413c59 Fix opencl crash in 'hole' variation 2015-07-24 13:00:28 +01:00
mfeemster
e16c6a825f --User changes
-Add variations filter/selection dialog.

--Bug fixes
 -Fix summary window not properly indicating the presence of pose affine.
 -Remove a file named Fractorium.aps which had been erroneously committed a year ago.

--Code changes
 -Use qobject_cast instead of dynamic_cast where appropriate.
 -Add more override keyword where appropriate.
 -Add variations list to settings for filter dialog.
2015-07-23 18:16:36 -07:00
mfeemster
2019dcb605 --Code changes
-Forgot EmberMotion.h
2015-07-22 17:06:14 -07:00
mfeemster
3aa9e13194 --User changes
-Add Summary tab to the info dock, place existing bounds related info in a new Bounds tab.
 -Add a toolbar with the most common actions on it.
 -Remove old toolbar at the top of the library tab.

--Code changes
 -Refactor code to make a color visible on a background into VisibleColor() in FractoriumCommon.h
 -Add IsXformLinked() to determine if an xform is linked to another.
 -Remove SetPaletteRefTable() and GetQRgbFromPaletteIndex() from FractoriumEmberControllerBase and its derivations, unused.
 -Add FillSummary() to FractoriumEmberController. Call in Update(), UpdateXform() and other places where values are changed to force an update of the summary view.
 -Add export statements to FractoriumInfo.cpp.
 -Remove image parameter from SetPaletteTableItem(), it was a bad design.
 -InitToolbarUI() is now empty since toolbar initialization happens automatically. Leave as a placeholder.
 -Refactor code to get a palette color at a given index and convert it to a QColor to ColorIndexToQColor().
2015-07-15 20:27:32 -07:00
mfeemster
fb262c2469 --User changes
-Add motion support from Simon Detheridge at the ember level instead of just individual xforms:
  Add the ability to manipulate camera pitch, yaw and other goodies during flame rotation using a new element specified at the top-level of the flame.
  Create a new 'saw' motion function, so that these values can effectively be looped (e.g. yaw -1 to +1) over the course of a rotation.
  Add an offset to existing motion elements, to start them partway through their cycle. This would (for example) enable creating circular motion of xform affines, by combining two offset sine waves, one with an offset of 0.25 or 0.75.
  Fix loops in EmberGenome (they only had an on/off effect - this was broken in flame-genome as well) and make the loop count floating-point as well. For sequence animations, it's not necessary for clips to loop precisely if they're not designed specifically for the ES project.
  Similarly, there's no need for motion_frequency to be an integer value either so this was changed to allow motion that doesn't necessarily start or end at the loop boundary.
  I've attempted to keep each bit of functionality in its own commit.
  There's an argument as to whether to call the new flame motion elements <flame_motion/> (to differentiate programmatically) or just <motion/> (for consistency within the file) -- I opted for the former because it was easier to modify the xml parser that way.

--Code changes
 -Change FlameMotion.h to EmberMotion.h to keep the naming convention consistent.
 -Made elements of EmberMotion.m_MotionParams into their own type, MotionParam, which allows for CopyVec() to work.
 -Change m_FlameMotionElements to m_EmberMotionElements in Ember.
 -Use CopyVec() for EmberMotion instead of manual copy in copy constructors.
 -Add exports in Ember.cpp for EmberMotion.
 -Format eEmberMotionParam enum with one entry per line since it has many entries.
 -Use fabs() in XmlToEmber instead of glm::abs.
 -Minor formatting.
2015-07-06 21:36:46 -07:00
mfeemster
3a9ce0928f Merge branch 'motion-goodies' of https://github.com/gh2k/fractorium 2015-07-06 20:22:52 -07:00
mfeemster
0839d610c1 Merge branch 'master' of https://github.com/mfeemster/fractorium.git 2015-07-06 20:05:05 -07:00
mfeemster
570331adb5 --Bug fixes
-Allow for empty fields in template files.

--Code changes
 -When parsing, a boolean is not available to specify whether to use the default values if they are not present. This will be false for template files.
2015-07-06 20:04:38 -07:00
Simon Detheridge
3fa59be990 Add new 'motion_offset' parameter to motion elements 2015-07-06 16:29:03 +01:00
Simon Detheridge
efb39f8160 Make 'loops' param to EmberGenome work correcly, and convert to double 2015-07-06 16:15:58 +01:00
Simon Detheridge
f606986b7d Apply flame motion elements when generating flame sequence for animation 2015-07-06 16:15:58 +01:00
Simon Detheridge
679a8b4129 Serialise FlameMotion elements to/from XML 2015-07-06 16:15:54 +01:00
Simon Detheridge
9d5f3e8578 Add new class to store flame motion parameters 2015-07-06 16:10:00 +01:00
Simon Detheridge
d75a15136d Convert motion_frequency to floating point 2015-07-06 16:09:14 +01:00
Simon Detheridge
1a37504b09 Add 'saw' motion function 2015-07-06 16:09:05 +01:00
Simon Detheridge
9c7bd807b4 Fix ambiguous call to 'pow' in 'Interface2' variation
Fixes #8
2015-07-02 16:15:43 +01:00
mfeemster
fa3175aad1 --Code changes
-Better use of const functions.
 -Ember.pro should not define BUILDING_EMBERCL, instead define BUILDING_EMBER.
2015-06-29 20:13:53 -07:00
mfeemster
770ff4622c --User changes
-Allow for continuous update during interactive rendering.

--Code changes
 -Make some variation related functions const where appropriate.
 -Use auto keyword more.
2015-06-28 17:48:26 -07:00
mfeemster
e8af1050b3 --User changes
-Eliminate delay when switching between single and double precision.

--Code changes
 -Variation tree and associated widgets no longer actually contain variation objects, only IDs.
2015-06-28 14:04:30 -07:00
mfeemster
3cd970a347 --User changes
Add linked xform support, with new button and icon on the xforms tab.
2015-06-24 20:49:09 -07:00
Simon Detheridge
f51ff1e051 Replace pthread_setschedprio for osx, as it doesn't exist 2015-06-22 15:05:09 +01:00
mfeemster
d80343a28b --User changes
-Better default/min/max sizes for docks/tabs.
 -Add a reset workspace menu item.

--Bug fixes
 -Order of affine scale up/down buttons was reversed from what's intuitive.
 -Projection was not properly being set when animating flames with 3D parameters.
2015-06-20 11:35:08 -07:00
mfeemster
5f3e70c6a8 --User changes
Allow for detaching of top level tabs in the dock widget so workspaces can be customized.
 Save workspace between runs.
 Only correct variation names/params during parsing when the source of the Xml file is not from Ember/Fractorium.
2015-06-17 20:05:53 -07:00
mfeemster
5bd593b42f --User changes
Allow for setting rendering thread priorities from the command line and final render dialog. Currently only implemented on Windows.
 Show estimated time left on the final render dialog.
 Sort palette list by name, instead of by index in the palette file.
 Sorting can be flipped by clicking the column headers of the palette table.

--Code changes
 Remove unnecessary connect() statement in Variations tab.
2015-05-30 22:14:34 -07:00
mfeemster
c97946c660 --Code changes
Add DoubleSpinBoxTableItemDelegate.h to Fractorium.pro to get it building on Linux.
2015-05-29 21:57:09 -07:00
mfeemster
83ad93aadf --User changes
More efficient table on the Xaos tab when using xaos on a flame with a large number of xforms.

--Code changes
Use QTableView instead of QTableWidget for the xaos table.
Add custom DoubleSpinBoxTableItemDelegate for this.
Make row and column toggling functions work for QTableView and QTableWidget.
Remove some dead code from Fractorium.h/cpp
Miscellaneous hacks to keep it building on Linux.
2015-05-29 21:08:44 -07:00
Simon Detheridge
5707617312 Fix pedantic gcc error about missing template keyword 2015-05-27 15:51:21 +01:00
mfeemster
cb54605878 --User changes
Implement copying and pasting xforms between flames.

--Code changes
 Make palette filename be a shared_ptr<string> to avoid duplication.
 Ensure random seeds in RendererCL have no duplicates and are not zero.
2015-05-19 19:31:33 -07:00
mfeemster
3c51e58379 --User changes
Add the ability to click the right mouse button and drag to adjust values in spinners.
 Filling the palette controls will now also select the proper palette filename (if not empty) in the combo box.
 Allow for toggling row and column of affine tables.

--Bug fixes
 Fix tab tool tips again.
 Fix palette list switching.

--Code changes
 Palettes now keep the filename they originated from as a member.
 Refactor table row and column cell toggling into their own functions.
 Do not force random select on palette combo index change.
2015-05-15 18:52:31 -07:00
mfeemster
2561708ae0 oops 2015-05-15 18:45:57 -07:00
mfeemster
e005b4c20e --User changes
Add the ability to set the current xform by pressing F1 - F32.
 Add the ability to toggle an entire row or column of xaos values.

--Bug fixes
 Prevent xform index flickering whenever changing the number of xforms.

--Code changes
 Remove ForEach() wrappers and replace with range based for loops with auto.
 Replace every regular for loop with a range based one where applicable. Note this doesn't work everywhere.
 Make event filter application wide.
 Add parameter to FillXforms() to specify the index to select, default 0.
 Rename some scroll areas and layouts to names that make sense, rather than their designer defaults.
2015-05-03 17:13:14 -07:00
mfeemster
cd5669d0ef Merge pull request #12 from gh2k/buildfixes
Several osx/linux build fixes
2015-04-26 22:19:41 -07:00
mfeemster
be8e9a5e02 --User changes
Add the ability to apply operations to a selection of xforms, rather than just the current one.
 Update tool tips accordingly.

--Bug fixes
 Fix NAN in equalized weight calculation when all weights are set to 0.

--Code changes
 Clean up strange nested usage of Update([&]()) calls when changing xform color index via either the spinner or scroll bar. Made no sense.
 Make ISAAC RandBit() use RandByte() to be slightly more efficient.
 Put FillXforms() in the controller where it belongs, rather than the main window class.
 Add UpdateXform() function to the controller to handle applying operations to multiple xforms.
 Remove the word "Current" out of most xform related functions because they now operate on whatever is selected.
 Properly use Update() for various xform operations whereas before it was manually calling UpdateRender().
 Also properly use Update() in places where it was erroneously using UpdateXform() for things that did not involve xforms.
 Block signals in FillXaosTable().
 Add new file named FractoriumXformsSelect.cpp to handle new xform selection code.
2015-04-26 22:11:56 -07:00
Simon Detheridge
949bc93fdd Fix ambiguous call to pow due to uncast float literal 2015-04-20 11:57:10 +01:00
Simon Detheridge
a8a39f4ac0 Add required using declarations for new member variables in Renderer
Without this, there are a couple of `undeclared identifier` errors when attempting to use the variables.
2015-04-20 11:38:34 +01:00
Simon Detheridge
63b8a3134d Explicitly namespace calls to sqrt and isnan
osx/linux have alternative top-level implementations of these methods, so the calls are ambiguous given the  - so these should be used explicitly
2015-04-20 11:38:29 +01:00
Simon Detheridge
0a5a492ab6 Ensure GlobalRand is specialized before implicitly instantiated
I don't like this as it results in some code amongst the headers, but I couldn't figure a better way to do this, as I think this specialization needs to be in a cpp file

GlobalRand is implicitly instantiated in PaletteList.h:82, which is seen before the specialization, which isn't allowed by the standard.

See: http://stackoverflow.com/questions/21112148/specialization-of-member-function-template-after-instantiation-error-and-order
2015-04-13 12:18:33 +01:00
Simon Detheridge
3f5db01a06 Move NowMs() to EmberDefines
This prevents a circular reference where Isaac.h requires this method, but Utils.h includes Isaac.h
2015-04-13 12:12:38 +01:00
mfeemster
e8bbfdd2d4 Rename FractoriumXformsXaos.cpp to FractoriumXaos.cpp to reflect that it's no longer a per-xform part of the UI. 2015-04-08 18:30:07 -07:00
mfeemster
053a9fcf95 Allow for multiple palette files rather than hard coding to flam3-palettes.xml.
Make xaos display a matrix rather than a single column. This will be moved out into its own tab since it's no longer xform dependent, but that will be in a future commit.

Remove xaos from/to button since it's no longer applicable.

Add test function to Isaac to return just one random byte. Might be used in the future.
2015-04-08 18:23:29 -07:00
mfeemster
4067422075 Fix bug with xaos interpolation, by setting all xaos values to zero first.
Remove unnecessary resize() in Interpolate().

These are from Simon Detheridge's PR:

Set file name padding in EmberRender and
EmberAnimate based on the log10() of how many images are getting rendered, rather than hardcoding it to 5.

Use non-locale-imbued stream for writing filename in EmberAnimate.

Properly cast immediate float value used with pow() in density filter kernel.
2015-03-30 17:46:52 -07:00
Simon Detheridge
e746ae33ab Add filename padding option to EmberAnimate
Enables padding with more than 5 zeros when rendering animations with more than 99,999 frames
2015-03-26 21:10:26 +00:00
Simon Detheridge
b5b660e2a0 Use a non-imbued stringstream to generate output filename
Previously, 'os' had imbue(std::locale("")) called on it, which resulted in a localised stream that inserted commas into numbers.

This is inconvenient, as it inserts commas into the output filename for frame numbers of 1,000 or higher
2015-03-26 21:10:15 +00:00
mfeemster
3d206c1d22 Fix bug where xform fields that were not specified for motion interpolation were still getting interpolated.
Carry logic from this fix to writing Xform Xmls as well.

Motion was not supported on some Xform fields as it was originally copied from flam3. Allow it on all but xaos now.

Fix clamping range for m_ColorSpeed at the end of ApplyMotion() to match the values we accept elsewhere.
2015-03-25 20:47:57 -07:00
mfeemster
53db8907ff Forgot to remove OpenCLWrapper::ProgramBuildErrors(). 2015-03-22 12:49:43 -07:00
mfeemster
ef01380e6d This is commit of Simon Detheridge's pull request "osx-opencl" with a few modifications.
-If we change OpenCLWrapper to capture build log errors, we don't need to manually concat them in RendererCL because the overridden ErrorReport() function already concatenates the errors from both classes.

-Do not define T in OpenCL programs. We already have real_t to handle this.

-Do keep the casting to real_t. However this should not be necessary because there is a command line option to do this automatically which we already use: -cl-single-precision-constant. The only reason we do this is because the Apple OpenCL compiler does not follow the standard and obviously ignores this option. Absolutely awful.

-Fix a few improper casts in the CircleTrans1 and GlynnSim1 variations.

-Add an automated OpenCL program build tester to EmberTester, as well as a cast checker.
2015-03-22 12:46:10 -07:00
mfeemster
fa6ec63447 Merge branch 'osx-opencl' of https://github.com/gh2k/fractorium 2015-03-21 16:28:42 -07:00
mfeemster
ee0f437d50 Merge branch 'retina-glwidget' of https://github.com/gh2k/fractorium 2015-03-21 16:23:29 -07:00
mfeemster
d69c83d5b0 Merge branch 'options-device-selection' of https://github.com/gh2k/fractorium 2015-03-21 16:14:37 -07:00