Commit Graph

1037 Commits

Author SHA1 Message Date
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
Simon Detheridge
91006edf34 Merge branch 'master' into travis 2015-06-04 17:24:42 +01: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
Simon Detheridge
1e88aa740c Merge branch 'master' into travis 2015-05-30 10:17:09 +01: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
64fdcbdfb2 Add travis config
This adds a travis config to build everyting on 12.04. Because 12.04 is quite old, there are a certain number of hoops that need to be jumped through in order to get things working. As a result, the build script is more complex than I'd like.
2015-05-28 14:23:35 +01:00
Matt Feemster
74056d4c31 Merge pull request #15 from gh2k/gcc-template-pedantism
Fix pedantic gcc error about missing template keyword
2015-05-27 08:09:15 -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
Matt Feemster
48ccce69f6 Merge pull request #14 from gh2k/missing-qmake-file
Add missing FractoriumXformsSelect.cpp to qmake build
2015-05-18 06:45:05 -07:00
Simon Detheridge
822c787a6c Add missing FractoriumXformsSelect.cpp to qmake build 2015-05-18 11:50:24 +01: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
afad780c7d Update fractorium .pro with new files 2015-04-20 11:38:33 +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
mfeemster
07592c9d78 Remove ReadMe.txt from all project files.
Add Curves.h, and CurvesGraphicsView.h/cpp to support bezier color curves.
Add Curves member to Ember.
Add curves capability to EmberCL.
Remove some unused variables in the kernel created in RendererCL::CreateFinalAccumKernelString().
Use glm namespace for vec classes if GLM_VERSION >= 96, else use glm::detail.
As a result of using glm namespace, all instances of min and max had to be qualified with std::
Split ComputeCamera into that and ComputeQuality().
Reduce the amount of ComputeCamera() and MakeDmap() calls on each incremental iter that doesn't use temporal samples.
Fix clamping bug with DE filter widths.
Provide functions to return the kernels from RendererCL to assist with diagnostics and debugging.
Prevent extra newline in EmberRender when only rendering a single image.
Add the ability to delete an ember at a given index in EmberFile.
Allow deleting/focusing ember in library tab with delete and enter keys.
Reorder some code in Fractorium.h to match the tabs order.
Add and call ClearFinalImages() to clear buffers in controller to fix bug where previous CPU render would be shown for a split second when switching from OpenCL back to CPU.
Refactor ember library pointer syncing to a function SyncPointers().
Add the ability to save ember Xmls to an unique automatically generated name after the first time the user has specified a name.
2015-03-21 15:27:37 -07:00
mfeemster
f334ce1704 Merge branch 'debug' of https://github.com/gh2k/fractorium 2015-03-08 20:35:26 -07:00
Simon Detheridge
f3987d2858 Fix call to in FinalAccumOpenCLKernelCreator.cpp to use real_t, not T() 2015-03-01 16:49:36 +00:00
Simon Detheridge
eef9a30cad Ensure correct opencl device is populated when platform setting is changed
This fixes an issue where the options dialog displays the incorrect device when it is first opened, when using a device other than 0
2015-03-01 15:53:25 +00:00
Simon Detheridge
33b59b2f72 Fix status bar height on retina displays 2015-03-01 12:28:14 +00:00
Simon Detheridge
1762d8251f Multiply x and y mouse event coords by device pixel ratio
This fixes issues with retina displays, where there are more opengl pixels than logical device pixels
2015-02-28 22:18:07 +00:00
Simon Detheridge
f906e06927 Ditch T(f) define in opencl programs in preference to already-defined real_t.
Also removed some erroneously-added double-'T(' statements
2015-02-26 21:18:55 +00:00
Simon Detheridge
022ccf1472 Whitespace fixes 2015-02-25 13:20:03 +00:00
Simon Detheridge
045d6ac6e0 Force all float literals in opencl variations to correct precision
This avoids 'ambiguous call' errors on mac.

It's probably not necessary to have changed every single instance, only the ones in functions with multiple signatures. However, it was easier and safer to do this automatically than manually.
2015-02-25 13:15:31 +00:00
Simon Detheridge
b222ed4cc3 Update osx ambiguous-call fix to support the varying-precision mechanism 2015-02-25 13:15:31 +00:00
Simon Detheridge
cf4f5d9899 Show program build errors from BuildIterProgramForEmber 2015-02-25 13:15:31 +00:00
Simon Detheridge
d05231f082 Fix 'error: call to 'clamp' is ambiguous' error when compiling opencl program 2015-02-25 13:15:31 +00:00
Simon Detheridge
582bd93dea Show opencl program build errors on info tab, when compilation fails 2015-02-25 13:15:31 +00:00
Simon Detheridge
2dc392a1cc Use different output directory for debug build
Saves lots of recompiling! :-)
2015-02-20 16:23:10 +00:00
Simon Detheridge
eef2c548db Don't omit frame pointer in debug version
You can't really debug without a frame pointer :-)
2015-02-09 11:06:20 +00:00