mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-02-01 10:30:08 -05:00
fb262c2469
-Add motion support from Simon Detheridge at the ember level instead of just individual xforms: Add the ability to manipulate camera pitch, yaw and other goodies during flame rotation using a new element specified at the top-level of the flame. Create a new 'saw' motion function, so that these values can effectively be looped (e.g. yaw -1 to +1) over the course of a rotation. Add an offset to existing motion elements, to start them partway through their cycle. This would (for example) enable creating circular motion of xform affines, by combining two offset sine waves, one with an offset of 0.25 or 0.75. Fix loops in EmberGenome (they only had an on/off effect - this was broken in flame-genome as well) and make the loop count floating-point as well. For sequence animations, it's not necessary for clips to loop precisely if they're not designed specifically for the ES project. Similarly, there's no need for motion_frequency to be an integer value either so this was changed to allow motion that doesn't necessarily start or end at the loop boundary. I've attempted to keep each bit of functionality in its own commit. There's an argument as to whether to call the new flame motion elements <flame_motion/> (to differentiate programmatically) or just <motion/> (for consistency within the file) -- I opted for the former because it was easier to modify the xml parser that way. --Code changes -Change FlameMotion.h to EmberMotion.h to keep the naming convention consistent. -Made elements of EmberMotion.m_MotionParams into their own type, MotionParam, which allows for CopyVec() to work. -Change m_FlameMotionElements to m_EmberMotionElements in Ember. -Use CopyVec() for EmberMotion instead of manual copy in copy constructors. -Add exports in Ember.cpp for EmberMotion. -Format eEmberMotionParam enum with one entry per line since it has many entries. -Use fabs() in XmlToEmber instead of glm::abs. -Minor formatting. |
||
|---|---|---|
| .. | ||
| Affine2D.cpp | ||
| Affine2D.h | ||
| CarToRas.h | ||
| Curves.h | ||
| DensityFilter.h | ||
| DllMain.cpp | ||
| Ember.cpp | ||
| Ember.h | ||
| EmberDefines.h | ||
| EmberPch.cpp | ||
| EmberPch.h | ||
| EmberToXml.h | ||
| Interpolate.h | ||
| Isaac.h | ||
| Iterator.h | ||
| Palette.h | ||
| PaletteList.h | ||
| Point.h | ||
| Renderer.cpp | ||
| Renderer.h | ||
| RendererBase.cpp | ||
| RendererBase.h | ||
| SheepTools.h | ||
| SpatialFilter.h | ||
| TemporalFilter.h | ||
| Timing.h | ||
| Utils.h | ||
| Variation.h | ||
| VariationList.h | ||
| Variations01.h | ||
| Variations02.h | ||
| Variations03.h | ||
| Variations04.h | ||
| Variations05.h | ||
| VariationsDC.h | ||
| Xform.h | ||
| XmlToEmber.h | ||