2014-07-08 03:11:14 -04:00
# pragma once
# include "Utils.h"
# include "PaletteList.h"
# include "VariationList.h"
# include "Ember.h"
/// <summary>
/// EmberToXml class.
/// </summary>
namespace EmberNs
{
/// <summary>
/// Class for converting ember objects to Xml documents.
/// Support for saving one or more to a single file.
/// Template argument expected to be float or double.
/// </summary>
template < typename T >
class EMBER_API EmberToXml : public EmberReport
{
public :
/// <summary>
/// Empty constructor.
/// </summary>
EmberToXml ( )
{
}
/// <summary>
/// Save the ember to the specified file.
/// </summary>
/// <param name="filename">Full path and filename</param>
/// <param name="ember">The ember to save</param>
/// <param name="printEditDepth">How deep the edit depth goes</param>
/// <param name="doEdits">If true included edit tags, else don't.</param>
/// <param name="intPalette">If true use integers instead of floating point numbers when embedding a non-hex formatted palette, else use floating point numbers.</param>
/// <param name="hexPalette">If true, embed a hexadecimal palette instead of Xml Color tags, else use Xml color tags.</param>
/// <param name="append">If true, append to the file if it already exists, else create a new file.</param>
/// <param name="start">Whether a new file is to be started</param>
/// <param name="finish">Whether an existing file is to be ended</param>
/// <returns>True if successful, else false</returns>
2014-10-14 11:53:15 -04:00
bool Save ( const string & filename , Ember < T > & ember , size_t printEditDepth , bool doEdits , bool intPalette , bool hexPalette , bool append = false , bool start = false , bool finish = false )
2014-07-08 03:11:14 -04:00
{
vector < Ember < T > > vec ;
vec . push_back ( ember ) ;
return Save ( filename , vec , printEditDepth , doEdits , intPalette , hexPalette , append , start , finish ) ;
}
/// <summary>
/// Save a vector of embers to the specified file.
/// </summary>
/// <param name="filename">Full path and filename</param>
/// <param name="embers">The vector of embers to save</param>
/// <param name="printEditDepth">How deep the edit depth goes</param>
/// <param name="doEdits">If true included edit tags, else don't.</param>
/// <param name="intPalette">If true use integers instead of floating point numbers when embedding a non-hex formatted palette, else use floating point numbers.</param>
/// <param name="hexPalette">If true, embed a hexadecimal palette instead of Xml Color tags, else use Xml color tags.</param>
/// <param name="append">If true, append to the file if it already exists, else create a new file.</param>
/// <param name="start">Whether a new file is to be started</param>
/// <param name="finish">Whether an existing file is to be ended</param>
/// <returns>True if successful, else false</returns>
2014-10-14 11:53:15 -04:00
bool Save ( const string & filename , vector < Ember < T > > & embers , size_t printEditDepth , bool doEdits , bool intPalette , bool hexPalette , bool append = false , bool start = false , bool finish = false )
2014-07-08 03:11:14 -04:00
{
bool b = false ;
--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 17:15:07 -05:00
bool hasTimes = false ;
T t = 0 ;
2014-07-08 03:11:14 -04:00
string temp ;
ofstream f ;
try
{
if ( append )
f . open ( filename , std : : ofstream : : out | std : : ofstream : : app ) ; //Appending allows us to write multiple embers to a single file.
else
f . open ( filename ) ;
if ( f . is_open ( ) )
{
--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 17:15:07 -05:00
//Check to see if there are valid times by checking if any differed.
//If so, assume they were intentionally entered times.
for ( size_t i = 1 ; i < embers . size ( ) ; i + + )
{
if ( embers [ i ] . m_Time ! = embers [ i - 1 ] . m_Time )
{
hasTimes = true ;
break ;
}
}
if ( ! hasTimes )
for ( auto & ember : embers )
ember . m_Time = t + + ;
2014-07-08 03:11:14 -04:00
if ( ( append & & start ) | | ! append )
{
temp = " <flames> \n " ;
2014-12-05 23:04:41 -05:00
//temp = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<flames>\n";
2014-07-08 03:11:14 -04:00
f . write ( temp . c_str ( ) , temp . size ( ) ) ;
}
2015-05-03 20:13:14 -04:00
for ( auto & ember : embers )
2014-07-08 03:11:14 -04:00
{
2015-05-03 20:13:14 -04:00
string s = ToString ( ember , " " , printEditDepth , doEdits , intPalette , hexPalette ) ;
2014-07-08 03:11:14 -04:00
f . write ( s . c_str ( ) , s . size ( ) ) ;
}
if ( ( append & & finish ) | | ! append )
{
temp = " </flames> \n " ;
f . write ( temp . c_str ( ) , temp . size ( ) ) ;
}
f . close ( ) ;
b = true ;
}
else
{
2016-02-12 00:38:21 -05:00
cout < < " Error: Writing flame " < < filename < < " failed. \n " ;
2014-07-08 03:11:14 -04:00
b = false ;
}
}
--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 21:33:45 -04:00
catch ( const std : : exception & e )
{
2016-02-12 00:38:21 -05:00
cout < < " Error: Writing flame " < < filename < < " failed: " < < e . what ( ) < < " \n " ;
--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 21:33:45 -04:00
b = false ;
}
2014-07-08 03:11:14 -04:00
catch ( . . . )
{
2016-02-12 00:38:21 -05:00
cout < < " Error: Writing flame " < < filename < < " failed. \n " ;
2014-07-08 03:11:14 -04:00
b = false ;
}
--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 21:33:45 -04:00
if ( f . is_open ( ) )
f . close ( ) ;
2014-07-08 03:11:14 -04:00
return b ;
}
/// <summary>
/// Return the Xml string representation of an ember.
/// </summary>
/// <param name="ember">The ember to create the Xml with</param>
/// <param name="extraAttributes">If true, add extra attributes, else don't</param>
/// <param name="printEditDepth">How deep the edit depth goes</param>
/// <param name="doEdits">If true included edit tags, else don't.</param>
/// <param name="intPalette">If true use integers instead of floating point numbers when embedding a non-hex formatted palette, else use floating point numbers.</param>
/// <param name="hexPalette">If true, embed a hexadecimal palette instead of Xml Color tags, else use Xml color tags.</param>
/// <returns>The Xml string representation of the passed in ember</returns>
--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 21:33:45 -04:00
string ToString ( Ember < T > & ember , const string & extraAttributes , size_t printEditDepth , bool doEdits , bool intPalette , bool hexPalette = true )
2014-07-08 03:11:14 -04:00
{
2014-10-14 11:53:15 -04:00
size_t i , j ;
2014-09-01 00:25:15 -04:00
string s ;
2014-07-08 03:11:14 -04:00
ostringstream os ;
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-19 02:33:18 -04:00
vector < Variation < T > * > variations ;
2014-07-08 03:11:14 -04:00
os < < " <flame version= \" EMBER- " < < EmberVersion ( ) < < " \" time= \" " < < ember . m_Time < < " \" " ;
if ( ! ember . m_Name . empty ( ) )
os < < " name= \" " < < ember . m_Name < < " \" " ;
os < < " size= \" " < < ember . m_FinalRasW < < " " < < ember . m_FinalRasH < < " \" " ;
os < < " center= \" " < < ember . m_CenterX < < " " < < ember . m_CenterY < < " \" " ;
os < < " scale= \" " < < ember . m_PixelsPerUnit < < " \" " ;
if ( ember . m_Zoom ! = 0 )
os < < " zoom= \" " < < ember . m_Zoom < < " \" " ;
os < < " rotate= \" " < < ember . m_Rotate < < " \" " ;
2015-03-21 18:27:37 -04:00
os < < " supersample= \" " < < std : : max < size_t > ( 1 , ember . m_Supersample ) < < " \" " ;
2014-07-08 03:11:14 -04:00
os < < " filter= \" " < < ember . m_SpatialFilterRadius < < " \" " ;
os < < " filter_shape= \" " < < ToLower ( SpatialFilterCreator < T > : : ToString ( ember . m_SpatialFilterType ) ) < < " \" " ;
os < < " temporal_filter_type= \" " < < ToLower ( TemporalFilterCreator < T > : : ToString ( ember . m_TemporalFilterType ) ) < < " \" " ;
2015-12-31 19:00:36 -05:00
if ( ember . m_TemporalFilterType = = eTemporalFilterType : : EXP_TEMPORAL_FILTER )
2014-07-08 03:11:14 -04:00
os < < " temporal_filter_exp= \" " < < ember . m_TemporalFilterExp < < " \" " ;
os < < " temporal_filter_width= \" " < < ember . m_TemporalFilterWidth < < " \" " ;
os < < " quality= \" " < < ember . m_Quality < < " \" " ;
os < < " temporal_samples= \" " < < ember . m_TemporalSamples < < " \" " ;
2014-11-28 04:37:51 -05:00
os < < " sub_batch_size= \" " < < ember . m_SubBatchSize < < " \" " ;
os < < " fuse= \" " < < ember . m_FuseCount < < " \" " ;
2014-07-08 03:11:14 -04:00
os < < " background= \" " < < ember . m_Background . r < < " " < < ember . m_Background . g < < " " < < ember . m_Background . b < < " \" " ;
os < < " brightness= \" " < < ember . m_Brightness < < " \" " ;
os < < " gamma= \" " < < ember . m_Gamma < < " \" " ;
os < < " highlight_power= \" " < < ember . m_HighlightPower < < " \" " ;
os < < " vibrancy= \" " < < ember . m_Vibrancy < < " \" " ;
os < < " estimator_radius= \" " < < ember . m_MaxRadDE < < " \" " ;
os < < " estimator_minimum= \" " < < ember . m_MinRadDE < < " \" " ;
os < < " estimator_curve= \" " < < ember . m_CurveDE < < " \" " ;
os < < " gamma_threshold= \" " < < ember . m_GammaThresh < < " \" " ;
os < < " cam_zpos= \" " < < ember . m_CamZPos < < " \" " ;
os < < " cam_persp= \" " < < ember . m_CamPerspective < < " \" " ;
os < < " cam_yaw= \" " < < ember . m_CamYaw < < " \" " ;
os < < " cam_pitch= \" " < < ember . m_CamPitch < < " \" " ;
os < < " cam_dof= \" " < < ember . m_CamDepthBlur < < " \" " ;
2015-12-31 19:00:36 -05:00
if ( ember . m_PaletteMode = = ePaletteMode : : PALETTE_STEP )
2014-07-08 03:11:14 -04:00
os < < " palette_mode= \" step \" " ;
2015-12-31 19:00:36 -05:00
else if ( ember . m_PaletteMode = = ePaletteMode : : PALETTE_LINEAR )
2014-07-08 03:11:14 -04:00
os < < " palette_mode= \" linear \" " ;
2015-12-31 19:00:36 -05:00
if ( ember . m_Interp = = eInterp : : EMBER_INTERP_LINEAR )
--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 17:15:07 -05:00
os < < " interpolation= \" linear \" " ;
2015-12-31 19:00:36 -05:00
else if ( ember . m_Interp = = eInterp : : EMBER_INTERP_SMOOTH )
2014-07-08 03:11:14 -04:00
os < < " interpolation= \" smooth \" " ;
2015-12-31 19:00:36 -05:00
if ( ember . m_AffineInterp = = eAffineInterp : : AFFINE_INTERP_LINEAR )
2014-07-08 03:11:14 -04:00
os < < " interpolation_type= \" linear \" " ;
2015-12-31 19:00:36 -05:00
else if ( ember . m_AffineInterp = = eAffineInterp : : AFFINE_INTERP_LOG )
2014-07-08 03:11:14 -04:00
os < < " interpolation_type= \" log \" " ;
2015-12-31 19:00:36 -05:00
else if ( ember . m_AffineInterp = = eAffineInterp : : AFFINE_INTERP_COMPAT )
2014-07-08 03:11:14 -04:00
os < < " interpolation_type= \" old \" " ;
2015-12-31 19:00:36 -05:00
else if ( ember . m_AffineInterp = = eAffineInterp : : AFFINE_INTERP_OLDER )
2014-07-08 03:11:14 -04:00
os < < " interpolation_type= \" older \" " ;
2015-12-31 19:00:36 -05:00
if ( ember . m_PaletteInterp = = ePaletteInterp : : INTERP_SWEEP )
2014-07-08 03:11:14 -04:00
os < < " palette_interpolation= \" sweep \" " ;
if ( ! extraAttributes . empty ( ) )
os < < " " < < extraAttributes ;
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-19 02:33:18 -04:00
os < < " plugins= \" " ;
ember . GetPresentVariations ( variations , false ) ;
if ( ! variations . empty ( ) )
2015-05-03 20:13:14 -04:00
for ( auto var : variations ) os < < var - > Name ( ) < < ( var ! = variations . back ( ) ? " " : " \" " ) ;
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-19 02:33:18 -04:00
else
os < < " \" " ;
os < < " new_linear= \" 1 \" " ;
2015-03-21 18:27:37 -04:00
os < < " curves= \" " ;
for ( glm : : length_t ci = 0 ; ci < 4 ; ci + + )
{
for ( glm : : length_t cj = 0 ; cj < 4 ; cj + + )
{
os < < ember . m_Curves . m_Points [ ci ] [ cj ] . x < < " " ;
os < < ember . m_Curves . m_Points [ ci ] [ cj ] . y < < " " ;
os < < ember . m_Curves . m_Weights [ ci ] [ cj ] < < " " ;
}
}
os < < " \" > \n " ;
2014-07-08 03:11:14 -04:00
2015-07-07 00:36:46 -04:00
for ( i = 0 ; i < ember . m_EmberMotionElements . size ( ) ; + + i )
os < < " " < < ToString ( ember . m_EmberMotionElements [ i ] ) ;
2015-06-26 16:23:27 -04:00
2014-07-08 03:11:14 -04:00
//This is a grey area, what to do about symmetry to avoid duplicating the symmetry xforms when reading back?//TODO//BUG.
//if (ember.m_Symmetry)
// os << " <symmetry kind=\"" << ember.m_Symmetry << "\"/>\n";
for ( i = 0 ; i < ember . XformCount ( ) ; i + + )
os < < ToString ( * ember . GetXform ( i ) , ember . XformCount ( ) , false , false ) ; //Not final, don't do motion.
if ( ember . UseFinalXform ( ) )
os < < ToString ( * ember . NonConstFinalXform ( ) , ember . XformCount ( ) , true , false ) ; //Final, don't do motion.
2015-05-15 21:45:15 -04:00
//Note that only embedded palettes are saved. The old style of specifying a palette index to look up in a default palette file
//is no longer supported, as it makes no sense when using multiple palette files. The only way it could work is if the index was
//always meant to refer to the default file, or if the filename was embedded as well. It's easier, more straightforward and
//less error prone to just embed the palette.
2014-07-08 03:11:14 -04:00
if ( hexPalette )
{
os < < " <palette count= \" 256 \" format= \" RGB \" > \n " ;
for ( i = 0 ; i < 32 ; i + + )
{
os < < " " ;
for ( j = 0 ; j < 8 ; j + + )
{
2014-10-14 11:53:15 -04:00
size_t idx = 8 * i + j ;
--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 20:02:15 -05:00
os < < hex < < setw ( 2 ) < < setfill ( ' 0 ' ) < < int ( std : : rint ( ember . m_Palette [ idx ] [ 0 ] * 255 ) ) ;
os < < hex < < setw ( 2 ) < < setfill ( ' 0 ' ) < < int ( std : : rint ( ember . m_Palette [ idx ] [ 1 ] * 255 ) ) ;
os < < hex < < setw ( 2 ) < < setfill ( ' 0 ' ) < < int ( std : : rint ( ember . m_Palette [ idx ] [ 2 ] * 255 ) ) ;
2014-07-08 03:11:14 -04:00
}
2016-02-12 00:38:21 -05:00
os < < " \n " ;
2014-07-08 03:11:14 -04:00
}
os < < " </palette> \n " ;
}
else
{
for ( i = 0 ; i < 256 ; i + + )
{
double r = ember . m_Palette [ i ] [ 0 ] * 255 ;
double g = ember . m_Palette [ i ] [ 1 ] * 255 ;
double b = ember . m_Palette [ i ] [ 2 ] * 255 ;
double a = ember . m_Palette [ i ] [ 3 ] * 255 ;
os < < " " ;
2015-12-31 19:00:36 -05:00
2014-07-08 03:11:14 -04:00
//The original used a precision of 6 which is totally unnecessary, use 2.
if ( IsClose ( a , 255.0 ) )
{
if ( intPalette )
--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 20:02:15 -05:00
os < < " <color index= \" " < < i < < " \" rgb= \" " < < int ( std : : rint ( r ) ) < < " " < < int ( std : : rint ( g ) ) < < " " < < int ( std : : rint ( b ) ) < < " \" /> " ;
2014-07-08 03:11:14 -04:00
else
os < < " <color index= \" " < < i < < " \" rgb= \" " < < std : : fixed < < std : : setprecision ( 2 ) < < r < < " " < < g < < " " < < b < < " \" /> " ;
}
else
{
if ( intPalette )
--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 20:02:15 -05:00
os < < " <color index= \" " < < i < < " \" rgba= \" " < < int ( std : : rint ( r ) ) < < " " < < int ( std : : rint ( g ) ) < < " " < < int ( std : : rint ( b ) ) < < " " < < int ( std : : rint ( a ) ) < < " \" /> " ;
2014-07-08 03:11:14 -04:00
else
os < < " <color index= \" " < < i < < " \" rgba= \" " < < std : : fixed < < std : : setprecision ( 2 ) < < r < < " " < < g < < " " < < b < < " " < < a < < " \" /> " ;
}
os < < " \n " ;
}
}
2015-10-27 00:31:35 -04:00
if ( doEdits & & ember . m_Edits )
2014-07-08 03:11:14 -04:00
os < < ToString ( xmlDocGetRootElement ( ember . m_Edits ) , 1 , true , printEditDepth ) ;
os < < " </flame> \n " ;
return os . str ( ) ;
}
/// <summary>
/// Create a new editdoc optionally based on parents passed in.
/// This is used when an ember is made out of some mutation or edit from one or two existing embers and
/// the user wants to capture the genetic lineage history information in the edit doc of the new ember.
/// </summary>
2014-09-10 01:41:26 -04:00
/// <param name="parent0">The first parent, optionally nullptr.</param>
/// <param name="parent1">The second parent, optionally nullptr.</param>
2014-07-08 03:11:14 -04:00
/// <param name="action">The action that was taken to create the new ember</param>
/// <param name="nick">The nickname of the author</param>
/// <param name="url">The Url of the author</param>
/// <param name="id">The id of the author</param>
/// <param name="comment">The comment to include</param>
/// <param name="sheepGen">The sheep generation used if > 0. Default: 0.</param>
/// <param name="sheepId">The sheep id used if > 0. Default: 0.</param>
/// <returns></returns>
--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 21:33:45 -04:00
xmlDocPtr CreateNewEditdoc ( Ember < T > * parent0 , Ember < T > * parent1 , const string & action , const string & nick , const string & url , const string & id , const string & comment , intmax_t sheepGen = 0 , intmax_t sheepId = 0 )
2014-07-08 03:11:14 -04:00
{
char timeString [ 128 ] ;
time_t myTime ;
2014-10-14 11:53:15 -04:00
string s ;
2014-09-10 01:41:26 -04:00
xmlDocPtr commentDoc = nullptr ;
2014-12-07 02:51:44 -05:00
xmlDocPtr doc = xmlNewDoc ( XC ( " 1.0 " ) ) ;
2014-09-10 01:41:26 -04:00
xmlNodePtr rootNode = nullptr , node = nullptr , nodeCopy = nullptr ;
xmlNodePtr rootComment = nullptr ;
2014-10-14 11:53:15 -04:00
ostringstream os ;
2014-07-08 03:11:14 -04:00
//Create the root node, called "edit".
2014-12-07 02:51:44 -05:00
rootNode = xmlNewNode ( nullptr , XC ( " edit " ) ) ;
2014-07-08 03:11:14 -04:00
xmlDocSetRootElement ( doc , rootNode ) ;
//Add the edit attributes.
//Date.
2014-09-10 01:41:26 -04:00
myTime = time ( nullptr ) ;
2014-09-01 00:25:15 -04:00
# ifdef WIN32
tm localt ;
2014-07-08 03:11:14 -04:00
localtime_s ( & localt , & myTime ) ;
strftime ( timeString , 128 , " %a %b %d %H:%M:%S %z %Y " , & localt ) ; //XXX use standard time format including timezone.
2014-09-01 00:25:15 -04:00
# else
tm * localt ;
localt = localtime ( & myTime ) ;
strftime ( timeString , 128 , " %a %b %d %H:%M:%S %z %Y " , localt ) ; //XXX use standard time format including timezone.
# endif
2014-12-07 02:51:44 -05:00
xmlNewProp ( rootNode , XC ( " date " ) , XC ( timeString ) ) ;
2014-07-08 03:11:14 -04:00
//Nick.
if ( nick ! = " " )
2014-12-07 02:51:44 -05:00
xmlNewProp ( rootNode , XC ( " nick " ) , XC ( nick . c_str ( ) ) ) ;
2014-07-08 03:11:14 -04:00
//Url.
if ( url ! = " " )
2014-12-07 02:51:44 -05:00
xmlNewProp ( rootNode , XC ( " url " ) , XC ( url . c_str ( ) ) ) ;
2014-07-08 03:11:14 -04:00
if ( id ! = " " )
2014-12-07 02:51:44 -05:00
xmlNewProp ( rootNode , XC ( " id " ) , XC ( id . c_str ( ) ) ) ;
2014-07-08 03:11:14 -04:00
//Action.
2014-12-07 02:51:44 -05:00
xmlNewProp ( rootNode , XC ( " action " ) , XC ( action . c_str ( ) ) ) ;
2014-07-08 03:11:14 -04:00
//Sheep info.
if ( sheepGen > 0 & & sheepId > 0 )
{
//Create a child node of the root node called sheep.
2014-12-07 02:51:44 -05:00
node = xmlNewChild ( rootNode , nullptr , XC ( " sheep " ) , nullptr ) ;
2014-07-08 03:11:14 -04:00
//Create the sheep attributes.
2014-10-14 11:53:15 -04:00
os < < sheepGen ;
s = os . str ( ) ;
2014-12-07 02:51:44 -05:00
xmlNewProp ( node , XC ( " generation " ) , XC ( s . c_str ( ) ) ) ;
2014-10-14 11:53:15 -04:00
os . str ( " " ) ;
os < < sheepId ;
s = os . str ( ) ;
2014-12-07 02:51:44 -05:00
xmlNewProp ( node , XC ( " id " ) , XC ( s . c_str ( ) ) ) ;
2014-10-14 11:53:15 -04:00
os . str ( " " ) ;
2014-07-08 03:11:14 -04:00
}
//Check for the parents.
//If parent 0 not specified, this is a randomly generated genome.
if ( parent0 )
{
2014-10-14 11:53:15 -04:00
os < < parent0 - > m_Index ;
s = os . str ( ) ;
2014-07-08 03:11:14 -04:00
if ( parent0 - > m_Edits )
{
//Copy the node from the parent.
node = xmlDocGetRootElement ( parent0 - > m_Edits ) ;
nodeCopy = xmlCopyNode ( node , 1 ) ;
AddFilenameWithoutAmpersand ( nodeCopy , parent0 - > m_ParentFilename ) ;
2014-12-07 02:51:44 -05:00
xmlNewProp ( nodeCopy , XC ( " index " ) , XC ( s . c_str ( ) ) ) ;
2014-07-08 03:11:14 -04:00
xmlAddChild ( rootNode , nodeCopy ) ;
}
else
{
//Insert a (parent has no edit) message.
2014-12-07 02:51:44 -05:00
nodeCopy = xmlNewChild ( rootNode , nullptr , XC ( " edit " ) , nullptr ) ;
2014-07-08 03:11:14 -04:00
AddFilenameWithoutAmpersand ( nodeCopy , parent0 - > m_ParentFilename ) ;
2014-12-07 02:51:44 -05:00
xmlNewProp ( nodeCopy , XC ( " index " ) , XC ( s . c_str ( ) ) ) ;
2014-07-08 03:11:14 -04:00
}
2014-10-14 11:53:15 -04:00
os . str ( " " ) ;
2014-07-08 03:11:14 -04:00
}
if ( parent1 )
{
2014-10-14 11:53:15 -04:00
os < < parent1 - > m_Index ;
s = os . str ( ) ;
2014-07-08 03:11:14 -04:00
if ( parent1 - > m_Edits )
{
//Copy the node from the parent.
node = xmlDocGetRootElement ( parent1 - > m_Edits ) ;
nodeCopy = xmlCopyNode ( node , 1 ) ;
AddFilenameWithoutAmpersand ( nodeCopy , parent1 - > m_ParentFilename ) ;
2014-12-07 02:51:44 -05:00
xmlNewProp ( nodeCopy , XC ( " index " ) , XC ( s . c_str ( ) ) ) ;
2014-07-08 03:11:14 -04:00
xmlAddChild ( rootNode , nodeCopy ) ;
}
else
{
//Insert a (parent has no edit) message.
2015-12-31 19:00:36 -05:00
nodeCopy = xmlNewChild ( rootNode , nullptr , XC ( " edit " ) , nullptr ) ;
2014-07-08 03:11:14 -04:00
AddFilenameWithoutAmpersand ( nodeCopy , parent1 - > m_ParentFilename ) ;
2014-12-07 02:51:44 -05:00
xmlNewProp ( nodeCopy , XC ( " index " ) , XC ( s . c_str ( ) ) ) ;
2014-07-08 03:11:14 -04:00
}
2014-10-14 11:53:15 -04:00
os . str ( " " ) ;
2014-07-08 03:11:14 -04:00
}
//Comment string:
//This one's hard, since the comment string must be treated as
2014-10-14 11:53:15 -04:00
//a valid XML document. Create a new document using the comment
2014-07-08 03:11:14 -04:00
//string as the in-memory document, and then copy all children of
//the root node into the edit structure
//Parsing the comment string should be done once and then copied
//for each new edit doc, but that's for later.
if ( comment ! = " " )
{
2014-10-14 11:53:15 -04:00
os < < " <comm> " < < comment < < " </comm> " ;
s = os . str ( ) ;
2014-12-07 02:51:44 -05:00
commentDoc = xmlReadMemory ( s . c_str ( ) , int ( s . length ( ) ) , " comment.env " , nullptr , XML_PARSE_NONET ) ;
2014-10-14 11:53:15 -04:00
os . str ( " " ) ;
2014-07-08 03:11:14 -04:00
//Check for errors.
2015-10-27 00:31:35 -04:00
if ( commentDoc )
2014-07-08 03:11:14 -04:00
{
//Loop through the children of the new document and copy them into the rootNode.
rootComment = xmlDocGetRootElement ( commentDoc ) ;
for ( node = rootComment - > children ; node ; node = node - > next )
{
nodeCopy = xmlCopyNode ( node , 1 ) ;
xmlAddChild ( rootNode , nodeCopy ) ;
}
//Free the created document.
xmlFreeDoc ( commentDoc ) ;
}
else
{
2016-02-12 00:38:21 -05:00
cout < < " Failed to parse comment into Xml. \n " ;
2014-07-08 03:11:14 -04:00
}
}
2014-10-14 11:53:15 -04:00
//Return the Xml doc.
2014-07-08 03:11:14 -04:00
return doc ;
}
private :
/// <summary>
/// Return the Xml string representation of an xform.
/// </summary>
/// <param name="xform">The xform to create the Xml with</param>
/// <param name="xformCount">The number of non-final xforms in the ember to which this xform belongs. Used for xaos.</param>
/// <param name="isFinal">True if the xform is the final xform in the ember, else false.</param>
/// <param name="doMotion">If true, include motion elements in the Xml string, else omit.</param>
/// <returns>The Xml string representation of the passed in xform</returns>
2014-10-14 11:53:15 -04:00
string ToString ( Xform < T > & xform , size_t xformCount , bool isFinal , bool doMotion )
2014-07-08 03:11:14 -04:00
{
2014-10-14 11:53:15 -04:00
size_t i , j ;
2014-07-08 03:11:14 -04:00
ostringstream os ;
if ( doMotion )
{
os < < " <motion motion_frequency= \" " < < xform . m_MotionFreq < < " \" " ;
2015-12-31 19:00:36 -05:00
if ( xform . m_MotionFunc = = eMotion : : MOTION_SIN )
2014-07-08 03:11:14 -04:00
os < < " motion_function= \" sin \" " ;
2015-12-31 19:00:36 -05:00
else if ( xform . m_MotionFunc = = eMotion : : MOTION_TRIANGLE )
2014-07-08 03:11:14 -04:00
os < < " motion_function= \" triangle \" " ;
2015-12-31 19:00:36 -05:00
else if ( xform . m_MotionFunc = = eMotion : : MOTION_HILL )
2014-07-08 03:11:14 -04:00
os < < " motion_function= \" hill \" " ;
2015-12-31 19:00:36 -05:00
else if ( xform . m_MotionFunc = = eMotion : : MOTION_SAW )
2015-06-22 09:50:43 -04:00
os < < " motion_function= \" saw \" " ;
2015-07-06 10:05:43 -04:00
if ( xform . m_MotionOffset ! = 0 )
os < < " motion_offset= \" " < < xform . m_MotionOffset < < " \" " ;
2014-07-08 03:11:14 -04:00
}
else
{
if ( isFinal )
os < < " <finalxform " ;
else
os < < " <xform weight= \" " < < xform . m_Weight < < " \" " ;
}
2015-03-25 23:47:57 -04:00
if ( ! doMotion | | xform . m_ColorX ! = EMPTYFIELD ) os < < " color= \" " < < xform . m_ColorX < < " \" " ;
2015-12-31 19:00:36 -05:00
2015-03-25 23:47:57 -04:00
//if (!doMotion || xform.m_ColorY != EMPTYFIELD) os << "color=\"" << xform.m_ColorX << " " << xform.m_ColorY << "\" ";
if ( ! doMotion | | xform . m_DirectColor ! = EMPTYFIELD ) os < < " var_color= \" " < < xform . m_DirectColor < < " \" " ;
2015-12-31 19:00:36 -05:00
2015-03-25 23:47:57 -04:00
if ( ! doMotion | | xform . m_ColorSpeed ! = EMPTYFIELD ) os < < " color_speed= \" " < < xform . m_ColorSpeed < < " \" " ;
2015-12-31 19:00:36 -05:00
2015-03-25 23:47:57 -04:00
//os << "symmetry=\"" << fabs(xform.m_ColorSpeed - 1) * 2 << "\" ";//Legacy support.
2014-07-08 03:11:14 -04:00
if ( ! doMotion )
{
string s = xform . m_Name ;
std : : replace ( s . begin ( ) , s . end ( ) , ' ' , ' _ ' ) ;
os < < " name= \" " < < s < < " \" " ; //Flam3 didn't do this, but Apo does.
if ( ! isFinal )
os < < " animate= \" " < < xform . m_Animate < < " \" " ;
}
//Variation writing order differs slightly from the original to make it a bit more readable.
//The original wrote out all of the variation names and weights. Then wrote out the parameters for
//the parametric variations. Here, write out the params immediately after each parametric variation
//so they are more closely grouped with the variation they apply to, rather than being all grouped at the end.
for ( i = 0 ; i < xform . TotalVariationCount ( ) ; i + + )
{
Variation < T > * var = xform . GetVariation ( i ) ;
ParametricVariation < T > * parVar = dynamic_cast < ParametricVariation < T > * > ( var ) ;
if ( var - > m_Weight ! = 0 )
{
os < < var - > Name ( ) < < " = \" " < < var - > m_Weight < < " \" " ;
if ( parVar )
{
2015-06-28 20:48:26 -04:00
auto params = parVar - > Params ( ) ;
2014-07-08 03:11:14 -04:00
for ( j = 0 ; j < parVar - > ParamCount ( ) ; j + + )
{
if ( ( ! doMotion | | ( doMotion & & ( params [ j ] . ParamVal ( ) ! = 0 ) ) ) & & ! params [ j ] . IsPrecalc ( ) )
os < < params [ j ] . Name ( ) < < " = \" " < < params [ j ] . ParamVal ( ) < < " \" " ;
}
}
}
}
2015-03-25 23:47:57 -04:00
if ( ! doMotion | | ( doMotion & & ! xform . m_Affine . IsZero ( ) & & ! xform . m_Affine . IsEmpty ( ) ) )
2014-07-08 03:11:14 -04:00
{
os < < " coefs= \" " < < xform . m_Affine . A ( ) < < " " < < xform . m_Affine . D ( ) < < " " < < xform . m_Affine . B ( ) < < " "
2015-12-31 19:00:36 -05:00
< < xform . m_Affine . E ( ) < < " " < < xform . m_Affine . C ( ) < < " " < < xform . m_Affine . F ( ) < < " \" " ;
2014-07-08 03:11:14 -04:00
}
2015-03-25 23:47:57 -04:00
if ( ( ! doMotion & & ! xform . m_Post . IsID ( ) ) | | ( doMotion & & ! xform . m_Post . IsZero ( ) & & ! xform . m_Post . IsEmpty ( ) ) )
2014-07-08 03:11:14 -04:00
{
os < < " post= \" " < < xform . m_Post . A ( ) < < " " < < xform . m_Post . D ( ) < < " " < < xform . m_Post . B ( ) < < " "
2015-12-31 19:00:36 -05:00
< < xform . m_Post . E ( ) < < " " < < xform . m_Post . C ( ) < < " " < < xform . m_Post . F ( ) < < " \" " ;
2014-07-08 03:11:14 -04:00
}
//Original only printed xaos values that were not 1. Here, print them all out if any are present.
2015-03-25 23:47:57 -04:00
if ( ! isFinal & & ! doMotion & & xform . XaosPresent ( ) ) //Applying motion to xaos not supported.
2014-07-08 03:11:14 -04:00
{
os < < " chaos= \" " ;
for ( i = 0 ; i < xformCount ; i + + )
os < < xform . Xaos ( i ) < < " " ;
os < < " \" " ;
}
2015-03-25 23:47:57 -04:00
if ( ! doMotion | | xform . m_Opacity ! = EMPTYFIELD ) os < < " opacity= \" " < < xform . m_Opacity < < " \" " ;
2014-07-08 03:11:14 -04:00
if ( ! doMotion & & ! xform . m_Motion . empty ( ) )
{
os < < " > \n " ;
for ( i = 0 ; i < xform . m_Motion . size ( ) ; i + + )
os < < ToString ( xform . m_Motion [ i ] , 0 , false , true ) ;
if ( isFinal ) //Fixed to properly close final.//SMOULDER
os < < " </finalxform> \n " ;
else
os < < " </xform> \n " ;
}
else
os < < " /> \n " ;
return os . str ( ) ;
}
/// <summary>
/// Return an edit node Xml string.
/// </summary>
/// <param name="editNode">The edit node to get the string for</param>
/// <param name="tabs">How many tabs to use</param>
/// <param name="formatting">If true, include newlines and tabs, else don't.</param>
/// <param name="printEditDepth">How deep the edit depth goes</param>
/// <returns>The edit node Xml string</returns>
2014-10-14 11:53:15 -04:00
string ToString ( xmlNodePtr editNode , size_t tabs , bool formatting , size_t printEditDepth )
2014-07-08 03:11:14 -04:00
{
bool indentPrinted = false ;
2014-09-01 00:25:15 -04:00
const char * tabString = " " , * attStr ;
const char * editString = " edit " ;
const char * sheepString = " sheep " ;
2014-10-14 11:53:15 -04:00
size_t ti ; //, editOrSheep = 0;
2014-09-10 01:41:26 -04:00
xmlAttrPtr attPtr = nullptr , curAtt = nullptr ;
xmlNodePtr childPtr = nullptr , curChild = nullptr ;
2014-07-08 03:11:14 -04:00
ostringstream os ;
if ( printEditDepth > 0 & & tabs > printEditDepth )
return " " ;
//If this node is an XML_ELEMENT_NODE, print it and its attributes.
if ( editNode - > type = = XML_ELEMENT_NODE )
{
//Print the node at the tab specified.
if ( formatting )
for ( ti = 0 ; ti < tabs ; ti + + )
os < < tabString ;
os < < " < " < < editNode - > name ;
//This can either be an edit node or a sheep node.
//If it's an edit node, add one to the tab.
2014-09-01 00:25:15 -04:00
if ( ! Compare ( editNode - > name , editString ) )
2014-07-08 03:11:14 -04:00
{
2014-09-10 01:41:26 -04:00
//editOrSheep = 1;
2014-07-08 03:11:14 -04:00
tabs + + ;
}
2014-09-10 01:41:26 -04:00
else if ( ! Compare ( editNode - > name , sheepString ) ) { }
2015-12-31 19:00:36 -05:00
//editOrSheep = 2;
2014-09-10 01:41:26 -04:00
else { }
2014-07-08 03:11:14 -04:00
2015-12-31 19:00:36 -05:00
//editOrSheep = 0;
2014-07-08 03:11:14 -04:00
//Print the attributes.
attPtr = editNode - > properties ;
for ( curAtt = attPtr ; curAtt ; curAtt = curAtt - > next )
{
2014-12-07 02:51:44 -05:00
attStr = CX ( xmlGetProp ( editNode , curAtt - > name ) ) ;
2014-07-08 03:11:14 -04:00
os < < " " < < curAtt - > name < < " = \" " < < attStr < < " \" " ;
2014-12-07 02:51:44 -05:00
xmlFree ( reinterpret_cast < void * > ( const_cast < char * > ( attStr ) ) ) ;
2014-07-08 03:11:14 -04:00
}
//Does this node have children?
if ( ! editNode - > children | | ( printEditDepth > 0 & & tabs > printEditDepth ) )
{
//Close the tag and subtract the tab.
os < < " /> " ;
if ( formatting )
os < < " \n " ;
tabs - - ;
}
else
{
//Close the tag.
os < < " > " ;
if ( formatting )
os < < " \n " ;
//Loop through the children and print them.
childPtr = editNode - > children ;
indentPrinted = false ;
for ( curChild = childPtr ; curChild ; curChild = curChild - > next )
{
2014-09-01 00:25:15 -04:00
//If child is an element, indent first and then print it.
2014-07-08 03:11:14 -04:00
if ( curChild - > type = = XML_ELEMENT_NODE & &
2015-12-31 19:00:36 -05:00
( ! Compare ( curChild - > name , editString ) | | ! Compare ( curChild - > name , sheepString ) ) )
2014-07-08 03:11:14 -04:00
{
if ( indentPrinted )
{
indentPrinted = false ;
os < < " \n " ;
}
os < < ToString ( curChild , tabs , true , printEditDepth ) ;
}
else
{
//Child is a text node, don't want to indent more than once.
if ( xmlIsBlankNode ( curChild ) )
continue ;
2014-09-10 01:41:26 -04:00
2014-07-08 03:11:14 -04:00
if ( ! indentPrinted & & formatting )
{
for ( ti = 0 ; ti < tabs ; ti + + )
os < < tabString ;
2014-09-10 01:41:26 -04:00
2014-07-08 03:11:14 -04:00
indentPrinted = true ;
}
2014-09-10 01:41:26 -04:00
2014-07-08 03:11:14 -04:00
//Print nodes without formatting.
os < < ToString ( curChild , tabs , false , printEditDepth ) ;
}
}
if ( indentPrinted & & formatting )
os < < " \n " ;
tabs - - ; //Tab out.
if ( formatting )
for ( ti = 0 ; ti < tabs ; ti + + )
os < < tabString ;
os < < " </ " < < editNode - > name < < " > " ; //Close the tag.
if ( formatting )
os < < " \n " ;
}
}
else if ( editNode - > type = = XML_TEXT_NODE )
{
2014-12-07 02:51:44 -05:00
string s ( reinterpret_cast < char * > ( xmlNodeGetContent ( editNode ) ) ) ;
2014-07-08 03:11:14 -04:00
os < < Trim ( s ) ;
}
return os . str ( ) ;
}
2015-06-26 16:23:27 -04:00
/// <summary>
/// Convert a FlameMotion element to an xml string
/// </summary>
/// <param name="motion">The FlameMotion object to convert to XML</param>
2015-07-07 00:36:46 -04:00
string ToString ( const EmberMotion < T > & motion )
2015-06-26 16:23:27 -04:00
{
ostringstream os ;
os < < " <flame_motion motion_frequency= \" " < < motion . m_MotionFreq < < " \" " ;
2015-07-06 10:05:43 -04:00
if ( motion . m_MotionOffset > 0 )
os < < " motion_offset= \" " < < motion . m_MotionOffset < < " \" " ;
2015-06-26 16:23:27 -04:00
os < < " motion_func= " ;
2015-07-07 00:36:46 -04:00
switch ( motion . m_MotionFunc )
2015-06-26 16:23:27 -04:00
{
2015-12-31 19:00:36 -05:00
case eMotion : : MOTION_SIN :
os < < " \" sin \" " ;
break ;
case eMotion : : MOTION_HILL :
os < < " \" hill \" " ;
break ;
case eMotion : : MOTION_TRIANGLE :
os < < " \" triangle \" " ;
break ;
case eMotion : : MOTION_SAW :
default :
os < < " \" saw \" " ;
break ;
2015-06-26 16:23:27 -04:00
}
T r = 0.0 ;
T g = 0.0 ;
T b = 0.0 ;
T cx = 0.0 ;
T cy = 0.0 ;
--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 21:33:45 -04:00
for ( size_t i = 0 ; i < motion . m_MotionParams . size ( ) ; + + i )
2015-06-26 16:23:27 -04:00
{
2015-12-31 19:00:36 -05:00
switch ( motion . m_MotionParams [ i ] . first )
2015-06-26 16:23:27 -04:00
{
2015-12-31 19:00:36 -05:00
case eEmberMotionParam : : FLAME_MOTION_ZOOM :
os < < " zoom= \" " < < motion . m_MotionParams [ i ] . second < < " \" " ;
break ;
case eEmberMotionParam : : FLAME_MOTION_ZPOS :
os < < " cam_zpos= \" " < < motion . m_MotionParams [ i ] . second < < " \" " ;
break ;
case eEmberMotionParam : : FLAME_MOTION_PERSPECTIVE :
os < < " cam_persp= \" " < < motion . m_MotionParams [ i ] . second < < " \" " ;
break ;
case eEmberMotionParam : : FLAME_MOTION_YAW :
os < < " cam_yaw= \" " < < motion . m_MotionParams [ i ] . second < < " \" " ;
break ;
case eEmberMotionParam : : FLAME_MOTION_PITCH :
os < < " cam_pitch= \" " < < motion . m_MotionParams [ i ] . second < < " \" " ;
break ;
case eEmberMotionParam : : FLAME_MOTION_DEPTH_BLUR :
os < < " cam_dof= \" " < < motion . m_MotionParams [ i ] . second < < " \" " ;
break ;
case eEmberMotionParam : : FLAME_MOTION_CENTER_X :
cx = motion . m_MotionParams [ i ] . second ;
break ;
case eEmberMotionParam : : FLAME_MOTION_CENTER_Y :
cy = motion . m_MotionParams [ i ] . second ;
break ;
case eEmberMotionParam : : FLAME_MOTION_ROTATE :
os < < " rotate= \" " < < motion . m_MotionParams [ i ] . second < < " \" " ;
break ;
case eEmberMotionParam : : FLAME_MOTION_BRIGHTNESS :
os < < " brightness= \" " < < motion . m_MotionParams [ i ] . second < < " \" " ;
break ;
case eEmberMotionParam : : FLAME_MOTION_GAMMA :
os < < " gamma= \" " < < motion . m_MotionParams [ i ] . second < < " \" " ;
break ;
case eEmberMotionParam : : FLAME_MOTION_GAMMA_THRESH :
os < < " gamma_threshold= \" " < < motion . m_MotionParams [ i ] . second < < " \" " ;
break ;
case eEmberMotionParam : : FLAME_MOTION_HIGHLIGHT_POWER :
os < < " highlight_power= \" " < < motion . m_MotionParams [ i ] . second < < " \" " ;
break ;
case eEmberMotionParam : : FLAME_MOTION_BACKGROUND_R :
r = motion . m_MotionParams [ i ] . second ;
break ;
case eEmberMotionParam : : FLAME_MOTION_BACKGROUND_G :
g = motion . m_MotionParams [ i ] . second ;
break ;
case eEmberMotionParam : : FLAME_MOTION_BACKGROUND_B :
b = motion . m_MotionParams [ i ] . second ;
break ;
case eEmberMotionParam : : FLAME_MOTION_VIBRANCY :
os < < " vibrancy= \" " < < motion . m_MotionParams [ i ] . second < < " \" " ;
break ;
case eEmberMotionParam : : FLAME_MOTION_NONE :
default :
break ;
2015-06-26 16:23:27 -04:00
}
}
2015-07-07 00:36:46 -04:00
if ( r ! = 0.0 | | g ! = 0.0 | | b ! = 0.0 )
2015-06-26 16:23:27 -04:00
os < < " background= \" " < < r < < " " < < g < < " " < < b < < " \" " ;
2015-07-07 00:36:46 -04:00
if ( cx ! = 0.0 | | cy ! = 0.0 )
2015-06-26 16:23:27 -04:00
os < < " center= \" " < < cx < < " " < < cy < < " \" " ;
os < < " /> \n " ;
return os . str ( ) ;
}
2014-07-08 03:11:14 -04:00
void AddFilenameWithoutAmpersand ( xmlNodePtr node , string & filename )
{
if ( filename . find_first_of ( ' & ' ) ! = std : : string : : npos )
{
string filenameWithoutAmpersands = filename ;
FindAndReplace < string > ( filenameWithoutAmpersands , " & " , " & " ) ;
2014-12-07 02:51:44 -05:00
xmlNewProp ( node , XC ( " filename " ) , XC ( filenameWithoutAmpersands . c_str ( ) ) ) ;
2014-07-08 03:11:14 -04:00
}
else
{
2014-12-07 02:51:44 -05:00
xmlNewProp ( node , XC ( " filename " ) , XC ( filename . c_str ( ) ) ) ;
2014-07-08 03:11:14 -04:00
}
}
} ;
2014-09-10 01:41:26 -04:00
}
