Commit Graph

567 Commits

Author SHA1 Message Date
Michel Mastriani
ba1cdb87da Added Gnarly Variation 2019-05-27 20:26:02 -03:00
Michel Mastriani
9c21e87fe1 Fixing Poincare translation name of the params 2019-05-24 18:20:13 +00:00
Matt Feemster
53e410f452 Variations02.h edited online with Bitbucket 2019-05-24 17:48:31 +00:00
Michel Mastriani
8b4dfb3991 Variations02.h edited online with Bitbucket 2019-05-24 17:33:21 +00:00
Michel Mastriani
82b41c37e7 Added poincare2 2019-05-24 14:26:03 -03:00
Person
95f29d8f7c --Bug fixes
-Ensure all OpenCL functions that take multiple arguments cast literal values to real_t.
2019-05-23 19:44:27 -07:00
Person
9724b4d936 --Code changes
-Formatting.
2019-05-22 20:34:08 -07:00
Person
ee6d3c6f1b Merge branch 'master' of https://bitbucket.org/mfeemster/fractorium 2019-05-22 20:33:26 -07:00
Person
a9650e6b43 --Bug fixes
-mirror_x, y and z variations were totally wrong.
 -Reading color curves from older version 2 .chaos files which did not have the "knots" and "values" names was broken.
2019-05-22 20:33:19 -07:00
Michel Mastriani
21311ce0aa Fixed colors and Y position 2019-05-21 21:09:11 -03:00
Person
28ce868a9f --Code changes
-Formatting.
2019-05-21 16:28:37 -07:00
Michel Mastriani
96e8bcdb23 FractoriumPalette.cpp edited online with Bitbucket 2019-05-21 22:35:23 +00:00
Michel Mastriani
fcdfb0b300 Removed duplicated code 2019-05-21 19:15:45 -03:00
Michel Mastriani
9fdf512a1f Solving Linux-Gnome Palette Editor problem 2019-05-21 13:33:00 -03:00
Michel Mastriani
f29dda2ec0 Merged mfeemster/fractorium into master 2019-05-21 13:20:06 -03:00
Person
243be8d702 --Bug fixes
-Dragging library items to a new position was not properly resetting the current flame pointer, so subsequent edits would unintentionally overwrite different flames.
2019-05-20 18:24:32 -07:00
Person
142b597565 --Bug fixes
-Switching between SP/DP was resetting palette rotation.
2019-05-20 15:44:46 -07:00
Michel Mastriani
2d2d561e29 Solving Gnome Palette Editor problem 2019-05-19 18:10:56 -03:00
Person
4550f9dc87 --Bug fixes
-Right clicking when showing only current affines caused a crash.
2019-05-18 22:25:22 -07:00
Person
1ed8f09eb3 --Bug fixes
-Auger was implemented wrong.
2019-05-18 18:46:49 -07:00
Person
30c2a103c9 --Bug fixes
-Case insensitive comparisons via stricmp() were wrong on non-Windows systems.
2019-05-18 14:31:16 -07:00
Person
8614ae86a9 Merge branch 'master' of https://bitbucket.org/mfeemster/fractorium 2019-05-16 20:56:15 -07:00
Person
d8b3dd40d6 --Bug fixes
-Fix some recently changed calls to fma().

--Code changes
 -Update version to 1.0.0.16.
2019-05-16 20:56:05 -07:00
Michel Mastriani
d2d5a0d55b finishing mac build 2019-05-16 22:06:09 -03:00
Mastriani
9f7535a08a Mac build 2019-05-16 21:23:46 -03:00
Matt Feemster
9909391475 EmberDefines.h edited online with Bitbucket 2019-05-16 13:51:57 +00:00
Person
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
Person
70eaeffbf8 --Bug fixes
-Parsing parameters of the oscilloscope variation in a .chaos file was failing.
2019-05-15 20:07:00 -07:00
Person
5e662714d2 1.0.0.15 Release 2019-05-13 22:57:54 -07:00
Person
e4a29f56cb --Bug fixes
-K2 adjustments were not being applied properly.
2019-05-13 18:15:18 -07:00
Person
83d109c282 --Code changes
-Remove some debug printing.
2019-05-13 15:46:36 -07:00
Person
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
Person
5faa8aa5bd --Bug fixes
-Deleting a flame in the library tree was taking three tries.
2019-04-26 16:18:21 -07:00
Person
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
Person
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
Person
5209ead086 --Code changes
-Change some menu capitalization to make the text easier on the eyes.
2019-04-14 23:46:45 -07:00
Person
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
Person
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
Person
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
Person
f50226e52a 1.0.0.14 Release
--Bug fixes
 -File saving was broken.
2018-10-20 18:40:46 -07:00
Person
a0b658481a --User changes
-Disable Start button in final render dialog when Pause is clicked.

--Bug fixes
 -Rapidly changing spinner values was causing the OpenCL renderer to report a failure, when it was really just aborting.

--Code changes
 -Renderers never internally set abort to true due to a failure. Abort is only set to true by the calling code.
2018-10-05 19:50:38 -07:00
Person
c91866acc3 --User changes
-Add a button to swap the pre and post affine values for all selected xforms.

--Bug fixes
 -Remove the ability to change spinner values with +=-=, it was conflicting with other things and added no real value.
 -All file dialog opening in Linux would freeze. No longer using native file dialogs, they are broken.
 -Set default open path to the desktop if there is no settings file present, which will be the case on the first run.
 -Amphibole_Supergroup.ugr palette had an invalid character in two of the palette names.

--Code changes
 -Change some table header padding styles to work with new Qt. Qss reload is required.
 -Ensure the open folder path setting always has a valid string in it before opening a folder.
2018-09-30 14:20:02 -07:00
Person
2d27eecd5e --Code changes
-Upgrade to Qt 5.11.2
2018-09-29 13:28:03 -07:00
Person
fc0fefec01 --Bug fixes
-OpenCL renderer would occasionally crash on first run.
2018-09-27 17:02:34 -07:00
Person
585d0f99d5 --User changes
-Change the thickness of some of the lines used to draw the affine..
2018-09-25 19:12:48 -07:00
Person
5283250204 --User changes
-Use a green dot for the x axis and purple dot for the y axis when drawing affines to help distinguish them more easily.
2018-09-25 18:37:26 -07:00
Person
55a2c393cf --User changes
-Add new palettes from user Rubydeva.

--Bug fixes
 -Avoid an occasional divide by zero in the OpenCL renderer when using the interactive editor.

--Code changes
 -Use exact comparisons in IsID() and IsZero() in Affine2D.
 -When testing for bad point values while iterating, only test for NaN now.
 -For rendering with OpenCL on the command line and in the final render dialog, use an optimized kernel that does a direct assignment for any affines which are ID.
2018-09-21 22:42:18 -07:00
Person
5f3a97e825 --User changes
-Further work on the About box.
 --Change qss files to make the text box in the About box be the same color as the one in the style dialog, so the link text is easier to see.
 --This requires reloading the qss file.

--Bug fixes
 -Pre/post assign method was wrong for Sphereblur, Concentric, RandCubes and PixelFlow.

--Code changes
 -Make Hypershift2 use MwcNextRange() instead of MwcNext() %.
 -Add m_HasPre to Xform similar to m_HasPost, to skip application of the affine if it's the ID matrix (in this case just assign the input x and y points). This gives a 5% speedup.
2018-09-18 20:49:38 -07:00
Person
0a3d41de36 --User changes
-New look for the About dialog, it was growing too large before. More work to be done on it in a follow up commit.

--Bug fixes
 -Fix build with new glm, no longer uses type_int.hpp.
2018-09-17 22:16:12 -07:00
Person
15fdc860b8 --User changes
-Add buttons to copy and paste affine transforms.
 -Show xform names on the column headers of the xaos table.
 -Add a color-coded third column to the variations tree which shows any properties of each variation which are non-standard.
 -Draw a transparent circle over hovered xforms.
 -Change how xforms respond to dragging. Rotate only is now the default, and scale will only happen with shift.
 --Optionally do scale and rotate when holding shift, via a setting in the options dialog.

--Bug fixes
 -Snapping when dragging was wrong sometimes.
 -The program would very rarely crash on startup due to some values being in an uninitialized state.

--Code changes
 -Change almost every variation to use fma() in OpenCL when doing computations of the form a * b + c. This provides a slight speedup, mostly in double precision mode.
 -Also apply fma() to affine calcs.
 -Cleanup of OpenGL affine drawing code.
 -Separate the concept of hovering and selecting xforms.
2018-09-15 03:11:12 -07:00
Person
dee4304bf2 --User changes
-Attempt to preserve xaos when adding xforms. Note this is not an exact copy, but just a preservation of some values based on position.
 -Add some acceleration to the changing of spinner values when dragging the right mouse button to adjust.
 -Make the pivot be the center of the viewable area when doing drag/rotate/scale with the right mouse button.
 --Clamp minimum scale to 10
 --Draw a line from the mouse position to the pivot.
 -Keep a cache of the last added final xform with each flame so that it can be quickly added, removed, then added back for testing its effect.
 --This is not saved with the xml file and is solely for interactive editing.

--Bug fixes
 -File filtering in open and save dialogs were broken.
 -Right clicking on integer spin boxes was causing the context menu to pop up, when it should be supressed just like double spin boxes.
 -Deleting xforms was still broken.

--Code changes
 -Refactor the code for adding and pasting xforms into a single global static function called AddXformsWithXaos().
2018-08-10 18:06:04 -07:00
Person
26c558a2f5 --User changes
-Give tabs a height of 4px in the qss files. Looks a little large on 4k screens, but just right on HD screens which are much more common.
 -Allow for styling of zero and non-zero variation tree nodes via qss.
 -Allow for toggling whether to interpolate between colors in the palette editor, or to do hard cuts between colors.
 -Allow for adjusting spinner values with the + = or up arrow keys to increase, and - _ or down arrow keys to decrease.
 -Allow for responding to global presses of + = and - _ to cycle up or down to specify which xform is set as the current one.
 -Allow for adding "layers" via xaos which will add a user-specified number of xforms, and set certain xaos values to 0 or 1.
 -Add a new menu item under the Edit menu to copy the OpenCL iteration kernel source to the clipboard.
 -Show text on the status bar which indicates that an OpenCL kernel compilation is taking place.
 -Show xform name on xform combo box when expanded. Adjust size to fit all names.
 -Draw post affine circles using dashed lines.
 -Prevent QSS dialog from styling its editor, which makes it easier to see text when creating styles which have custom colors for text boxes.

--Bug fixes
 -Fix up some table layouts which seemed to have regressed/decayed over time for reasons unknown.
 -Using undo/redo would create a new flame in the library every time.
 -Solo was not being preserved when using undo/redo.

--Code changes
 -Make the solo flag be a part of the flame data now.
 -Fix some tabification in the OpenCL code for EllipticVariation.
 -Fix tabification in the varState code for OpenCL.
 -Add an event called m_CompileBegun to RendererCL that is called right before an OpenCL compile is begun.
 --This required making RendererCLBase not a pure virtual base class. Member functions just return defaults.
 -Filter key presses on main window to only process the third one. This is due to Qt triggering three events for every key press.
 -The palette preview table was installing an event filter for seemingly no reason. Remove it.
 -Mark certain virtual functions as override in SpinBox and DoubleSpinBox.
2018-07-30 21:39:41 -07:00
Yuju Lu
0deabd45b8 Merged in luyuju151/fractorium/out-master (pull request #5)
Small improvements on fractorium UI
2018-07-13 22:54:37 +00:00
luyuju151
d88d8bb2ea Let xform combo show the names of xforms 2018-07-13 23:34:20 +08:00
luyuju151
e58deb1194 Change the method that normalized weight text displayed from spinner box suffix to a Qlabel to prevent annoying interruption when typing weight. 2018-07-13 23:34:20 +08:00
luyuju151
8b2d5c9697 Make variation tree background colors themable. 2018-07-13 23:34:19 +08:00
Person
235381b4b9 --User changes
-Double clicking on width or height spinner resizes both, but scales to the one double clicked.

--Bug fixes
 -Show grid setting was not being preserved during program run, only on close.
 -Zooming with the mouse wheel was broken for images whose size is greater than the screen area.
2018-07-08 08:31:26 -07:00
Person
264aa8c454 --Bug fixes
-Fix out of bounds crash in EmberGenome.
2018-06-19 19:32:20 -07:00
Person
6ff199d1ef --User changes
-No longer constrain pitch, yaw or depth spinners to -180 - 180.

--Bug fixes
 -Properly set color index on padded xforms.
 -Adding a padding final xform included a linear variation with a weight of zero to not appear empty. Made it have a weight of 1.
 -Always write animate tag on final xform when saving to Xml.
 -Motion was being applied to the wrong flame in SheepTools::Edge(), so apply it to the correct one.
 -Prevent divide by zero when normalizing variation weights.
 -Was accidentally adding the placeholder value of -9999 for motion_offset to varation weights and parameters when applying motion. Set to zero if no value present.
 -Clamp flame rotation values to -180 - 180 when reading a flame from Xml.
 -Events were not properly wired for user changes in the random rotations per blend controls in the sequencer.
 -Fix major UI bugs with sequencer min/max random controls which made it nearly impossible to hand type values.
 -Values from rotations per blend and rotations per blend max were not being saved to file between program runs.
 -Checking animate for an xform was not applied to all flames even if Apply All was checked.
 -Changing interpolation type, temporal filter width, temporal type, and affine interpolation type were not actually saving to the flame when changed.
 -Grid on the main window was not being drawn at the right scale initially due to some OpenGL initialization occurring in the wrong order.
 -Severe bugs in sequence generation code:
  --Improperly detected padding xforms.
  --When looking for specific variations during xform aligning, only presence was detected, when it should have been presence plus a weight greater than zero.
  --When adding specific variations during xform aligning, must first remove any variations of that type.
  --Two variables were unsigned when they should have been signed. This prevented large blocks of code from ever executing.
  --When interpolating affines, an EPS that was too small was used, causing affine values to interpolate incorrectly. Instead use 1e-10 to ensure results equal to flam3.

--Code changes
 -Modify FractoriumEmberController::UpdateXform() to pass the selected xform index as well as the absolute index to func().
2018-06-12 21:20:15 -07:00
Person
93fcedebd4 1.0.0.9 Release
--Bug fixes
 -Pausing did not work when using OpenCL renderer.
2018-05-13 11:02:37 -07:00
Person
4352fab84d --Code changes
-Add include statements for Mac.
2018-05-04 19:38:47 -07:00
Person
dba1bdc6c8 --Code changes
-Make previous path related code work for all OSes.
2018-05-03 00:24:51 -07:00
Person
ccf5a7e80f --Bug fixes
-Allow running from outside of the folder the executable is in on Windows, by adding the install folder to the PATH variable. This was needed to properly find the palette file (even though it's mostly unneeded).
2018-05-02 18:23:26 -07:00
Person
f15620375b --Code changes
-Fix erroneous export statement in Ember.cpp.
 -Add using statement in RendererCL.h.
2018-05-01 16:46:18 -07:00
Person
92e9836151 --User changes
-Add two new variations, hyperbolic and hypershift2.
 -Allow for animating final xforms.
 -More detailed diagnostics when any action in the OpenCL renderer fails.
 -Allow for creating an OpenCL renderer which does not share a texture with the main window, and instead manually copies its final output image from GPU to CPU then back to GPU.

--Bug fixes
 -Text was not properly being copied out of the Info | Bounds text box.

--Code changes
 -Remove Renderer::AccumulatorToFinalImage(v4F* pixels, size_t finalOffset), it's no longer needed or makes sense.
 -Controllers no longer keep track of shared status, it's kept inside the renderers.
 -Make getter functions in FractoriumOptionsDialog be public.
2018-04-28 22:28:05 -07:00
Person
0c67c52720 --Bug fixes
-Fix bug where animate flag was not properly being set.
2018-04-13 17:45:31 -07:00
Person
5c8837707c --Code changes
-Get GLSL code working on Mac and Linux.
2018-04-10 18:52:43 -07:00
Person
d6131b67e5 --Code changes
-Attempt to get GLSL working on Linux. Does not work.
2018-04-04 18:54:32 -07:00
Person
ae7b1f3ba8 --User changes
-Allow for pausing and resuming of final renders.

--Code changes
 -Only instantiate float version of Palette and PaletteList, no need for double since it's never used.
 -Allow for FinalRenderDialog to be queried on whether it's currently rendering.
2018-03-30 09:56:24 -07:00
Person
cd1749fe5f --User changes
-Add the ability to drag the rotation of the current palette via the palette preview table.
2018-03-29 16:10:22 -07:00
Person
ed74fd6a83 --User changes
-Convert OpenGL drawing code to use GLSL. Leave #define in until testing on multiple platforms is done.
 -Always use double precision extension defines in OpenCL programs, even if DP is not selected. This is because elliptic now always uses DP.
2018-03-27 21:32:10 -07:00
Person
90e7097d7f --User changes
-Added pixel_flow variation from user bezo97.
2018-02-04 11:44:22 -08:00
Person
b0dae7795a --Bug fixes
-Fix a variety of very strange bugs when clicking around on palettes in different files in the palette editor.
2018-01-29 22:14:48 -08:00
Person
4c53364f62 --Bug fixes
-Allow 7 decimal places in variations spinners.
 -Try to prevent infinite loop that sometimes happens when drawing grid. Unsure if this actually works since it's very hard to reproduce.
2018-01-28 17:51:19 -08:00
Person
4636c1047d --Bug fixes
-Change variation spin boxes to only show the precision needed, and also allow scientific notation.
2018-01-28 11:40:34 -08:00
Person
3f83b49cf0 --Bug fixes
-Clicking random palette when using a palette file with only two entries in it could lead to a program freeze.
2017-12-22 20:07:24 -08:00
Person
49b6ef20c1 --Bug fixes
-Update /debian/changelog to use a newer version of ubuntu named artful. Users will need to add that PPA to get it via apt.
-Update copyright year to 2018.
2017-12-21 22:11:18 -08:00
Person
7a343606b4 --Bug fixes
-Fix crash when creating a dummy renderer when showing the final render dialog.
 -Fix default tab size with new version of Qt.
2017-12-21 20:09:08 -08:00
Person
6d38e57b38 --User changes
-Add new variations: rays1, rays2, rays3.
2017-12-17 20:44:40 -08:00
Person
244d2f5dc2 --Bug fixes
-Allow group dragging and floating of dock widgets.
 --Note this has a bug where if tabls are grouped while floating, the tab position is placed on the bottom. It restores to the top when dropping on a dock location. I've filed a bug at qt.io
 -Make some tables auto size to their contents because some text appeared obscured on Linux.
 -The size of the xforms and palette tabs were preventing the main window from being resized to a small size on lower resolution monitors when docked. So rework scroll areas, minimum sizes and layouts to allow for a smaller main window.
2017-12-15 21:05:58 -08:00
Person
5646b5162a --Bug fixes
-Fix build.sh for Mac.
 -No longer need special code for color dialog on Mac.
 -Fix OpenGL blending issues on Mac.
2017-12-15 16:22:00 -08:00
Person
6874688940 --Bug fixes
-Opening an Xml was not properly setting the background field on the GUI, even though it was correctly parsed and used.
2017-12-14 17:31:47 -08:00
Person
2900416e96 --Code changes
-Attempt to fix OpenGL drawing changes on Mac.
 -Allow toggling of color speed spinner to zero.
2017-12-13 15:32:50 -08:00
Person
f28edf3217 --Code changes
-Add a benchmarking suite which includes a Powershell script and sample flames.
2017-12-04 20:56:43 -08:00
Person
1c835160d7 --Code changes
-Forgot using statement for Variation::WeightDefineString().
2017-11-27 16:29:57 -08:00
Person
13d3200c1e --Bug fixes
-Fix some dialog sizing problems present in the last commit.
2017-11-26 18:24:08 -08:00
Person
59fb29f5b7 For some reason these didn't get committed. 2017-11-26 17:29:58 -08:00
Person
fcd060976c --User changes
-Support 4k monitors, and in general, properly scale any monitor that is not HD.
 -Allow for a spatial filter of radius zero, which means do not use a spatial filter.
 -Add new variations: concentric, cpow3, helicoid, helix, rand_cubes, sphereblur.
 -Use a new method for computing elliptic which is more precise. Developed by Discord user Claude.
 -Remove the 8 variation per xform limitation on the GPU.
 -Allow for loading the last flame file on startup, rather than randoms.
 -Use two different default quality values in the interactive renderer, one each for CPU and GPU.
 -Creating linked xforms was using non-standard behavior. Make it match Apo and also support creating multiple linked xforms at once.

--Bug fixes
 -No variations in an xform used to have the same behavior as a single linear variation with weight 1. While sensible, this breaks backward compatibility. No variations now sets the output point to zeroes.
 -Prevent crashing the program when adjusting a value on the main window while a final render is in progress.
 -The xaos table was inverted.

--Code changes
 -Convert projects to Visual Studio 2017.
 -Change bad vals from +- 1e10 to +-1e20.
 -Reintroduce the symmetry tag in xforms for legacy support in programs that do not use color_speed.
 -Compiler will not let us use default values in templated member functions anymore.
2017-11-26 17:27:00 -08:00
Person
be1bfd9ab6 1.0.0.6 09/03/2017 Release (Linux) 2017-09-03 13:26:42 -07:00
Person
98ff28a9a9 1.0.0.6 Release
--Bug fixes
 -Strips renders crashed.
 -Better handling of large memory allocations by forcing a free of previous allocations.
 -Final render dialog did not properly save last used extension setting.
 -Density filtering progress bar in final render dialog did not update if only log scaling was being used.
2017-09-02 23:01:10 -07:00
Person
43dcdd4305 1.0.0.5 08/28/2017 Release 2017-08-28 20:45:58 -07:00
Person
5da944f589 Bug fixes:
--Cleaner exit on some failures.
--Better reporting of OpenCL errors.
2017-08-27 21:24:33 -07:00
Person
4749a7aec4 Bug fixes:
--Better locks around creating image files in command line programs.
2017-08-22 20:13:25 -07:00
Person
50485f5d73 Bug fixes:
--EXR images needed the values to be squared to look correct.
2017-08-22 18:07:43 -07:00
Person
b677e6355e Bug fixes:
--Only allow crackle_cellsize to be greater than 0.
2017-08-18 07:16:30 -07:00
Person
48a6111bf9 Bug fixes:
--Typing in the xform color index spinner produced strange results.
--Returning from palette editor did not always update xform color indices.
2017-08-17 22:40:03 -07:00
Person
59f5bffc3c Features:
--Added panorama1 and panorama2 variations.

Bug fixes:
--crackle had a bug with Nvidia GPUs.

Code changes:
--crackle now uses real_t* for cache rather than real2. This is what was causing the bug.
--Make the local offsets array used in crackle a precalc since it's the same for all. This reduces register pressure.
--Get rid of all usages of real3, just to be safe since Nvidia doesn't like them.
--#define TOTAL_GLOBAL_SIZE_END in the OpenCL iteration kernel just for debugging purposes to see how large the parvars buffer is.
2017-08-16 17:33:11 -07:00
Person
6c9d9e57cc Bug fixes:
--Disallow the use of synth when randomly generating xforms if the user has an Nvidia device present on their system.

Code changes:
--Use some CPU defines in CL code.
--Change curves color scaling buffer to be 2^16 per channel instead of 2^17 which was probably overkill.
--Code in RendererClDevice::Init() to detect Nvidia was wrong even thought it technically worked.
2017-08-07 19:53:13 -07:00
Person
a0ed758999 Code changes:
--Fix include paths for openexr on Mac.
--Use static_partitioner in all parallel_for() calls.
2017-08-03 19:56:14 -07:00
Person
a81b93d94a Bug fixes:
--Fix bug where clearing the final xform, but leaving it present, then editing it would crash the program.
2017-07-26 21:25:44 -07:00
Person
0e19ec901a Code changes:
--Get installer ready.
2017-07-22 22:24:04 -07:00
Person
8f2218326a Bug fixes:
--Fix logic for showing context menu when the option for right click to toggle is true.
2017-07-22 18:30:25 -07:00
Person
de613404de Features:
--Add support for Exr files which use 32-bit floats for each RGBA channel. Seems to come out too washed out.
--Allow for clearing an individual color curve.
--Allow for saving multiple image types in EmberRender and EmberAnimate. All writes are threaded.
--Remove --bpc command line argument. Add format png16 as a replacement.
--Remove --enable_jpg_comments and --enable_png_comments command line arguments, and replace them with --enable_comments which applies to jpg, png and exr.
--Add menu items to variations and affine spinners which allow for easy entry of specific numeric values like pi.
--Make final render dialog be wider rather than so tall.

Bug fixes:
--Fix some OpenCL compile errors on Mac.
--Remove ability to save bitmap files on all platforms but Windows.

Code changes:
--New dependency on OpenEXR.
--Allow Curves class to interact with objects of a different template type.
--Make m_Curves member of Ember always use float as template type.
--Set the length of the curves array to always be 2^17 which should offer enough precision with new 32-bit float pixel types.
--Set pixel types to always be 32-bit float. This results in a major reduction of code in the final accumulation part of Renderer.h/cpp.
--Remove corresponding code from RendererCL and FinalAccumOpenCLKernelCreator.
--Remove Transparency, NumChannels and BytesPerPixel setters from Renderer.h/cpp.
--Add new global functions to format final image buffers and place all alpha calculation and scaling code in them.
--Blending is no longer needed in OpenGLWidget because of the new pixel type.
--Make new class, AffineDoubleSpinBox.
--Attempt to make file save dialog code work the same on all OSes.
--Remove some unused functions.
2017-07-22 13:43:35 -07:00
Person
2adf9f3ff9 --Bug fixes
-Attempt to fix several OpenCL build errors that were occurring on Mac.

--Code changes
 -Improve the coloring code during final accum by getting rid of the last remnants of unnecessary scaling to 255 from flam3.
 -Begin work of supporting 16bpc on the GPU.
2017-07-04 23:08:06 -07:00
Person
f192bc7ae4 1.0.0.4 07/01/2017 Release 2017-07-01 09:18:01 -07:00
Person
f66a278c73 06/11/2017
--Code changes
 -Make the OS-specific stylesheets part of the installer.
2017-06-11 15:02:44 -07:00
Person
c4e891b18c 06/09/2017
--User changes
 -dark.qss is now per-OS.
 -Properly set/reload palette when coming from the palette editor. The latter must be done if they've modified the current palette even if they've clicked cancel.

--Bug fixes
 -Make the following variations safer by using Zeps(): conic, bipolar, edisc, whorl, tan, csc, cot, tanh, sech, csch, coth, auger, bwraps, hypertile3d, hypertile3d1, ortho, poincare, rational3, barycentroid, sschecks, cscq, cschq, scry_3D, splitbrdr, hexcrop, nblur, crob.
 -Fix bug enabling/disabling overwrite button in palette editor.
 -Small optimization for gdoffs, use precalcAtanYX.
 -Properly propagate z through circlesplit, cylinder2 and tile_log variations.
 -Some values in truchet_fill could've been NaN.

--Code changes
 -Make most installation files read only.
 -Qualify many calls with std:: to ensure they're not colliding with glm::
 -Use auto in more places.
2017-06-09 19:38:06 -07:00
Person
11ca4f9000 06/6/2017
--Bug fixes
 -Any measurement of time which was sub-millisecond was wrong.
2017-06-06 20:13:30 -07:00
Person
c194d708fd 06/6/2017
--Bug fixes
 -Fix crash when opening palette editor with a flame whose palette specifies no originating file.

--Code changes
 -Revert font changes, only use qss for these now.
2017-06-06 16:41:00 -07:00
Person
66a597df39 06/04/2017
--User changes
 -Make all fonts be MS Shell Dlg 2. This will require reloading dark.qss if users are already using it.
 -Limit size of the left side of the palette editor.
 -Disable create from image buttons in the palette editor when working on a fixed palette.

--Bug fixes
 -The following variations were wrong: coshq, cothq.
 -During iteration, the color index could become nan if all xform color speeds were negative. This could lead to bad results on the GPU. Fix to check for nan. Minimal speed difference.

--Code changes
 -Make the following variations safer by using Zeps(): sinq, sinhq, secq, sechq, tanq, tanhq, cosq, coshq, cotq, cothq, cscq, cschq, estiq.
 -Always pass -cl-no-signed-zeros -cl-denorms-are-zero to kernel compiles for both single and double.
 -Flush all denormals to zero for all executable programs. This will likely lead to a speedup for badly behaving programs.
2017-06-04 17:37:29 -07:00
Person
5a8b4b1148 05/31/2017
--User changes
 -Add support for adjusting xform color indices in the palette editor. Fixed palettes can now be displayed there, but they will have no color arrows as they are not editable.
 -Add support for independent dimension scaling in the EmberRender and EmberAnimate programs to bring them in line with the final render dialog Fractorium.

--Bug fixes
 -File paths with a space in them did not work in the command line programs.
 -Any Xml file in the search paths would erroneously be treated as a palette file.

--Code changes
 -Change some for loops to while loops when iterating through xforms.
 -Allow FractoriumEmberController<T>::UpdateXform() to be able to apply the action to an xform at a specific index.
 -Remove old code blocks build files that were never used.
 -Make GetPath() return empty string if no path is present in the passed in file path.
 -GetTotalXform() was always counting the final xform, even if it was unused.
2017-05-31 19:50:05 -07:00
Person
f4bdc1c50a 05/12/2017
--Bug fixes
 -Fractorium would occasionally freeze after dismissing the final render dialog because some values were not properly re-initialized.

--Code changes
 -Remove VS 2013 build files.
 -Qualify sqrt with std:: in ColorTriangle.cpp
2017-05-12 15:31:48 -07:00
Person
59489e40cb --Bug fixes
-Opacity was accidentally being set to zero when clearing.
2017-04-09 10:10:45 -07:00
Person
24cb304918 --Bug fixes
-Fix build error on Mac.
2017-04-04 20:00:39 -07:00
Person
2773ef27f7 --Bug fixes:
-Fix path bugs when creating dialogs on Mac.
 -Add new setting for path when creating palette from image.
2017-04-04 16:21:58 -07:00
Person
2f54215e65 --Bug fixes
-On delete, select the library item closest to the last one which was deleted.
2017-03-30 17:10:44 -07:00
Person
dea12ee96a --Code changes
-Bump to version 1.0.0.3
 -Remove all code for opacity adjustment, it's no longer needed.
 -Small optimization on accumulating to the histogram on the CPU.
2017-03-27 18:05:06 -07:00
Person
71abee0396 --Bug fixes
-Double clicking min/max DE filter spinners would not trigger a render reset if the other was non-zero. The fix has the downside of triggering a change event when scrolling even if the value is already capped. This is an acceptable tradeoff.
2017-03-21 20:09:10 -07:00
Person
a83c0f95bc --Bug fixes
-Remove old flam3 opacity/vizadjusted code. It makes no sense and produces bad results.
2017-03-21 19:02:31 -07:00
Person
d59538869b Linux release. 2017-03-16 17:37:22 -07:00
Person
7862cf4c40 --Bug fixes
-Set path to libxml2 properly on Mac in defaults.pri
 -Workaround for color picker dialog crashing on program exit on Mac
2017-03-12 18:34:45 -07:00
Person
188a5216d5 --Bug fixes
-Deleting, then overwriting a palette used the wrong index and was not updating.
2017-03-11 10:26:00 -08:00
Person
a1862c5c1d --Bug fixes
-Add min/max size on Palette Editor button to prevent weird resizing on Mac.
2017-03-11 09:25:08 -08:00
Person
74a371e567 --Bug fixes
-Do not reset rendering process when arrow is double clicked in the palette editor, because nothing has changed.
2017-03-07 18:15:53 -08:00
Person
d6b112dd32 --Bug fixes:
-Xaos has been wrong this entire time on the GPU because it was not selecting from the unweighted distributions on the very first iteration when fusing.
2017-03-05 08:32:58 -08:00
Person
2fba807777 --Bug fixes:
-Query matrices when drawing affines even if they are set not to be drawn because the values are used elsewhere.
 -No longer need to move library items on a delayed timer when dragging and dropping.
2017-03-04 07:46:28 -08:00
Person
621a037c2a --Bug Fixes
-Fix strange spurious crash in library tab when switching between SP and DP.
 -Compensate for severe Qt bug where dragging and dropping disjoint items in the Library tree would resort the dropped items in special situations.
 -Move Info.plist to Data folder.
 -Ensure RTTI is included in build.
 -Add darker versions of .png icons.
2017-03-02 20:04:47 -08:00
Person
cfb766f728 --Bug Fixes:
-Save palettes values in flame files as uppercase.
2017-02-28 19:01:49 -08:00
Person
9b810d529f --Bug fixes
-Update Mac build script build.sh.
 -Remove legacy build_osx_package.sh script.
 -Fix affine zooming bug on Mac.
2017-02-27 16:11:51 -08:00
Person
29c084a058 --Bug fixes
-Add missing Mac build files.
 -Convert PaletteList into a Singleton<T>.
2017-02-26 09:34:43 -08:00
Person
00189531fc --Bug fixes
-Forgot to commit icons.
2017-02-26 08:05:14 -08:00
Person
8a4127d5d7 --User changes
-Add a palette editor.
 -Add support for reading .ugr/.gradient/.gradients palette files.
 -Allow toggling on spinners whose minimum value is not zero.
 -Allow toggling display of image, affines and grid.
 -Add new variations: cylinder2, circlesplit, tile_log, truchet_fill, waves2_radial.

--Bug fixes
 -cpow2 was wrong.
 -Palettes with rapid changes in color would produce slightly different outputs from Apo/Chaotica. This was due to a long standing bug from flam3.
 -Use exec() on Apple and show() on all other OSes for dialog boxes.
 -Trying to render a sequence with no frames would crash.
 -Selecting multiple xforms and rotating them would produce the wrong rotation.
 -Better handling when parsing flames using different encoding, such as unicode and UTF-8.
 -Switching between SP/DP didn't reselect the selected flame in the Library tab.

--Code changes
 -Make all types concerning palettes be floats, including PaletteTableWidgetItem.
 -PaletteTableWidgetItem is no longer templated because all palettes are float.
 -Include the source colors for user created gradients.
 -Change parallel_for() calls to work with very old versions of TBB which are lingering on some systems.
 -Split conditional out of accumulation loop on the CPU for better performance.
 -Vectorize summing when doing density filter for better performance.
 -Make all usage of palettes be of type float, double is pointless.
 -Allow palettes to reside in multiple folders, while ensuring only one of each name is added.
 -Refactor some palette path searching code.
 -Make ReadFile() throw and catch an exception if the file operation fails.
 -A little extra safety in foci and foci3D with a call to Zeps().
 -Cast to (real_t) in the OpenCL string for the w variation, which was having trouble compiling on Mac.
 -Fixing missing comma between paths in InitPaletteList().
 -Move Xml and PaletteList classes into cpp to shorten build times when working on them.
 -Remove default param values for IterOpenCLKernelCreator<T>::SharedDataIndexDefines in cpp file.
 -Change more NULL to nullptr.
2017-02-26 00:02:21 -08:00
Person
5cdfe0b6b9 1.0.0.2 12/05/2016
--User changes
 -Add many tooltips to help clarify functionality.
 -Select multiple flames in library for del/move. Still only one allowed to be set as the current.
 -Show checkbox for current flame. Remember this is not necessarily what's selected.
 -User can now drag a square to select xforms, which keeps in sync with checkboxes.
 -Remove --nframes from command line. Replace with new params: --loopframes, --interpframes, --interploops.
 -Add two new options to EmberGenome: --cwloops --cwinterploops to specify whether rotation should go clockwise instead of the default counter clockwise.
 -Add these to Fractorium as checkboxes.
 -Apply All now also works for toggling animate flag on xforms.
 -Options dialog now allows user to set whether double click toggles spinners, or right click does.

--Bug fixes
 -Selecting final and non-final xforms, and then dragging the non-final did not drag the final with it.
 -Selecting all xforms when a final was present, then deleting crashed the program.
 -Remove support for ppm files in the command line programs, it's an outdated format.
 -Switching between SP and DP kept reapplying the palette adjustments.

--Code changes
 -Move build system to Visual Studio 2015 and Qt 5.6.
 -SSE used during addition of points to the histogram.
 -Remove last remnants of old flam3 C code and replace with C++.
 -Remove unused code involving tbb::task_group.
 -Make settings object a global shared_ptr singleton, so it doesn't have to be passed around.
2016-12-05 19:04:33 -08:00
mfeemster
edd1a0c9cc --Bug fixes
-Highlight power values less than 0 were accidentally disabled on the UI.
2016-06-21 19:27:37 -07:00
mfeemster
f8133c73bf Exit beta and move revision to an official 1.0 release. 2016-06-17 17:19:13 -07:00
mfeemster
b328cc6a01 --User changes
-Add fractorium.com link to the about box.
2016-06-13 19:26:03 -07:00
mfeemster
45cafc66da --Bug fixes
-Automatically check Apply to All on final render dialog when coming from Render Sequence button.
2016-06-13 17:59:17 -07:00
mfeemster
881927bb0a --Bug fixes
-Apply template when saving sequences.
 -Was improperly setting name of sequence file.
2016-06-13 16:33:51 -07:00
mfeemster
2e518aeebb --Bug fixes
-Make stagger a double instead of a bool.
 -Save stagger values to settings.
 -Random stagger was being set in the wrong place.
 -Save rotation values as double rather than int.
2016-06-11 19:01:19 -07:00
mfeemster
c91171d392 --User changes
-Add animation sequence creation to Fractorium.
 -Add two new options to EmberGenome which are used when generating an animation sequence.:
  --startcount: Add this number to the filename of each flame.
  --padding: Override the automatically calculated amount of padding zeroes added to each filename.

--Bug fixes
 -Prevent filenames in command line programs from using scientific notation when rendering a large number of frames.
 -Fix tab orders to match newer GUI items which were overlooked in previous releases.
 -Re-render previews if transparency value in the options dialog was changed. Re-rendering was previously only done if early clip or y axis up was changed.
 -Use transparency when rendering thumbnail previews.

--Code changes
 -Wrap EmberCommon.h in a namespace called EmberCommon.
 -Move FormatName() from EmberGenome to EmberCommon.h/cpp
 -Add a prefix parameter to EmberFile::DefaultFilename() to allow for creating a default filename for sequences.
 -When showing the final render dialog, allow specifying where it came from: the toolbar or the render sequence button.
 -Refactor all preview rendering code out into its own class hierarchy with overrides for the main window and the final render dialog.
 -Remove all preview render cancelling functions, they are now built into the new class hierarchy and a new render will not start until the previous one is stopped.
 -Add two new function ConstrainLow() and ConstrainHigh() which wrap constraining two min/max spinboxes to each others' values.
 -Add a bool to FractoriumEmberControllerBase::CopyEmberFile() to specify whether to copy the main file or the sequence file. This is somewhat of a hack and was done in a rush.
 -Add a bool to FractoriumEmberControllerBase::SetEmberFile() to specify whether to move the file rather than copy. This is used in FinalRenderEmberController and improves efficiency.
 -Add wrapper functions for variations filter dialog settings.
2016-06-11 17:47:03 -07:00
mfeemster
51c1cc7a83 --Bug fixes
-Switching between SP and DP before previews had finished would set the current flame back to the first one in the file.
2016-06-07 20:37:15 -07:00
mfeemster
1f50394cb4 --User Changes
-Tooltip cleanups.
2016-05-30 13:35:33 -07:00
Matt Feemster
ad336bb2b7 Fix randomization of post affines.
-Bug fixes:
--Make post affines properly randomize.

-Code changes:
--Use references rather than pointers when grabbing pre/post affines.
2016-05-24 07:02:05 -07:00
mfeemster
991275a656 --User changes
-Add a button to randomize both pre and post affine transforms to values between -1 to 1.
2016-05-23 19:48:04 -07:00
mfeemster
cffeceec99 --User changes
-Add a new option --statevars to EmberGenome to list the variations which change state.
 -Allow for filtering in the Variations Dialog based on the same types listed in the EmberGenome options.

--Code changes
 -More correctly populate VariationList::m_ParametricVariations and VariationList::m_NonParametricVariations to account for variations which have params only used for precalc.
 -Consolidate some of the code in VariationList which searches by name.
2016-05-18 16:48:40 -07:00
mfeemster
33cc2a4326 --Bug fixes
-Fix final render dialog failure when minimizing and restoring during a render on Linux. Note this bug was not present on Windows.
2016-05-16 19:24:45 -07:00
mfeemster
5aec58b4a2 --User changes
-Add new options to EmberGenome to better help assess which variations have certain characteristics. The options are:
  --sumvars: Display the names of all regular variations which have the default behavior of summing their outputs and exit.
  --assignvars: Display the names of all regular variations which have the non-standard behavior of assigning their outputs and exit.
  --ppsumvars: Display the names of all pre/post variations which have the non-standard behavior of summing their outputs and exit.
  --ppassignvars: Display the names of all pre/post variations which have the default behavior of assigning their outputs and exit.
  --dcvars: Display the names of all variations which use direct coloring and exit.
  --parvars: Display the names of all variations which have parameters and exit.
  --nonparvars: Display the names of all variations which do not have parameters (weight only) and exit.

--Code changes
 -Make VariationList vectors have const elements since no callers should ever change them.
 -Add new function to VariationList to retrieve a const ref to the parametric variations.
 -Move some search functions out of EmberTester and into EmberCommon.h.
 -General code cleanup.
2016-05-14 23:33:08 -07:00
mfeemster
42de2d107a 0.9.9.6 Beta Release 2016-05-05 17:46:27 -07:00
mfeemster
b5341c7d79 --User changes
-Remove --time option for EmberAnimate, it was redundant with --frame.
 -Make --enable_jpg_comments and --enable_png_comments just be bools that when present mean true, rather than having to specify =true.
 -Add a new argument --ts for EmberAnimate to allow the user to specify the temporal samples value to use for the entire animation. Useful for testing.

--Bug fixes
 -Properly seed rands in EmberAnimate when specifying --isaac_seed and using more than one device with --opencl.

--Code changes
 --Small cleanup to flatten/unflatten all code.
 --Make EmberOptionEntry<T>::operator() return a const reference instead of a copy.
2016-05-05 16:11:30 -07:00
mfeemster
95a71ea6d7 --User changes
-Add apply all functionality to flatten/unflatten menu items.
2016-05-02 17:49:58 -07:00
mfeemster
bbc5d0c783 --User changes
-Highlight power is now on by default.
 -Allow for adjustments on the Flame tab to apply to all open flames in the file.
 -Add two new buttons to the color tab to randomize and toggle the xform color indices.
 -Remove the --strip option from EmberGenome. It was useless and was likely just a carry over from flam3 during its early debugging stages when testing strips.
 -Make randoms in EmberGenome have default dimensions of 1920 x 1080.
 -Prevent --inter and --rotate in EmberGenome from rotating backward before the first flame since it doesn't really make sense.
 -Ensure every loaded flame has at least one xform in it.
 -Change dark.qss to hide dotted selection outline around checkboxes. Users must reload it to take effect.

--Bug fixes
 -The saving of last.flame during editing was appending the file when it should have been replacing.
 -It was impossible for EmberGenome to create a random flame. It can now be done by specifying no arguments: EmberGenome.exe
 -Crossing in EmberGenome was not logging the performed actions to the edit Xml tag.
 -Apply sub batch size and fuse count to template files used on the command line.
 -Use new default filter types with template files.

--Code changes
 -Use cerr in SheepTools instead of cout.
 -Set m_SubBatchSize and m_FuseCount to default values in Ember::Clear().
 -Clean up some command line options text formatting.
2016-05-02 16:54:56 -07:00
mfeemster
1f0cc4bb4a --User changes
-Always force times of each flame to increase from zero when saving a file.
 -Remove check for times when doing a sequence in EmberGenome because the original times are never used there.

--Bug fixes
 -Multi-GPU synchronization was not actually thread safe and was likely doing less iters than requested. It is now properly synchronized.

--Code changes
 -Optimize Interpolater by making it a non-static class by adding some members used for caching values during interpolation.
 -Cache values in SheepTools as well, which was already a non-static class.
 -General cleanup.
2016-04-23 09:02:09 -07:00
mfeemster
322c630b8f --Code changes
-Pass XML_PARSE_HUGE to xmlReadMemory() to allow for reading large Xml files.
2016-04-21 18:43:52 -07:00
Matt Feemster
cac7308776 Misc intermediate fixes, more work on these to follow.
--Bug fixes:
-Fix crash when using smooth interpolation in EmberGenome.
-Print error and exit EmberGenome when sequencing if times are not
sorted.

--Code changes:
-Another attempt at Singleton. This reverts the design to what it was
before with a fix to the code that was causing it not to behave like a
singleton should.
2016-04-21 15:33:00 -07:00
mfeemster
d639921d68 --User changes
-crackle is now 5-10 times faster as a result of using cached values as is done on the CPU. These were previously omitted due to a bug elsewhere in the code that was erroneously attributed to the crackle caching mechanism.
 -Report precision in command line programs.
2016-04-14 19:32:42 -07:00
mfeemster
0fbea60026 --User changes
-Edits will not save back to the file in memory on render completion when preview renderer is running.

--Bug fixes
 -dc_perlin was crashing on Nvidia when using SP.
 -Duplicate images were randomly getting added to the file in memory.
 -Crash when opening an Xml with less than 2 flames in it.

--Code changes
 -Use raw array of floats in OpenCL for perlin noise, rather than float3/double3.
 -Add some default cases to dc_perlin.
 -Redo singleton pattern yet again. Deriving from a templated Singleton<T> class was creating a separate instance per module. Now only one instance of each type will ever be created and it will be wrapped in a shared_ptr which guarantees its deletion as main() exits.
2016-04-13 20:59:57 -07:00
mfeemster
7715910362 --User changes
-The concept of "saving back to file in memory" has been removed. The current ember is saved back to memory whenever the render completes and the thumbnail will be updated each time.
 -Command line programs now default to using double precision.
 -The --bits argument has been removed and replaced with --sp to specify single precision. If omitted, DP is used.
 -Remove the --seed option, it was never used.
 -Remove the --sub_batch_size option, it has been part of the Xml for a long time.
 -Remove --hex_palette argument for EmberRender, it only makes sense in EmberAnimate and EmberGenome.
 -Set enable_jpg_comments and enable_png_comments to false by default. It was a very bad idea to have them be true because it reveals the flame parameters used to render the image which many artists guard closely.

--Bug fixes
 -Continuous update was broken.
 -Undo list was broken with new Library tab design.
 -Force repaint on xform checkbox change to ensure circles are immediately drawn around selected xforms.

--Code changes
 -Remove save to back to file in memory icon, document-hf-insert.png.
2016-04-11 18:15:14 -07:00
mfeemster
b690bf8071 --User changes
-Remove the option --intpalette to format the palette in the xml as ints. If they are not hex formatted, then they should always be float. This option was pointless.
 -Cleanup some options text for the command line programs.
 -Allow for dragging around flames in the library tab. This is useful for setting up the order of an animation.
 -Make the opening of large files in Fractorium much more efficient when not-appending.
 -Make the opening of large files in all EmberRender and EmberAnimate more efficient.
 -Better error reporting when opening files.

--Bug fixes
 -Get rid of leftover artifacts that would appear on preview thumbnails when either switching SP/DP or re-rendering previews.
 -Filename extension was not being appended on Linux when saving as Xml, thus making it impossible to drag that file back in becase drop is filtered on extension.

--Code changes
 -Move GCC compiler spec to C++14. Building with 5.3 now on linux.
 -Use inline member data initializers.
 -Make a #define for static for use in Utils.h to make things a little cleaner.
 -Make various functions able to take arbitrary collections as their parameters rather than just vectors.
 -Make library collection a list rather than vector. This alleviates the need to re-sync pointers whenever the collection changes.
 -Subclass QTreeWidget for the library tree. Two new files added for this.
 -Remove all usage of #ifdef ROW_ONLY_DE in DEOpenCLKernelCreator, it was never used.
 -Add move constructor and assignment operator to EmberFile.
 -Add the ability to use a pointer to outside memory in the renderer for the vector of Ember<T>.
 -Make a lot more functions const where they should be.
2016-04-03 18:55:12 -07:00
mfeemster
124f807772 --Code changes
-Make summing histograms from one or more secondary devices to the primary a little more elegant by using HOST_PTR. This requires one less copy.
2016-03-28 21:30:08 -07:00
mfeemster
e6882ee865 --User changes
-Better handling of crossed min/max DE filter values on the GUI.
 -Changes to spatial and density filter values will no longer restart the entire render.
 -Support reading cam_zoom from xml as zoom since JWildfire uses cam_zoom.
 -Change drag n drop behavior: the default is now to append, hold Ctrl to overwrite.
 -Set max value of zoom to 25 because it will crash with values around 28 or 29 due to numeric overflow when scaling quality.
 -Update links in About Dialog.
 -Rename some controls in Options Dialog.
 -Move the color curves control to the Palette tab.

--Bug fixes
 -Remove extra space in info tree text when dealing with a linked xform.
 -Update summary xform name field whenever xform name changes.
 -Get rid of selection border on summary tab xform tree cells.
 -Only add variations from Xml that have a non-zero weight. There seemed to be spurious flattens coming from Apo with a weight of 0.

--Code changes
 -Gutters are now a fixed size of 8 * supersample.
 -Use stl data() member to get pointer to first element instead of &vec[0].
 -Eliminate extra calls in renderer to ComputeBounds(), CreateSpatialFilter() and CreateTemporalFilter() to only be done at the start of a render.
 -Another attempt at vectorizing LogScaleDensityFilter(). Vectorizes, but not sure if it helps.
 -Some other loop optimizations in Renderer.
 -No longer check temporal samples in response to some control changes, they are always 1 in the interactive renderer.
2016-03-28 18:49:10 -07:00
mfeemster
19cb27b83a --User changes
-Remove some warnings about interpolation type on first and last flames.

--Code changes
 -Make DE block size always be 16x16, this should help stability on some Nvidia cards. No changes for AMD cards since they were that size already.
-Since the block size is now so small, do not reduce it further when supersampling.
 -Clean up some variable names and documentation around OpenCL DE to be more clear.
2016-03-12 19:25:19 -08:00
mfeemster
020cfe9116 --User changes
-Make the default interpolation type be smooth.
 -Correctly label interpolation types in the combo in the animation table on the Flame tab.
  --Set the default combo index to be smooth.
2016-03-12 14:42:56 -08:00
mfeemster
f22d0503d0 --Bug fixes
-Make config dir use lowercase "fractorium" on Linux.
2016-03-08 20:55:01 -08:00
mfeemster
787388a3dd --Bug fixes
-Try yet again to place last.flame in ~/.config/Fractorium on Linux.
 -Remove ~/.Fractorium as a search path on Linux, it's non-standard.
2016-03-08 20:37:19 -08:00
mfeemster
c067568781 --Bug fixes
-Place last.flame in ~/.config/Fractorium on Linux.
2016-03-07 19:37:15 -08:00
mfeemster
3c07a3b087 --Bug fixes
-Attempt to prevent crash when selecting OpenCL in the final render dialog when unsupported hardware is present.
  --This works by selecting the last known good device in the main window.
2016-03-07 18:39:51 -08:00
mfeemster
243ad605f1 --Bug fixes
-Place last.flame in ~/.config/fractorium on Linux.
2016-03-07 18:38:47 -08:00
mfeemster
f4ea6c3959 0.9.9.5 Release 2016-03-04 19:20:30 -08:00
mfeemster
0efb319b12 --Code changes
-Make usage of VarFuncs more consistent by moving some global functions there.
 -Make CircleTrans1 a little safer by calling Zeps() on m_Sc during precalc.
 -Begin prepping for 0.9.9.5 release.
2016-03-04 18:54:06 -08:00
mfeemster
1c7e95c59a --Bug fixes
-Be more forgiving when loading an Xml with warnings.
2016-03-02 19:16:36 -08:00
mfeemster
7c856c929c --Bug fixes
-Really fix locking of affine scale.

--Code changes
 -Remove dependency projects from the solution. Move to a project design where they are built once via command line and stored in a /Deps folder.
  --Because of this, libpng is built as a static lib instead of a dll because that's what its command line makefile supports.
  --Remove libpng16.dll from Wix installer.
 -Remove all configs except for debug and release.
 -Remove all platforms except for x64.
 -Add #define __TBB_NO_IMPLICIT_LINKAGE 1 to prevent tbb from locking for tbb_debug.lib by default on debug builds.
 -Put Ember.rc in a filter folder in the project.
 -Place pragma warning disable statements in PCH files rather than in projects. This makes it easier when using Qt Creator.
 -Move all resource files to the MSVC folder.
 -Set all targets in QtCreator project to their lowercase names to be more *nix friendly. Set -l link statements to use these new lowercase names for ember and embercl.
 -Rework projects to favor shadow builds.
 -Remove the symlinks.sh file and all references to it. It was never needed. Instead, just specify multiple include and link paths in the .pro files.
 -Change WIN32 to _WIN32.
 -Fix a few code warnings.
2016-03-01 17:26:45 -08:00
mfeemster
695b8fc823 --Bug fixes
-Do not reset locked affine scale on new flame.
2016-02-29 16:35:25 -08:00
mfeemster
63f933de0e --Bug fixes
-Fix build on Linux.
2016-02-25 23:41:00 -08:00
mfeemster
4133db9f83 --Bug fixes
-Gracefully recover from reading a bad palette file.
2016-02-25 23:12:18 -08:00
mfeemster
6ff8aa0722 --Bug fixes
-Available memory size checking in the final render dialog was accidentally removed during the multi-gpu work last year. Add it back in.
2016-02-25 21:38:45 -08:00
mfeemster
32d6982210 --Bug fixes
-Fix crash when using Lanczos2 filter with color curves due to negative numbers. Fix by passing abs() of first argument to pow() in Renderer::GammaCorrection().
 -Fix crash in hexes with SP. Rounding error caused out of bounds index.
2016-02-23 21:01:02 -08:00
mfeemster
c282ee4c2c 0.9.9.4 Release 2016-02-21 18:53:36 -08:00
mfeemster
66f8f1e50c --User changes
-Draw selection circles around all selected xforms plus the current one.

--Bug fixes
 -Add control key as a modifier to increase the amount a spinbox is changed when using right mouse drag to edit. Previously only observed shift key to decrease the value.
 -Change the copy/paste selected xforms shortcuts to be Ctrl+X+C and Ctrl+X+V.

--Code changes
 -Add function Fractorium::IsXformSelected() to determine if an xform has been selected with the checkboxes.
2016-02-20 18:44:52 -08:00
mfeemster
f1dd20b0ca --Bug fixes
-Devices settings was empty on first run, so switching to OpenCL had no effect until the user manually selected a device in the options dialog. Fix by defaulting to device 0 if present.
2016-02-18 19:31:06 -08:00
mfeemster
c09457d5fe --Code changes
-Split VariationList into .h/cpp files.
  --Make VariationList.cpp the only place where the variations files are included from. This speeds up the build, but variations can no longer be directly instantiated.
  --Variations are no longer exported.
2016-02-18 18:58:24 -08:00
mfeemster
d92a600ced --Bug fixes
-Crash when supersample minus final spatial filter width was negative.
2016-02-15 18:54:24 -08:00
mfeemster
73356301da --User changes
-Add 4 new possible arguments to EmberGenome:
  --allvars: Print the names of all supported variations.
  --regvars: Print the names of all supported regular variations.
  --prevars: Print the names of all supported pre variations.
  --postvars: Print the names of all supported post variations.
2016-02-15 12:02:37 -08:00
mfeemster
10c12b5250 --Code changes
-Fix build.
 -Cleanup warnings.
2016-02-13 17:24:51 -08:00
Matt Feemster
09fd339696 Fix build error with static member. 2016-02-12 09:31:41 -08:00
mfeemster
a800b08b67 --User changes
-Add variations changes to the list of functionality that can be applied to all xforms using the Select tab.
 -Allow for graphical affine adjustments to apply to multiple selected xforms.
 -Slight optimization of the pie variation.
 -Undo state is only saved when the render completes and the mouse buttons are released. This helps avoid intermediate steps for quickly completing renders while dragging.
 -Add some keyboard shortcuts for toolbar and menu items.
 -Make info tab tree always expanded.

--Bug fixes
 -Make precalcs for all hypertile variations safer by using Zeps() for denominators.
 -Changing the current xform with more than one selected would set all xform's color index value that of the current one.
 -Use hard found palette path information for randoms as well.
 -OpenCL build and assignment errors for Z value in epispiral variation.
 -Unitialized local variables in hexaplay3D, crob, pRose3D.

--Code changes
 -Change static member variables from m_ to s_.
 -Get rid of excessive endl and replace with "\n".
 -Remove old IMAGEGL2D define from before Nvidia supported OpenCL 1.2.
 -Remove old CriticalSection code and use std::recursive_mutex.
 -Make Affine2D Rotate() and RotateTrans() take radians instead of angles.
 -More C++11 work.
 -General cleanup.
2016-02-11 21:38:21 -08:00
mfeemster
a345e2d5e1 --Bug fixes
-Bad path parsing for multiple search paths for palette in command line programs.
2016-02-09 15:53:55 -08:00
mfeemster
f10e4e610a --User changes
-Allow locking of the scale at which affine circles are displayed.
 -Allow user to toggle whether xform will be animated when generating sequences. Also show the animate value when loading.

--Code changes
 -More conversion to C++11 style code.
 -Add another value to the eXformUpdate enum called UPDATE_CURRENT_AND_SELECTED in anticipation of future work.
 -Remove some old #defines.
2016-02-02 17:51:58 -08:00
mfeemster
96d53113a0 Merge branch 'master' of https://github.com/mfeemster/fractorium.git 2016-01-29 17:02:26 -08:00
mfeemster
cf9da379b6 --User changes
-Allow for pausing the renderer in the main window. This makes is more efficient when entering many parameters, such as when following a tutorial.
 -Add support for new variations: erf, gamma, jac_cn, jac_dn, jac_sn, logDB, pressure_wave, pRose3D, splits3D, w, waves2b, x, xerf, y, z.
 -Inform user of the start and stop of file parsing in EmberAnimate because the files could potentially be very large.
 -Move the follwing fields to a new table called Animation: Interpolation, Affine Interpolation, Temporal Samples, Temporal Filter Width, Temporal Filter Type.
  -These currently have no effect on the interactive renderer and instead are used when running flames through EmberGenome to generate sequences, and then animating them in Fractorium or EmberAnimate.
 -Add new parameter overrides for EmberRender and EmberAnimate which directly assign values to all flames being rendered, rather than scale:
  --quality
  --demin
  --demax

--Bug fixes
 -Left pad instead of right pad names of sequence outputs from EmberGenome.
 -Unique file naming was broken for files which already had an underscore in them.
 -Properly report that png is the default format of EmberRender and EmberAnimate output instead of erroneously claiming it was jpg.
 -Make command line programs search these folders in this order for the palette file:
  ./
  ~/.fractorium
  ~/.config/fractorium
  /usr/share/fractorium
  /usr/local/share/fractorium
 -Fix possible bad values in hexes.
 -Better assignment of Z variables.
 -Fix boarders due to use of poorly implemented rint() function from flam3. Use std::rint() now.
 -wedge_sph was completely wrong due to having accidentally swapped the mapping of two parameters.
 -Make juliascope juliascope_power parameter be of type REAL_NONZERO since it's used as a denominator.
 -Make Z assignment compatible with the originals in:
  -arch, bcircle, bCollide, bent, bent2, bisplit, blob, blur_linear, blur_square, bMod, boarders, boarders2, bSwirl, bTransform, butterfly, cardioid, cell, circleblur, circlize, circlize2, circus, collideoscope, cos, cosine, cosh, coth, cpow, cpow2, crescents, cropn, csc, csch, curl, curve, dc_gridout, deltaa, diamond, disc2, eclipse, eCollide, edisc, eJulia, elliptic, eMod, eMotion, ennepers, epispiral, ePush, eRotate, eScale, eSwirl, ex, exp, expo, exponential, fan, fdisc, fibonacci, fibonacci2, fisheye, flipcircle, flipy, flower, flux, funnel, glynnia, GlynnSim1, GlynnSim2, GlynnSim3, gridout, handkerchief, heart, hole, idisc, julia, julian2, juliaNab, kaleidoscope, lazyTravis, Lissajous, mask, MobiusN, mobius_strip, modulus, murl, murl2, npolar, ortho, oscilloscope, parabola, perspective, petal, phoenix_julia, pie (was also inconsistent between cpu and gpu), poincare, popcorn, popcorn2, power, pow_block, rational3, rays, rblur, rings, rippled, roundspher, sec, secant2, sigmoid, sin, sineblur, sinh, sinusgrid, sphericaln, spiralwing, spirograph, split, squarize, squirrel, squish, sschecks, starblur, stripes, stwin, super_shape, tan, tancos, tangent, tanh, TwinTrian, twoface, unpolar, waves, wavesn, wedge_julia, whorl, xheart, zblur, zscale.

--Code changes
 -Generalize Variation::PrecalcHelper() and rename to PrePostPrecalcHelper().
  --Do the same for the OpenCL version and rename it PrePostPrecalcOpenCLString().
 -Rename Variation::m_AssignType to m_PrePostAssignType since it's only relevant to pre/post variations.
2016-01-29 17:02:15 -08:00
Gambhiro
e735191cb8 move icon 2016-01-20 20:54:56 +00:00
mfeemster
6b02ea3465 --Bug fixes
-Fix PCH in Fractorium.
2016-01-19 16:21:01 -08:00
mfeemster
79a2a28694 --0.9.9.3 Release 2016-01-17 16:10:06 -08:00
mfeemster
c94c1eba66 --Bug fixes
-Long standing animation looping but that goes all the way back to flam3.
 -Build failure in hexes variation.
2016-01-16 14:23:22 -08:00
mfeemster
0b05f1a394 --Bug fixes
-Changes in the xaos grid were not always being processed due to rounding.
2016-01-16 11:51:29 -08:00
mfeemster
19385c28b9 --User changes
-Add the following modes to synth:
  -MODE_SHIFTNSTRETCH 14
  -MODE_SHIFTTANGENT 15
  -MODE_XMIRROR 17
  -MODE_XYMIRROR 18
  -MODE_SPHERICAL2 19
 -Clamp synth_mode, synth_*_type and synth_*_layer to valid values.

--Bug fixes
 -synth was broken due to passing synth_mode to Interpolate, rather than synth_smooth.
 -Fix bad include and link path in EmberAnimate project.
2016-01-13 19:08:25 -08:00
mfeemster
ccd4ea8d05 Manual merge 2016-01-12 20:51:13 -08:00
mfeemster
a3ecbbf690 --User changes
-Add post_smartcrop.

--Bug fixes
 -Fix bug in crackle.
 -Wrong point assignment in hexaplay3D, hexnix3D.
 -Improper Z assignment in rblur.
 -Fix inconsistency with original in circlecrop.
 -Put EMBER_ROOT bakc to ./../../../ in default.pri. This is TBD.

--Code changes
 -Convert all enums to class enum to be consistent with C++11 style.
 -Convert some if/else statements in filter classes to case statements.
 -Add overloaded stream operators to print various enums.
 -Optimize crob, nBlur.
 -Fix weird assignment statement in falloff3.
 -Cleanup in VarFuncs::SimplexNoise3D().
 -Replace fabs() with std::abs().
 -General cleanup.
2016-01-12 20:42:12 -08:00
mfeemster
f5d0be5e5d --Code changes
-Convert all enums to class enum to be consistent with C++11 style.
 -Convert some if/else statements in filter classes to case statements.
 -Add overloaded stream operators to print various enums.
2016-01-04 16:50:15 -08:00
luyuju151
02261e6e76 modify Qt projects for building with Qt Creator (windows)
add build guide using Qt Creator and MSVC2013
2016-01-04 21:45:40 +08:00
mfeemster
c8e2355ec2 --Code changes
-Convert all enums to class enum to be consistent with C++11 style.
 -Convert some if/else statements in filter classes to case statements.
 -Add overloaded stream operators to print various enums.
2015-12-31 16:00:36 -08:00
mfeemster
6ba16888e3 --User changes
-Add new variations: crackle, dc_perlin.
 -Make default palette interp mode be linear instead of step.
 -Make summary tab the selected one in the Info tab.
 -Allow for highlight power of up to 10. It was previously limited to 2.

--Bug fixes
 -Direct color calculations were wrong.
 -Flattening was not applied to final xform.
 -Fix "pure virtual function call" error on shutdown.

--Code changes
 -Allow for array precalc params in variations by adding a size member to the ParamWithName class.
  -In IterOpenCLKernelCreator, memcpy precalc params instead of a direct assign since they can now be of variable length.
 -Add new file VarFuncs to consolidate some functions that are common to multiple variations. This also contains texture data for crackle and dc_perlin.
  -Place OpenCL versions of these functions in the FunctionMapper class in the EmberCL project.
 -Add new Singleton class that uses CRTP, is thread safe, and deletes after the last reference goes away. This fixes the usual "delete after main()" problem with singletons that use the static local function variable pattern.
 -Began saving files with AStyle autoformatter turned on. This will eventually touch all files as they are worked on.
 -Add missing backslash to CUDA include and library paths for builds on Nvidia systems.
 -Add missing gl.h include for Windows.
 -Remove glew include paths from Fractorium, it's not used.
 -Remove any Nvidia specific #defines and build targets, they are no longer needed with OpenCL 1.2.
 -Fix bad paths on linux build.
 -General cleanup.
2015-12-31 13:41:59 -08:00
Gambhiro
43d0aef5a4 Merge remote-tracking branch 'origin/master' into linux-mac-0.9.9.2 2015-12-11 12:00:46 +00:00
mfeemster
aece4afc60 --Bug fixes:
-Omit duplicate entries in error reports.
-Properly report missing palette file in command line programs.
2015-12-10 20:19:41 -08:00
Gambhiro
06d4c95975 look harder for a palette 2015-12-10 18:02:24 +00:00
Gambhiro
c2d227b403 look for the palettes in various places 2015-12-09 18:08:21 +00:00
Gambhiro
66aa8fa6a1 successful Mac build on OSX 10.10 2015-12-09 16:14:44 +00:00
Gambhiro
d60bc4dc6c hard-code /usr/share/fractorium for now 2015-12-01 17:33:27 +00:00
mfeemster
49e2104fd2 --Code changes:
-Cleanup.
2015-11-25 14:32:34 -08:00
mfeemster
cbead15e18 --Bug fixes:
-Crash on linux when saving style due to null pointer in m_Theme variable.
2015-11-25 14:27:49 -08:00
mfeemster
7269d2176a --Bug fixes:
-Qualify sqrt with std:: in Variations06.h
2015-11-25 13:30:37 -08:00
mfeemster
cdcbd409ab --Bug fixes:
-Add Zeps to global OpenCL function list for any ember that contains 3D params.
2015-11-23 16:33:43 -08:00
mfeemster
5e82167155 Linux build. 2015-11-22 17:03:11 -08:00
mfeemster
330074cfb2 --User changes
-Add new variations: bubbleT3D, crob, hexaplay3D, hexcrop, hexes, hexnix3D, loonie2, loonie3, nBlur, octapol and synth.
 -Allow for pre/post versions of dc_bubble, dc_cylinder and dc_linear whereas before they were omitted.
 -When saving a file with multiple embers in it, detect if time values are all the same and if so, start them at zero and increment by 1 for each ember.
 -Allow for numerous quality increases to be coalesced into one. It will pick up at the end of the current render.
 -Show selection highlight on variations tree in response to mouse hover. This makes it easier to see for which variation or param the current mouse wheel action will apply.
 -Make default temporal samples be 100, whereas before it was 1000 which was overkill.
 -Require the shift key to be held with delete for deleting an ember to prevent it from triggering when the user enters delete in the edit box.
  -This wasn't otherwise fixable without writing a lot more code.

--Bug fixes
 -EmberGenome was crashing when generating a sequence from a source file with more than 2 embers in it.
 -EmberGenome was improperly handling the first frame of a merge after the last frame of the loop.
  -These bugs were due to a previous commit. Revert parts of that commit.
 -Prevent a zoom value of less than 0 when reading from xml.
 -Slight optimization of the crescents, and mask variations, if the compiler wasn't doing it already.
 -Unique file naming was broken because it was looking for _# and the default names ended with -#.
 -Disallow renaming of an ember in the library tree to an empty string.
 -Severe bug that prevented some variations from being read correctly from params generated outside this program.
 -Severe OpenCL randomization bug. The first x coordinates of the first points in the first kernel call of the first ember of a render since the OpenCL renderer object was created were not random and were mostly -1.
 -Severe bug when populating xform selection distributions that could sometimes cause a crash due to roundoff error. Fix by using double.
 -Limit the max number of variations in a random ember to MAX_CL_VARS, which is 8. This ensures they'll look the same on CPU and GPU.
 -Prevent user from saving stylesheet to default.qss, it's a special reserved filename.

--Code changes
 -Generalize using the running sum output point inside of a variation for all cases: pre, reg and post.
 -Allow for array variables in variations where the address of each element is stored in m_Params.
 -Qualify all math functions with std::
 -No longer use our own Clamp() in OpenCL, instead use the standard clamp().
 -Redesign how functions are used in the variations OpenCL code.
 -Add tests to EmberTester to verify some of the new functionality.
 -Place more const and override qualifiers on functions where appropriate.
 -Add a global rand with a lock to be used very sparingly.
 -Use a map instead of a vector for bad param names in Xml parsing.
 -Prefix affine interpolation mode defines with "AFFINE_" to make their purpose more clear.
 -Allow for variations that change state during iteration by sending a separate copy of the ember to each rendering thread.
 -Implement this same functionality with a local struct in OpenCL. It's members are the total of all variables that need to change state within an ember.
 -Add Contains() function to Utils.h.
 -EmberRender: print names of kernels being printed with --dump_kernel option.
 -Clean up EmberTester to handle some of the recent changes.
 -Fix various casts.
 -Replace % 2 with & 1, even though the compiler was likely doing this already.
 -Add new file Variations06.h to accommodate new variations.
 -General cleanup.
2015-11-22 14:15:07 -08:00
mfeemster
04e72c27de --User changes
-Add a new dialog for editing QSS stylesheets. Allow for saving, reloading and setting styles as default.
  --Include a dark style with the installation called dark.qss.
  --Also add support for themes such as Fusion.
  --Resize some controls to better fit with the new style.
 -Add an option to specify the number of random embers generated on startup. 1 is the minimum and the default.

--Bug fixes
 -Properly enable/disable thread priority label in final render dialog in response to enable/disable of the OpenCL checkbox.
 -Remove all inline stylesheets.
 -Show xaos spinners with 6 decimal places.

--Code changes
 -Remove redundant comparisons to nullptr, use ! instead;
 -Give some controls valid names instead of the auto generated ones.
 -DoubleSpinBoxTableItemDelegate.h: Add virtual keyword to overridden functions.
2015-10-26 21:31:35 -07:00
mfeemster
9f524e1ad1 -Bug fixes:
--Xaos table was not updating when pasting xforms.
2015-09-27 12:06:47 -07:00
mfeemster
e978e63d5a --Bug fixes:
Fix crash on startup when no GPU present.
2015-09-21 17:44:19 -07:00
mfeemster
34d6325be8 0.9.9.0 Beta 09/19/2015
--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 parsing of legacy "symmetry" xform Xml element.
 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
 Add resource files for Ember and EmberCL.
Capture work since the last release in VersionHistory.txt.
2015-09-19 18:03:25 -07:00
mfeemster
d67e56c794 -Bug fixes:
--Set auto fill background for all of the nested tabs on the ui. This has ping ponged back and forth since the beginning of this project.
2015-09-14 22:10:46 -07:00
mfeemster
171b687421 -Bug fixes
--Adjust height of final render dialog to make it look better on Linux.
2015-09-14 21:34:37 -07:00
mfeemster
16dbbf1b29 -Bug fixes:
--Adjust xaos cells when any group modification is made, such as random, clear, or row/col change.
--Remove some old style sheet code on the xforms tab that doesn't seem to make sense and was probably just a workaround for a transient Qt bug, of which there are hundreds.
2015-09-14 20:53:19 -07:00
mfeemster
e8b8d70f47 --Bug fixes:
-Make xform weight cell slightly wider, it was getting clipped on Linux.
2015-09-13 12:10:58 -07:00
mfeemster
63f0d5cdad --Bug fixes:
-Wraparound bug when generating random flames.
	-Make combo boxes have zero margins, they were getting clipped on Linux.
2015-09-13 11:53:14 -07:00
mfeemster
2f0227755b --User changes:
Resize options and about dialogs for Linux.

--Bug fixes:
	Null check on file close in ReadFile().
2015-09-12 20:10:47 -07:00
mfeemster
018ba26b5f --User changes
-Add support for multiple GPU devices.
  --These options are present in the command line and in Fractorium.
 -Change scheme of specifying devices from platform,device to just total device index.
  --Single number on the command line.
  --Change from combo boxes for device selection to a table of all devices in Fractorium.
 -Temporal samples defaults to 100 instead of 1000 which was needless overkill.

--Bug fixes
 -EmberAnimate, EmberRender, FractoriumSettings, FinalRenderDialog: Fix wrong order of arguments to Clamp() when assigning thread priority.
 -VariationsDC.h: Fix NVidia OpenCL compilation error in DCTriangleVariation.
 -FractoriumXformsColor.cpp: Checking for null pixmap pointer is not enough, must also check if the underlying buffer is null via call to QPixmap::isNull().

--Code changes
 -Ember.h: Add case for FLAME_MOTION_NONE and default in ApplyFlameMotion().
 -EmberMotion.h: Call base constructor.
 -EmberPch.h: #pragma once only on Windows.
 -EmberToXml.h:
  --Handle different types of exceptions.
  --Add default cases to ToString().
 -Isaac.h: Remove unused variable in constructor.
 -Point.h: Call base constructor in Color().
 -Renderer.h/cpp:
  --Add bool to Alloc() to only allocate memory for the histogram. Needed for multi-GPU.
  --Make CoordMap() return a const ref, not a pointer.
 -SheepTools.h:
  --Use 64-bit types like the rest of the code already does.
  --Fix some comment misspellings.
 -Timing.h: Make BeginTime(), EndTime(), ElapsedTime() and Format() be const functions.
 -Utils.h:
  --Add new functions Equal() and Split().
  --Handle more exception types in ReadFile().
  --Get rid of most legacy blending of C and C++ argument parsing.
 -XmlToEmber.h:
  --Get rid of most legacy blending of C and C++ code from flam3.
  --Remove some unused variables.
 -EmberAnimate:
  --Support multi-GPU processing that alternates full frames between devices.
  --Use OpenCLInfo instead of OpenCLWrapper for --openclinfo option.
  --Remove bucketT template parameter, and hard code float in its place.
  --If a render fails, exit since there is no point in continuing an animation with a missing frame.
  --Pass variables to threaded save better, which most likely fixes a very subtle bug that existed before.
  --Remove some unused variables.
 -EmberGenome, EmberRender:
  --Support multi-GPU processing that alternates full frames between devices.
  --Use OpenCLInfo instead of OpenCLWrapper for --openclinfo option.
  --Remove bucketT template parameter, and hard code float in its place.
 -EmberRender:
  --Support multi-GPU processing that alternates full frames between devices.
  --Use OpenCLInfo instead of OpenCLWrapper for --openclinfo option.
  --Remove bucketT template parameter, and hard code float in its place.
  --Only print values when not rendering with OpenCL, since they're always 0 in that case.
 -EmberCLPch.h:
  --#pragma once only on Windows.
  --#include <atomic>.
 -IterOpenCLKernelCreator.h: Add new kernel for summing two histograms. This is needed for multi-GPU.
 -OpenCLWrapper.h:
  --Move all OpenCL info related code into its own class OpenCLInfo.
  --Add members to cache the values of global memory size and max allocation size.
 -RendererCL.h/cpp:
  --Redesign to accomodate multi-GPU.
  --Constructor now takes a vector of devices.
  --Remove DumpErrorReport() function, it's handled in the base.
  --ClearBuffer(), ReadPoints(), WritePoints(), ReadHist() and WriteHist() now optionally take a device index as a parameter.
  --MakeDmap() override and m_DmapCL member removed because it no longer applies since the histogram is always float since the last commit.
  --Add new function SumDeviceHist() to sum histograms from two devices by first copying to a temporary on the host, then a temporary on the device, then summing.
  --m_Calls member removed, as it's now per-device.
  --OpenCLWrapper removed.
  --m_Seeds member is now a vector of vector of seeds, to accomodate a separate and different array of seeds for each device.
  --Added member m_Devices, a vector of unique_ptr of RendererCLDevice.
 -EmberCommon.h
  --Added Devices() function to convert from a vector of device indices to a vector of platform,device indices.
  --Changed CreateRenderer() to accept a vector of devices to create a single RendererCL which will split work across multiple devices.
  --Added CreateRenderers() function to accept a vector of devices to create multiple RendererCL, each which will render on a single device.
  --Add more comments to some existing functions.
 -EmberCommonPch.h: #pragma once only on Windows.
 -EmberOptions.h:
  --Remove --platform option, it's just sequential device number now with the --device option.
  --Make --out be OPT_USE_RENDER instead of OPT_RENDER_ANIM since it's an error condition when animating. It makes no sense to write all frames to a single image.
  --Add Devices() function to parse comma separated --device option string and return a vector of device indices.
  --Make int and uint types be 64-bit, so intmax_t and size_t.
  --Make better use of macros.
 -JpegUtils.h: Make string parameters to WriteJpeg() and WritePng() be const ref.
 -All project files: Turn off buffer security check option in Visual Studio (/Gs-)
 -deployment.pri: Remove the line OTHER_FILES +=, it's pointless and was causing problems.
 -Ember.pro, EmberCL.pro: Add CONFIG += plugin, otherwise it wouldn't link.
 -EmberCL.pro: Add new files for multi-GPU support.
 -build_all.sh: use -j4 and QMAKE=${QMAKE:/usr/bin/qmake}
 -shared_settings.pri:
  -Add version string.
  -Remove old DESTDIR definitions.
  -Add the following lines or else nothing would build:
   CONFIG(release, debug|release) {
    CONFIG += warn_off
    DESTDIR = ../../../Bin/release
   }

   CONFIG(debug, debug|release) {
    DESTDIR = ../../../Bin/debug
   }

   QMAKE_POST_LINK += $$quote(cp --update ../../../Data/flam3-palettes.xml $${DESTDIR}$$escape_expand(\n\t))
   LIBS += -L/usr/lib -lpthread
 -AboutDialog.ui: Another futile attempt to make it look correct on Linux.
 -FinalRenderDialog.h/cpp:
  --Add support for multi-GPU.
  --Change from combo boxes for device selection to a table of all devices.
  --Ensure device selection makes sense.
  --Remove "FinalRender" prefix of various function names, it's implied given the context.
 -FinalRenderEmberController.h/cpp:
  --Add support for multi-GPU.
  --Change m_FinishedImageCount to be atomic.
  --Move CancelRender() from the base to FinalRenderEmberController<T>.
  --Refactor RenderComplete() to omit any progress related functionality or image saving since it can be potentially ran in a thread.
  --Consolidate setting various renderer fields into SyncGuiToRenderer().
 -Fractorium.cpp: Allow for resizing of the options dialog to show the entire device table.
 -FractoriumCommon.h: Add various functions to handle a table showing the available OpenCL devices on the system.
 -FractoriumEmberController.h/cpp: Remove m_FinalImageIndex, it's no longer needed.
 -FractoriumRender.cpp: Scale the interactive sub batch count and quality by the number of devices used.
 -FractoriumSettings.h/cpp:
  --Temporal samples defaults to 100 instead of 1000 which was needless overkill.
  --Add multi-GPU support, remove old device,platform pair.
 -FractoriumToolbar.cpp: Disable OpenCL toolbar button if there are no devices present on the system.
 -FractoriumOptionsDialog.h/cpp:
  --Add support for multi-GPU.
  --Consolidate more assignments in DataToGui().
  --Enable/disable CPU/OpenCL items in response to OpenCL checkbox event.
 -Misc: Convert almost everything to size_t for unsigned, intmax_t for signed.
2015-09-12 18:33:45 -07:00
mfeemster
a4aae06b02 --User changes
-Add Simon Detheridge's name to the About Box.

--Bug fixes
 -Fix bug in OpenCL atomic string, which is never used.
 -Wrong hist and accum allocation size in RendererCL when using float-only buffers now.
 -Move some kernel initialization to a place where it's done once per render, rather than on every interactive iter chunk.

--Code changes
 -Make ConvertCarToRas() just assign to the member rather than return a struct.
 -Make kernel string accessor functions in IterOpenCLKernelCreator, FinalAccumOpenCLKernelCreator and DEOpenCLKernelCreator be const and return a const string reference.
 -Don't include atomic string unless locking on the GPU, which is never.
2015-08-12 18:51:07 -07:00
mfeemster
6b813c8dac Fix Linux build. 2015-08-10 20:59:09 -07:00
mfeemster
eecd3c254f --User changes
-Remove Hue as a saved parameter, as well as animation parameters associated with it. It's now a GUI-only field that is never saved.
 -Make histogram, density filter buffer, and all associated fields always float, even when using double. In that case, only the iteration calculations are now double. Suggested by Thomas Ludwig.
 -Print all three kernels in EmberRender when the --dump_kernel option is specified.
 -Apply variations filter to randoms.

--Bug fixes
 -Fix bug where hue was not being preserved when switching controllers and embers. Very hard to repro bug, but mostly overcome by eliminating hue as a saved parameter.

--Code changes
 -De-templatized DEOpenCLKernelCreator and FinalAccumOpenCLKernelCreator. They now just take a bool as a parameter to specify double precision.
 -To accommodate the buffers being float, introduce a new #define types in EmberCL called real4_bucket, and real4reals_bucket.
 -Density and spatial filtering structs now use this type.
 -ConvertDensityFilter() and ConvertSpatialFilter() no longer return a value, they just assign to the member.
2015-08-10 20:10:23 -07:00
mfeemster
fda1fdeee7 --Bug fixes
-Nvidia OpenCL compilation was broken for density filtering due to ambiguity in the arguments to min(). Fix it by casting.
 -Put Nvidia block size in DE back to 24 where it used to be. Nvidia fails when it's 32.
 -Fix misspelling of the word "Rendering" in failure messages in final render dialog.
 -Put FillSummary() back when loading an ember.
 -Properly disable add final xform button when a final xform is present.
2015-07-31 19:46:53 -07:00
Matt Feemster
1f77ca2098 Merge pull request #26 from gh2k/osx-packager
Add osx packaging script
2015-07-29 17:44:06 -07:00
Matt Feemster
28a25644a2 Merge pull request #27 from gh2k/osx-native-menus
Force creation of native menu bar when main window is shown
2015-07-29 17:42:49 -07:00
mfeemster
51df7b3681 Merge branch 'master' of https://github.com/mfeemster/fractorium 2015-07-29 17:35:38 -07:00
mfeemster
2317be332a --User changes
-Add toolbar buttons to switch some rendering options without having to open the options dialog.

--Bug fixes
 -Only update summary on render completion, no need to constantly update it.
 -Properly handle cancel even on variations dialog.

--Code changes
 -Add small function ShutdownAndRecreateFromOptions() to wrap shutting down the timer and recreating the renderer.
 -Use the overridden accept() and reject() functions more consistently across dialogs.
2015-07-29 17:25:02 -07:00
Simon Detheridge
916863dd0a Force creation of native menu bar when main window is shown
Native menu bar recreation is hooked up to the focusWindowChanged signal in
QGuiApplication. Emittng this when the window is shown ensures that Qt
creates the menubar at the correct time.

Fixes gh2k/fractorium#1
2015-07-29 14:56:51 +01:00
Simon Detheridge
26bc0d1b72 Look for flam3-palettes.xml in executable dir, not working dir 2015-07-29 12:42:22 +01:00
Simon Detheridge
84c87c966a Display char* excptions when Something Bad happens
When these are raised on osx (and Linux?) the program crashes with no error.
This displays the message in a fatal error box and then quits slightly more
gracefully.
2015-07-26 21:02:23 +01:00
Matt Feemster
c005755a50 Merge pull request #24 from gh2k/menu-hotkeys
Change hotkeys for copy/paste selected xforms
2015-07-24 08:05:00 -07:00
Simon Detheridge
24ce030c2f Change hotkeys for copy/paste selected xforms
Apple users will very much expect command-Q to exit the app.

I'm not sure if it's possible to change these just for mac... People may be used to them being on Q/W on Windows?
2015-07-24 15:57:05 +01:00
Matt Feemster
ad7d4a3b4f Merge pull request #22 from gh2k/opencl-hole
Fix opencl crash in 'hole' variation
2015-07-24 06:41:42 -07:00
Simon Detheridge
328a413c59 Fix opencl crash in 'hole' variation 2015-07-24 13:00:28 +01:00
mfeemster
e16c6a825f --User changes
-Add variations filter/selection dialog.

--Bug fixes
 -Fix summary window not properly indicating the presence of pose affine.
 -Remove a file named Fractorium.aps which had been erroneously committed a year ago.

--Code changes
 -Use qobject_cast instead of dynamic_cast where appropriate.
 -Add more override keyword where appropriate.
 -Add variations list to settings for filter dialog.
2015-07-23 18:16:36 -07:00
mfeemster
2019dcb605 --Code changes
-Forgot EmberMotion.h
2015-07-22 17:06:14 -07:00
mfeemster
3aa9e13194 --User changes
-Add Summary tab to the info dock, place existing bounds related info in a new Bounds tab.
 -Add a toolbar with the most common actions on it.
 -Remove old toolbar at the top of the library tab.

--Code changes
 -Refactor code to make a color visible on a background into VisibleColor() in FractoriumCommon.h
 -Add IsXformLinked() to determine if an xform is linked to another.
 -Remove SetPaletteRefTable() and GetQRgbFromPaletteIndex() from FractoriumEmberControllerBase and its derivations, unused.
 -Add FillSummary() to FractoriumEmberController. Call in Update(), UpdateXform() and other places where values are changed to force an update of the summary view.
 -Add export statements to FractoriumInfo.cpp.
 -Remove image parameter from SetPaletteTableItem(), it was a bad design.
 -InitToolbarUI() is now empty since toolbar initialization happens automatically. Leave as a placeholder.
 -Refactor code to get a palette color at a given index and convert it to a QColor to ColorIndexToQColor().
2015-07-15 20:27:32 -07:00
mfeemster
fb262c2469 --User changes
-Add motion support from Simon Detheridge at the ember level instead of just individual xforms:
  Add the ability to manipulate camera pitch, yaw and other goodies during flame rotation using a new element specified at the top-level of the flame.
  Create a new 'saw' motion function, so that these values can effectively be looped (e.g. yaw -1 to +1) over the course of a rotation.
  Add an offset to existing motion elements, to start them partway through their cycle. This would (for example) enable creating circular motion of xform affines, by combining two offset sine waves, one with an offset of 0.25 or 0.75.
  Fix loops in EmberGenome (they only had an on/off effect - this was broken in flame-genome as well) and make the loop count floating-point as well. For sequence animations, it's not necessary for clips to loop precisely if they're not designed specifically for the ES project.
  Similarly, there's no need for motion_frequency to be an integer value either so this was changed to allow motion that doesn't necessarily start or end at the loop boundary.
  I've attempted to keep each bit of functionality in its own commit.
  There's an argument as to whether to call the new flame motion elements <flame_motion/> (to differentiate programmatically) or just <motion/> (for consistency within the file) -- I opted for the former because it was easier to modify the xml parser that way.

--Code changes
 -Change FlameMotion.h to EmberMotion.h to keep the naming convention consistent.
 -Made elements of EmberMotion.m_MotionParams into their own type, MotionParam, which allows for CopyVec() to work.
 -Change m_FlameMotionElements to m_EmberMotionElements in Ember.
 -Use CopyVec() for EmberMotion instead of manual copy in copy constructors.
 -Add exports in Ember.cpp for EmberMotion.
 -Format eEmberMotionParam enum with one entry per line since it has many entries.
 -Use fabs() in XmlToEmber instead of glm::abs.
 -Minor formatting.
2015-07-06 21:36:46 -07:00
mfeemster
3a9ce0928f Merge branch 'motion-goodies' of https://github.com/gh2k/fractorium 2015-07-06 20:22:52 -07:00
mfeemster
0839d610c1 Merge branch 'master' of https://github.com/mfeemster/fractorium.git 2015-07-06 20:05:05 -07:00
mfeemster
570331adb5 --Bug fixes
-Allow for empty fields in template files.

--Code changes
 -When parsing, a boolean is not available to specify whether to use the default values if they are not present. This will be false for template files.
2015-07-06 20:04:38 -07:00
Simon Detheridge
3fa59be990 Add new 'motion_offset' parameter to motion elements 2015-07-06 16:29:03 +01:00
Simon Detheridge
efb39f8160 Make 'loops' param to EmberGenome work correcly, and convert to double 2015-07-06 16:15:58 +01:00
Simon Detheridge
f606986b7d Apply flame motion elements when generating flame sequence for animation 2015-07-06 16:15:58 +01:00
Simon Detheridge
679a8b4129 Serialise FlameMotion elements to/from XML 2015-07-06 16:15:54 +01:00