Move the velocity out of the transformation object

components/nif/nif_file.hpp

@@ -179,7 +179,6 @@ public:
         t.pos = getVector3();
         t.rotation = getMatrix3();
         t.scale = getFloat();
-        t.velocity = getVector3();
         return t;
     }
 

components/nif/nif_types.hpp

@@ -37,12 +37,11 @@ struct Transformation
     Ogre::Vector3 pos;
     Ogre::Matrix3 rotation;
     float scale;
-    Ogre::Vector3 velocity;
 
     static const Transformation& getIdentity()
     {
         static const Transformation identity = {
-            Ogre::Vector3::ZERO, Ogre::Matrix3::IDENTITY, 1.0f, Ogre::Vector3::ZERO
+            Ogre::Vector3::ZERO, Ogre::Matrix3::IDENTITY, 1.0f
         };
         return identity;
     }

components/nif/node.hpp

@@ -43,6 +43,7 @@ public:
     // Node flags. Interpretation depends somewhat on the type of node.
     int flags;
     Transformation trafo;
+    Ogre::Vector3 velocity; // Unused? Might be a run-time game state
     PropertyList props;
 
     // Bounding box info
@@ -57,6 +58,7 @@ public:
 
         flags = nif->getUShort();
         trafo = nif->getTrafo();
+        velocity = nif->getVector3();
         props.read(nif);
 
         hasBounds = !!nif->getInt();

components/nifbullet/bullet_nif_loader.cpp

@@ -204,7 +204,6 @@ void ManualBulletShapeLoader::handleNode(Nif::Node *node, int flags,
         // For both position and rotation we have that:
         // final_vector = old_vector + old_rotation*new_vector*old_scale
         final.pos = trafo->pos + trafo->rotation*final.pos*trafo->scale;
-        final.velocity = trafo->velocity + trafo->rotation*final.velocity*trafo->scale;
 
         // Merge the rotations together
         final.rotation = trafo->rotation * final.rotation;

components/nifogre/ogre_nif_loader.cpp

@@ -1121,7 +1121,6 @@ void NIFLoader::handleNode(Nif::Node *node, int flags,
         // For both position and rotation we have that:
         // final_vector = old_vector + old_rotation*new_vector*old_scale
         final.pos = trafo->pos + trafo->rotation*final.pos*trafo->scale;
-        final.velocity = trafo->velocity + trafo->rotation*final.velocity*trafo->scale;
 
         // Merge the rotations together
         final.rotation = trafo->rotation * final.rotation;