teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Move the velocity out of the transformation object

Browse source
This commit is contained in:
Chris Robinson 2012-07-12 11:21:52 -07:00
parent b292665de9
commit 86b37c6c11
5 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
components/nif/nif_file.hpp
View file

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

3
components/nif/nif_types.hpp
View file

@ -37,12 +37,11 @@ struct Transformation
Ogre::Vector3 pos; Ogre::Vector3 pos;
Ogre::Matrix3 rotation; Ogre::Matrix3 rotation;
float scale; float scale;
Ogre::Vector3 velocity;
static const Transformation& getIdentity() static const Transformation& getIdentity()
{ {
static const Transformation identity = { 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; return identity;
} }

2
components/nif/node.hpp
View file

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

1
components/nifbullet/bullet_nif_loader.cpp
View file

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

1
components/nifogre/ogre_nif_loader.cpp
View file

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