Commit Graph

333 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
770ff4622c --User changes
-Allow for continuous update during interactive rendering.

--Code changes
 -Make some variation related functions const where appropriate.
 -Use auto keyword more.
2015-06-28 17:48:26 -07:00
mfeemster
e8af1050b3 --User changes
-Eliminate delay when switching between single and double precision.

--Code changes
 -Variation tree and associated widgets no longer actually contain variation objects, only IDs.
2015-06-28 14:04:30 -07:00
mfeemster
3cd970a347 --User changes
Add linked xform support, with new button and icon on the xforms tab.
2015-06-24 20:49:09 -07:00
mfeemster
d80343a28b --User changes
-Better default/min/max sizes for docks/tabs.
 -Add a reset workspace menu item.

--Bug fixes
 -Order of affine scale up/down buttons was reversed from what's intuitive.
 -Projection was not properly being set when animating flames with 3D parameters.
2015-06-20 11:35:08 -07:00
mfeemster
5f3e70c6a8 --User changes
Allow for detaching of top level tabs in the dock widget so workspaces can be customized.
 Save workspace between runs.
 Only correct variation names/params during parsing when the source of the Xml file is not from Ember/Fractorium.
2015-06-17 20:05:53 -07:00
mfeemster
5bd593b42f --User changes
Allow for setting rendering thread priorities from the command line and final render dialog. Currently only implemented on Windows.
 Show estimated time left on the final render dialog.
 Sort palette list by name, instead of by index in the palette file.
 Sorting can be flipped by clicking the column headers of the palette table.

--Code changes
 Remove unnecessary connect() statement in Variations tab.
2015-05-30 22:14:34 -07:00
mfeemster
c97946c660 --Code changes
Add DoubleSpinBoxTableItemDelegate.h to Fractorium.pro to get it building on Linux.
2015-05-29 21:57:09 -07:00
mfeemster
83ad93aadf --User changes
More efficient table on the Xaos tab when using xaos on a flame with a large number of xforms.

--Code changes
Use QTableView instead of QTableWidget for the xaos table.
Add custom DoubleSpinBoxTableItemDelegate for this.
Make row and column toggling functions work for QTableView and QTableWidget.
Remove some dead code from Fractorium.h/cpp
Miscellaneous hacks to keep it building on Linux.
2015-05-29 21:08:44 -07:00
mfeemster
cb54605878 --User changes
Implement copying and pasting xforms between flames.

--Code changes
 Make palette filename be a shared_ptr<string> to avoid duplication.
 Ensure random seeds in RendererCL have no duplicates and are not zero.
2015-05-19 19:31:33 -07:00
mfeemster
3c51e58379 --User changes
Add the ability to click the right mouse button and drag to adjust values in spinners.
 Filling the palette controls will now also select the proper palette filename (if not empty) in the combo box.
 Allow for toggling row and column of affine tables.

--Bug fixes
 Fix tab tool tips again.
 Fix palette list switching.

--Code changes
 Palettes now keep the filename they originated from as a member.
 Refactor table row and column cell toggling into their own functions.
 Do not force random select on palette combo index change.
2015-05-15 18:52:31 -07:00
mfeemster
2561708ae0 oops 2015-05-15 18:45:57 -07:00
mfeemster
e005b4c20e --User changes
Add the ability to set the current xform by pressing F1 - F32.
 Add the ability to toggle an entire row or column of xaos values.

--Bug fixes
 Prevent xform index flickering whenever changing the number of xforms.

--Code changes
 Remove ForEach() wrappers and replace with range based for loops with auto.
 Replace every regular for loop with a range based one where applicable. Note this doesn't work everywhere.
 Make event filter application wide.
 Add parameter to FillXforms() to specify the index to select, default 0.
 Rename some scroll areas and layouts to names that make sense, rather than their designer defaults.
2015-05-03 17:13:14 -07:00
mfeemster
be8e9a5e02 --User changes
Add the ability to apply operations to a selection of xforms, rather than just the current one.
 Update tool tips accordingly.

--Bug fixes
 Fix NAN in equalized weight calculation when all weights are set to 0.

--Code changes
 Clean up strange nested usage of Update([&]()) calls when changing xform color index via either the spinner or scroll bar. Made no sense.
 Make ISAAC RandBit() use RandByte() to be slightly more efficient.
 Put FillXforms() in the controller where it belongs, rather than the main window class.
 Add UpdateXform() function to the controller to handle applying operations to multiple xforms.
 Remove the word "Current" out of most xform related functions because they now operate on whatever is selected.
 Properly use Update() for various xform operations whereas before it was manually calling UpdateRender().
 Also properly use Update() in places where it was erroneously using UpdateXform() for things that did not involve xforms.
 Block signals in FillXaosTable().
 Add new file named FractoriumXformsSelect.cpp to handle new xform selection code.
2015-04-26 22:11:56 -07:00
mfeemster
e8bbfdd2d4 Rename FractoriumXformsXaos.cpp to FractoriumXaos.cpp to reflect that it's no longer a per-xform part of the UI. 2015-04-08 18:30:07 -07:00
mfeemster
053a9fcf95 Allow for multiple palette files rather than hard coding to flam3-palettes.xml.
Make xaos display a matrix rather than a single column. This will be moved out into its own tab since it's no longer xform dependent, but that will be in a future commit.

Remove xaos from/to button since it's no longer applicable.

Add test function to Isaac to return just one random byte. Might be used in the future.
2015-04-08 18:23:29 -07:00
mfeemster
ee0f437d50 Merge branch 'retina-glwidget' of https://github.com/gh2k/fractorium 2015-03-21 16:23:29 -07:00
mfeemster
d69c83d5b0 Merge branch 'options-device-selection' of https://github.com/gh2k/fractorium 2015-03-21 16:14:37 -07:00
mfeemster
07592c9d78 Remove ReadMe.txt from all project files.
Add Curves.h, and CurvesGraphicsView.h/cpp to support bezier color curves.
Add Curves member to Ember.
Add curves capability to EmberCL.
Remove some unused variables in the kernel created in RendererCL::CreateFinalAccumKernelString().
Use glm namespace for vec classes if GLM_VERSION >= 96, else use glm::detail.
As a result of using glm namespace, all instances of min and max had to be qualified with std::
Split ComputeCamera into that and ComputeQuality().
Reduce the amount of ComputeCamera() and MakeDmap() calls on each incremental iter that doesn't use temporal samples.
Fix clamping bug with DE filter widths.
Provide functions to return the kernels from RendererCL to assist with diagnostics and debugging.
Prevent extra newline in EmberRender when only rendering a single image.
Add the ability to delete an ember at a given index in EmberFile.
Allow deleting/focusing ember in library tab with delete and enter keys.
Reorder some code in Fractorium.h to match the tabs order.
Add and call ClearFinalImages() to clear buffers in controller to fix bug where previous CPU render would be shown for a split second when switching from OpenCL back to CPU.
Refactor ember library pointer syncing to a function SyncPointers().
Add the ability to save ember Xmls to an unique automatically generated name after the first time the user has specified a name.
2015-03-21 15:27:37 -07:00
Simon Detheridge
eef9a30cad Ensure correct opencl device is populated when platform setting is changed
This fixes an issue where the options dialog displays the incorrect device when it is first opened, when using a device other than 0
2015-03-01 15:53:25 +00:00
Simon Detheridge
33b59b2f72 Fix status bar height on retina displays 2015-03-01 12:28:14 +00:00
Simon Detheridge
1762d8251f Multiply x and y mouse event coords by device pixel ratio
This fixes issues with retina displays, where there are more opengl pixels than logical device pixels
2015-02-28 22:18:07 +00:00
mfeemster
c01f444d52 Add option to display affines in polar coords. 2015-02-03 17:11:16 -08:00
mfeemster
b1d5db261b Additional changes to work with Simon's pull request.
-Remove unneeded glFinish() call in GLWidget.
-Remove unneeded AMD_OS_WIN preprocessor in several projects.
-Define NVIDIA in all projects that use the NvidiaRelease build and depend on OpenCL.
2015-01-29 18:22:15 -08:00
mfeemster
4059767dc4 0.4.1.8 Beta - Date pending testing.
--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 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
 Minor changes to enable a Mac build.
 Double the memory required for the final output buffer in RendererBase::MemoryRequired() when threading image writing.
 Reuse same buffer for RgbaToRgb() in EmberRender and EmberAnimate.
 Only resize in RgbaToRgb() if the two vectors are not the same.
 Add a final output buffer ping-ponging mechanism to facilitate threaded writes in controllers.
2015-01-19 08:39:50 -08:00
Simon Detheridge
2999cd159f Work around segfault in LLVM on osx by removing lambda default parameters
It's an ugly hack, but it's the only workaround I could find.
2015-01-14 13:15:23 +00:00
mfeemster
5354e96fe2 0.4.1.7 Beta 01/02/2015
--User changes
 Use actual strips count when computing memory requirements in the final render dialog.
 Output CL_DEVICE_ADDRESS_BITS when passing --openclinfo to command line programs.
 Warn if single/total allocations are greater than the max allowed for OpenCL in the final render dialog.
 Make about box properly sized for different fonts.
 Dock widget is slightly resizable now.
 Center scroll area when loading a new ember.

--Bug Fixes
 Fix bad values left in an ember when a render with strips > 1 fails in the final render dialog.
 Fix incorrect calculation in dc_cube variation when using OpenCL.

--Code Changes
 Major work to get it running on Linux.
 Migrate from QGLWidget to QOpenGLWidget.
 Delayed init due to QOpenGLWidget.
 Break RendererBase::MemoryRequired() into two functions, it and HistMemRequired() and return a tuple.
 Add GlobalMemSize() and MaxAllocSize() functions in OpenCLWrapper.
 Change CHOOSE_XFORM_GRAIN to be 16384, so we can & with 16383 instead of using modulo when selecting an xform. This results in a 9% speed increase on the CPU.
 Save each newly loaded ember in a file called "last.flame" in the executable folder. This will help diagnose crashes that occur when switching embers.
 Use nullptr instead of NULL in the Fractorium project. It had previously been done in all other places.
2015-01-02 15:11:36 -08:00
mfeemster
3cf6141e27 Derive from QOpenGLWidget instead of QGLWidget.
Derive from QOpenGLWidget instead of QGLWidget.
More commits to follow.
2015-01-01 07:17:05 -08:00
mfeemster
9502ae57ab Linux. 2014-12-14 20:25:46 -08:00
mfeemster
a004f71888 Windows. 2014-12-14 17:12:01 -08:00
mfeemster
c0f98bf632 Linux. 2014-12-12 02:37:29 -08:00
mfeemster
713007dadd Windows. 2014-12-12 00:54:03 -08:00
mfeemster
2531b1215e linux 2014-12-11 18:57:49 -08:00
mfeemster
f32eaadd3d Linux/Windows sync. 2014-12-11 15:13:26 -08:00
mfeemster
6abd04058a Windows/Linux sync. 2014-12-11 09:02:42 -08:00
mfeemster
a9ecb6a78e More linux work. 2014-12-10 21:50:15 -08:00
mfeemster
3e70b8eec6 Report memory required in final render dialog.
Fix broken state of ember during failed render with strips.
2014-12-09 00:24:28 -08:00
mfeemster
47dd9fe35c Replace unsigned int, and char with uint and uchar. 2014-12-05 21:05:09 -08:00
mfeemster
8a3521206b Add "ISO-8859-1" as the encoding type when reading Xml files.
Fix small bug when setting the current ember in the final render dialog when showing it.

Have Wix installer point to proper location for installed vcredist DLLs.

Remove VS2010 builds dir.
2014-12-05 20:04:41 -08:00
mfeemster
4777ab52bc 0.4.1.6 Beta 11/29/2014
--User Changes
 None.

--Bug Fixes
 Fix broken continuity of randomness in OpenCL when using strips, broken in last build.
 Fix broken density filtering dimensions in OpenCL which left black lines, broken in last build.
 Fix broken preview update on when the only change is scale.
 Update density filtering progress bar to 100% in final render dialog when DE radius is 0 (disabled).

--Code Changes
 Make RendererBase::RandVec() virtual.
2014-11-29 09:44:23 -08:00
mfeemster
b29bedec38 0.4.1.5 Beta 11/28/2014
--User Changes
 Remove limit on the number of xforms allowable on the GPU. This was previously 21.
 Show actual strips count to be used in parens outside of user specified strips count on final render dialog.
 Allow for adjustment of iteration depth and fuse count per ember and save/read these values with the xml.
 Iteration optimizations on both CPU and GPU.
 Automatically adjust default quality spinner value when using CPU/GPU to 10/30, respectively.

--Bug Fixes
 Fix severe randomization bug with OpenCL.
 Fix undo list off by one error when doing a new edit anywhere but the end of the undo list.
 Make integer variation parameters use 4 decimal places in the variations list like all the others.
 New build of the latest Qt to fix scroll bar drawing bug.
 Prevent grid from showing as much when pressing control to increase a spinner's increment speed. Still shows sometimes, but better than before.

--Code Changes
 Pass count and fuse to iterator as a structure now to allow for passing more params in the future.
 Slightly different grid/block logic when running DE filtering on the GPU.
 Attempt a different way of doing DE, but #define out because it ended up not being faster.
 Restructure some things to allow for a variable length xforms buffer to be passed to the GPU.
 Add sub batch size and fuse count as ember members, and remove them from the renderer classes.
 Remove m_LastPass from Renderer. It should have been removed with passes.
 Pass seeds as a buffer to the OpenCL iteration kernel, rather than a single seed that gets modified.
 Slight optimization on CPU accum.
 Use case statement instead of if/else for xform chosing in OpenCL for a 2% speedup on params with large numbers of xforms.
 Add SizeOf() wrapper around sizeof(vec[0]) * vec.size().
 Remove LogScaleSum() functions from the CPU and GPU because they're no longer used since passes were removed.
 Make some OpenCLWrapper getters const.
 Better ogranize RendererCL methods that return grid dimensions.
2014-11-28 01:37:51 -08:00
mfeemster
3f29025f99 Fix accidental disabling of post affine group box. The designer was clobbering it. 2014-11-04 17:38:20 -08:00
mfeemster
b2600f0fff Remove passes.
Fix some table dimensions.
Proper locale for normalized weight.
2014-11-02 23:16:34 -08:00
mfeemster
6b2b6ede7f Fix bug when using rotation with strips by adding a new member to Ember named m_RotCenterY which is a copy of the original center value since the center value gets changed when using strips.
Change PaletteList Count() member to Size() to be consistent with other code.

Remove PaletteImage option, it's unused. Improve documentation for some other options.

Make ComposePath() always return a unique string.

Add Random Palette and Random Adjustment buttons.

Another attempt at solving the locale bug with the affine adjustment combo boxes.
2014-10-27 14:21:06 -07:00
mfeemster
2a98e8c05b FinalRenderEmberController: Fix unique names and estimated iter count with strips. 2014-10-19 12:29:12 -07:00
mfeemster
69b8aaea5b Replace all instances of auto_ptr with unique_ptr.
Make EmberRender and EmberAnimate place their output renders in the same folder of the input parameter file. Previously it was just placing them in the same folder as the executable, which is wrong.
2014-10-18 14:07:07 -07:00
mfeemster
2df1f7a52b Affine2D: Remove * operator, it's unused.
RendererBase: Add ComputeCamera() as a virtual function. Add strips parameter to TotalIterCount().

Renderer: Implement ComputeCamera() as an override.

SpatialFilter: Ensure filters that are too small are made large enough to create.

FinalRenderDialog: Add estimated iters table row and populate on all UI updates.

FractoriumParams: Zoom was not being saved, loaded. Fixed.

GLWidget: Prevent mouse wheel event from being passed to the scroll bars. It should only affect the scale.
2014-10-18 12:56:37 -07:00
mfeemster
f5a707ea63 Remove focus handling code from spin boxes. It was originally done to compensate for a bug in Qt, but required the user to make very precise mouse movements. This is no longer needed since the bug has been fixed.
Prevent spatial and density filters from returning empty filters.

Another attempt at properly setting the locale for the affine rotate/move/scale combo boxes.
2014-10-16 23:05:08 -07:00
mfeemster
f51f210d15 Add random Xaos button. 2014-10-15 20:09:44 -07:00
mfeemster
9e94170a70 0.4.1.3 Beta 10/14/2014
--User Changes
 Size is no longer fixed to the window size.
 Size scaling is done differently in the final render dialog. This fixes several bugs.
 Remove Xml saving size from settings and options dialog, it no longer applies.
 Final render can be broken into strips.
 Set default save path to the desktop if none is found in the settings file.
 Set default output size to 1920x1080 if none is found in the settings file.

--Bug Fixes
 Better memory size reporting in final render dialog.

--Code Changes
 Migrate to C++11, Qt 5.3.1, and Visual Studio 2013.
 Change most instances of unsigned int to size_t, and int to intmax_t.
 Add m_OrigPixPerUnit and m_ScaleType to Ember for scaling purposes.
 Replace some sprintf_s() calls in XmlToEmber with ostringstream.
 Move more non-templated members into RendererBase.
 Add CopyVec() overload that takes a per element function pointer.
 Add vector Memset().
 Replace '&' with '+' instead of "&amp;" in XmlToEmber for much faster parsing.
 Break strips rendering out into EmberCommon and call from EmberRender and Fractorium.
 Make AddAndWriteBuffer() just call WriteBuffer().
 Make AddAndWriteImage() delete the existing image first before replacing it.
 Add SetOutputTexture() to RendererCL to support making new textures in response to resize events.
 Remove multiple return statements in RendererCL, and replace with a bool that tracks results.
 Add ToDouble(), MakeEnd(), ToString() and Exists() wrappers in Fractorium.
 Add Size() wrapper in EmberFile.
 Make QString function arguments const QString&, and string with const string&.
 Make ShowCritical() wrapper for invoking a message box from another thread.
 Add combo box to TwoButtonWidget and rename.
2014-10-14 08:53:15 -07:00
mfeemster
44c90abb32 More C++11 2014-09-09 22:41:26 -07:00
mfeemster
e4a47d0d16 -tan(float) was crashing under VS2013 with large numbers so replace with SafeTan<T>().
-Put about dialog in the center of the screen. A Qt upgrade somehow moved it to the side.
2014-09-07 21:05:27 -07:00
mfeemster
79d611dd20 Initial VS2013, C++11 and linux commit. This most likely won't build and suffers from some compiler issues. More commits to follow. 2014-08-31 21:25:15 -07:00
mfeemster
d1196f4205 0.4.1.2 Beta 08/05/2014
--User Changes
Add --yaxisup and --supersample options for command line programs.

--Bug Fixes
Make certain options available only to the command line programs in
which they make sense. Most were good, some were misplaced.

--Code Changes
Include pure render time as part of stats.
Output iters/sec measurement in EmberRender and EmberAnimate.
2014-08-05 21:50:52 -07:00
mfeemster
570d3bcf1d 0.4.1.1 Beta 08/03/2014
--Bug Fixes
Spatial filter would not be correctly recreated on subsequent runs of
differing supersample values during final render.
Fix DCBubble, Funnel, SphericalN,
Wrong logic with some usage of DO_DOUBLE. Only relevant for testing.
Use uint64 for iters/sec calculation on final render dialog. int was
overflowing on extremely fast GPU renders.

--Code Changes
Make density, spatial and temporal filters preserve the values they were
created with. This helps in determining when a new instance is needed.
Better NULL checks when copying embers and xforms.
Rename members in FractoriumEmberControllerBase.h to omit duplicating
the members declared in the base.
2014-08-03 16:16:10 -07:00
mfeemster
b3c313b5c5 0.4.0.9 Beta 07/29/2014
0.4.0.9 Beta 07/29/2014
--Bug Fixes
Final render dialog didn't create the renderer properly on first run
when more than one platform was present.
2014-07-29 08:06:09 -07:00
mfeemster
88a325a5cd 0.4.0.9 Beta 07/27/2014
0.4.0.9 Beta 07/27/2014
--User Changes
Properly set tab order on all controls.
Calculate and report iters/second in the final render dialog.
Immediately draw yellow dot on xform mouse down on previously unselected
xform.

--Bug Fixes
Fix GlynnSim1, GlynnSim2, GlynnSim3 and juliaNab by ensuring the first
argument to pow() is >= 0.
Ensure OpenCL platform and device combo boxes in the final render dialog
expand as needed.

--Code Changes
Make VariationTreeSpinbox take its parent VariationTreeWidgetItem as a
constructor argument. This makes SetupVariationTree() and
VariationSpinBoxValueChanged() more efficient.
Make Interference2 and ho use fabs().
2014-07-27 22:25:38 -07:00
mfeemster
a5d69c75a2 0.4.0.8 Beta 07/26/2014
0.4.0.8 Beta 07/26/2014
--Bug Fixes
Fix falloff, falloff2, falloff3.
2014-07-26 17:26:15 -07:00
mfeemster
d9d676393c 0.4.0.7 Beta 07/26/2014
0.4.0.7 Beta 07/26/2014
--User Changes
Color code xforms like Apo does.
Change other aspects of xform color drawing.
Add option to invert the Y axis to both the options final render
dialogs.
Coordinate Y axis setting with preview renders.
Add option to show all xforms when dragging. Previously, only the
current one was shown.
Make final render dialog appear in the middle of the screen.
Immediately draw yellow selection dot on mouse down.

--Bug Fixes
Resize final render dialog vertically if it's taller than the 90% of the
desktop area.
2014-07-26 12:03:51 -07:00
mfeemster
ed8850e3db Scroll panels for certain areas of the UI
0.4.0.6 Beta 07/22/2014
--User Changes
Place certain areas of the UI on scroll panels so they are not obscured
on low resolution monitors.
2014-07-22 07:53:36 -07:00
mfeemster
280473c8a0 Add scrollbars
Add scrollbars to various UI areas to be more friendly to low resolution
monitors. This works well down to vertical resolutions of 960. Below
that, things will get scrunched.
2014-07-20 17:16:23 -07:00
mfeemster
e3b207c562 Numerous fixes
0.4.0.5 Beta 07/18/2014
--User Changes
Allow for vibrancy values > 1.
Add flatten and unflatten menu items.
Automatically flatten like Apophysis does.
Add plugin and new_linear tags to Xml to be compatible with Apophysis.

--Bug Fixes
Fix blur, blur3d, bubble, cropn, cross, curl, curl3d, epispiral, ho,
julia3d, julia3dz, loonie, mirror_x, mirror_y, mirror_z, rotate_x,
sinusoidal, spherical, spherical3d, stripes.
Unique filename on final render was completely broken.
Two severe OpenCL bugs. Random seeds were biased and fusing was being
reset too often leading to results that differ from the CPU.
Subtle, but sometimes severe bug in the setup of the xaos weights.
Use properly defined epsilon by getting the value from
std::numeric_limits, rather than hard coding 1e-6 or 1e-10.
Omit incorrect usage of epsilon everywhere. It should not be
automatically added to denominators. Rather, it should only be used if
the denominator is zero.
Force final render progress bars to 100 on completion. Sometimes they
didn't seem to make it there.
Make variation name and params comparisons be case insensitive.

--Code Changes
Make ForEach and FindIf wrappers around std::for_each and std::find_if.
2014-07-18 23:33:18 -07:00
mfeemster
1884934b9d Final migration commit
Update versions to match the last commit on Google code. All subsequent
commits will be on GH.
2014-07-09 21:07:22 -07:00
mfeemster
c0f2d61b0b falloff2 followup
falloff2 followup
2014-07-08 19:35:35 -07:00
mfeemster
ef56c16b2b Initial source commit
Initial source commit
2014-07-08 00:11:14 -07:00