actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

model types

Browse Source
This commit is contained in:
Glenn Maynard
2004-05-11 20:35:21 +00:00
parent 9dfcb5b7e1
commit 17207ba6b5
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Model.cpp
+2 -2
View File
@@ -646,7 +646,7 @@ void Model::PlayAnimation( CString sAniName, float fPlayRate )
{ {
// int nBoneIndex = (pMesh->nBoneIndex!=-1) ? pMesh->nBoneIndex : bone; // int nBoneIndex = (pMesh->nBoneIndex!=-1) ? pMesh->nBoneIndex : bone;
RageVector3 &pos = Vertices[j].p; RageVector3 &pos = Vertices[j].p;
Sint8 bone = Vertices[j].bone; int8_t bone = Vertices[j].bone;
if (bone != -1) if (bone != -1)
{ {
pos[0] -= m_vpBones[bone].mAbsolute.m[3][0]; pos[0] -= m_vpBones[bone].mAbsolute.m[3][0];
@@ -834,7 +834,7 @@ void Model::Update( float fDelta )
RageVector3& originalNormal = origVertices[j].n; RageVector3& originalNormal = origVertices[j].n;
RageVector2& tempTex = tempVertices[j].t; RageVector2& tempTex = tempVertices[j].t;
RageVector2& originalTex = origVertices[j].t; RageVector2& originalTex = origVertices[j].t;
Sint8 bone = origVertices[j].bone; int8_t bone = origVertices[j].bone;
tempTex = originalTex; tempTex = originalTex;
stepmania/src/RageTypes.h
+1 -3
View File
@@ -5,8 +5,6 @@
#ifndef RAGETYPES_H #ifndef RAGETYPES_H
#define RAGETYPES_H #define RAGETYPES_H
#include "SDL_types.h" // for Sint8
enum GlowMode { GLOW_BRIGHTEN, GLOW_WHITEN }; enum GlowMode { GLOW_BRIGHTEN, GLOW_WHITEN };
enum BlendMode { BLEND_NORMAL, BLEND_ADD, BLEND_NO_EFFECT, BLEND_INVALID }; enum BlendMode { BLEND_NORMAL, BLEND_ADD, BLEND_NO_EFFECT, BLEND_INVALID };
enum CullMode { CULL_BACK, CULL_FRONT, CULL_NONE }; 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 p; // position
RageVector3 n; // normal RageVector3 n; // normal
RageVector2 t; // texture coordinates RageVector2 t; // texture coordinates
Sint8 bone; int8_t bone;
}; };