Ported Entity and SkeletalModel constructor

include/Entity.h

@@ -21,7 +21,7 @@ public:
         MoveTypeSwim       = 3
     } MoveType;
 
-    Entity(TombRaider &tr);
+    Entity(TombRaider &tr, unsigned int index, unsigned int i, unsigned int model);
 
     bool operator<(Entity &o);
     void display();

include/SkeletalModel.h

@@ -62,7 +62,6 @@ public:
 
     unsigned int size();
     AnimationFrame &get(unsigned int i);
-    void add(AnimationFrame &a);
 
 private:
     int id;

src/Entity.cpp

@@ -19,8 +19,42 @@
 #include "Entity.h"
 #include "main.h"
 
-Entity::Entity(TombRaider &tr) {
+Entity::Entity(TombRaider &tr, unsigned int index, unsigned int i, unsigned int model) {
+    tr2_moveable_t *moveable = tr.Moveable();
+    tr2_item_t *item = tr.Item();
 
+    vec_t yaw = ((item[i].angle >> 14) & 0x03);
+    yaw *= 90;
+
+    pos[0] = item[i].x;
+    pos[1] = item[i].y;
+    pos[2] = item[i].z;
+    angles[0] = 0;
+    angles[1] = yaw;
+    angles[2] = 0;
+    objectId = moveable[index].object_id;
+    moveType = MoveTypeWalk;
+    room = getWorld().getRoomByLocation(pos[0], pos[1], pos[2]);
+    skeletalModel = model;
+    boneFrame = 0;
+    animationFrame = 0;
+    idleAnimation = 0;
+    state = 0;
+
+    if (tr.Engine() == TR_VERSION_1) {
+        switch (objectId) {
+            case TombRaider1::Wolf:
+                state = TombRaider1::WolfState_Lying;
+                animationFrame = 3;
+                break;
+        }
+    }
+
+    // Gather more info if this is lara
+    if (objectId == 0) {
+        animationFrame = TR_ANIAMTION_RUN;
+        idleAnimation = TR_ANIAMTION_STAND;
+    }
 }
 
 bool Entity::operator<(Entity &o) {

src/Game.cpp

@@ -381,13 +381,10 @@ void Game::processMoveables()
 
 // index moveable, i item, sometimes both moveable
 // object_id of item or moveable
-void Game::processMoveable(int index, int i, int object_id)
-{
-    //std::vector<skeletal_model_t *> &cache2
-    //std::vector<unsigned int> &cache
-
+void Game::processMoveable(int index, int i, int object_id) {
     bool cached = false;
-    for (unsigned int mod = 0; mod < getWorld().sizeSkeletalModel(); mod++) {
+    unsigned int mod = 0;
+    for (; mod < getWorld().sizeSkeletalModel(); mod++) {
         if (getWorld().getSkeletalModel(mod).getId() == moveable[index].object_id) {
             cached = true;
             break;
@@ -395,310 +392,14 @@ void Game::processMoveable(int index, int i, int object_id)
     }
 
     if (!cached) {
-        getWorld().addSkeletalModel(*new SkeletalModel(mTombRaider, index));
-    }
-
-    getWorld().addEntity(*new Entity(mTombRaider, /* ... */ mod));
-
-
-
-    // This creates both Entity and SkeletalModel
-    // Basic Idea:
-    // - Move animation state from SkeletalModel into Entity
-    // - Check if skeletal model is already stored
-    // - If so tell new Entity to reuse
-    // - Else store new skeletal model, tell new entity to use this one
-
-
-
-
-    int j, k, a, frame_step;
-    unsigned int l, frame_offset, frame_count, f;
-
-    unsigned short *frame = mTombRaider.Frame();
-    tr2_moveable_t *moveable = mTombRaider.Moveable();
-    tr2_meshtree_t *meshtree = mTombRaider.MeshTree();
-    tr2_mesh_t *mesh = mTombRaider.Mesh();
-    tr2_item_t *item = mTombRaider.Item();
-    tr2_animation_t *animation = mTombRaider.Animation();
-
-    float yaw = ((item[i].angle >> 14) & 0x03);
-    yaw *= 90;
-
-    entity_t *thing = new entity_t;
-    thing->pos[0] = item[i].x;
-    thing->pos[1] = item[i].y;
-    thing->pos[2] = item[i].z;
-    thing->angles[1] = yaw;
-    thing->objectId = moveable[index].object_id;
-
-    SkeletalModel *sModel = new SkeletalModel();
-    getRender().addSkeletalModel(sModel);
-    thing->tmpHook = sModel; // temp hack to keep a running version during refactoring
-
-    if (mTombRaider.Engine() == TR_VERSION_1)
-    {
-        switch (thing->objectId)
-        {
-            case TombRaider1::Wolf:
-                thing->state = TombRaider1::WolfState_Lying;
-                sModel->setAnimation(3);
-                sModel->setFrame(0);
-                break;
-        }
-    }
-
-    skeletal_model_t *r_model = new skeletal_model_t;
-    r_model->id = moveable[index].object_id;
-
-    // Gather more info if this is lara
-    if (moveable[index].object_id == 0)
-    {
-        mLara = thing; // Mongoose 2002.03.22, Cheap hack for now
-
-        sModel->setAnimation(TR_ANIAMTION_RUN);
-        sModel->setIdleAnimation(TR_ANIAMTION_STAND);
-
-        // Only TR4 lara has 2 layer bone tags/meshes per bone frame
-        r_model->tr4Overlay = (mTombRaider.Engine() == TR_VERSION_4);
-        r_model->ponytailId = 0;
-    }
-    else
-    {
-        r_model->ponytailId = -1;
-    }
-
-    // Animation
-    a = moveable[index].animation;
-
-    frame_offset = animation[a].frame_offset / 2;
-    frame_step = animation[a].frame_size;
-
-    if (a >= (int)mTombRaider.NumAnimations())
-    {
-        a = mTombRaider.NumFrames() - frame_offset;
-    }
-    else
-    {
-        a = (animation[a].frame_offset / 2) - frame_offset;
-    }
-
-    if (frame_step != 0)  // prevent divide-by-zero errors
-        a /= frame_step;
-
-    if (a < 0)
-    {
-        //continue;
-        getConsole().print("Invalid animation data for model %d", index);
-        delete r_model;
-        return; // leaking thing here!
-    }
-
-    //! \fixme Might be better UID for each model, but this seems to work well
-    j = object_id;
-
-    // We only want one copy of the skeletal model in memory
-    unsigned int foundIndex;
-    bool found = false;
-    for (foundIndex = 0; foundIndex < cache.size(); foundIndex++) {
-        if ((int)cache[foundIndex] == j) {
-            found = true;
-            break;
-        }
+        getWorld().addSkeletalModel(*new SkeletalModel(mTombRaider, index, i));
     }
-    if (!found)
-    {
-        sModel->model = r_model;
-        getWorld().addEntity(thing);
-
-        k = getWorld().addModel(r_model);
-
-        cache.push_back(j);
-        cache2.push_back(r_model);
-
-        switch (mTombRaider.Engine())
-        {
-            case TR_VERSION_4:
-                if (mLara && moveable[index].object_id == 30)
-                {
-                    r_model->ponytailId = k;
-                    r_model->ponytailMeshId = moveable[index].starting_mesh;
-                    r_model->ponytailNumMeshes = ((moveable[index].num_meshes > 0) ?
-                            moveable[index].num_meshes : 0);
-                    r_model->ponytailAngle = -90.0f;
-                    r_model->ponytail[0] = -3;
-                    r_model->ponytail[1] = -22;
-                    r_model->ponytail[2] = -20;
-                    r_model->ponyOff = 40;
-                    r_model->ponyOff2 = 32;
-                    r_model->pigtails = false;
-
-                    // Try to guess pigtails by looking for certian num verts in head
-                    if (mesh[moveable[0].starting_mesh].num_vertices > 80)
-                    {
-                        r_model->pigtails = true;
-                        r_model->ponyOff -= 20;
-                        r_model->ponytail[1] -= 32;
-                    }
-
-                    getRender().setFlags(Render::fRenderPonytail);
-                    getConsole().print("Found known ponytail");
-                }
-                break; // ?
-            case TR_VERSION_1:
-            case TR_VERSION_2:
-            case TR_VERSION_3:
-            case TR_VERSION_5:
-            case TR_VERSION_UNKNOWN:
-                if (mLara && moveable[index].object_id == 2)
-                {
-                    r_model->ponytailId = k;
-                    r_model->ponytailMeshId = moveable[index].starting_mesh;
-                    r_model->ponytailNumMeshes = ((moveable[index].num_meshes > 0) ?
-                            moveable[index].num_meshes : 0);
-                    r_model->ponytailAngle = -90.0f;
-                    r_model->ponytail[0] = 0;
-                    r_model->ponytail[1] = -20;
-                    r_model->ponytail[2] = -20;
-                    r_model->ponyOff = 40;
-                    r_model->ponyOff2 = 0;
-
-                    getRender().setFlags(Render::fRenderPonytail);
-                    getConsole().print("Found ponytail?");
-                }
-                break;
-        }
-    }
-    else
-    {
-        // Already cached
-        delete r_model;
-        r_model = cache2[foundIndex];
-        sModel->model = r_model;
-        getWorld().addEntity(thing);
-        getWorld().addModel(r_model);
-        printf("c");
-        return;
-    }
-
-    //a = moveable[index].animation;
-    //frame_offset = animation[a].frame_offset / 2;
-    //frame_step = animation[a].frame_size;
-
-    for (; a < mTombRaider.getNumAnimsForMoveable(index); a++) {
-        frame_offset = animation[a].frame_offset / 2;
-        frame_step = animation[a].frame_size;
-
-        animation_frame_t *animation_frame = new animation_frame_t;
-        r_model->animation.push_back(animation_frame);
 
-        frame_count = (animation[a].frame_end - animation[a].frame_start) + 1;
-        animation_frame->rate = animation[a].frame_rate;
+    getWorld().addEntity(*new Entity(mTombRaider, index, i, mod));
 
-        // Get all the frames for aniamtion
-        for (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 && mTombRaider.Engine() == TR_VERSION_3)
-            {
-                for (j = 0; j < (int)mTombRaider.NumMoveables() && !index; ++j)
-                {
-                    if (moveable[j].object_id == 315)
-                        index = j;
-                }
-            }
-
-            // Fix Lara in TR4
-            if (index == 0 && mTombRaider.Engine() == TR_VERSION_4)
-            {
-                for (j = 0; j < (int)mTombRaider.NumMoveables() && !index; ++j)
-                {
-                    // Body is ItemID 8, joints are ItemID 9
-                    //  (TR4 demo: body is ItemID 10, joints are ItemID 11)
-                    if (moveable[j].object_id == 8)
-                        index = j;
-                }
-            }
-            else if (moveable[index].object_id == 8 &&
-                    mTombRaider.Engine() == TR_VERSION_4)
-            {
-                // KLUDGE to do "skinning"
-                index = 0;
-
-                for (j = 0; j < (int)mTombRaider.NumMoveables() && !index; ++j)
-                {
-                    // Body is ItemID 8, joints are ItemID 9
-                    //  (TR4 demo: body is ItemID 10, joints are ItemID 11)
-                    if (moveable[j].object_id == 9)
-                        index = j;
-                }
-            }
-
-            // Mongoose 2002.08.15, Was
-            //   if (frame_offset + 8 > _tombraider.NumFrames())
-            if (frame_offset > mTombRaider.NumFrames())
-            {
-                getConsole().print("WARNING: Bad animation frame %i > %i",
-                        frame_offset, mTombRaider.NumFrames());
-                return; //continue;
-            }
-
-            // Generate bone frames and tags per frame ////////////
-            bone_frame_t *bone = new bone_frame_t;
-            animation_frame->frame.push_back(bone);
-
-            // Init translate for bone frame
-            bone->pos[0] = (short)frame[frame_offset + 6];
-            bone->pos[1] = (short)frame[frame_offset + 7];
-            bone->pos[2] = (short)frame[frame_offset + 8];
-            bone->yaw = yaw;
-
-            //printf("%f %f %f\n", bone->pos[0], bone->pos[1], bone->pos[2]);
-
-            l = 9;   // First angle offset in this Frame
-
-            // Run through the tag and calculate the rotation and offset
-            for (j = 0; j < (int)moveable[index].num_meshes; ++j)
-            {
-                bone_tag_t *tag = new bone_tag_t;
-                bone->tag.push_back(tag);
-                tag->off[0] = 0.0;
-                tag->off[1] = 0.0;
-                tag->off[2] = 0.0;
-                tag->flag = 0x00;
-                tag->rot[0] = 0.0;
-                tag->rot[1] = 0.0;
-                tag->rot[2] = 0.0;
-                tag->mesh = moveable[index].starting_mesh + j;
-
-                // Setup offsets to produce skeletion
-                if (j == 0)
-                {
-                    // Always push tag[0], this isn't really used either
-                    tag->flag = 0x02;
-                }
-                else  // Nonprimary tag - position relative to first tag
-                {
-                    int *tree;
-                    // Hack: moveable[index].mesh_tree is a byte offset
-                    //       into mesh_tree[], so we have to convert to index
-                    tree = (int *)(void *)meshtree;
-                    tr2_meshtree_t *mesh_tree = (tr2_meshtree_t *)&tree[moveable[index].mesh_tree
-                        + ((j - 1) * 4)];
-
-                    tag->off[0] = mesh_tree->x;
-                    tag->off[1] = mesh_tree->y;
-                    tag->off[2] = mesh_tree->z;
-                    tag->flag = (char)mesh_tree->flags;
-                }
-
-                // Setup tag rotations
-                mTombRaider.computeRotationAngles(&frame, &frame_offset, &l,
-                        tag->rot, tag->rot+1, tag->rot+2);
-            }
-        }
-    }
+    // Store reference to Lara
+    if (getWorld().getEntity(getWorld().sizeEntity() - 1).getObjectId() == 0)
+        mLara = getWorld().sizeEntity() - 1;
 
     if (i == mTombRaider.getSkyModelId())
         getRender().setSkyMesh(i, //moveable[i].starting_mesh,

src/SkeletalModel.cpp

@@ -8,14 +8,60 @@
 
 #include <assert.h>
 
+#include "main.h"
 #include "SkeletalModel.h"
 
-BoneTag::BoneTag() {
+BoneTag::BoneTag(TombRaider &tr, unsigned int index, int j, unsigned int *l) {
+    tr2_moveable_t *moveable = mTombRaider.Moveable();
+    tr2_meshtree_t *meshtree = mTombRaider.MeshTree();
 
+    off[0] = 0.0;
+    off[1] = 0.0;
+    off[2] = 0.0;
+    flag = 0x00;
+    rot[0] = 0.0;
+    rot[1] = 0.0;
+    rot[2] = 0.0;
+    mesh = moveable[index].starting_mesh + j;
+
+    // Setup offsets to produce skeleton
+    if (j == 0) {
+        // Always push tag[0], this isn't really used either
+        tag->flag = 0x02;
+    } else { // Nonprimary tag - position relative to first tag
+
+        // Hack: moveable[index].mesh_tree is a byte offset
+        //       into mesh_tree[], so we have to convert to index
+        int *tree = (int *)(void *)meshtree;
+        tr2_meshtree_t *mesh_tree = (tr2_meshtree_t *)(tree
+                + moveable[index].mesh_tree + ((j - 1) * 4));
+
+        off[0] = mesh_tree->x;
+        off[1] = mesh_tree->y;
+        off[2] = mesh_tree->z;
+        flag = (char)mesh_tree->flags;
+    }
+
+    // Setup tag rotations
+    tr.computeRotationAngles(&frame, &frame_offset, l, rot, rot+1, rot+2);
 }
 
-BoneFrame::BoneFrame() {
+BoneFrame::BoneFrame(TombRaider &tr, unsigned int index, unsigned int i, unsigned int frame_offset) {
+    tr2_moveable_t *moveable = mTombRaider.Moveable();
+    unsigned short *frame = mTombRaider.Frame();
+
+    pos[0] = (short)frame[frame_offset + 6];
+    pos[1] = (short)frame[frame_offset + 7];
+    pos[2] = (short)frame[frame_offset + 8];
+
+    yaw = ((item[i].angle >> 14) & 0x03);
+    yaw *= 90;
 
+    unsigned int l = 9; // First angle offset in this Frame
+
+    // Run through the tag and calculate the rotation and offset
+    for (int j = 0; j < (int)moveable[index].num_meshes; ++j)
+        tag.push_back(*new BoneTag(tr, index, j, &l));
 }
 
 BoneFrame::~BoneFrame() {
@@ -36,8 +82,50 @@ void BoneFrame::add(BoneTag &b) {
     tag.push_back(&b);
 }
 
-AnimationFrame::AnimationFrame() {
-
+AnimationFrame::AnimationFrame(TombRaider &tr, unsigned int index, unsigned int i, int a) {
+    tr2_moveable_t *moveable = mTombRaider.Moveable();
+    tr2_animation_t *animation = mTombRaider.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) {
+        // 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)) {
+            for (int j = 0; (j < (int)tr.NumMoveables()) && (index == 0); j++) {
+                if (moveable[j].object_id == 315)
+                    index = j;
+            }
+        }
+
+        // Fix Lara in TR4
+        // Body is ItemID 8, joints are ItemID 9
+        // (TR4 demo: body is ItemID 10, joints are ItemID 11)
+        if ((index == 0) && (tr.Engine() == TR_VERSION_4)) {
+            for (int j = 0; (j < (int)tr.NumMoveables()) && (index == 0); j++) {
+                if (moveable[j].object_id == 8)
+                    index = j;
+            }
+        } else if ((moveable[index].object_id == 8) && (tr.Engine() == TR_VERSION_4)) {
+            // KLUDGE to do "skinning"
+            index = 0;
+            for (int j = 0; (j < (int)tr.NumMoveables()) && (index == 0); j++) {
+                if (moveable[j].object_id == 9)
+                    index = j;
+            }
+        }
+
+        if (frame_offset > tr.NumFrames()) {
+            getConsole().print("WARNING: Bad animation frame %i > %i",
+                    frame_offset, tr.NumFrames());
+            return;
+        }
+
+        frame.push_back(*new BoneFrame(tr, index, i, frame_offset));
+    }
 }
 
 AnimationFrame::~AnimationFrame() {
@@ -58,8 +146,93 @@ void AnimationFrame::add(BoneFrame &b) {
     frame.push_back(&b);
 }
 
-SkeletalModel::SkeletalModel(TombRaider &tr, unsigned int index) {
-
+SkeletalModel::SkeletalModel(TombRaider &tr, unsigned int index, unsigned int i) {
+    tr2_moveable_t *moveable = mTombRaider.Moveable();
+    tr2_animation_t *anim = mTombRaider.Animation();
+
+    id = moveable[index].object_id;
+
+    // Gather more info if this is lara
+    if (id == 0) {
+        // Only TR4 lara has 2 layer bone tags/meshes per bone frame
+        tr4Overlay = (mTombRaider.Engine() == TR_VERSION_4);
+        ponytailId = 0;
+    } else {
+        tr4Overlay = false;
+        ponytailId = -1;
+    }
+
+    switch (mTombRaider.Engine()) {
+        case TR_VERSION_4:
+            if (moveable[index].object_id == 30) {
+                ponytailId = getWorld().sizeSkeletalModel(); //! \fixme Why is this even needed?
+                ponytailMeshId = moveable[index].starting_mesh;
+                ponytailNumMeshes = ((moveable[index].num_meshes > 0) ?
+                        moveable[index].num_meshes : 0);
+                ponytailAngle = -90.0f;
+                ponytail[0] = -3;
+                ponytail[1] = -22;
+                ponytail[2] = -20;
+                ponyOff = 40;
+                ponyOff2 = 32;
+                pigtails = false;
+
+                // Try to guess pigtails by looking for certian num verts in head
+                if (mesh[moveable[0].starting_mesh].num_vertices > 80) {
+                    pigtails = true;
+                    ponyOff -= 20;
+                    ponytail[1] -= 32;
+                }
+
+                getRender().setFlags(Render::fRenderPonytail);
+                getConsole().print("Found known ponytail");
+            }
+            break;
+
+        case TR_VERSION_1:
+        case TR_VERSION_2:
+        case TR_VERSION_3:
+        case TR_VERSION_5:
+        case TR_VERSION_UNKNOWN:
+            if (moveable[index].object_id == 2) {
+                ponytailId = k;
+                ponytailMeshId = moveable[index].starting_mesh;
+                ponytailNumMeshes = ((moveable[index].num_meshes > 0) ?
+                        moveable[index].num_meshes : 0);
+                ponytailAngle = -90.0f;
+                ponytail[0] = 0;
+                ponytail[1] = -20;
+                ponytail[2] = -20;
+                ponyOff = 40;
+                ponyOff2 = 0;
+
+                getRender().setFlags(Render::fRenderPonytail);
+                getConsole().print("Found ponytail?");
+            }
+            break;
+    }
+
+    // Animations
+    int a = moveable[index].animation;
+    unsigned int frame_offset = anim[a].frame_offset / 2;
+    int frame_step = anim[a].frame_size;
+
+    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;
+
+    if (frame_step != 0) // prevent divide-by-zero errors
+        a /= frame_step;
+
+    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, i, a))
+        }
+    }
 }
 
 SkeletalModel::~SkeletalModel() {
@@ -80,7 +253,3 @@ AnimationFrame &SkeletalModel::get(unsigned int i) {
     return *animation.at(i);
 }
 
-void SkeletalModel::add(AnimationFrame &a) {
-    animation.push_back(&a);
-}
-

src/World.cpp

@@ -227,8 +227,6 @@ SpriteSequence &World::getSprite(unsigned int index) {
 }
 
 void World::addEntity(Entity &entity) {
-    //e->moveType = worldMoveType_walk; // Walk
-    //e->room = getRoomByLocation(e->pos[0], e->pos[1], e->pos[2]);
     mEntities.push_back(&entity);
 }