mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-01-21 21:20:07 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
307 Commits 5 Branches 0 Tags 20 MiB
4cffd47f47
Commit Graph

197 Commits

Author SHA1 Message Date
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