Commit Graph

567 Commits

Author SHA1 Message Date
Seth Troisi
2ae68776a9 Add FPS parameter to UI 2022-03-11 14:11:53 -08:00
Seth Troisi
f922b1731d Fix warning about unused CLStrings 2022-03-11 14:06:09 -08:00
Person
2909af2408 --Code changes
-Cleanup and small bug fix for the new animation preview feature.
2022-02-28 20:36:11 -07:00
Matt Feemster
4bbc8466e2 Merged animate_review_prework_part2 into master 2022-02-28 06:07:56 +00:00
Seth
d4174ef92a Merged in animate_review_rebased_bit (pull request #59)
Animated Rendering

Approved-by: Matt Feemster
2022-02-28 06:01:51 +00:00
Seth Troisi
8ab6c920ee --Code Change
-Add Animate Button
2022-02-27 20:44:03 -08:00
Seth Troisi
36e83c5552 --Code Change
-Add Clear Sequence button to Sequence Panel
2022-02-27 20:44:03 -08:00
Seth Troisi
0fc2d3107e --Code Change
-Change Sequence Preview to PREVIEW_SIZE (128)
2022-02-27 20:44:03 -08:00
Seth Troisi
9558f81e69 --Code Change
-Remove unused `varIndex = IndexInXform;`
    Removes 2087 instances of  [-Wunused-variable] warnings
2022-02-27 20:42:31 -08:00
Seth Troisi
344c8c6457 --Code Change
-Fix compiler warnings in XmlToEmber
2022-02-27 20:39:13 -08:00
Person
ee7ca7065e --Code changes
-Remove all dependencies on Intel Threading Building Blocks.
 -Write our own version of parallel_for().
2021-12-29 23:10:54 -07:00
Person
5524180d4b --Code changes
-More work on upgrading openexr.
2021-11-16 23:22:02 -07:00
Person
f476afa545 --Bug fixes
-Numbering of rendered files was wrong.
 -Truchet_hex_fill was not compiling with some newer Nvidia drivers.

--Code changes
 -Update Wix installer to use VS 2019.
2021-08-08 15:20:09 -06:00
Person
2219ea755f --Bug fixes
-Start and end tags were not properly included in the final render backup file output.
2021-07-01 09:54:17 -06:00
Rye Mutt
da64ccf87f Revert file path construction behavior to not strip forward slashes from prefix so it can be utilized to change output directory 2021-04-27 15:11:03 -04:00
Person
6a6e2f3dde --Bug fixes
-Text output of command line programs was not being flushed.
2021-04-22 13:21:29 -06:00
Person
e64dd6c67d --Bug fixes
-Fix build.
2021-04-19 22:23:29 -06:00
Person
a726b99dea --Code changes
-Modernize some C++ code.
2021-04-19 21:53:25 -06:00
Person
8086cfa731 22.21.4.2 4/19/2021
--User changes
 -Allow users to set the Exp value when using the Exp temporal filter type.
 -Set the default temporal filter type to be Box, which does not alter the palette values at all during animation. This is done to avoid confusion when using Gaussian or Exp which can produce darkened images.

--Bug fixes
 -Sending a sequence to the final render dialog when the keyframes had non zero rotate and center Y values would produce off center animations when rendered.
 -Temporal filters were being unnecessarily recreated many times when rendering or generating sequences.
 -Exp filter was always treated like a Box filter.

--Code changes
 -Add a new member function SaveCurrentAsXml(QString filename = "") to the controllers which is only used for testing.
 -Modernize some C++ code.
2021-04-19 21:07:24 -06:00
Person
f411c355f3 21.21.4.1 Release 2021-04-07 08:49:35 -06:00
Person
0956cd6592 --User changes
-Allow for specifying linear or smooth interpolation when generating a sequence in the Library tab (was formerly hardcoded to smooth). This has the effect of exposing the --unsmoother option used in EmberGenome in the GUI.
 -Clarify tool tips of the sequence interpolation fields in the animation group on the Flame tab.
 -Change caption of the Bounds tab to be Bounds & Log.
2021-03-28 20:37:02 -06:00
Person
897ccdd375 --User changes
-Make Shift+F keys select the flames in the file, and Shift +/- cycle through them.
2021-03-08 08:20:35 -07:00
Person
6156036370 --Bug fixes
-depth_blur2 was wrong.
2021-02-04 23:49:06 -08:00
Person
e3e5120130 --Bug fixes
-Sequence generation was generating the wrong color curves when a non-default curve had less than 5 nodes in it.
2021-02-03 00:49:10 -08:00
Person
c23d2ad049 --Bug fixes
-ETA in the final render dialog was not correct when doing incremental renders.
2021-01-21 20:48:45 -08:00
Person
b31f45251c --Bug fixes
-bcircle was not properly setting output values to zero when the bcircle_borderwidth was zero.
2021-01-13 21:43:10 -08:00
Michel Mastriani
5d11fbe66c Merged in master (pull request #54)
--Bug fixes -Pixel_flow sincos x,y was inverted

Approved-by: Matt Feemster
2021-01-03 18:30:31 +00:00
Michel Mastriani
81253863cc --Bug fixes -Pixel_flow sincos x,y was inverted 2021-01-03 13:32:04 +00:00
Person
8c591d6163 --User changes
-Make a space bar press be the equivalent of a double click when inside of a spin box. This makes it easy to toggle without using the mouse.
2020-12-29 23:33:44 -08:00
Person
47b6614c8a --Bug fixes
-Fix improper usage of rand() in cpow2, cpow3, hypertile1, hypertile3D1, hypertile3D2, juliac, juliaq.
 -Fix program crashing during density filtering on some Nvidia cards.
 -hypertile3D1 was wrong.
 -Parsing phoenix_julia when coming from Apophysis was wrong.
 -Density filtering was freezing on certain Nvidia cards.

--Code changes
 -Optimize juliac, npolar.
 -Add a new function Crand() which behaves like the legacy C rand() which returns an integer between 0 and 32766, inclusive.
 -Use RandBit() in some places.
 -Remove Zeps() from vignette, it's not needed.
 -Restructure OpenCL code for density filtering such that it does not hang after being compiled on some Nvidia cards, such as the gtx 1660. Remove barriers from conditionals where possible.
2020-12-28 21:46:55 -08:00
Person
d68deb1255 --Bug fixes
-Forward slash in file path was accidentally being removed.
2020-12-17 22:36:11 -08:00
Person
2b60d2b87e --Bug fixes
-Remove illegal characters from filenames.
2020-11-30 19:32:02 -08:00
Person
73efd76bdd --Code changes
-Tabify.
2020-10-20 21:57:31 -07:00
Person
8c4d9fd866 Merge branch 'master' of https://bitbucket.org/mfeemster/fractorium 2020-10-20 21:01:04 -07:00
Person
9160f08b5a --User changes
-Allow for an opacity greater than 1, which can have the effect of highlighting a specific xform.
2020-10-20 21:00:50 -07:00
Michel Mastriani
601c000b10 Pitch-Yaw mouse move feature 2020-09-27 11:59:09 -03:00
Person
36b71278ec --Bug fixes
-Fix bug in previous vignette variation.
2020-08-01 18:05:14 -07:00
Person
99cc597abc --Code changes
-Add vignette variation.
2020-07-30 19:55:37 -07:00
Person
54610ab73d --User changes
-Make tooltip for the show/hide affine toolbar buttons show the keyboard shortcut.
2020-07-21 06:49:49 -07:00
Person
14750ad96c Merge branch 'master' of https://bitbucket.org/mfeemster/fractorium 2020-07-14 17:45:27 -07:00
Person
c0a1395a2b --Bug fixes
-Add support for Chaotica files which specify xform weight as "Base weight" instead of "base_weight".
 -Fix bug where Fractorium would crash when a new file was dragged in while previews were still rendering.
  --This was done by changing the TreeItemChanged() events in the library tab use a direct connection rather than a queued connection.
  --This obviated the need for QCoreApplication::processEvents() calls in the library tree code.
 -Fix bug where renaming a flame within a file, then tabbing away did not commit the name change.

--Code changes
 -Clean up some warnings about const variables in the latest version of Visual Studio 2019.
 -Upgrade installer to latest update of Visual Studio 2019.
2020-07-14 17:45:07 -07:00
Michel Mastriani
c1310146a5 Added free rotation 2020-05-13 23:21:57 -03:00
Person
a07955d12e --Code changes
-Clean up Michel's PR.
2020-05-07 06:48:25 -07:00
Michel Mastriani
af56d633cf macOS improvements 2020-05-02 15:19:14 -03:00
Michel Mastriani
17c6f29524 Added PaletteFilenameCombo sort 2020-04-19 00:29:01 -03:00
Person
12bef2a3cb sync 2020-04-12 14:38:22 -07:00
Claude Heiland-Allen
8215749b71 Merged in claudeha/fractorium/intrinsics (pull request #46)
include intrinsics headers for _MM_ macros
2020-04-12 21:17:42 +00:00
Claude Heiland-Allen
d0c4fe5477 include intrinsics headers for _MM_ macros 2020-04-12 22:08:04 +01:00
Person
39414b2263 --Bug fixes
-Fix possible OpenCL bugs in cubic3D, cubicLattice3D, dc_cube, falloff, falloff2, falloff3, waffle.

--Code changes
 -Upgrade to Visual Studio 2019.
2020-04-11 20:07:12 -07:00
Michel Mastriani
e741ba880e Fixed cubic3D and cubicLattice_3D variations for AMD GPUs 2020-04-10 15:46:51 +00:00
Person
b9ce48f649 --Bug fixes
-ETA time was wrong with incremental final renders after waiting for a period of time.

--Code changes
 -Small change to prevent parsing error when using tbb on some systems.
2020-04-09 15:41:49 -07:00
Person
d2893010f0 1.0.0.19 Re-release
--Bug fixes
 -Blur Cuve never worked with strips.
 -Images with temporal filter width values below 0.6 would sometimes create blank images.
2020-03-18 19:34:56 -07:00
Person
58d5124a05 --Bug fixes
-Previous commit removing a field ruined strips renders.
2020-03-17 07:16:14 -07:00
Person
0323d035bf 1.0.0.19 Re-release
--Bug fixes
 -New Blur Curve math was not applied on the CPU.
2020-03-15 23:51:25 -07:00
Michel Mastriani
577e4c0fa7 Fixing mac version 2020-03-15 15:02:03 -03:00
Person
80a26ac1ec --User changes
-Change Blur Curve math to be centered on 0,0 and create a more dramatic effect at lower values.
2020-03-15 10:49:33 -07:00
Person
4a71602900 Merge branch 'master' of https://bitbucket.org/mfeemster/fractorium 2020-03-15 00:41:04 -07:00
Person
f170811e09 --Code changes
-Remove the unused field m_RotCenterY from Ember.
 -Make a #define for fma() testing, but seems to make no difference.
 -Optimize some of the OpenCL iteration kernel generation code.
 -Possible fix to an OpenCL compilation bug when using blur curve on AMD on Mac.
2020-03-15 00:40:57 -07:00
Michel Mastriani
b7abe52c40 C-91 files 2020-03-14 17:45:37 -03:00
Michel Mastriani
c35393655f Mac adjustments 2020-03-14 15:40:56 -03:00
Person
be86f1084c 1.0.0.19 Release 2020-03-13 18:56:42 -07:00
Person
a2e60bdaa5 Merge branch 'master' of https://bitbucket.org/mfeemster/fractorium 2020-03-12 23:41:51 -07:00
Person
ce0961a236 --Code changes
-Remove boolean parameter in AddXformsWithXaos().
2020-03-12 23:41:44 -07:00
Michel Mastriani
96c3b162e5 Mac build adjustments 2020-03-12 23:05:06 -03:00
Michel Mastriani
b7d37eb886 Right click+shift 2020-03-12 07:52:50 -03:00
Person
ab836aaa82 --Bug fixes
-Make xaos pasting options apply all of the time even if there is no xaos.
2020-03-11 07:02:38 -07:00
Person
1ba1e0925f Merge branch 'master' of https://bitbucket.org/mfeemster/fractorium 2020-03-11 06:49:37 -07:00
Person
18809e65aa --User changes
-Entering xaos cells will always select the entire cell to make editing easier.
 -Add radio buttons on the xaos tab to specify how pasting or duplicating xforms should preserve xaos.

--Bug fixes
 -The left header column in the xaos visualization table had somehow disappeared.

--Code changes
 -DoubleSpinBox now has a boolean which specifies whether it clears its selection on enter. Default true.
 -Make AddXformsWithXaos() be a static member of FractoriumEmberController for quicker build times.
 -Add new exmaple flames to package_linux.sh
2020-03-11 06:49:29 -07:00
Michel Mastriani
59d7041c6f Open Examples AboutDialog 2020-03-10 21:54:31 -03:00
Michel Mastriani
4026a6d615 Open Examples fixes 2020-03-10 21:33:44 -03:00
Person
61dd5e6eeb --Code changes
-Fix up .pro file for building with the new examples files.
 -Rename FlameExamples folder to Examples.
2020-03-08 23:37:27 -07:00
Person
8e8c8a3e7d --Code changes
-Default flam3 compatibility mode to false on the command line.
2020-03-08 14:41:06 -07:00
Person
83ce2a29cb --Bug fixes
-Preserve prefix and suffix fields between open/close of the Final Render dialog.
2020-03-08 14:30:47 -07:00
Person
61ddc06151 --User changes
-Allow dragging in folders which will be recursively traversed for flame files.
 -Allow for adjusting scale via keyboard with the < and > keys.
 -Show the count of opened flames on the header of the library tree.

--Bug fixes
 -Attempt to preserve xaos when pasting xforms.

--Code changes
 -Default flam3 compatibility mode to true.
2020-03-08 14:17:13 -07:00
Michel Mastriani
3ef32565c7 Merged in mmastriani/fractorium_michel (pull request #37)
Open Examples Feature
2020-03-08 05:30:27 +00:00
Person
efa9dc072d --Bug fixes
-EmberAnimate.exe was using 1-based indexing for filenames, but Fractorium and all of the documentation was using 0-based indexing. Make all use 0-based indexing.
2020-03-07 21:23:05 -08:00
Michel Mastriani
7d65568510 OpenExamples Flames 2020-03-05 22:26:16 -03:00
Michel Mastriani
becdb64d40 Merged mfeemster/fractorium into master 2020-03-05 21:40:04 -03:00
Michel Mastriani
49017137f8 OpenExamples added Fractorium.cpp Code 2020-03-05 21:39:17 -03:00
Michel Mastriani
552cb192aa OpenExamples Code 2020-03-05 21:17:29 -03:00
Person
27a9767316 --Bug fixes
-Fix dragging post variations.
2020-03-05 06:35:09 -08:00
Person
ea649bbda6 --User changes
-Add backward compatibility option for the following variations: cos, cosh, cot, coth, csc, csch, sec, sech, sin, sinh, tan, tanh.
 -Add the ability to re-order variations by dragging them in the Info tab.
2020-03-04 22:30:08 -08:00
Person
c50568a98b --Bug fixes
-Custom palettes were not being read correctly on non ANSI machines.

--Code changes
 -Prepare files for next release.
2020-02-25 18:31:44 -08:00
Person
87a8161fe4 --Code changes
-Missed a file.
2020-02-17 22:18:44 -08:00
Person
8c66fa2c24 --Bug fixes
-Fix crash on palette editor when opening it with certain palette files in a particular order.
 -An xform with only a post variation in it might have showed up wrong.
 -The xforms combo box was obscuring the name of the xforms by not being wide enough.
 -Make variation state preservation be a little bit more correct in OpenCL.

--Code changes
 -Make all iterators on the CPU use a temporary point.
2020-02-17 18:45:02 -08:00
Person
40567eb301 --Bug fixes
-Forgot to include uranium.qss in the linux AppImage installer.
2020-02-03 06:24:30 -08:00
Person
8ffa29ba57 1.0.0.18 Release. 2020-01-31 21:38:17 -08:00
Person
541185df8c --Bug fixes
-Fix more bugs with keyboard shortcuts.
2020-01-31 16:21:23 -08:00
Person
c1d336b693 --User changes
-Add new keyboard shortcuts:
 --P/Shift+P toggles visibility of pre/post xforms.
 --L/Shift+L toggles visibility of all/selected pre/post xforms.

--Bug fixes
 -Xforms were erroneously able to edit via key pressed when not shown.
2020-01-30 18:55:39 -08:00
Person
47541e4551 --Bug fixes
-Ctrl+Y for redo had been taken by another shortcut. Reassign to Ctrl+B.
2020-01-26 18:47:17 -08:00
Person
04b87da642 --Bug fixes
-Only allow editing affines via key press when affines are actually shown.

--Code changes
 -Fix up from Michel's merge.
2020-01-25 15:50:53 -08:00
Person
e61b77651a Merge branch 'master' of https://bitbucket.org/mfeemster/fractorium 2020-01-25 14:52:50 -08:00
Person
c923a0b468 --Code changes
-Update a tooltip.
2020-01-25 14:52:43 -08:00
Michel Mastriani
b99d5ab5dd Merged in mmastriani/fractorium_michel (pull request #34)
--User changes -Add pre/post in Toolbar

Approved-by: Matt Feemster <matt.feemster@gmail.com>
2020-01-25 22:50:48 +00:00
Person
3b261124b2 --User changes
-Optimization and correction for hexaplay3D and hexnix3D.
 -Major optimization on the GPU for flames which only have one xform, by skipping all random xform selection code.
 -Changes to how xaos is "preserved" when adding new xforms, copying xforms and duplicating xforms.
 --Duplicating xforms when no xaos is present in the flame now maintains not using xaos, and keeps all values as one.
 --Duplicating xforms when xaos is present, will result in xaos rows and columns that are the same as the xforms being duplicated, with the new row and column area having values of 1.
 --Duplicating xforms when xaos is present, while Control is pressed, will result in xaos rows and columns that have values of 0, with the new row and column area having values of 1.
 ---Copying xforms has the same behavior as duplicating with Control pressed.

--Bug fixes
 -hexaplay3D, hexnix3D and post_smartcrop were wrong on the GPU because they are the rare variations which preserve state between iterations.
 -Changing the sub batch size would improperly wrong the wrong number of iterations.

--Code changes
 -Some functions in Affine2D made const.
 -Change in the index at which points and variation state are preserved between kernel calls.
 -Some arguments in some member functions of GLEmberController made const.
2020-01-25 11:12:49 -08:00
Michel Mastriani
1fdebe6f05 --User changes -Add pre/post in Toolbar 2020-01-22 20:24:15 -03:00
Person
207ace6c67 --Code changes
-Small optimization for cubic3D.
 -Code cleanup for cubicLattice_3D.
2020-01-19 14:29:04 -08:00
Person
5f08e54bd4 --User changes
-Add new Blur Cuve field which controls how blurring increases when moving from the center out.

--Bug fixes
 -Undo Y axis flipping from previous commit, it never worked and is not worth the effort.

--Code changes
 -The new field is a member of Ember and is called m_BlurCurve, and the corresponding xml field is called "blur_curve".
2020-01-18 22:29:08 -08:00
Person
8e6ba922af --User changes
-Duplicate xform will now only add the new xforms with xaos preserved if xaos is already being used in the flame. Otherwise, they'll just be added normally.
 -This is a hybrid of the original behavior and the new behavior added a year or so ago.
2020-01-17 18:58:51 -08:00
Person
f550a3e9b8 --Bug fixes
-Properly display bounds from last commit.
2020-01-16 20:55:28 -08:00