70 Commits

Author	SHA1	Message	Date
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	51dbe8e59d	--Code changes ... -Migrate to bitbucket.	2016-05-30 14:51:54 -07:00
Matt Feemster	5b6c62b95d	Update Version History.txt	2016-05-06 17:25:57 -07:00
Gambhiro	288274a11c	xenial	2016-05-06 13:43:54 +01:00
mfeemster	42de2d107a	0.9.9.6 Beta Release	2016-05-05 17:46:27 -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	7e1d41dfc7	Merge branch 'master' of https://github.com/mfeemster/fractorium.git	2016-03-28 18:50:08 -07:00
mfeemster	e6882ee865	--User changes ... -Better handling of crossed min/max DE filter values on the GUI. -Changes to spatial and density filter values will no longer restart the entire render. -Support reading cam_zoom from xml as zoom since JWildfire uses cam_zoom. -Change drag n drop behavior: the default is now to append, hold Ctrl to overwrite. -Set max value of zoom to 25 because it will crash with values around 28 or 29 due to numeric overflow when scaling quality. -Update links in About Dialog. -Rename some controls in Options Dialog. -Move the color curves control to the Palette tab. --Bug fixes -Remove extra space in info tree text when dealing with a linked xform. -Update summary xform name field whenever xform name changes. -Get rid of selection border on summary tab xform tree cells. -Only add variations from Xml that have a non-zero weight. There seemed to be spurious flattens coming from Apo with a weight of 0. --Code changes -Gutters are now a fixed size of 8 * supersample. -Use stl data() member to get pointer to first element instead of &vec[0]. -Eliminate extra calls in renderer to ComputeBounds(), CreateSpatialFilter() and CreateTemporalFilter() to only be done at the start of a render. -Another attempt at vectorizing LogScaleDensityFilter(). Vectorizes, but not sure if it helps. -Some other loop optimizations in Renderer. -No longer check temporal samples in response to some control changes, they are always 1 in the interactive renderer.	2016-03-28 18:49:10 -07:00
Matt Feemster	2f0964dcda	Update BuildGuideMacOSX.md	2016-03-15 20:40:02 -07:00
Matt Feemster	cd5c5f2021	Update BuildGuideLinux.md	2016-03-15 20:39:49 -07:00
Matt Feemster	c2c293a373	Update BuildGuideQtCreator.md	2016-03-09 19:58:41 -08:00
Matt Feemster	f6831ea832	Update BuildGuideQtCreator.md	2016-03-09 19:58:00 -08:00
Matt Feemster	df9921a8fb	Update BuildGuideQtCreator.md	2016-03-09 19:55:24 -08:00
Gambhiro	0aa2accea3	deps	2016-03-07 15:34:47 +00:00
mfeemster	f4ea6c3959	0.9.9.5 Release	2016-03-04 19:20:30 -08:00
Matt Feemster	b6f3e94087	Update BuildGuideQtCreator.md	2016-03-03 20:36:38 -08:00
Matt Feemster	0795776a51	Update BuildGuideQtCreator.md	2016-03-03 20:24:45 -08:00
Matt Feemster	9cc0560545	Update BuildGuideQtCreator.md	2016-03-03 19:45:27 -08:00
Matt Feemster	0877625eb9	Update BuildGuideQtCreator.md	2016-03-03 19:43:31 -08:00
Matt Feemster	79390a6ecf	Update BuildGuideQtCreator.md	2016-03-03 19:32:30 -08:00
Matt Feemster	476869f80a	Update BuildGuideLinux.md	2016-03-03 19:14:42 -08:00
Matt Feemster	f19ac3ec2e	Update BuildGuideLinux.md	2016-03-03 19:09:56 -08:00
Matt Feemster	92baac41b3	Update BuildGuideQtCreator.md	2016-03-03 19:00:18 -08:00
Matt Feemster	db447d2075	Update BuildGuideQtCreator.md	2016-03-03 18:55:49 -08:00
Matt Feemster	7b491c2c24	Update BuildGuideLinux.md	2016-03-01 18:44:43 -08:00
Matt Feemster	f2accfed5c	Update BuildGuideQtCreator.md	2016-03-01 18:24:21 -08:00
Matt Feemster	a75bf9a857	Update BuildGuideQtCreator.md	2016-03-01 18:10:37 -08:00
Matt Feemster	d64b7023e9	Update BuildGuideQtCreator.md	2016-03-01 18:00:02 -08:00
Matt Feemster	2d19b8a948	Update BuildGuideQtCreator.md	2016-03-01 17:58:34 -08:00
Matt Feemster	4cffd47f47	Update BuildGuideQtCreator.md	2016-03-01 17:47:59 -08:00
mfeemster	c282ee4c2c	0.9.9.4 Release	2016-02-21 18:53:36 -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	e184557aed	note to select Qt 5	2016-01-24 15:30:16 +00:00
Gambhiro	e735191cb8	move icon	2016-01-20 20:54:56 +00:00
Gambhiro	581b0d975c	readme upd	2016-01-20 18:48:21 +00:00
Gambhiro	c853f478aa	icon and launcher	2016-01-20 15:53:31 +00:00
mfeemster	79a2a28694	--0.9.9.3 Release	2016-01-17 16:10:06 -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
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	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	66aa8fa6a1	successful Mac build on OSX 10.10	2015-12-09 16:14:44 +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	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	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	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