mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-05 12:47:53 +02:00
Code Issues Releases Wiki Activity

revert animation changes

Browse Source
This commit is contained in:
XProger
2020-01-21 23:44:00 +03:00
parent 8eb26c2f31
commit f9999c9d92
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/animation.h
View File

@@ -26,7 +26,6 @@ struct Animation {
Animation(TR::Level *level, const TR::Model *model, bool smooth = true) : level(level), model(NULL), smooth(smooth), overrides(NULL), overrideMask(0) { Animation(TR::Level *level, const TR::Model *model, bool smooth = true) : level(level), model(NULL), smooth(smooth), overrides(NULL), overrideMask(0) {
setModel(model); setModel(model);
frameA = frameB = NULL;
} }
~Animation() { ~Animation() {
@@ -249,9 +248,6 @@ struct Animation {
} }
quat getJointRot(int joint) { quat getJointRot(int joint) {
if (!frameA || !frameB) {
return quat(0, 0, 0, 1);
}
return lerpAngle(frameA->getAngle(level->version, joint), frameB->getAngle(level->version, joint), delta); return lerpAngle(frameA->getAngle(level->version, joint), frameB->getAngle(level->version, joint), delta);
} }
@@ -260,10 +256,7 @@ struct Animation {
ASSERT(model); ASSERT(model);
vec3 offset = isPrepareToNext ? this->offset : vec3(0.0f); vec3 offset = isPrepareToNext ? this->offset : vec3(0.0f);
if (frameA && frameB) {
basis.translate(((vec3)frameA->pos).lerp(offset + frameB->pos, delta)); basis.translate(((vec3)frameA->pos).lerp(offset + frameB->pos, delta));
}
TR::Node *node = (int)model->node < level->nodesDataSize ? (TR::Node*)&level->nodesData[model->node] : NULL; TR::Node *node = (int)model->node < level->nodesDataSize ? (TR::Node*)&level->nodesData[model->node] : NULL;
@@ -305,9 +298,8 @@ struct Animation {
} }
Box getBoundingBox(const vec3 &pos, int dir) { Box getBoundingBox(const vec3 &pos, int dir) {
if (!model || !frameA || !frameB) { if (!model)
return Box(pos, pos); return Box(pos, pos);
}
vec3 nextMin = frameB->box.min(); vec3 nextMin = frameB->box.min();
vec3 nextMax = frameB->box.max(); vec3 nextMax = frameB->box.max();