Commit Graph

773 Commits

Author SHA1 Message Date
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
mfeemster
c01f444d52 Add option to display affines in polar coords. 2015-02-03 17:11:16 -08: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
Simon Detheridge
301b6ee452 Add .gch directories to gitignore 2015-01-26 20:17:29 +00:00
Simon Detheridge
c1031bbfee Update qt build script to set nvidia or native configs from commandline 2015-01-26 18:13:53 +00:00
Simon Detheridge
52f6415085 Add nvidia config to build nvidia-compatible binary on osx/linux
Also added config to build a cpu-native binary to take advantage of additional CPU features
2015-01-26 17:50:41 +00:00
Simon Detheridge
6e929a7aaf Tidy shared_settings to group platform-specific items together 2015-01-26 17:23:41 +00:00
Simon Detheridge
8bafa3ddbc Add linux/osx intermediate files to gitignore 2015-01-26 17:18:29 +00:00
Simon Detheridge
254bf89469 Refactor .pro files to keep shared settings all in one place 2015-01-26 17:17:51 +00:00
Simon Detheridge
5a610601af Don't strip symbols on osx release build
This avoids clang error in release mode: atom not found in symbolIndex(__ZN7EmberNs11EmberReport23StaticErrorReportStringERKNSt3__16vectorINS1_12basic_stringIcNS1_11char_traitsIcEENS1_9allocatorIcEEEENS6_IS8_EEEE) for architecture x86_64
2015-01-26 16:01:10 +00:00
Simon Detheridge
0f0035e37c Add helper script to [re]build all QtCreator projects 2015-01-26 16:00:59 +00:00
mfeemster
73cd4f9718 Fix incorrect parsing of legacy "symmetry" xform Xml element. 2015-01-23 18:26:18 -08:00
Simon Detheridge
c2ef02a8bf Write all non-xml data to cerr from EmberGenome
The command is intended to write XML output to stdout for piping into an xml file, but adds diagnostic information and warnings to the output, generating invalid XML.
2015-01-21 13:34:34 +00:00
Simon Detheridge
cc2ce44140 Don't prematurely terminate if doCross1 is not specified 2015-01-21 10:51:26 +00: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