--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
|
|
|
#include "EmberCLPch.h"
|
|
|
|
#include "FunctionMapper.h"
|
|
|
|
|
|
|
|
namespace EmberCLns
|
|
|
|
{
|
|
|
|
std::unordered_map<string, string> FunctionMapper::m_GlobalMap;
|
|
|
|
|
|
|
|
FunctionMapper::FunctionMapper()
|
|
|
|
{
|
|
|
|
if (m_GlobalMap.empty())
|
|
|
|
{
|
|
|
|
m_GlobalMap["LRint"] =
|
|
|
|
"inline real_t LRint(real_t x)\n"
|
|
|
|
"{\n"
|
|
|
|
" intPrec temp = (x >= 0.0 ? (intPrec)(x + 0.5) : (intPrec)(x - 0.5));\n"
|
|
|
|
" return (real_t)temp;\n"
|
|
|
|
"}\n";
|
|
|
|
|
|
|
|
m_GlobalMap["Round"] =
|
|
|
|
"inline real_t Round(real_t r)\n"
|
|
|
|
"{\n"
|
|
|
|
" return (r > 0.0) ? floor(r + 0.5) : ceil(r - 0.5);\n"
|
|
|
|
"}\n";
|
|
|
|
|
|
|
|
m_GlobalMap["Sign"] =
|
|
|
|
"inline real_t Sign(real_t v)\n"
|
|
|
|
"{\n"
|
|
|
|
" return (v < 0.0) ? -1 : (v > 0.0) ? 1 : 0.0;\n"
|
|
|
|
"}\n";
|
|
|
|
|
|
|
|
m_GlobalMap["SignNz"] =
|
|
|
|
"inline real_t SignNz(real_t v)\n"
|
|
|
|
"{\n"
|
|
|
|
" return (v < 0.0) ? -1.0 : 1.0;\n"
|
|
|
|
"}\n";
|
|
|
|
|
|
|
|
m_GlobalMap["Sqr"] =
|
|
|
|
"inline real_t Sqr(real_t v)\n"
|
|
|
|
"{\n"
|
|
|
|
" return v * v;\n"
|
|
|
|
"}\n";
|
|
|
|
|
|
|
|
m_GlobalMap["SafeSqrt"] =
|
|
|
|
"inline real_t SafeSqrt(real_t x)\n"
|
|
|
|
"{\n"
|
|
|
|
" if (x <= 0.0)\n"
|
|
|
|
" return 0.0;\n"
|
|
|
|
"\n"
|
|
|
|
" return sqrt(x);\n"
|
|
|
|
"}\n";
|
|
|
|
|
|
|
|
m_GlobalMap["Cube"] =
|
|
|
|
"inline real_t Cube(real_t v)\n"
|
|
|
|
"{\n"
|
|
|
|
" return v * v * v;\n"
|
|
|
|
"}\n";
|
|
|
|
|
|
|
|
m_GlobalMap["Hypot"] =
|
|
|
|
"inline real_t Hypot(real_t x, real_t y)\n"
|
|
|
|
"{\n"
|
|
|
|
" return sqrt(SQR(x) + SQR(y));\n"
|
|
|
|
"}\n";
|
|
|
|
|
|
|
|
m_GlobalMap["Spread"] =
|
|
|
|
"inline real_t Spread(real_t x, real_t y)\n"
|
|
|
|
"{\n"
|
|
|
|
" return Hypot(x, y) * ((x) > 0.0 ? 1.0 : -1.0);\n"
|
|
|
|
"}\n";
|
|
|
|
|
|
|
|
m_GlobalMap["Powq4"] =
|
|
|
|
"inline real_t Powq4(real_t x, real_t y)\n"
|
|
|
|
"{\n"
|
|
|
|
" return pow(fabs(x), y) * SignNz(x);\n"
|
|
|
|
"}\n";
|
|
|
|
|
|
|
|
m_GlobalMap["Powq4c"] =
|
|
|
|
"inline real_t Powq4c(real_t x, real_t y)\n"
|
|
|
|
"{\n"
|
|
|
|
" return y == 1.0 ? x : Powq4(x, y);\n"
|
|
|
|
"}\n";
|
|
|
|
|
|
|
|
m_GlobalMap["Zeps"] =
|
|
|
|
"inline real_t Zeps(real_t x)\n"
|
|
|
|
"{\n"
|
|
|
|
" return x == 0.0 ? EPS : x;\n"
|
|
|
|
"}\n";
|
|
|
|
|
|
|
|
m_GlobalMap["Lerp"] =
|
|
|
|
"inline real_t Lerp(real_t a, real_t b, real_t p)\n"
|
|
|
|
"{\n"
|
|
|
|
" return a + (b - a) * p;\n"
|
|
|
|
"}\n";
|
|
|
|
|
|
|
|
m_GlobalMap["Fabsmod"] =
|
|
|
|
"inline real_t Fabsmod(real_t v)\n"
|
|
|
|
"{\n"
|
|
|
|
" real_t dummy;\n"
|
|
|
|
"\n"
|
|
|
|
" return modf(v, &dummy);\n"
|
|
|
|
"}\n";
|
|
|
|
|
|
|
|
m_GlobalMap["Fosc"] =
|
|
|
|
"inline real_t Fosc(real_t p, real_t amp, real_t ph)\n"
|
|
|
|
"{\n"
|
|
|
|
" return 0.5 - cos(p * amp + ph) * 0.5;\n"
|
|
|
|
"}\n";
|
|
|
|
|
|
|
|
m_GlobalMap["Foscn"] =
|
|
|
|
"inline real_t Foscn(real_t p, real_t ph)\n"
|
|
|
|
"{\n"
|
|
|
|
" return 0.5 - cos(p + ph) * 0.5;\n"
|
|
|
|
"}\n";
|
|
|
|
|
|
|
|
m_GlobalMap["LogScale"] =
|
|
|
|
"inline real_t LogScale(real_t x)\n"
|
|
|
|
"{\n"
|
|
|
|
" return x == 0.0 ? 0.0 : log((fabs(x) + 1) * M_E) * SignNz(x) / M_E;\n"
|
|
|
|
"}\n";
|
|
|
|
|
|
|
|
m_GlobalMap["LogMap"] =
|
|
|
|
"inline real_t LogMap(real_t x)\n"
|
|
|
|
"{\n"
|
|
|
|
" return x == 0.0 ? 0.0 : (M_E + log(x * M_E)) * 0.25 * SignNz(x);\n"
|
|
|
|
"}\n";
|
|
|
|
|
|
|
|
m_GlobalMap["ClampGte"] =
|
|
|
|
"inline real_t ClampGte(real_t val, real_t gte)\n"
|
|
|
|
"{\n"
|
|
|
|
" return (val < gte) ? gte : val;\n"
|
|
|
|
"}\n";
|
|
|
|
|
|
|
|
m_GlobalMap["Swap"] =
|
|
|
|
"inline void Swap(real_t* val1, real_t* val2)\n"
|
|
|
|
"{\n"
|
|
|
|
" real_t tmp = *val1;\n"
|
|
|
|
" *val1 = *val2;\n"
|
|
|
|
" *val2 = tmp;\n"
|
|
|
|
"}\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
const string* FunctionMapper::GetGlobalFunc(const string& func)
|
|
|
|
{
|
2015-11-22 20:03:11 -05:00
|
|
|
const auto& text = m_GlobalMap.find(func);
|
--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
|
|
|
|
|
|
|
if (text != m_GlobalMap.end())
|
|
|
|
return &text->second;
|
|
|
|
else
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
}
|