Merge branch 'master' of github.com:aap/librw

This commit is contained in:
aap
2016-08-03 20:33:01 +02:00
3 changed files with 76 additions and 46 deletions

View File

@@ -249,7 +249,7 @@ AnimInterpolator::addTime(float32 t)
}
KeyFrameHeader *last = this->getAnimFrame(this->currentAnim->numFrames);
KeyFrameHeader *next = (KeyFrameHeader*)this->nextFrame;
InterpFrameHeader *ifrm;
InterpFrameHeader *ifrm = nil;
while(next < last && next->prev->time <= this->currentTime){
// find next interpolation frame to expire
for(i = 0; i < this->numNodes; i++){

View File

@@ -204,6 +204,9 @@ struct Skin
static Skin *get(Geometry *geo){
return *PLUGINOFFSET(Skin*, geo, skinGlobals.geoOffset);
}
static void set(Geometry *geo, Skin *skin){
*PLUGINOFFSET(Skin*, geo, skinGlobals.geoOffset) = skin;
}
static void setHierarchy(Atomic *atomic, HAnimHierarchy *hier){
*PLUGINOFFSET(HAnimHierarchy*, atomic,
skinGlobals.atomicOffset) = hier;