--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.
-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.
-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.
-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.
-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.
-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.
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.
Fixesgh2k/fractorium#1
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.
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?
-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.
-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().
-Add motion support from Simon Detheridge at the ember level instead of just individual xforms:
Add the ability to manipulate camera pitch, yaw and other goodies during flame rotation using a new element specified at the top-level of the flame.
Create a new 'saw' motion function, so that these values can effectively be looped (e.g. yaw -1 to +1) over the course of a rotation.
Add an offset to existing motion elements, to start them partway through their cycle. This would (for example) enable creating circular motion of xform affines, by combining two offset sine waves, one with an offset of 0.25 or 0.75.
Fix loops in EmberGenome (they only had an on/off effect - this was broken in flame-genome as well) and make the loop count floating-point as well. For sequence animations, it's not necessary for clips to loop precisely if they're not designed specifically for the ES project.
Similarly, there's no need for motion_frequency to be an integer value either so this was changed to allow motion that doesn't necessarily start or end at the loop boundary.
I've attempted to keep each bit of functionality in its own commit.
There's an argument as to whether to call the new flame motion elements <flame_motion/> (to differentiate programmatically) or just <motion/> (for consistency within the file) -- I opted for the former because it was easier to modify the xml parser that way.
--Code changes
-Change FlameMotion.h to EmberMotion.h to keep the naming convention consistent.
-Made elements of EmberMotion.m_MotionParams into their own type, MotionParam, which allows for CopyVec() to work.
-Change m_FlameMotionElements to m_EmberMotionElements in Ember.
-Use CopyVec() for EmberMotion instead of manual copy in copy constructors.
-Add exports in Ember.cpp for EmberMotion.
-Format eEmberMotionParam enum with one entry per line since it has many entries.
-Use fabs() in XmlToEmber instead of glm::abs.
-Minor formatting.
-Allow for empty fields in template files.
--Code changes
-When parsing, a boolean is not available to specify whether to use the default values if they are not present. This will be false for template files.
-Allow for continuous update during interactive rendering.
--Code changes
-Make some variation related functions const where appropriate.
-Use auto keyword more.
-Eliminate delay when switching between single and double precision.
--Code changes
-Variation tree and associated widgets no longer actually contain variation objects, only IDs.
-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.
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.
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.
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.
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.
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.
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.
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.
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.
Remove unnecessary resize() in Interpolate().
These are from Simon Detheridge's PR:
Set file name padding in EmberRender and
EmberAnimate based on the log10() of how many images are getting rendered, rather than hardcoding it to 5.
Use non-locale-imbued stream for writing filename in EmberAnimate.
Properly cast immediate float value used with pow() in density filter kernel.
Previously, 'os' had imbue(std::locale("")) called on it, which resulted in a localised stream that inserted commas into numbers.
This is inconvenient, as it inserts commas into the output filename for frame numbers of 1,000 or higher
Carry logic from this fix to writing Xform Xmls as well.
Motion was not supported on some Xform fields as it was originally copied from flam3. Allow it on all but xaos now.
Fix clamping range for m_ColorSpeed at the end of ApplyMotion() to match the values we accept elsewhere.
-If we change OpenCLWrapper to capture build log errors, we don't need to manually concat them in RendererCL because the overridden ErrorReport() function already concatenates the errors from both classes.
-Do not define T in OpenCL programs. We already have real_t to handle this.
-Do keep the casting to real_t. However this should not be necessary because there is a command line option to do this automatically which we already use: -cl-single-precision-constant. The only reason we do this is because the Apple OpenCL compiler does not follow the standard and obviously ignores this option. Absolutely awful.
-Fix a few improper casts in the CircleTrans1 and GlynnSim1 variations.
-Add an automated OpenCL program build tester to EmberTester, as well as a cast checker.
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.
This avoids 'ambiguous call' errors on mac.
It's probably not necessary to have changed every single instance, only the ones in functions with multiple signatures. However, it was easier and safer to do this automatically than manually.
-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.
The command is intended to write XML output to stdout for piping into an xml file, but adds diagnostic information and warnings to the output, generating invalid XML.
--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.
--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.
