libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-27 05:32:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1139 from Akz-/grim-elevator-fix

Browse Source 
GRIM: Quaternion rotation fixes
This commit is contained in:
Paweł Kołodziejski 2014-12-27 08:43:03 +01:00
commit 951a61a09a
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
engines/grim/model.cpp
View File

@ -198,9 +198,9 @@ void Model::loadText(TextSplitter *ts) {
_rootHierNode[num]._numChildren = numChildren;
_rootHierNode[num]._pos = Math::Vector3d(x, y, z);
_rootHierNode[num]._pitch = pitch;
_rootHierNode[num]._yaw = yaw;
_rootHierNode[num]._roll = roll;
_rootHierNode[num]._rot = Math::Quaternion::fromEuler(yaw, pitch, roll, Math::EO_ZXY);
_rootHierNode[num]._animRot = _rootHierNode[num]._rot;
_rootHierNode[num]._animPos = _rootHierNode[num]._pos;
_rootHierNode[num]._pivot = Math::Vector3d(pivotx, pivoty, pivotz);
_rootHierNode[num]._meshVisible = true;
_rootHierNode[num]._hierVisible = true;
@ -626,12 +626,13 @@ void ModelNode::loadBinary(Common::SeekableReadStream *data, ModelNode *hierNode
data->read(v3, 4 * 3);
_pos = Math::Vector3d::getVector3d(v3);
data->read(f, 4);
_pitch = get_float(f);
float pitch = get_float(f);
data->read(f, 4);
_yaw = get_float(f);
float yaw = get_float(f);
data->read(f, 4);
_roll = get_float(f);
_rot = Math::Quaternion::fromEuler(_yaw, _pitch, _roll, Math::EO_ZXY);
float roll = get_float(f);
_rot = Math::Quaternion::fromEuler(yaw, pitch, roll, Math::EO_ZXY);
_animRot = _rot;
_animPos = _pos;
_sprite = nullptr;

6
engines/grim/model.h
View File

@ -187,11 +187,11 @@ public:
int _type;
int _depth, _numChildren;
ModelNode *_parent, *_child, *_sibling;
// Specifies the bind pose for this node. This data is read from the model file and never altered
// (could be const).
Math::Vector3d _pos, _pivot;
// Specifies the bind pose YPR values for this node. This data
// is read from the model file and never altered (could be const).
Math::Angle _pitch, _yaw, _roll;
Math::Quaternion _rot;
// Specifies the animated pose for this node.
Math::Vector3d _animPos;
Math::Quaternion _animRot;
bool _meshVisible, _hierVisible;