Commit Graph

791 Commits

Author SHA1 Message Date
dc0c83036a Added new files to Fractorium.pro 2020-03-07 17:18:39 -03:00
7c27b8e921 Added OpenExamples Flames folder and new tatasz gradients 2020-03-07 17:12:33 -03:00
c8032074be Deleted OpenExamples Flames folder 2020-03-07 17:07:42 -03:00
7d65568510 OpenExamples Flames 2020-03-05 22:26:16 -03:00
becdb64d40 Merged mfeemster/fractorium into master 2020-03-05 21:40:04 -03:00
49017137f8 OpenExamples added Fractorium.cpp Code 2020-03-05 21:39:17 -03:00
552cb192aa OpenExamples Code 2020-03-05 21:17:29 -03:00
27a9767316 --Bug fixes
-Fix dragging post variations.
2020-03-05 06:35:09 -08:00
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
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
87a8161fe4 --Code changes
-Missed a file.
2020-02-17 22:18:44 -08:00
23ad4b77c2 Merge branch 'master' of https://bitbucket.org/mfeemster/fractorium 2020-02-17 18:45:09 -08:00
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
7882093cbc Merged in mmastriani/fractorium/Michel-Mastriani/added-uraniumqss-into-macos-package-1580818817314 (pull request #35)
--added uranium.qss into MacOS package
2020-02-04 13:54:55 +00:00
f689cf9923 --added uranium.qss into MacOS package 2020-02-04 12:20:37 +00:00
8cd2340484 Merge branch 'master' of https://bitbucket.org/mfeemster/fractorium 2020-02-03 06:24:38 -08:00
40567eb301 --Bug fixes
-Forgot to include uranium.qss in the linux AppImage installer.
2020-02-03 06:24:30 -08:00
721a34c05c README.md edited online with Bitbucket 2020-02-02 02:25:49 +00:00
8ffa29ba57 1.0.0.18 Release. 2020-01-31 21:38:17 -08:00
541185df8c --Bug fixes
-Fix more bugs with keyboard shortcuts.
2020-01-31 16:21:23 -08:00
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
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
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
e61b77651a Merge branch 'master' of https://bitbucket.org/mfeemster/fractorium 2020-01-25 14:52:50 -08:00
c923a0b468 --Code changes
-Update a tooltip.
2020-01-25 14:52:43 -08:00
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
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
1fdebe6f05 --User changes -Add pre/post in Toolbar 2020-01-22 20:24:15 -03:00
207ace6c67 --Code changes
-Small optimization for cubic3D.
 -Code cleanup for cubicLattice_3D.
2020-01-19 14:29:04 -08:00
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
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
f550a3e9b8 --Bug fixes
-Properly display bounds from last commit.
2020-01-16 20:55:28 -08:00
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
6a14ef89e4 --Bug fixes
-Don't apply keyboard edits to affines when alt is pressed.
2020-01-15 06:07:18 -08:00
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
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
9747889c88 Variations02.h edited online with Bitbucket 2020-01-07 15:59:01 +00:00
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
d9d21a88b8 CurvesGraphicsView.cpp edited online with Bitbucket 2020-01-04 13:25:40 +00:00
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
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
7479aaa95d Color&Filter 2020-01-02 15:04:32 -03:00
9d1abfce15 Color&Filter 2020-01-02 15:02:57 -03:00
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
6794b42a03 CurvesGraphicsView.cpp edited online with Bitbucket 2020-01-02 04:14:14 +00:00
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
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
7ced17a6b2 --Bug fixes
-Bump render was broken.
2019-12-29 13:59:38 -08:00
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
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