From 17207ba6b5f38a7b127dafa802ca44a2b3882f6c Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 11 May 2004 20:35:21 +0000 Subject: [PATCH] model types --- stepmania/src/Model.cpp | 4 ++-- stepmania/src/RageTypes.h | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/stepmania/src/Model.cpp b/stepmania/src/Model.cpp index eebcffd1f3..fc4dc3f949 100644 --- a/stepmania/src/Model.cpp +++ b/stepmania/src/Model.cpp @@ -646,7 +646,7 @@ void Model::PlayAnimation( CString sAniName, float fPlayRate ) { // int nBoneIndex = (pMesh->nBoneIndex!=-1) ? pMesh->nBoneIndex : bone; RageVector3 &pos = Vertices[j].p; - Sint8 bone = Vertices[j].bone; + int8_t bone = Vertices[j].bone; if (bone != -1) { pos[0] -= m_vpBones[bone].mAbsolute.m[3][0]; @@ -834,7 +834,7 @@ void Model::Update( float fDelta ) RageVector3& originalNormal = origVertices[j].n; RageVector2& tempTex = tempVertices[j].t; RageVector2& originalTex = origVertices[j].t; - Sint8 bone = origVertices[j].bone; + int8_t bone = origVertices[j].bone; tempTex = originalTex; diff --git a/stepmania/src/RageTypes.h b/stepmania/src/RageTypes.h index fd14368322..ec5a14ca11 100644 --- a/stepmania/src/RageTypes.h +++ b/stepmania/src/RageTypes.h @@ -5,8 +5,6 @@ #ifndef RAGETYPES_H #define RAGETYPES_H -#include "SDL_types.h" // for Sint8 - enum GlowMode { GLOW_BRIGHTEN, GLOW_WHITEN }; enum BlendMode { BLEND_NORMAL, BLEND_ADD, BLEND_NO_EFFECT, BLEND_INVALID }; enum CullMode { CULL_BACK, CULL_FRONT, CULL_NONE }; @@ -248,7 +246,7 @@ struct RageModelVertex // doesn't have color. Relies on material color RageVector3 p; // position RageVector3 n; // normal RageVector2 t; // texture coordinates - Sint8 bone; + int8_t bone; };