AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-13 17:47:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

convert Flip CustomModelAnimType to use a euclidian modulo function

Browse Source
This commit is contained in:
SpiralP 2020-09-13 22:02:17 -07:00 committed by GitHub
parent 5c8c13f80f
commit f60b1246cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Model.c
View File

@ -526,6 +526,14 @@ void CustomModel_BuildPart(struct CustomModel* cm, struct CustomModelPartDef* pa
part->rotationOrigin.X, part->rotationOrigin.Y, part->rotationOrigin.Z); part->rotationOrigin.X, part->rotationOrigin.Y, part->rotationOrigin.Z);
} }
/* C's % operator/fmod act differently on negatives vs positives,
but we want the function to be consistent on both so that the user can
specify direction using the "a" parameter in "Game.Time * anim->a".
*/
static float EuclidianMod(float x, float y) {
return x - Math_Floor(x / y) * y;
}
static struct ModelVertex oldVertices[MODEL_BOX_VERTICES]; static struct ModelVertex oldVertices[MODEL_BOX_VERTICES];
static float CustomModel_GetAnimationValue( static float CustomModel_GetAnimationValue(
struct CustomModelAnim* anim, struct CustomModelAnim* anim,
@ -595,12 +603,12 @@ static float CustomModel_GetAnimationValue(
case CustomModelAnimType_FlipRotate: case CustomModelAnimType_FlipRotate:
case CustomModelAnimType_FlipTranslate: case CustomModelAnimType_FlipTranslate:
case CustomModelAnimType_FlipSize: case CustomModelAnimType_FlipSize:
return Math_Modf((float)Game.Time * anim->a + anim->c, anim->d) * anim->b; return EuclidianMod((float)Game.Time * anim->a + anim->c, anim->d) * anim->b;
case CustomModelAnimType_FlipRotateVelocity: case CustomModelAnimType_FlipRotateVelocity:
case CustomModelAnimType_FlipTranslateVelocity: case CustomModelAnimType_FlipTranslateVelocity:
case CustomModelAnimType_FlipSizeVelocity: case CustomModelAnimType_FlipSizeVelocity:
return Math_Modf(e->Anim.WalkTime * anim->a + anim->c, anim->d) * anim->b; return EuclidianMod(e->Anim.WalkTime * anim->a + anim->c, anim->d) * anim->b;
} }
return 0.0f; return 0.0f;