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

--User changes

Browse Source 
-Users can now specify animation params on a per flame basis.
 --These get saved with the flame file.
 -Allow for rotating xforms around the world origin during animation.
 -Make the Clear Flame menu item be more comprehensive in how it clears a flame out.

--Bug fixes
 -Fix an extremely rare possible memory leak when using motion during animation, which is never used in Fractorium.
 -Do not skip to the current flame index, or attach a prefix in the Final Render Dialog when rendering an animation sequence.

--Code changes
 -Place all animation params in Ember.
This commit is contained in:
Person
2024-03-16 10:15:51 -06:00
parent 26e075def5
commit a0a205edd8
22 changed files with 864 additions and 857 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Ember/EmberToXml.cpp
View File

@ -158,6 +158,14 @@ string EmberToXml<T>::ToString(Ember<T>& ember, const string& extraAttributes, s
os << " cam_pitch=\"" << ember.m_CamPitch << "\"";
os << " cam_dof=\"" << ember.m_CamDepthBlur << "\"";
os << " blur_curve=\"" << ember.m_BlurCurve << "\"";
os << " stagger=\"" << ember.m_Stagger << "\"";
os << " rotations=\"" << ember.m_Rotations << "\"";
os << " seconds_per_rotation=\"" << ember.m_SecondsPerRotation << "\"";
os << " rotate_xforms_cw=\"" << ember.m_RotateXformsCw << "\"";
os << " blend_seconds=\"" << ember.m_BlendSeconds << "\"";
os << " rotations_per_blend=\"" << ember.m_RotationsPerBlend << "\"";
os << " blend_rotate_xforms_cw=\"" << ember.m_BlendRotateXformsCw << "\"";
os << " linear_blend=\"" << ember.m_Linear << "\"";
if (ember.m_PaletteMode == ePaletteMode::PALETTE_STEP)
os << " palette_mode=\"step\"";
@ -544,6 +552,7 @@ string EmberToXml<T>::ToString(Xform<T>& xform, size_t xformCount, bool isFinal,
std::replace(s.begin(), s.end(), ' ', '_');
os << "name=\"" << s << "\" ";//Flam3 didn't do this, but Apo does.
os << "animate=\"" << xform.m_Animate << "\" ";//Flam3 only did this for non-final. Ember supports animating final.
os << "animate_origin=\"" << xform.m_AnimateOrigin << "\" ";
}
//Variation writing order differs slightly from the original to make it a bit more readable.
@ -872,6 +881,10 @@ string EmberToXml<T>::ToString(const EmberMotion<T>& motion)
os << " vibrancy=\"" << motion.m_MotionParams[i].second << "\"";
break;
case eEmberMotionParam::FLAME_MOTION_SCALE:
os << " scale=\"" << motion.m_MotionParams[i].second << "\"";
break;
case eEmberMotionParam::FLAME_MOTION_NONE:
default:
break;