diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-05-12 23:55:52 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-05-12 23:55:52 +0200 |
| commit | 7c2b9478d52e5122eff2e11298f31bfc1b896f94 (patch) | |
| tree | 53ad6828eb1366a5dd00d9977eec330bd3d7b52f /src/animation | |
| parent | Merge remote-tracking branch 'origin/master' into miami (diff) | |
| parent | Merge pull request #537 from ShFil119/linux_warns (diff) | |
| download | re3-7c2b9478d52e5122eff2e11298f31bfc1b896f94.tar re3-7c2b9478d52e5122eff2e11298f31bfc1b896f94.tar.gz re3-7c2b9478d52e5122eff2e11298f31bfc1b896f94.tar.bz2 re3-7c2b9478d52e5122eff2e11298f31bfc1b896f94.tar.lz re3-7c2b9478d52e5122eff2e11298f31bfc1b896f94.tar.xz re3-7c2b9478d52e5122eff2e11298f31bfc1b896f94.tar.zst re3-7c2b9478d52e5122eff2e11298f31bfc1b896f94.zip | |
Diffstat (limited to 'src/animation')
| -rw-r--r-- | src/animation/AnimBlendAssociation.h | 5 | ||||
| -rw-r--r-- | src/animation/FrameUpdate.cpp | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/animation/AnimBlendAssociation.h b/src/animation/AnimBlendAssociation.h index 7efd8099..fe9b18e0 100644 --- a/src/animation/AnimBlendAssociation.h +++ b/src/animation/AnimBlendAssociation.h @@ -63,7 +63,10 @@ public: CAnimBlendAssociation(void); CAnimBlendAssociation(CAnimBlendAssociation &other); - virtual ~CAnimBlendAssociation(void); +#ifndef FIX_BUGS + virtual +#endif + ~CAnimBlendAssociation(void); void AllocateAnimBlendNodeArray(int n); void FreeAnimBlendNodeArray(void); void Init(RpClump *clump, CAnimBlendHierarchy *hier); diff --git a/src/animation/FrameUpdate.cpp b/src/animation/FrameUpdate.cpp index 03e67017..b886e95d 100644 --- a/src/animation/FrameUpdate.cpp +++ b/src/animation/FrameUpdate.cpp @@ -148,11 +148,12 @@ FrameUpdateCallBackWithVelocityExtractionNonSkinned(AnimBlendFrameData *frame, v mat->pos.x = pos.x - transx; mat->pos.y = pos.y - transy; mat->pos.z = pos.z; - if(mat->pos.z >= -0.8f) + if(mat->pos.z >= -0.8f) { if(mat->pos.z < -0.4f) mat->pos.z += (2.5f * mat->pos.z + 2.0f) * frame->resetPos.z; else mat->pos.z += frame->resetPos.z; + } mat->pos.x += frame->resetPos.x; mat->pos.y += frame->resetPos.y; } @@ -356,11 +357,12 @@ FrameUpdateCallBackWithVelocityExtractionSkinned(AnimBlendFrameData *frame, void xform->t.x = pos.x - transx; xform->t.y = pos.y - transy; xform->t.z = pos.z; - if(xform->t.z >= -0.8f) + if(xform->t.z >= -0.8f) { if(xform->t.z < -0.4f) xform->t.z += (2.5f * xform->t.z + 2.0f) * frame->resetPos.z; else xform->t.z += frame->resetPos.z; + } xform->t.x += frame->resetPos.x; xform->t.y += frame->resetPos.y; } |