mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-06-30 21:36:33 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

More C++11

Browse Source
This commit is contained in:
mfeemster
2014-09-09 22:41:26 -07:00
parent e4a47d0d16
commit 44c90abb32
39 changed files with 881 additions and 730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Ember/Variations02.h
View File

@ -347,7 +347,7 @@ public:
virtual string OpenCLString() override
{
ostringstream ss, ss2;
int i = 0, varIndex = IndexInXform();
int varIndex = IndexInXform();
ss2 << "_" << XformIndexInEmber() << "]";
string index = ss2.str();
@ -1925,7 +1925,7 @@ public:
virtual string OpenCLString() override
{
ostringstream ss, ss2;
int i = 0, varIndex = IndexInXform();
int i = 0;
ss2 << "_" << XformIndexInEmber() << "]";
string index = ss2.str();
string repeat = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
@ -4435,7 +4435,6 @@ public:
{
T c0 = helper.In.x * m_Vpi;
T c1 = helper.In.y * m_Vpi;
T c2 = helper.In.z * m_Vpi;
T sinc0, cosc0, sinc1, cosc1;
sincos(c0, &sinc0, &cosc0);
@ -4449,7 +4448,7 @@ public:
virtual string OpenCLString() override
{
ostringstream ss, ss2;
int i = 0, varIndex = IndexInXform();
int i = 0;
ss2 << "_" << XformIndexInEmber() << "]";
string index = ss2.str();
string zscale = "parVars[" + ToUpper(m_Params[i++].Name()) + index;
@ -4458,7 +4457,6 @@ public:
ss << "\t{\n"
<< "\t\treal_t c0 = vIn.x * " << vpi << ";\n"
<< "\t\treal_t c1 = vIn.y * " << vpi << ";\n"
<< "\t\treal_t c2 = vIn.z * " << vpi << ";\n"
<< "\n"
<< "\t\treal_t sinc0 = sin(c0);\n"
<< "\t\treal_t cosc0 = cos(c0);\n"