mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-07-14 20:24:54 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

--Code changes

Browse Source 
-Convert all enums to class enum to be consistent with C++11 style.
 -Convert some if/else statements in filter classes to case statements.
 -Add overloaded stream operators to print various enums.
This commit is contained in:
mfeemster
2016-01-04 16:50:15 -08:00
parent c8e2355ec2
commit f5d0be5e5d
40 changed files with 1483 additions and 2041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Source/Ember/Xform.h
View File

@ -880,7 +880,7 @@ public:
{
bool shouldFlatten = true;
if (GetVariationById(VAR_FLATTEN) == nullptr)
if (GetVariationById(eVariationId::VAR_FLATTEN) == nullptr)
{
AllVarsFunc([&] (vector<Variation<T>*>& variations, bool & keepGoing)
{
@ -943,15 +943,15 @@ public:
switch (varType)
{
case VARTYPE_REG:
case VARTYPE_PRE:
case eVariationType::VARTYPE_REG:
case eVariationType::VARTYPE_PRE:
s =
"\tvIn.x = transX;\n"
"\tvIn.y = transY;\n"
"\tvIn.z = transZ;\n";
break;
case VARTYPE_POST:
case eVariationType::VARTYPE_POST:
default:
s =
"\tvIn.x = outPoint->m_X;\n"
@ -972,7 +972,7 @@ public:
{
switch (assignType)
{
case ASSIGNTYPE_SET:
case eVariationAssignType::ASSIGNTYPE_SET:
{
helper.m_TransX = helper.Out.x;
helper.m_TransY = helper.Out.y;
@ -980,7 +980,7 @@ public:
break;
}
case ASSIGNTYPE_SUM:
case eVariationAssignType::ASSIGNTYPE_SUM:
default:
{
helper.m_TransX += helper.Out.x;
@ -1000,7 +1000,7 @@ public:
{
switch (assignType)
{
case ASSIGNTYPE_SET:
case eVariationAssignType::ASSIGNTYPE_SET:
{
outPoint.m_X = helper.Out.x;
outPoint.m_Y = helper.Out.y;
@ -1008,7 +1008,7 @@ public:
break;
}
case ASSIGNTYPE_SUM:
case eVariationAssignType::ASSIGNTYPE_SUM:
default:
{
outPoint.m_X += helper.Out.x;
@ -1031,7 +1031,7 @@ public:
switch (varType)
{
case VARTYPE_REG:
case eVariationType::VARTYPE_REG:
{
s =
"\toutPoint->m_X += vOut.x;\n"
@ -1040,11 +1040,11 @@ public:
break;
}
case VARTYPE_PRE:
case eVariationType::VARTYPE_PRE:
{
switch (assignType)
{
case ASSIGNTYPE_SET:
case eVariationAssignType::ASSIGNTYPE_SET:
{
s =
"\ttransX = vOut.x;\n"
@ -1053,7 +1053,7 @@ public:
break;
}
case ASSIGNTYPE_SUM:
case eVariationAssignType::ASSIGNTYPE_SUM:
default:
{
s =
@ -1067,12 +1067,12 @@ public:
break;
}
case VARTYPE_POST:
case eVariationType::VARTYPE_POST:
default:
{
switch (assignType)
{
case ASSIGNTYPE_SET:
case eVariationAssignType::ASSIGNTYPE_SET:
{
s =
"\toutPoint->m_X = vOut.x;\n"
@ -1081,7 +1081,7 @@ public:
break;
}
case ASSIGNTYPE_SUM:
case eVariationAssignType::ASSIGNTYPE_SUM:
default:
{
s =