/[hegemonie]/hegemonie/Model/MdlModel.m
ViewVC logotype

Diff of /hegemonie/Model/MdlModel.m

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.13 by zaral, Thu Jul 24 14:14:23 2003 UTC revision 1.14 by dam, Fri Jul 25 21:08:22 2003 UTC
# Line 572  currentAnimation: (NSString *)animName Line 572  currentAnimation: (NSString *)animName
572    coord_t tagPositionNext = [_data tagPosition: 0    coord_t tagPositionNext = [_data tagPosition: 0
573                                     inFrame: frameNext];                                     inFrame: frameNext];
574    Quaternion *quat =    Quaternion *quat =
575      [[Quaternion alloc] initWithMatrix: m3x32m4x4(tagMatrix)];      [[Quaternion alloc] initWithRotation: m3x32m4x4(tagMatrix)];
576    Quaternion *quatNext =    Quaternion *quatNext =
577      [[Quaternion alloc] initWithMatrix: m3x32m4x4(tagMatrixNext)];      [[Quaternion alloc] initWithRotation: m3x32m4x4(tagMatrixNext)];
578        
579    Quaternion *quatInterpolated = [[Quaternion alloc] init];    Quaternion *quatInterpolated = [[Quaternion alloc] init];
580        
581    [quatInterpolated slerp: quat    [quatInterpolated slerp: quat
582                      with: quatNext                       with: quatNext
583                      accordingTime: time];              accordingTime: time];
584        
585    float * matrix = [quatInterpolated createMatrix];    Matrix rotation;
586      [quatInterpolated convertToRotation: rotation];
587        
588    matrix[12] = tagPosition.x + time * (tagPositionNext.x - tagPosition.x);    rotation[12] = tagPosition.x + time * (tagPositionNext.x - tagPosition.x);
589    matrix[13] = tagPosition.y + time * (tagPositionNext.y - tagPosition.y);    rotation[13] = tagPosition.y + time * (tagPositionNext.y - tagPosition.y);
590    matrix[14] = tagPosition.z + time * (tagPositionNext.z - tagPosition.z);    rotation[14] = tagPosition.z + time * (tagPositionNext.z - tagPosition.z);
591        
592    glMultMatrixf (matrix);      glMultMatrixf (rotation);
593  }  }
594    
595  /**  /**

Legend:
Removed from v.1.13  
changed lines
  Added in v.1.14

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26