mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-01-21 13:10:04 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

--Code changes

Browse Source 
-Better use of const functions.
 -Ember.pro should not define BUILDING_EMBERCL, instead define BUILDING_EMBER.
This commit is contained in:
mfeemster 2015-06-29 20:13:53 -07:00
parent 770ff4622c
commit fa3175aad1
10 changed files with 329 additions and 329 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Builds/QtCreator/Ember/Ember.pro
View File

@ -9,7 +9,7 @@ include(../shared_settings.pri)
QMAKE_CXXFLAGS += -D_USRDLL
QMAKE_CXXFLAGS += -D_CONSOLE
QMAKE_CXXFLAGS += -BUILDING_EMBERCL
QMAKE_CXXFLAGS += -BUILDING_EMBER
SOURCES += \
../../../Source/Ember/Affine2D.cpp \

10
Source/Ember/Variation.h
View File

@ -1156,7 +1156,7 @@ public:
/// Per-variation precalc OpenCL string used for pre and post variations.
/// </summary>
/// <returns>The per-variation OpenCL precalc string</returns>
string PrecalcOpenCLString()
string PrecalcOpenCLString() const
{
ostringstream ss;
@ -1272,13 +1272,13 @@ public:
/// Derived classes will implement this.
/// </summary>
/// <returns>The OpenCL string to perform the equivalent calculation on the GPU in OpenCL</returns>
virtual string OpenCLString() { return ""; }
virtual string OpenCLString() const { return ""; }
/// <summary>
/// If the OpenCL string depends on any functions specific to this variation, return them.
/// </summary>
/// <returns>The OpenCL string for functions specific to this variation</returns>
virtual string OpenCLFuncsString() { return ""; }
virtual string OpenCLFuncsString() const { return ""; }
/// <summary>
/// In addition to the standard precalculation stored in the IteratorHelper object, some
@ -1336,8 +1336,8 @@ public:
eVariationAssignType AssignType() const { return m_AssignType; }
const Xform<T>* ParentXform() const { return m_Xform; }
void ParentXform(Xform<T>* xform) { m_Xform = xform; }
intmax_t IndexInXform() { return m_Xform ? m_Xform->GetVariationIndex(this) : -1; }
intmax_t XformIndexInEmber() { return m_Xform ? m_Xform->IndexInParentEmber() : -1; }
intmax_t IndexInXform() const { return m_Xform ? m_Xform->GetVariationIndex(const_cast<Variation<T>*>(this)) : -1; }
intmax_t XformIndexInEmber() const { return m_Xform ? m_Xform->IndexInParentEmber() : -1; }
T m_Weight;//The weight of the variation.

194
Source/Ember/Variations01.h
View File

@ -26,7 +26,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -63,7 +63,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -103,7 +103,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -148,7 +148,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -193,7 +193,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -232,7 +232,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -269,7 +269,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -310,7 +310,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -358,7 +358,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -421,7 +421,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -463,7 +463,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -502,7 +502,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -550,7 +550,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -603,7 +603,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -651,7 +651,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -702,7 +702,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -779,7 +779,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -825,7 +825,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -872,7 +872,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -918,7 +918,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -961,7 +961,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -1011,7 +1011,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -1066,7 +1066,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -1118,7 +1118,7 @@ public:
helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1204,7 +1204,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1305,7 +1305,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1396,7 +1396,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1465,7 +1465,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -1503,7 +1503,7 @@ public:
helper.Out.z = m_Weight * (2 / denom - 1);
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -1539,7 +1539,7 @@ public:
helper.Out.z = m_Weight * cos(helper.In.x);
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -1578,7 +1578,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1655,7 +1655,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -1697,7 +1697,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1795,7 +1795,7 @@ public:
//helper.Out.y = r * sin(tempr);
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1897,7 +1897,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -1936,7 +1936,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -1984,7 +1984,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2059,7 +2059,7 @@ public:
helper.Out.y = r * sin(a);
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2141,7 +2141,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2246,7 +2246,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2326,7 +2326,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2395,7 +2395,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -2432,7 +2432,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -2465,7 +2465,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -2502,7 +2502,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -2543,7 +2543,7 @@ public:
helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -2589,7 +2589,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -2640,7 +2640,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -2683,7 +2683,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -2726,7 +2726,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2834,7 +2834,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2932,7 +2932,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2999,7 +2999,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -3065,7 +3065,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -3136,7 +3136,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -3247,7 +3247,7 @@ public:
}
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -3405,7 +3405,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -3480,7 +3480,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -3560,7 +3560,7 @@ public:
/// that output is slightly different than the CPU. But not by enough
/// to change the shape of the final image.
/// </summary>
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -3660,7 +3660,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -3745,7 +3745,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -3848,7 +3848,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -3923,7 +3923,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4007,7 +4007,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4098,7 +4098,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -4159,7 +4159,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4271,7 +4271,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4349,7 +4349,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4449,7 +4449,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4541,7 +4541,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4601,7 +4601,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4671,7 +4671,7 @@ public:
helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
int i = 0;
@ -4738,7 +4738,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4834,7 +4834,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4922,7 +4922,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4993,7 +4993,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -5062,7 +5062,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -5150,7 +5150,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -5247,7 +5247,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -5329,7 +5329,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -5397,7 +5397,7 @@ public:
helper.Out.z = m_Weight * (helper.In.z + m_ScaleZ * sin(helper.m_PrecalcSqrtSumSquares * m_FreqZ));
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -5472,7 +5472,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -5510,7 +5510,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -5566,7 +5566,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -5600,7 +5600,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -5639,7 +5639,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -5684,7 +5684,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -5729,7 +5729,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -5774,7 +5774,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -5818,7 +5818,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -5861,7 +5861,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -5905,7 +5905,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -5950,7 +5950,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -5995,7 +5995,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -6040,7 +6040,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -6087,7 +6087,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -6172,7 +6172,7 @@ public:
//helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();

130
Source/Ember/Variations02.h
View File

@ -24,7 +24,7 @@ public:
helper.Out.z = t;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -74,7 +74,7 @@ public:
}
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -184,7 +184,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -344,7 +344,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t varIndex = IndexInXform();
@ -420,7 +420,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -482,7 +482,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -572,7 +572,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -728,7 +728,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -816,7 +816,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -883,7 +883,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -945,7 +945,7 @@ public:
}
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
@ -989,7 +989,7 @@ public:
helper.Out.z = m_Weight * (rand.Frand01<T>() + rand.Frand01<T>() + rand.Frand01<T>() + rand.Frand01<T>() - 2);
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -1021,7 +1021,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -1053,7 +1053,7 @@ public:
helper.Out.z = m_Weight;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -1094,7 +1094,7 @@ public:
helper.Out.z = m_Weight * helper.m_PrecalcSqrtSumSquares;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -1144,7 +1144,7 @@ public:
helper.Out.z = r * cosb;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -1187,7 +1187,7 @@ public:
helper.Out.z = r2 * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -1228,7 +1228,7 @@ public:
helper.Out.z = r * (helper.In.z + m_Cz * r2);
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1314,7 +1314,7 @@ public:
helper.Out.z = vv * (r * cos(helper.In.z));
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1409,7 +1409,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1526,7 +1526,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1596,7 +1596,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1724,7 +1724,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1837,7 +1837,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1922,7 +1922,7 @@ public:
helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
int i = 0;
@ -2025,7 +2025,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -2071,7 +2071,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2158,7 +2158,7 @@ public:
}
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2229,7 +2229,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -2280,7 +2280,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2359,7 +2359,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2467,7 +2467,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2613,7 +2613,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -2716,7 +2716,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2783,7 +2783,7 @@ public:
helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2879,7 +2879,7 @@ public:
helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2974,7 +2974,7 @@ public:
helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -3063,7 +3063,7 @@ public:
helper.Out.z = d * (helper.In.z * m_S2z);
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -3187,7 +3187,7 @@ public:
helper.Out.z = d * (helper.In.z * m_S2z);
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -3289,7 +3289,7 @@ public:
helper.Out.z = vr * (helper.In.z * m_S2z);
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -3398,7 +3398,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -3466,7 +3466,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -3565,7 +3565,7 @@ public:
helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -3648,7 +3648,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -3746,7 +3746,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -3849,7 +3849,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4016,7 +4016,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4155,7 +4155,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4254,7 +4254,7 @@ public:
helper.Out.z = d * (helper.In.z * m_S2z + m_Cz * (y2cy + x2cx - r2 - 1));
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4368,7 +4368,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4445,7 +4445,7 @@ public:
helper.Out.z = cosc1 * m_ZScale;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
int i = 0;
@ -4525,7 +4525,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4637,7 +4637,7 @@ public:
helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4767,7 +4767,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4889,7 +4889,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4993,7 +4993,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -5061,7 +5061,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -5106,7 +5106,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -5177,7 +5177,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -5292,7 +5292,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -5401,7 +5401,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -5472,7 +5472,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -5525,7 +5525,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -5560,7 +5560,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -5613,7 +5613,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();

112
Source/Ember/Variations03.h
View File

@ -27,7 +27,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -77,7 +77,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -116,7 +116,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -192,7 +192,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -245,7 +245,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -287,7 +287,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -356,7 +356,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -463,7 +463,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -523,7 +523,7 @@ public:
return ss.str();
}
virtual string OpenCLFuncsString()
virtual string OpenCLFuncsString() const
{
return
"void GlynnSim1Circle(__constant real_t* radius1, __constant real_t* thickness, __constant real_t* x1, __constant real_t* y1, uint2* mwc, real_t* x, real_t* y)\n"
@ -631,7 +631,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -679,7 +679,7 @@ public:
return ss.str();
}
virtual string OpenCLFuncsString()
virtual string OpenCLFuncsString() const
{
return
"void GlynnSim2Circle(__constant real_t* radius, __constant real_t* thickness, __constant real_t* phi10, __constant real_t* delta, __constant real_t* gamma, uint2* mwc, real_t* x, real_t* y)\n"
@ -789,7 +789,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -835,7 +835,7 @@ public:
return ss.str();
}
virtual string OpenCLFuncsString()
virtual string OpenCLFuncsString() const
{
return
"void GlynnSim3Circle(__constant real_t* radius, __constant real_t* radius1, __constant real_t* radius2, __constant real_t* thickness, __constant real_t* gamma, uint2* mwc, real_t* x, real_t* y)\n"
@ -944,7 +944,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1033,7 +1033,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1089,7 +1089,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -1133,7 +1133,7 @@ public:
helper.Out.z = m_Weight * (helper.m_TransZ + helper.In.z * coeff);
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1214,7 +1214,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1317,7 +1317,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1401,7 +1401,7 @@ public:
}
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1502,7 +1502,7 @@ public:
helper.Out.z = r * z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1581,7 +1581,7 @@ public:
helper.Out.z = r * helper.In.z / (helper.m_PrecalcSqrtSumSquares * m_AbsN);
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1655,7 +1655,7 @@ public:
helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1709,7 +1709,7 @@ public:
helper.Out.z = T(helper.In.z < 0 ? -1 : 1) * pow(fabs(helper.In.z), m_PowZ) * m_Weight;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1768,7 +1768,7 @@ public:
helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1826,7 +1826,7 @@ public:
helper.Out.z = helper.In.z * r * m_Z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1890,7 +1890,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1973,7 +1973,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -2015,7 +2015,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -2089,7 +2089,7 @@ public:
helper.Out.z = tempPz + m_Weight * (m_Weight / d * tempTz / e);
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -2175,7 +2175,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -2243,7 +2243,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -2324,7 +2324,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2411,7 +2411,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2498,7 +2498,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2597,7 +2597,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2751,7 +2751,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2883,7 +2883,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2963,7 +2963,7 @@ public:
helper.Out.z = m_Weight * (sy * cn);
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -3033,7 +3033,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -3117,7 +3117,7 @@ public:
helper.Out.z = m_Weight * (m_Sor * cy) + (m_1MinusSor * helper.In.y);
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -3222,7 +3222,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -3328,7 +3328,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -3397,7 +3397,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -3470,7 +3470,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -3553,7 +3553,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -3664,7 +3664,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -3746,7 +3746,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -3809,7 +3809,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -3881,7 +3881,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4013,7 +4013,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4123,7 +4123,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4223,7 +4223,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4319,7 +4319,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4407,7 +4407,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4493,7 +4493,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();

118
Source/Ember/Variations04.h
View File

@ -39,7 +39,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -208,7 +208,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -427,7 +427,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -543,7 +543,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -608,7 +608,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -645,7 +645,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -695,7 +695,7 @@ public:
helper.Out.z = z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
int i = 0;
@ -780,7 +780,7 @@ public:
helper.Out.z = m_RySin * helper.In.x + m_RyCos * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
int i = 0;
@ -862,7 +862,7 @@ public:
}
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
int i = 0;
@ -950,7 +950,7 @@ public:
}
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
@ -1023,7 +1023,7 @@ public:
}
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
@ -1096,7 +1096,7 @@ public:
}
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
@ -1159,7 +1159,7 @@ public:
helper.Out.y = m_Weight * (helper.In.y + (rand.Frand01<T>() - T(0.5)) * r);
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1239,7 +1239,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;//Original did not multiply by weight. Do it here to be consistent with others.
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1322,7 +1322,7 @@ public:
helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1411,7 +1411,7 @@ public:
helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1466,7 +1466,7 @@ public:
return ss.str();
}
virtual string OpenCLFuncsString()
virtual string OpenCLFuncsString() const
{
return
"real_t VoronDiscreteNoise(int x)\n"
@ -1560,7 +1560,7 @@ public:
helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
int i = 0;
@ -1655,7 +1655,7 @@ public:
helper.Out.z = m_Weight * (rand.Frand01<T>() - T(0.5));
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -1727,7 +1727,7 @@ public:
}
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1915,7 +1915,7 @@ public:
}
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2024,7 +2024,7 @@ public:
}
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2142,7 +2142,7 @@ public:
helper.Out.z = radiusOut * z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2283,7 +2283,7 @@ public:
helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2433,7 +2433,7 @@ public:
helper.Out.z = (ny * dt - nt * dy - nz * dx + nx * dz) * ni;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2564,7 +2564,7 @@ public:
helper.Out.z = m_Weight * pc * (zr + m_Radius);
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2631,7 +2631,7 @@ public:
helper.Out.z = m_Z * r * cv;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2718,7 +2718,7 @@ public:
outPoint.m_ColorX = Clamp<T>(outPoint.m_ColorX + m_DcAdjust * c, 0, 1);
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2828,7 +2828,7 @@ public:
helper.Out.z = r * cp;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
int i = 0;
@ -3008,7 +3008,7 @@ public:
helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -3079,7 +3079,7 @@ public:
return ss.str();
}
virtual string OpenCLFuncsString()
virtual string OpenCLFuncsString() const
{
return
"real_t Interference2Sine(real_t a, real_t b, real_t c, real_t p, real_t x)\n"
@ -3170,7 +3170,7 @@ public:
helper.Out.z = d * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -3217,7 +3217,7 @@ public:
helper.Out.z = d * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -3265,7 +3265,7 @@ public:
helper.Out.z = -(d * helper.In.z);
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -3314,7 +3314,7 @@ public:
helper.Out.z = -(d * helper.In.z);
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -3368,7 +3368,7 @@ public:
helper.Out.z = (nstcv * b * helper.In.z + d * helper.In.z * ctcv) * ni;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -3427,7 +3427,7 @@ public:
helper.Out.z = (nstcv * b * helper.In.z + d * helper.In.z * ctcv) * ni;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -3480,7 +3480,7 @@ public:
helper.Out.z = d * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -3527,7 +3527,7 @@ public:
helper.Out.z = d * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -3580,7 +3580,7 @@ public:
helper.Out.z = -(nstcv * b * helper.In.z + d * helper.In.z * ctcv) * ni;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -3639,7 +3639,7 @@ public:
helper.Out.z = -(nstcv * b * helper.In.z + d * helper.In.z * ctcv) * ni;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -3693,7 +3693,7 @@ public:
helper.Out.z = -(d * helper.In.z);
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -3742,7 +3742,7 @@ public:
helper.Out.z = -(d * helper.In.z);
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -3789,7 +3789,7 @@ public:
helper.Out.z = m_Weight * a * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -3834,7 +3834,7 @@ public:
helper.Out.z = c * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -3893,7 +3893,7 @@ public:
helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -3935,7 +3935,7 @@ public:
helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4045,7 +4045,7 @@ public:
helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4236,7 +4236,7 @@ public:
helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
int i = 0;
@ -4458,7 +4458,7 @@ public:
helper.Out.z = m_Weight * helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4507,7 +4507,7 @@ public:
return ss.str();
}
virtual string OpenCLFuncsString()
virtual string OpenCLFuncsString() const
{
return
"inline real_t GdoffsFcip(real_t a) { return (real_t)((a < 0) ? -((int)(fabs(a)) + 1) : 0) + ((a > 1) ? ((int)(a)) : 0); }\n"
@ -4642,7 +4642,7 @@ public:
}
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4779,7 +4779,7 @@ public:
helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4895,7 +4895,7 @@ public:
helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -4970,7 +4970,7 @@ public:
helper.Out.z = m_Weight * helper.In.z * (sinr - cosr);
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -5012,7 +5012,7 @@ public:
helper.Out.z = m_Weight * sin(m_BlobWaves * helper.m_PrecalcAtanxy) * r;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -5100,7 +5100,7 @@ public:
helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -5239,7 +5239,7 @@ MAKEPREPOSTPARVAR(Blocky, blocky, BLOCKY)
// helper.Out.z = m_Weight * helper.In.z;
// }
//
// virtual string OpenCLString() override
// virtual string OpenCLString() const override
// {
// ostringstream ss;
// intmax_t varIndex = IndexInXform();
@ -5270,7 +5270,7 @@ MAKEPREPOSTPARVAR(Blocky, blocky, BLOCKY)
// helper.Out.z = m_Weight * helper.In.z;
// }
//
// virtual string OpenCLString() override
// virtual string OpenCLString() const override
// {
// ostringstream ss;
// intmax_t varIndex = IndexInXform();

56
Source/Ember/Variations05.h
View File

@ -34,7 +34,7 @@ public:
helper.Out.z += helper.In.z * r * m_Z;//The += is intentional.
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -142,7 +142,7 @@ public:
helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -208,7 +208,7 @@ public:
return ss.str();
}
virtual string OpenCLFuncsString()
virtual string OpenCLFuncsString() const
{
return
"real_t CircleLinearDiscreteNoise2(int x, int y)\n"
@ -300,7 +300,7 @@ public:
helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -339,7 +339,7 @@ public:
return ss.str();
}
virtual string OpenCLFuncsString()
virtual string OpenCLFuncsString() const
{
return
"real_t CircleRandDiscreteNoise2(int x, int y)\n"
@ -428,7 +428,7 @@ public:
helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -470,7 +470,7 @@ public:
return ss.str();
}
virtual string OpenCLFuncsString()
virtual string OpenCLFuncsString() const
{
return
"real_t CircleTrans1DiscreteNoise2(int x, int y)\n"
@ -666,7 +666,7 @@ public:
}
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -897,7 +897,7 @@ public:
}
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1039,7 +1039,7 @@ public:
helper.Out.z = sin(boot) * tmp;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -1095,7 +1095,7 @@ public:
helper.Out.z = m_Weight * z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1175,7 +1175,7 @@ public:
helper.Out.z = r * z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1259,7 +1259,7 @@ public:
helper.Out.z = m_Uz * r;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1354,7 +1354,7 @@ public:
}
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1430,7 +1430,7 @@ public:
helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1500,7 +1500,7 @@ public:
helper.Out.z = m_Weight * (helper.In.z + m_Scale * sin(avgxy * m_Freq));//Averages the XY to get Z.
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1560,7 +1560,7 @@ public:
helper.Out.z = m_Weight * sin(r);
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1639,7 +1639,7 @@ public:
helper.Out.z = tempPZ + m_Vv * (m_Z * m_SinTanC * tempTZ);
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
int i = 0;
@ -1735,7 +1735,7 @@ public:
helper.Out.z = m_Weight * (atan2(SQR(helper.In.x), SQR(helper.In.y)) * cos(helper.In.z));
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -1775,7 +1775,7 @@ public:
helper.Out.z = z * r;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
int i = 0;
@ -1842,7 +1842,7 @@ public:
//outPoint.m_Y = 0;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -1971,7 +1971,7 @@ public:
helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2078,7 +2078,7 @@ public:
helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -2157,7 +2157,7 @@ public:
}
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2336,7 +2336,7 @@ public:
}
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
int i = 0;
@ -2546,7 +2546,7 @@ public:
}
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
int i = 0;
@ -2739,7 +2739,7 @@ public:
helper.Out.z = (m_VarType == VARTYPE_REG) ? 0 : helper.In.z;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -2864,7 +2864,7 @@ public:
return ss.str();
}
virtual string OpenCLFuncsString()
virtual string OpenCLFuncsString() const
{
return
"\n"

16
Source/Ember/VariationsDC.h
View File

@ -36,7 +36,7 @@ public:
outPoint.m_ColorX = fmod(fabs(m_Bdcs * (Sqr<T>(tempX + m_CenterX) + Sqr<T>(tempY + m_CenterY))), T(1.0));
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -118,7 +118,7 @@ public:
outPoint.m_ColorX = fmod(fabs(outPoint.m_ColorX * T(0.5) * (1 + h) + x0_xor_y0 * (1 - h) * T(0.5)), T(1.0));
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -229,7 +229,7 @@ public:
helper.Out.z = z * m_DcCubeZ;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -387,7 +387,7 @@ public:
outPoint.m_ColorX = fmod(fabs(T(0.5) * (m_Ldcs * ((m_Cosa * tempX + m_Sina * tempY + m_Offset)) + 1)), T(1.0));
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -548,7 +548,7 @@ public:
outPoint.m_ColorX = fmod(c, T(1.0));
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss;
intmax_t varIndex = IndexInXform();
@ -661,7 +661,7 @@ public:
outPoint.m_ColorX = fmod(fabs(T(0.5) * (m_Ldcs * ((m_Cosa * tempX + m_Sina * tempY + m_Offset)) + T(1.0))), T(1.0));
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -822,7 +822,7 @@ public:
outPoint.m_ColorX = fmod(fabs(u + v), T(1.0));
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();
@ -967,7 +967,7 @@ public:
helper.Out.z = m_Weight * zf;
}
virtual string OpenCLString() override
virtual string OpenCLString() const override
{
ostringstream ss, ss2;
intmax_t i = 0, varIndex = IndexInXform();

2
Source/Ember/Xform.h
View File

@ -820,7 +820,7 @@ public:
const vector<T>& XaosVec() const { return m_Xaos; }
Ember<T>* ParentEmber() const { return m_ParentEmber; }
void ParentEmber(Ember<T>* ember) { m_ParentEmber = ember; }
intmax_t IndexInParentEmber() { return m_ParentEmber ? m_ParentEmber->GetTotalXformIndex(this) : -1; }
intmax_t IndexInParentEmber() const { return m_ParentEmber ? m_ParentEmber->GetTotalXformIndex(const_cast<Xform<T>*>(this)) : -1; }
/// <summary>
/// Set the precalc flags based on whether any variation in the vector needs them.

18
Source/EmberTester/EmberTester.cpp
View File

@ -321,7 +321,7 @@ void TestAtomicAdd()
}
template <typename T>
bool SearchVar(Variation<T>* var, vector<string>& stringVec, bool matchAll)
bool SearchVar(const Variation<T>* var, vector<string>& stringVec, bool matchAll)
{
bool ret = false;
size_t i;
@ -363,7 +363,7 @@ static vector<Variation<T>*> FindVarsWith(vector<string>& stringVec, bool findAl
while (index < vl.RegSize())
{
Variation<T>* regVar = vl.GetVariation(index, VARTYPE_REG);
auto regVar = vl.GetVariation(index, VARTYPE_REG);
if (SearchVar(regVar, stringVec, false))
{
@ -449,7 +449,7 @@ bool TestVarUnique()
}
template <typename sT, typename dT>
bool TestVarPrecalcEqual(Variation<sT>* var1, Variation<dT>* var2)
bool TestVarPrecalcEqual(const Variation<sT>* var1, const Variation<dT>* var2)
{
bool success = true;
@ -807,7 +807,7 @@ bool TestVarPrecalcUsedCL()
for (size_t i = 0; i < vlf.Size(); i++)
{
Variation<float>* var = vlf.GetVariation(i);
auto var = vlf.GetVariation(i);
string s = var->OpenCLString();
if (var->NeedPrecalcAngles())
@ -997,7 +997,7 @@ bool TestVarAssignTypes()
for (size_t i = 0; i < vlf.Size(); i++)
{
Variation<float>* var = vlf.GetVariation(i);
auto var = vlf.GetVariation(i);
string s = var->OpenCLString();
//Only test pre and post. The assign type for regular is ignored, and will always be summed.
@ -1055,7 +1055,7 @@ bool TestVarAssignVals()
for (size_t i = 0; i < vlf.Size(); i++)
{
Variation<float>* var = vlf.GetVariation(i);
auto var = vlf.GetVariation(i);
if (!SearchVar(var, xout, false))
{
@ -1089,7 +1089,7 @@ bool TestZepsFloor()
for (size_t i = 0; i < vlf.Size(); i++)
{
Variation<float>* var = vlf.GetVariation(i);
auto var = vlf.GetVariation(i);
if (SearchVar(var, zeps, false))
{
@ -1114,7 +1114,7 @@ bool TestConstants()
for (size_t i = 0; i < vlf.Size(); i++)
{
Variation<float>* var = vlf.GetVariation(i);
auto var = vlf.GetVariation(i);
if (SearchVar(var, stringVec, false))
{
@ -1131,7 +1131,7 @@ void PrintAllVars()
uint i = 0;
VariationList<float> vlf;
while(Variation<float>* var = vlf.GetVariation(i++))
while(auto var = vlf.GetVariation(i++))
cout << var->Name() << endl;
}