diff options
| author | aap <aap@papnet.eu> | 2020-05-08 15:59:57 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-08 15:59:57 +0200 |
| commit | 2eee4c51764d0d73986f2aae64fbaf4c0beeb9c1 (patch) | |
| tree | 25f43ed9e6a30b05603d3f1b75be3d3f8d2fee5f /src/animation/RpAnimBlend.cpp | |
| parent | Merge pull request #522 from Nick007J/miami (diff) | |
| download | re3-2eee4c51764d0d73986f2aae64fbaf4c0beeb9c1.tar re3-2eee4c51764d0d73986f2aae64fbaf4c0beeb9c1.tar.gz re3-2eee4c51764d0d73986f2aae64fbaf4c0beeb9c1.tar.bz2 re3-2eee4c51764d0d73986f2aae64fbaf4c0beeb9c1.tar.lz re3-2eee4c51764d0d73986f2aae64fbaf4c0beeb9c1.tar.xz re3-2eee4c51764d0d73986f2aae64fbaf4c0beeb9c1.tar.zst re3-2eee4c51764d0d73986f2aae64fbaf4c0beeb9c1.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/animation/RpAnimBlend.cpp | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/animation/RpAnimBlend.cpp b/src/animation/RpAnimBlend.cpp index d3e10889..b0cbd103 100644 --- a/src/animation/RpAnimBlend.cpp +++ b/src/animation/RpAnimBlend.cpp @@ -386,7 +386,6 @@ RpAnimBlendClumpFillFrameArray(RpClump *clump, AnimBlendFrameData **frames) AnimBlendFrameData *pFrameDataFound; -// FrameFindCallBack on PS2 void FrameFindByNameCBnonskin(AnimBlendFrameData *frame, void *arg) { @@ -395,7 +394,6 @@ FrameFindByNameCBnonskin(AnimBlendFrameData *frame, void *arg) pFrameDataFound = frame; } -#ifdef PED_SKIN void FrameFindByNameCBskin(AnimBlendFrameData *frame, void *arg) { @@ -403,21 +401,33 @@ FrameFindByNameCBskin(AnimBlendFrameData *frame, void *arg) if(name && CGeneral::faststricmp(name, (char*)arg) == 0) pFrameDataFound = frame; } -#endif + +void +FrameFindByBoneCB(AnimBlendFrameData *frame, void *arg) +{ + if(frame->nodeID == (int32)(uintptr)arg) + pFrameDataFound = frame; +} AnimBlendFrameData* RpAnimBlendClumpFindFrame(RpClump *clump, const char *name) { pFrameDataFound = nil; -#ifdef PED_SKIN if(IsClumpSkinned(clump)) (*RPANIMBLENDCLUMPDATA(clump))->ForAllFrames(FrameFindByNameCBskin, (void*)name); else -#endif (*RPANIMBLENDCLUMPDATA(clump))->ForAllFrames(FrameFindByNameCBnonskin, (void*)name); return pFrameDataFound; } +AnimBlendFrameData* +RpAnimBlendClumpFindBone(RpClump *clump, uint32 boneTag) +{ + pFrameDataFound = nil; + (*RPANIMBLENDCLUMPDATA(clump))->ForAllFrames(FrameFindByBoneCB, (void*)boneTag); + return pFrameDataFound; +} + void RpAnimBlendClumpUpdateAnimations(RpClump *clump, float timeDelta) { |