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

05/31/2017

Browse Source 
--User changes
 -Add support for adjusting xform color indices in the palette editor. Fixed palettes can now be displayed there, but they will have no color arrows as they are not editable.
 -Add support for independent dimension scaling in the EmberRender and EmberAnimate programs to bring them in line with the final render dialog Fractorium.

--Bug fixes
 -File paths with a space in them did not work in the command line programs.
 -Any Xml file in the search paths would erroneously be treated as a palette file.

--Code changes
 -Change some for loops to while loops when iterating through xforms.
 -Allow FractoriumEmberController<T>::UpdateXform() to be able to apply the action to an xform at a specific index.
 -Remove old code blocks build files that were never used.
 -Make GetPath() return empty string if no path is present in the passed in file path.
 -GetTotalXform() was always counting the final xform, even if it was unused.
This commit is contained in:
Person
2017-05-31 19:50:05 -07:00
parent f4bdc1c50a
commit 5a8b4b1148
49 changed files with 743 additions and 4031 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Source/Ember/Ember.h
View File

@ -316,17 +316,17 @@ public:
{
if (i < XformCount())
return const_cast<Xform<T>*>(&m_Xforms[i]);
else if (i == XformCount() || forceFinal)
else if (forceFinal || (i == XformCount() && UseFinalXform()))
return const_cast<Xform<T>*>(&m_FinalXform);
else
return nullptr;
}
/// <summary>
/// Search the xforms, excluding final, to find which one's address matches the address of the specified xform.
/// </summary>
/// <param name="xform">A pointer to the xform to find</param>
/// <returns>The index of the matched xform if found, else -1.</returns>
/// <summary>
/// Search the xforms, excluding final, to find which one's address matches the address of the specified xform.
/// </summary>
/// <param name="xform">A pointer to the xform to find</param>
/// <returns>The index of the matched xform if found, else -1.</returns>
intmax_t GetXformIndex(Xform<T>* xform) const
{
intmax_t index = -1;
@ -388,8 +388,10 @@ public:
/// </summary>
void DeleteMotionElements()
{
for (size_t i = 0; i < TotalXformCount(); i++)
GetTotalXform(i)->DeleteMotionElements();
size_t i = 0;
while (auto xform = GetTotalXform(i++))
xform->DeleteMotionElements();
m_EmberMotionElements.clear();
}
@ -399,9 +401,10 @@ public:
/// </summary>
void CacheXforms()
{
for (size_t i = 0; i < TotalXformCount(); i++)
size_t i = 0;
while (auto xform = GetTotalXform(i++))
{
auto xform = GetTotalXform(i);
xform->CacheColorVals();
xform->SetPrecalcFlags();
}
@ -594,12 +597,10 @@ public:
bool Flatten(vector<string>& names)
{
bool flattened = false;
size_t i = 0;
for (auto& xform : m_Xforms)
flattened |= xform.Flatten(names);
if (UseFinalXform())
flattened |= m_FinalXform.Flatten(names);
while (auto xform = GetTotalXform(i++))
flattened |= xform->Flatten(names);
return flattened;
}
@ -743,12 +744,8 @@ public:
for (size_t i = 0; i < totalXformCount; i++)//For each xform to populate.
{
for (size_t j = 0; j < size; j++)//For each ember in the list.
{
if (i < embers[j].TotalXformCount())//Xform in this position in this ember.
{
xformVec.push_back(embers[j].GetTotalXform(i));//Temporary list to pass to MergeXforms().
}
}
if (i < maxXformCount)//Working with standard xforms?
AddXform(Interpolater<T>::MergeXforms(xformVec, true));//Merge, set weights to zero, and add to the xform list.