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

--User changes

Browse Source 
-Allow for specifying linear or smooth interpolation when generating a sequence in the Library tab (was formerly hardcoded to smooth). This has the effect of exposing the --unsmoother option used in EmberGenome in the GUI.
 -Clarify tool tips of the sequence interpolation fields in the animation group on the Flame tab.
 -Change caption of the Bounds tab to be Bounds & Log.
This commit is contained in:
Person
2021-03-28 20:37:02 -06:00
parent 897ccdd375
commit 0956cd6592
9 changed files with 537 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Ember/Ember.h
View File

@ -922,7 +922,7 @@ public:
vector<v2T> cxTrn(size);
thisXform->m_Affine.m_Mat = m23T(0);
//Affine part.
Interpolater<T>::ConvertLinearToPolar(embers, size, i, 0, cxAng, cxMag, cxTrn);
Interpolater<T>::ConvertLinearToPolar(embers, size, i, false, cxAng, cxMag, cxTrn);
Interpolater<T>::InterpAndConvertBack(coefs, cxAng, cxMag, cxTrn, thisXform->m_Affine);
//Post part.
allID = true;
@ -945,7 +945,7 @@ public:
}
else
{
Interpolater<T>::ConvertLinearToPolar(embers, size, i, 1, cxAng, cxMag, cxTrn);
Interpolater<T>::ConvertLinearToPolar(embers, size, i, true, cxAng, cxMag, cxTrn);
Interpolater<T>::InterpAndConvertBack(coefs, cxAng, cxMag, cxTrn, thisXform->m_Post);
}
}

15
Source/Ember/Interpolate.h
View File

@ -667,13 +667,13 @@ public:
/// </summary>
/// <param name="embers">The vector of embers whose affine transforms will be copied and converted</param>
/// <param name="xfi">The xform index in each ember to convert</param>
/// <param name="cflag">If 0 convert pre affine, else post affine.</param>
/// <param name="post">True to convert post affine, else convert pre affine.</param>
/// <param name="cxAng">The vec2 vector to store the polar angular values</param>
/// <param name="cxMag">The vec2 vector to store the polar magnitude values</param>
/// <param name="cxTrn">The vec2 vector to store the polar translation values</param>
static void ConvertLinearToPolar(const vector<Ember<T>>& embers, size_t xfi, size_t cflag, vector<v2T>& cxAng, vector<v2T>& cxMag, vector<v2T>& cxTrn)
static void ConvertLinearToPolar(const vector<Ember<T>>& embers, size_t xfi, bool post, vector<v2T>& cxAng, vector<v2T>& cxMag, vector<v2T>& cxTrn)
{
ConvertLinearToPolar(embers.data(), embers.size(), xfi, cflag, cxAng, cxMag, cxTrn);
ConvertLinearToPolar(embers.data(), embers.size(), xfi, post, cxAng, cxMag, cxTrn);
}
/// <summary>
@ -683,11 +683,11 @@ public:
/// <param name="embers">The array of embers whose affine transforms will be copied and converted</param>
/// <param name="size">The size of the embers array</param>
/// <param name="xfi">The xform index in each ember to convert</param>
/// <param name="cflag">If 0 convert pre affine, else post affine.</param>
/// <param name="post">True to convert post affine, else convert pre affine.</param>
/// <param name="cxAng">The vec2 vector to store the polar angular values</param>
/// <param name="cxMag">The vec2 vector to store the polar magnitude values</param>
/// <param name="cxTrn">The vec2 vector to store the polar translation values</param>
static void ConvertLinearToPolar(const Ember<T>* embers, size_t size, size_t xfi, size_t cflag, vector<v2T>& cxAng, vector<v2T>& cxMag, vector<v2T>& cxTrn)
static void ConvertLinearToPolar(const Ember<T>* embers, size_t size, size_t xfi, bool post, vector<v2T>& cxAng, vector<v2T>& cxMag, vector<v2T>& cxTrn)
{
const auto LOCALEPS = T(1e-10);//Even though EPS is defined elsewhere, need this here for full compatibility with flam3.
@ -710,7 +710,7 @@ public:
{
for (col = 0; col < 2; col++)
{
if (cflag == 0)
if (!post)
{
c1[0] = xform->m_Affine.m_Mat[0][col];//a or b.
c1[1] = xform->m_Affine.m_Mat[1][col];//d or e.
@ -752,7 +752,7 @@ public:
if (auto xform = embers[k].GetTotalXform(xfi))
{
//Adjust angles differently if an asymmetric case.
if (xform->m_Wind[col] > 0 && cflag == 0)
if (xform->m_Wind[col] > 0 && !post)
{
//Adjust the angles to make sure that it's within wind : wind + 2pi.
refang = xform->m_Wind[col] - M_2PI;
@ -880,7 +880,6 @@ public:
else
accmag[col] += coefs[i] * (cxMag[i][col]);
//Translation is ready to go.
store.m_Mat[col][2] += coefs[i] * cxTrn[i][col];
}
}