Changeset 563

Show
Ignore:
Timestamp:
04/17/08 17:27:09 (9 months ago)
Author:
phill
Message:

o Added rootMatrix parameter to x42_GetAnimBoneMatrices.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/morph-targets/libx42.net/Pose.cpp

    r468 r563  
    122122 
    123123        tmp = x42_GetAnimBoneMatrices( boneMats, owner->m, animLerp, 
    124                 owner->Opts->opts ); 
     124                NULL, owner->Opts->opts ); 
    125125        if( tmp != boneMats ) 
    126126                throw gcnew Exception( "Failed to build pose." ); 

  • branches/morph-targets/libx42/include/x42.h

    r559 r563  
    435435 
    436436X42_EXPORT affine_t* X42_CALL x42_GetAnimBoneMatrices( void *out_buffer, const x42data_t *x42, 
    437         const x42animLerp_t *lerp, x42opts_t *opts ); 
     437        const x42animLerp_t *lerp, const affine_t *rootMatrix, x42opts_t *opts ); 
    438438X42_EXPORT affine_t* X42_CALL x42_GetAnimTagMatrices( void *out_buffer, const x42data_t *x42, 
    439439        const affine_t *boneMats, x42opts_t *opts ); 

  • branches/morph-targets/libx42/pose.c

    r468 r563  
    515515 
    516516X42_EXPORT affine_t* X42_CALL x42_GetAnimBoneMatrices( void *out_buffer, const x42data_t *x42, 
    517         const x42animLerp_t *lerp, x42opts_t *opts ) 
     517        const x42animLerp_t *lerp, const affine_t *rootMatrix, x42opts_t *opts ) 
    518518{ 
    519519        uint i; 
    …… 
    583583                if( b->parentIdx != X42_MODEL_BONE ) 
    584584                        affine_mul( ret + i, ret + b->parentIdx, ret + i ); 
     585                else if( rootMatrix ) 
     586                        affine_mul( ret + i, rootMatrix, ret + i );              
    585587        } 
    586588