Commit Graph

916 Commits

Author SHA1 Message Date
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
Person f806ba745d --User changes
-Change how the PositiveYUp option is actually handled to make things more compatible with Apophysis. depending on the value of that option:
 --Moving an affine up or down will mean a positive or negative value.
 --Locally, the display of the affine will be flipped.

--Bug fixes
 -Fix waffle.
2020-01-16 20:22:41 -08:00
Person 6a14ef89e4 --Bug fixes
-Don't apply keyboard edits to affines when alt is pressed.
2020-01-15 06:07:18 -08:00
Person ed35622928 --User changes
-Add new style sheet called uranium that is reminiscent of the old Winamp color scheme of the same name.
 -All for keyboard presses to edit affines.
 --Q: rotate counter clockwise.
 --E: rotate clockwise.
 --W: move up.
 --S: move down.
 --A: move left.
 --D: move right.
 --G: shrink.
 --H: grow.
 --Hold shift to decrease amount, control to increase amount.
 -Change some menu shortcuts to accommodate these new affine editing shortcuts.
 -Random xaos now just provides values of either 0 or 1. Hold control to get the old behavior.

--Bug fixes
 -Waffle variation was broken in OpenCL.
2020-01-14 20:08:27 -08:00
Michel Mastriani 75ffc2f665 Merged in mmastriani/fractorium-1/Michel-Mastriani/variations02h-edited-online-with-bitbuck-1578412731899 (pull request #33)
Variations02.h edited online with Bitbucket
2020-01-08 00:53:28 +00:00
Michel Mastriani 9747889c88 Variations02.h edited online with Bitbucket 2020-01-07 15:59:01 +00:00
Michel Mastriani 89aab8e360 Merged in mmastriani/fractorium/Michel-Mastriani/curvesgraphicsviewcpp-edited-online-with-1578144335752 (pull request #32)
CurvesGraphicsView.cpp edited online with Bitbucket

Approved-by: Matt Feemster <matt.feemster@gmail.com>
2020-01-04 18:20:38 +00:00
Michel Mastriani d9d21a88b8 CurvesGraphicsView.cpp edited online with Bitbucket 2020-01-04 13:25:40 +00:00
Person ba1e5ed922 --Code changes
-Fix up Miche's work on allowing a small subset of parameters to be copied from the main window to the final render dialog when doing save/render again.
2020-01-04 01:02:30 -08:00
Michel Mastriani aee36b52ab Merged in mmastriani/fractorium_michel (pull request #31)
Color&Filter

Approved-by: Matt Feemster <matt.feemster@gmail.com>
2020-01-04 05:50:13 +00:00
Michel Mastriani 7479aaa95d Color&Filter 2020-01-02 15:04:32 -03:00
Michel Mastriani 9d1abfce15 Color&Filter 2020-01-02 15:02:57 -03:00
Michel Mastriani e657eac9fe Merged in mmastriani/fractorium/Michel-Mastriani/curvesgraphicsviewcpp-edited-online-with-1577938448647 (pull request #30)
CurvesGraphicsView.cpp edited online with Bitbucket

Approved-by: Matt Feemster <matt.feemster@gmail.com>
2020-01-02 06:34:40 +00:00
Michel Mastriani 6794b42a03 CurvesGraphicsView.cpp edited online with Bitbucket 2020-01-02 04:14:14 +00:00
Person 9577d580cc --Bug fixes
-Fix OpenCL compilation bugs in a few variations.

--Code changes
 -Pre/post variations are now checked for precalcs when creating the OpenCL kernel code.
 -Change some enumeration t
2019-12-31 23:01:30 -08:00
Person 96d72004fc --Bug fixes
-Returning to main window after closing the final render dialog wouldn't restart the renderer.

--Code changes
 -Recreate the final render dialog each time it's shown.
2019-12-30 21:12:10 -08:00
Person 7ced17a6b2 --Bug fixes
-Bump render was broken.
2019-12-29 13:59:38 -08:00
Michel Mastriani ae0a1c799b Merged in mmastriani/fractorium_michel (pull request #29)
makedeps.bat for VS 2019

Approved-by: Matt Feemster <matt.feemster@gmail.com>
2019-12-28 05:09:54 +00:00
Person 0b0405382f --Bug fixes
-Fix variations: blob2 (broken on CPU), epispiral, hole.
 -Fix reading variations from Apophysis: supershape.
 -Bump render was broken.

--Code changes
 -Flip precalc sina/cosa and apply everywhere by flipping the usage. Flam3 had these reversed and it made the code confusing to read.
2019-12-27 21:04:41 -08:00
Michel Mastriani efab029006 makedeps.bat for VS 2019 2019-12-27 15:25:53 +00:00
Michel Mastriani 575357817c Merged mfeemster/fractorium into master 2019-12-27 12:14:43 -03:00
Person 35d4eb3464 --User changes
-Allow for saving EXR as full 31-bit float per component per pixel.
 -Allow for saving the output from the final render dialog as a different image format without starting the rendering process over.

--Code changes:
 -Make StripsRender() handle memsetting the final output image so calling code no longer has to.
 -Make FinalRenderEmberController<T>::SaveCurrentRender() return the path that the image was actually saved to.
2019-11-29 23:52:17 -08:00
Person 59605f10a8 --User changes
-Make the xform name field be a standard edit control so it's always editable.
2019-11-28 12:18:36 -08:00
Person adf590209a --Bug fixes
-Properly detect maximization of final render dialog when on linux.
2019-11-17 00:25:41 -08:00
Person 74fea61ad2 --User changes
-Allow the user to resume a finished render in the final render dialog with a higher quality. This only applies to rendering a single image with no strips.
 -Make clear xaos apply to all when Apply All is checked.
2019-11-08 21:44:57 -08:00
Person 5a26ed5044 --Code changes
-Add an include for Variations01.h which will allow a developer to make a build which is fully compatible with flam3.
2019-10-02 20:24:55 -07:00
Person 4a150132e1 --User changes
-Improve performance in the following variations: cpow2, dc_cube, julia3d, julia3dz, julian2, log_db, nblur, npolar, waffle, wavesn, xtrb.

--Code changes
 -Rand range now uses multiply + shift rather than modulo.
2019-07-24 18:29:33 -07:00
Michel Mastriani 1559a8e779 Merged mfeemster/fractorium into master 2019-07-06 14:13:00 -03:00
Person 1cafbb8837 --User changes
-Add entries for 1 and 101 in the affine rotation and scale combo boxes.
2019-06-30 20:44:07 -07:00
Person 0ac80217f7 1.0.0.17 Re-release 2019-06-28 21:07:18 -07:00
Person 58693a857d Merge branch 'master' of https://bitbucket.org/mfeemster/fractorium 2019-06-28 18:51:51 -07:00
Person afa6dea68a --Bug fixes
-Rapidly stopping and starting sequence preview generation would either freeze or crash the program.
2019-06-28 18:51:36 -07:00
Michel Mastriani 926578ec76 Merged mfeemster/fractorium into master 2019-06-25 23:09:13 -03:00
Matt Feemster 56c59c1d8b README.md edited online with Bitbucket 2019-06-26 00:23:47 +00:00
Person 4929017987 1.0.0.17 Release (RPM) 2019-06-24 22:16:05 -07:00
Person 33eb46b6dc 1.0.0.17 Release 2019-06-24 21:12:07 -07:00
Person ee1d5eb44d --Bug fixes
-Fix some potential OpenCL compilation bugs on circlecrop, circlecrop2, oscilloscope2, Truchet_hex_crop.
 -Prevent the minus key from changing the current xform when being pressed in a textbox.

--Code changes
 -Cleanup some casting in depth_blur, depth_blur2.
2019-06-24 19:43:15 -07:00
Michel Mastriani 079e2011fe Merged mfeemster/fractorium into master 2019-06-22 10:48:56 -03:00
Person d234f635ea --Code changes
-Affine tab default selection.
2019-06-21 17:57:03 -07:00
Person b0088e58bc --User changes
-Fix xform selection logic to prevent selecting hidden pre and post xforms.
 -Remove the "Current" visibility option for pre/post affines. Instead just have "Selected" and "All". If none are selected, show current.
2019-06-21 17:51:20 -07:00
Person f095df99c9 --Code changes
-Change two if statements into an if/else if in Truchet_hex_fill.
2019-06-20 16:29:17 -07:00
Person d34e2ffa4a --User changes
-Fix xform selection logic to prevent selecting hidden pre and post xforms.
 -Add hex_modulus.

--Bug fixes
 -starblur was wrong.

--Code changes
 -Optimize Truchet_hex_crop, Truchet_hex_fill.
 -Cleanup Truchet_inv.
 -Add new file Variations08.h, and move Gnarly and inkdrop there.
2019-06-18 21:29:58 -07:00
Michel Mastriani 09dd6efb23 Merged in mmastriani/fractorium_michel (pull request #28)
Added Truchet_hex plugins and Fixed Starblur in GPU

Approved-by: Matt Feemster <matt.feemster@gmail.com>
2019-06-16 15:26:07 +00:00
Michel Mastriani 358e899a05 Updating files 2019-06-16 00:40:43 -03:00