Commit Graph

639 Commits

Author SHA1 Message Date
d1078e4eb2 FractoriumInstaller.wixproj edited online with Bitbucket 2019-05-16 13:54:25 +00:00
9909391475 EmberDefines.h edited online with Bitbucket 2019-05-16 13:51:57 +00:00
7a2fa57d04 control.package edited online with Bitbucket 2019-05-16 13:47:01 +00:00
f79d717520 Fractorium.spec edited online with Bitbucket 2019-05-16 13:45:30 +00:00
c430deeea6 defaults.pri edited online with Bitbucket 2019-05-16 13:43:52 +00:00
b12cdc5da3 --Bug fixes
-The variation unicorngaloshen was wrong.

--Code changes
 -Add precalc optimizations for the following variations: starblur2, modulusx, modulusy, rotate, shift, waves3, waves4, waves23, waves42.
2019-05-15 23:42:52 -07:00
70eaeffbf8 --Bug fixes
-Parsing parameters of the oscilloscope variation in a .chaos file was failing.
2019-05-15 20:07:00 -07:00
5e662714d2 1.0.0.15 Release 2019-05-13 22:57:54 -07:00
654ef36b56 Merged in mmastriani/fractorium_michel (pull request #12)
linux bench

Approved-by: Matt Feemster <matt.feemster@gmail.com>
2019-05-14 02:40:52 +00:00
833f98366b linux bench 2019-05-13 22:30:07 -03:00
43a44d11ba linux bench 2019-05-13 22:27:52 -03:00
9867c97a18 Merged mfeemster/fractorium into master 2019-05-13 22:26:40 -03:00
e4a29f56cb --Bug fixes
-K2 adjustments were not being applied properly.
2019-05-13 18:15:18 -07:00
6c66985776 Merged mfeemster/fractorium into master 2019-05-13 21:37:11 -03:00
ca27ae1eb7 --Code changes
-Get EmberBench.ps1 working on linux.
2019-05-13 17:12:24 -07:00
f05209093d Merge branch 'master' of https://bitbucket.org/mfeemster/fractorium 2019-05-13 15:46:43 -07:00
83d109c282 --Code changes
-Remove some debug printing.
2019-05-13 15:46:36 -07:00
99dcc3a6f9 Merged mfeemster/fractorium into master 2019-05-13 13:22:42 -03:00
8457a9c4e9 BuildGuideQtCreator.md edited online with Bitbucket 2019-05-13 15:14:52 +00:00
04761955b2 BuildGuideQtCreator.md edited online with Bitbucket 2019-05-13 15:09:15 +00:00
540e234688 control.package edited online with Bitbucket 2019-05-13 14:57:39 +00:00
9c4f541eae package-linux.sh edited online with Bitbucket 2019-05-13 14:40:35 +00:00
4bf4908822 copyright edited online with Bitbucket 2019-05-13 14:36:51 +00:00
8f19bca460 control edited online with Bitbucket 2019-05-13 14:36:06 +00:00
cf4a7be7cd Merged in mmastriani/fractorium_michel (pull request #11)
linux fix arguments

Approved-by: Matt Feemster <matt.feemster@gmail.com>
2019-05-13 00:39:57 +00:00
0cb5bc7b1b linux fix arguments 2019-05-12 18:29:01 -03:00
1304099f73 Merged in mmastriani/fractorium_michel (pull request #10)
linux installer changes (new changes)

Approved-by: Matt Feemster <matt.feemster@gmail.com>
2019-05-08 01:16:20 +00:00
abbbd1de87 linux installer changes 2019-05-07 21:29:49 -03:00
b4ba6d6a82 --User changes
-Add new variations waves22, waves23, waves42, waves3 and waves4 from user tatasz.
 -Add new stylesheet called lightdark.qss which gives a more modern look to the dark theme. Started by Michel Mastriani (triptychaos).
 --Included in the qmake and Wix installers.

--Code changes
 -Add a new C# project that attempts to convert Apophysis plugins to Fractorium style Variation classes. It's not entirely perfect, but gets most of the job done much more quickly than doing so manually.
 -Remove unused OpenCL functions from variations: elliptic, poincare, mask, bMod, bSwirl, bTransform, bCollide, farblur, popcorn2_3D, falloff, falloff2, falloff3, crackle2, waves2b, hypercrop, depth_gaussian2, depth_sine, depth_sine2, dust, asteria, vibration, vibration2, arctanh, smartshape, squares, starblur2, Truchet,.
 -Add code in EmberTester to automatically detect such unused functions.
2019-05-06 19:29:27 -07:00
5faa8aa5bd --Bug fixes
-Deleting a flame in the library tree was taking three tries.
2019-04-26 16:18:21 -07:00
5f98be7336 --User changes
-Clear all color curves when clicking Reset while holding down Ctrl.
 -Interpolate color curves when generating a sequence.

--Bug fixes
 -Undo a change made last year which gave the wrong color index for final xforms when generating a sequence.

--Code changes
 -No longer assume palettes are 256 elements. Can now read longer palettes.
 -Ensure OpenCL images always get written when created.
2019-04-25 22:34:09 -07:00
77515aae73 --User changes
-Clear all color curves when clicking Reset while holding down Ctrl.

--Code changes
 -No longer assume palettes are 256 elements. Can now read and write longer palettes.
 -Ensure OpenCL images always get written when created.
2019-04-23 19:50:42 -07:00
5209ead086 --Code changes
-Change some menu capitalization to make the text easier on the eyes.
2019-04-14 23:46:45 -07:00
20f76cd090 Merge branch 'master' of https://bitbucket.org/mfeemster/fractorium 2019-04-13 19:08:54 -07:00
db1e2755e0 Fix benchmark. 2019-04-13 19:08:45 -07:00
3ea2d61332 Merged in mmastriani/fractorium/mmastriani/-updated-qt-version-1554835017990 (pull request #8)
-- updated QT version
2019-04-14 02:02:55 +00:00
c25a9a2f2b Merge branch 'master' of https://bitbucket.org/mfeemster/fractorium 2019-04-13 19:00:55 -07:00
90ec5b8246 --User changes:
-Show common folder locations such as documents, downloads, pictures in the sidebar in all file dialogs.
 -Warning message about exceeding memory in final render dialog now suggests strips as the solution to the problem.
 -Strips now has a tooltip explaining what it does.
 -Allow more digits in the spinners on the color section the flame tab.
 -Add manually adjustable size spinners in the final render dialog. Percentage scale and absolute size are fully synced.
 -Default prefix in final render is now the filename when doing animations (coming from sequence section of the library tab).
 -Changed the elliptic variation back to using a less precise version for float, and a more precise version for double. The last release had it always using double.
 -New applied xaos table that shows a read-only view of actual weights by taking the base xform weights and multiplying them by the xaos values.
 -New table in the xaos tab that gives a graphical representation of the probability that each xform is chosen, with and without xaos.
 -Add button to transpose the xaos rows and columns.
 -Add support for importing .chaos files from Chaotica.
 --Pasting back to Chaotica will work for most, but not all, variations due to incompatible parameter names in some.
 -Curves are now splines instead of Bezier. This adds compatibility with Chaotica, but breaks it for Apophysis. Xmls are still pastable, but the color curves will look different.
 --The curve editor on the palette tab can now add points by clicking on the lines and remove points by clicking on the points themselves, just like Chaotica.
 --Splines are saved in four new xml fields: overall_curve, red_curve, green_curve and blue_curve.
 -Allow for specifying the percentage of a sub batch each thread should iterate through per kernel call when running with OpenCL. This gives a roughly 1% performance increase due to having to make less kernel calls while iterating.
 --This field is present for interactive editing (where it's not very useful) and in the final render dialog.
 --On the command line, this is specified as --sbpctth for EmberRender and EmberAnimate.
 -Allow double clicking to toggle the supersample field in the flame tab between 1 and 2 for easily checking the effect of the field.
 -When showing affine values as polar coordinates, show angles normalized to 360 to match Chaotica.
 -Fuse Count spinner now toggles between 15 and 100 when double clicking for easily checking the effect of the field.
 -Added field for limiting the range in the x and y direction that the initial points are chosen from.
 -Added a field called K2 which is an alternative way to set brightness, ignored when zero.
 --This has no effect for many variations, but hs a noticeable effect for some.
 -Added new variations:
 arcsech
 arcsech2
 arcsinh
 arctanh
 asteria
 block
 bwraps_rand
 circlecrop2
 coth_spiral
 crackle2
 depth_blur
 depth_blur2
 depth_gaussian
 depth_gaussian2
 depth_ngon
 depth_ngon2
 depth_sine
 depth_sine2
 dragonfire
 dspherical
 dust
 excinis
 exp2
 flipx
 flowerdb
 foci_p
 gaussian
 glynnia2
 glynnsim4
 glynnsim5
 henon
 henon
 hex_rand
 hex_truchet
 hypershift
 lazyjess
 lens
 lozi
 lozi
 modulusx
 modulusy
 oscilloscope2
 point_symmetry
 pointsymmetry
 projective
 pulse
 rotate
 scry2
 shift
 smartshape
 spher
 squares
 starblur2
 swirl3
 swirl3r
 tanh_spiral
 target0
 target2
 tile_hlp
 truchet_glyph
 truchet_inv
 truchet_knot
 unicorngaloshen
 vibration
 vibration2
 --hex_truchet, hex_rand should always use double. They are extremely sensitive.

--Bug fixes:
 -Bounds sign was flipped for x coordinate of world space when center was not zero.
 -Right clicking and dragging spinner showed menu on mouse up, even if it was very far away.
 -Text boxes for size in final render dialog were hard to type in. Same bug as xform weight used to be so fix the same way.
 -Fix spelling to be plural in toggle color speed box.
 -Stop using the blank user palette to generate flames. Either put colored palettes in it, or exclude it from randoms.
 -Clicking the random palette button for a palette file with only one palette in it would freeze the program.
 -Clicking none scale in final render did not re-render the preview.
 -Use less precision on random xaos. No need for 12 decimal places.
 -The term sub batch is overloaded in the options dialog. Change the naming and tooltip of those settings for cpu and opencl.
 --Also made clear in the tooltip for the default opencl quality setting that the value is per device.
 -The arrows spinner in palette editor appears like a read-only label. Made it look like a spinner.
 -Fix border colors for various spin boxes and table headers in the style sheet. Requires reload.
 -Fix a bug in the bwraps variation which would produce different results than Chaotica and Apophysis.
 -Synth was allowed to be selected for random flame generation when using an Nvidia card but it shouldn't have been because Nvidia has a hard time compiling synth.
 -A casting bug in the OpenCL kernels for log scaling and density filtering was preventing successful compilations on Intel iGPUs. Fixed even though we don't support anything other than AMD and Nvidia.
 -Palette rotation (click and drag) position was not being reset when loading a new flame.
 -When the xform circles were hidden, opening and closing the options dialog would improperly reshow them.
 -Double click toggle was broken on integer spin boxes.
 -Fixed tab order of some controls.
 -Creating a palette from a jpg in the palette editor only produced a single color.
 --Needed to package imageformats/qjpeg.dll with the Windows installer.
 -The basic memory benchmark test flame was not really testing memory. Make it more spread out.
 -Remove the temporal samples field from the flame tab, it was never used because it's only an animation parameter which is specified in the final render dialog or on the command line with EmberAnimate.

--Code changes:
 -Add IsEmpty() to Palette to determine if a palette is all black.
 -Attempt to avoid selecting a blank palette in PaletteList::GetRandomPalette().
 -Add function ScanForChaosNodes() and some associated helper functions in XmlToEmber.
 -Make variation param name correction be case insensitive in XmlToEmber.
 -Report error when assigning a variation param value in XmlToEmber.
 -Add SubBatchPercentPerThread() method to RendererCL.
 -Override enterEvent() and leaveEvent() in DoubleSpinBox and SpinBox to prevent the context menu from showing up on right mouse up after already leaving the spinner.
 -Filtering the mouse wheel event in TableWidget no longer appears to be needed. It was probably an old Qt bug that has been fixed.
 -Gui/ember syncing code in the final render dialog needed to be reworked to accommodate absolute sizes.
2019-04-13 19:00:46 -07:00
04c463cb31 -- updated QT version 2019-04-09 18:37:00 +00:00
6097e9b0c3 Merged in SConaway/fractorium-1/SConaway/readmemd-edited-online-with-bitbucket-1550118725863 (pull request #7)
README.md edited online with Bitbucket
2019-02-14 04:57:14 +00:00
9d00c1043b README.md edited online with Bitbucket 2019-02-14 04:32:08 +00:00
3412060634 Merged in SConaway/fractorium/SConaway/change-macos-bundle-identifier-1549516162079 (pull request #6)
Change MacOS Bundle Identifier
2019-02-08 06:02:38 +00:00
363149f401 Change MacOS Bundle Identifier 2019-02-07 05:09:23 +00:00
d9bfe17b42 Merge branch 'master' of https://bitbucket.org/mfeemster/fractorium 2018-11-07 19:04:29 -08:00
e09e2fbfbe --Code changes
-Fix Mac build which was failing due to multiple definitions of TRUE and FALSE.
2018-11-07 19:04:06 -08:00
bf3ae414a7 README.md edited online with Bitbucket 2018-10-26 02:24:31 +00:00
c88085e938 update version in qt file 2018-10-21 20:39:39 -07:00
2089363bb0 1.0.0.14 Release
--Bug fixes
 -File saving was broken.

--Code changes
 -File saving and opening dialogs were shared between a single object which was causing trouble. Make them all use their own objects.
2018-10-20 23:08:20 -07:00
6d548a0023 Merge branch 'master' of https://bitbucket.org/mfeemster/fractorium 2018-10-20 18:41:03 -07:00
f50226e52a 1.0.0.14 Release
--Bug fixes
 -File saving was broken.
2018-10-20 18:40:46 -07:00