Commit Graph

128 Commits

Author SHA1 Message Date
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
d2593bb50d --Bug fixes
-Remove strange characters from two gradient files.
 -Copy new gradients to output on post build.
2017-03-11 09:38:59 -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
29c084a058 --Bug fixes
-Add missing Mac build files.
 -Convert PaletteList into a Singleton<T>.
2017-02-26 09:34:43 -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
42de2d107a 0.9.9.6 Beta Release 2016-05-05 17:46:27 -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
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
fb509f95bd --Bug fixes
-Add Qt DLLs to Visual Studio and Qt Creator post build steps just to be safe and to make it easier to copy out.
2016-03-03 20:32:15 -08:00
mfeemster
3533ea2002 --Bug fixes
-Take specific paths out of pri file.
2016-03-02 19:17:37 -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
c282ee4c2c 0.9.9.4 Release 2016-02-21 18:53:36 -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
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
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
b1dbed83b2 test for different CL and GL paths 2016-01-24 13:48:43 +00:00
Gambhiro
149a90bea8 use PRJ_DIR 2016-01-20 20:56:00 +00:00
Gambhiro
e735191cb8 move icon 2016-01-20 20:54:56 +00:00
Gambhiro
629e7c1c79 fix missing icon and launcher 2016-01-20 17:07:19 +00:00
Gambhiro
c853f478aa icon and launcher 2016-01-20 15:53:31 +00:00
Gambhiro
3674a01393 fix PWD 2016-01-19 11:53:39 +00:00
mfeemster
79a2a28694 --0.9.9.3 Release 2016-01-17 16:10:06 -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
a8688e87b5 Merge branch 'master' of https://github.com/mfeemster/fractorium.git 2016-01-04 16:51:23 -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
Gambhiro
12a9e1fb18 conditional relative paths 2016-01-02 14:46:34 +00:00
mfeemster
1dc363d190 Manual merge for default.pri 2015-12-31 13:55:24 -08:00
mfeemster
c43e3708b6 Merge 2015-12-31 13:51:55 -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
2975069a91 helper script for symlinks 2015-12-18 15:14:21 +00:00
Gambhiro
eaf802c562 opengl-headers 1.2 in vendor folder 2015-12-16 14:54:22 +00:00
Gambhiro
ea261c4c5e lib symlink fix 2015-12-16 04:28:25 +00:00
Gambhiro
f9923a673c local symlinks 2015-12-15 18:24:46 +00:00
Gambhiro
7318bff32c OpenCL 1.2 is supported in the Linux Nvidia drivers now 2015-12-15 16:26:22 +00:00
Gambhiro
994c05ba68 include paths 2015-12-15 16:22:51 +00:00
Gambhiro
c11b2b4fc2 palette and theme install 2015-12-10 18:05:51 +00:00
Gambhiro
08428d155c unix and macx scoping 2015-12-10 18:03:08 +00:00
Gambhiro
66aa8fa6a1 successful Mac build on OSX 10.10 2015-12-09 16:14:44 +00:00
Gambhiro
fa5e6188ee squashed linux packaging commits
Squashed commit of the following:

commit e7261977580bfd08d08717c27732eb0b0f534bb2
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Tue Dec 8 11:25:00 2015 +0000

    build signed source package

commit e652848b5e2d5dadfe1143282af204c13f8db418
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Sun Dec 6 12:51:42 2015 +0000

    linux packaging helper script

commit 0c8bf8fcea9d62692c3e973a277c9014b9ef636b
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Sat Dec 5 21:38:37 2015 +0000

    changelog

commit d6c6815d3a59779e03119c0546f01c778188c918
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Sat Dec 5 21:37:32 2015 +0000

    now it's all qmake

commit c37673a0d747134766bf9a1c3a898bbb9e416ed6
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Sat Dec 5 08:46:27 2015 +0000

    don't symlink in manual makefile

commit 2593da2401cbb5b83ea8ec188a3450f52595186e
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Thu Dec 3 16:53:31 2015 +0000

    postfix the version with an 'a'

commit 03d4bdde55d428354d8a8ebe4827ff191162bcb1
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Thu Dec 3 14:55:33 2015 +0000

    use MAKE_OPTS env if set

commit 6f7847c7c0e3eb32ec14e60736a4e2a7b5175a7c
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Thu Dec 3 14:36:21 2015 +0000

    also install dark theme, build only amd64 for now

commit e36d863b3101d4440816e08b9af704e89316d2e9
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Wed Dec 2 18:01:42 2015 +0000

    rules.dh7

commit 0e35f2ddf3b70eaf0040fcac6453d79c1a9571c8
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Wed Dec 2 17:57:57 2015 +0000

    deps

commit 492b4ae7aa41374bf89cd8accf82d5ab0283a5f9
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Wed Dec 2 10:40:04 2015 +0000

    typo

commit 6f0ed09a37849323f220d9aa50ac7c6bd3d411cb
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Wed Dec 2 10:37:55 2015 +0000

    deps and version

commit 82f2fd07b6703d5699926c297dee25a59111acb9
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Wed Dec 2 09:50:00 2015 +0000

    rev logic

commit e5d33b62236e0b33653fa79d82274e157cb26bc2
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Wed Dec 2 09:17:50 2015 +0000

    create bin and libdir

commit 84153860e6861a43ffc0f1073d462f2452f7e7c4
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Wed Dec 2 08:48:23 2015 +0000

    support prefix

commit a5da29a15a15fc130ef1147ed495d86238e7a2f3
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Wed Dec 2 08:45:52 2015 +0000

    support DESTDIR

commit da1be8b940fb3e51632ed4a35b6afe7defe17848
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Tue Dec 1 21:06:01 2015 +0000

    rev clean logic

commit 738c78a93b159d27fc5c00361bb621cd864ac224
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Tue Dec 1 20:59:34 2015 +0000

    better make clean

commit 2bf382412e573cd93c8a744b374196d5ea59c218
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Tue Dec 1 20:44:48 2015 +0000

    debian folder

commit af420ef5d98744315fa526f0d072197b00b1af28
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Tue Dec 1 18:18:51 2015 +0000

    make clean ./Bin too

commit 6d0243a10dac725251ea566ad717ff9b4fd0eea2
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Tue Dec 1 17:56:31 2015 +0000

    lowercase

commit 41b4eaef6d9adbbb8ec00a9a15c20498f300924e
Author: Gambhiro <gambhiro.bhikkhu.85@gmail.com>
Date:   Tue Dec 1 17:34:21 2015 +0000

    configure and Makefile
2015-12-08 11:49:19 +00: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