Fixed SkeletalModel animation creation

ChangeLog.md

@@ -2,6 +2,9 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20140617 ]
+    * Finally fixed SkeletalModel bug introduced a month ago
+
     [ 20140615 ]
     * Added FontManager, selecting Font library to use depending on
       the file extension of the font file specified in the config.

TODO.md

@@ -2,23 +2,17 @@
 
 ## General
 
-There are these DebugModel, DebugMap flags...?
-
 * Endian dependence ugly, shouldn't dereference to different types?
     * TombRaider.h/cpp structs aren't aligned... unportable to some big endian & other archs?!
 * Use more asserts
 * Don't use C-Style code, try to replace with C++ lib
-    * Use shared_ptr, should make memory handling/segfaults much less of a problem
-        * Don't even new ... the data structures but use std::make_shared or allocate_shared?
-        * Pass object references to all other objects that need it, completely remove gOpenRaider
     * Use std::strings
-    * Rewrite Console and use operator << to write to the console
+    * Rewrite Console and use operator << to write to the console?
 * SDL_TTF 2.0.12+ can do line breaks, use it: http://stackoverflow.com/questions/17847818/how-to-do-line-breaks-and-line-wrapping-with-sdl-ttf/18418688#18418688
 
 ## Changes
 
 * Using std::vector with [] is not bound checked. Segfaults were caused because the upper bound of the argument was never checked and garbage was returned... Do consistent checks, or use .at() as it throws an exception
-* The wrong SkeletalModels are used by entities, except for Lara...?
 
 ## Cmake
 
@@ -28,7 +22,7 @@ There are these DebugModel, DebugMap flags...?
 
 ## Future Features
 
-* Use only assets from old TR games, not even depending on a font file?
 * Cut TGA image reader, currently only used for menu background?!
+    * Abstract image reading/writing, like Font Engine selection
 * When cutscene rendering is working, use TR4/5 style menu?
 

include/SkeletalModel.h

@@ -47,7 +47,7 @@ private:
 
 class AnimationFrame {
 public:
-    AnimationFrame(TombRaider &tr, unsigned int index, int a);
+    AnimationFrame(TombRaider &tr, unsigned int index, int a, unsigned int *frame_offset, int frame_step);
     ~AnimationFrame();
 
     unsigned int size();

src/SkeletalModel.cpp

@@ -102,16 +102,14 @@ void BoneFrame::getPosition(vec3_t p) {
     p[2] = pos[2];
 }
 
-AnimationFrame::AnimationFrame(TombRaider &tr, unsigned int index, int a) {
+AnimationFrame::AnimationFrame(TombRaider &tr, unsigned int index, int a, unsigned int *frame_offset, int frame_step) {
     tr2_moveable_t *moveable = tr.Moveable();
     tr2_animation_t *animation = tr.Animation();
 
-    unsigned int frame_offset = animation[a].frame_offset / 2;
-    int frame_step = animation[a].frame_size;
     unsigned int frame_count = (animation[a].frame_end - animation[a].frame_start) + 1;
     rate = animation[a].frame_rate;
 
-    for (unsigned int f = 0; f < frame_count; f++, frame_offset += frame_step) {
+    for (unsigned int f = 0; f < frame_count; f++, *frame_offset += frame_step) {
         // HACK: Lara's ObjectID is 315, but her meshes start at 0, so make a
         // quick substitution (so she doesn't appear as a bunch of thighs)
         if ((index == 0) && (tr.Engine() == TR_VERSION_3)) {
@@ -138,13 +136,13 @@ AnimationFrame::AnimationFrame(TombRaider &tr, unsigned int index, int a) {
             }
         }
 
-        if (frame_offset > tr.NumFrames()) {
+        if (*frame_offset > tr.NumFrames()) {
             getConsole().print("WARNING: Bad animation frame %i > %i (%u.%d)",
-                    frame_offset, tr.NumFrames(), index, a);
+                    *frame_offset, tr.NumFrames(), index, a);
             return;
         }
 
-        frame.push_back(new BoneFrame(tr, index, frame_offset));
+        frame.push_back(new BoneFrame(tr, index, *frame_offset));
     }
 }
 
@@ -234,20 +232,27 @@ SkeletalModel::SkeletalModel(TombRaider &tr, unsigned int index, int objectId) {
     unsigned int frame_offset = anim[a].frame_offset / 2;
     int frame_step = anim[a].frame_size;
 
+    int frame_cycle = 0;
+
     if (a >= (int)tr.NumAnimations())
         a = tr.NumFrames() - frame_offset; //! \fixme Couldn't a be already used out of range?!
     else
-        a = (anim[a].frame_offset / 2) - frame_offset;
+        a = (anim[a].frame_offset / 2) - frame_offset; //! \fixme Same as a = 0; ??
 
     if (frame_step != 0) // prevent divide-by-zero errors
         a /= frame_step;
 
+    if (a != 0)
+        frame_offset += frame_step * (frame_cycle % a);
+
     if (a < 0) {
         getConsole().print("Invalid animation data for model %d. Skip!", index);
         return;
     } else {
         for (; a < tr.getNumAnimsForMoveable(index); a++) {
-            animation.push_back(new AnimationFrame(tr, index, a));
+            animation.push_back(new AnimationFrame(tr, index, a, &frame_offset, frame_step));
+            frame_offset = anim[a].frame_offset / 2;
+            frame_step = anim[a].frame_size;
         }
     }
 }