Fixed wrong entity rotation

ChangeLog.md

@@ -3,7 +3,8 @@
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
     [ 20140617 ]
-    * Finally fixed SkeletalModel bug introduced a month ago
+    * Finally fixed SkeletalModel bugs introduced a month ago
+      (animations and rotations are *mostly* correct now)
     * Reimplemented *animate* command
 
     [ 20140615 ]

src/Entity.cpp

@@ -17,14 +17,11 @@ Entity::Entity(TombRaider &tr, unsigned int index, unsigned int i, unsigned int
     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[1] = OR_DEG_TO_RAD(((item[i].angle >> 14) & 0x03) * 90.0f);
     angles[2] = 0;
     objectId = moveable[index].object_id;
     moveType = MoveTypeWalk;
@@ -46,6 +43,8 @@ void Entity::display() {
     glPushMatrix();
     glTranslatef(pos[0], pos[1], pos[2]);
     glRotatef(OR_RAD_TO_DEG(angles[1]), 0, 1, 0);
+    glRotatef(OR_RAD_TO_DEG(angles[0]), 1, 0, 0);
+    glRotatef(OR_RAD_TO_DEG(angles[2]), 0, 0, 1);
     getWorld().getSkeletalModel(skeletalModel).display(animationFrame, boneFrame);
     glPopMatrix();
 

src/SkeletalModel.cpp

@@ -280,14 +280,9 @@ void SkeletalModel::display(unsigned int aframe, unsigned int bframe) {
         tag.getOffset(off);
 
         if (a == 0) {
-            if (!equalEpsilon(rot[1], 0.0f))
-                glRotatef(rot[1], 0, 1, 0);
-
-            if (!equalEpsilon(rot[0], 0.0f))
-                glRotatef(rot[0], 1, 0, 0);
-
-            if (!equalEpsilon(rot[2], 0.0f))
-                glRotatef(rot[2], 0, 0, 1);
+            glRotatef(rot[1], 0, 1, 0);
+            glRotatef(rot[0], 1, 0, 0);
+            glRotatef(rot[2], 0, 0, 1);
         } else {
             if (tag.getFlag() & 0x01)
                 glPopMatrix();
@@ -296,15 +291,9 @@ void SkeletalModel::display(unsigned int aframe, unsigned int bframe) {
                 glPushMatrix();
 
             glTranslatef(off[0], off[1], off[2]);
-
-            if (!equalEpsilon(rot[1], 0.0f))
-                glRotatef(rot[1], 0, 1, 0);
-
-            if (!equalEpsilon(rot[0], 0.0f))
-                glRotatef(rot[0], 1, 0, 0);
-
-            if (!equalEpsilon(rot[2], 0.0f))
-                glRotatef(rot[2], 0, 0, 1);
+            glRotatef(rot[1], 0, 1, 0);
+            glRotatef(rot[0], 1, 0, 0);
+            glRotatef(rot[2], 0, 0, 1);
         }
 
         // Draw layered lara in TR4 (2 meshes per tag)