Commit Graph

80 Commits

Author SHA1 Message Date
Simon Detheridge
3fa59be990 Add new 'motion_offset' parameter to motion elements 2015-07-06 16:29:03 +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
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
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
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
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
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
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
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
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
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
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
mfeemster
b1d5db261b Additional changes to work with Simon's pull request.
-Remove unneeded glFinish() call in GLWidget.
-Remove unneeded AMD_OS_WIN preprocessor in several projects.
-Define NVIDIA in all projects that use the NvidiaRelease build and depend on OpenCL.
2015-01-29 18:22:15 -08:00
mfeemster
73cd4f9718 Fix incorrect parsing of legacy "symmetry" xform Xml element. 2015-01-23 18:26:18 -08:00
mfeemster
4059767dc4 0.4.1.8 Beta - Date pending testing.
--User changes
 Thread image writing in EmberAnimate and when doing animation sequence in final render dialog.
 Add total time output for verbose mode in EmberAnimate to match EmberRender.

--Bug Fixes
 Fix incorrect iters ran/requested percentage in EmberAnimate to match EmberRender.
 Fix motion blur being disabled when doing animations in final render dialog.
 Allow for boolean command line options which default to true to be set to false.

--Code Changes
 Minor changes to enable a Mac build.
 Double the memory required for the final output buffer in RendererBase::MemoryRequired() when threading image writing.
 Reuse same buffer for RgbaToRgb() in EmberRender and EmberAnimate.
 Only resize in RgbaToRgb() if the two vectors are not the same.
 Add a final output buffer ping-ponging mechanism to facilitate threaded writes in controllers.
2015-01-19 08:39:50 -08:00
Simon Detheridge
fbdd160061 Fix destructor exception-permissiveness errors in a less idiotic way 2015-01-14 13:10:25 +00:00
Simon Detheridge
a5fc85b17e Fix compiler error due to usage of << to close a template instantiation 2015-01-14 10:37:40 +00:00
Simon Detheridge
958a4786ab Use correct file handle structure on osx 2015-01-14 10:21:36 +00:00
Simon Detheridge
5ec065a66b Fix compiler error due to tbb member having more restrictive exception filter 2015-01-14 10:21:36 +00:00
Simon Detheridge
3791853a80 Fix compiler error due to missing 'template' keyword 2015-01-14 10:21:36 +00:00
Simon Detheridge
6576f4b290 Fix ember library includes for osx 2015-01-14 10:21:36 +00:00
Simon Detheridge
3ceafa176f Fix compiler error by explicitly instantiating static objects
Gave error about implicit instantiation having happened first
2015-01-14 10:21:36 +00:00
mfeemster
3cf6141e27 Derive from QOpenGLWidget instead of QGLWidget.
Derive from QOpenGLWidget instead of QGLWidget.
More commits to follow.
2015-01-01 07:17:05 -08:00
mfeemster
9502ae57ab Linux. 2014-12-14 20:25:46 -08:00
mfeemster
6abd04058a Windows/Linux sync. 2014-12-11 09:02:42 -08:00
mfeemster
a9ecb6a78e More linux work. 2014-12-10 21:50:15 -08:00
mfeemster
7abecaf7be Change CHOOSE_XFORM_GRAIN to be 16384, so we can & with 16383 instead of using modulo. This results in a 9% speed increase on the CPU. 2014-12-09 20:15:02 -08:00
mfeemster
d42cdfafe4 Followon commit 2014-12-09 02:03:54 -08:00
mfeemster
3e70b8eec6 Report memory required in final render dialog.
Fix broken state of ember during failed render with strips.
2014-12-09 00:24:28 -08:00
mfeemster
9263906cb5 linux work
Merge branch 'master' of https://github.com/mfeemster/fractorium
2014-12-08 02:19:29 -08:00
mfeemster
9947cd1c84 More Linux work, getting started with QtCreator. 2014-12-08 02:18:16 -08:00
mfeemster
fad9206229 Additional casting work. 2014-12-07 00:59:26 -08:00
mfeemster
623d417f0f More Linux work. Convert all casts to new style, away from legacy. 2014-12-06 23:51:44 -08:00