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

cleanup

Browse Source
This commit is contained in:
Glenn Maynard
2005-09-03 23:08:43 +00:00
parent aee7281ab4
commit be662eb724
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Banner.cpp
+4 -1
View File
@@ -22,7 +22,10 @@ Banner::Banner()
bool Banner::Load( RageTextureID ID, bool bIsBanner ) bool Banner::Load( RageTextureID ID, bool bIsBanner )
{ {
if( ID.filename == "" ) if( ID.filename == "" )
ID = THEME->GetPathG("Common","fallback banner"); {
LoadFallback();
return true;
}
if( bIsBanner ) if( bIsBanner )
ID = SongBannerTexture(ID); ID = SongBannerTexture(ID);
stepmania/src/Model.cpp
+7 -7
View File
@@ -511,7 +511,7 @@ void Model::PlayAnimation( CString sAniName, float fPlayRate )
m_fCurFrame = 0; m_fCurFrame = 0;
m_fCurAnimationRate = fPlayRate; m_fCurAnimationRate = fPlayRate;
if ( m_pCurAnimation == pNewAnimation ) if( m_pCurAnimation == pNewAnimation )
return; return;
m_pCurAnimation = pNewAnimation; m_pCurAnimation = pNewAnimation;
@@ -532,7 +532,7 @@ void Model::PlayAnimation( CString sAniName, float fPlayRate )
m_vpBones[i].mRelative.m[3][2] = pBone->Position[2]; m_vpBones[i].mRelative.m[3][2] = pBone->Position[2];
int nParentBone = m_pCurAnimation->FindBoneByName( pBone->szParentName ); int nParentBone = m_pCurAnimation->FindBoneByName( pBone->szParentName );
if (nParentBone != -1) if( nParentBone != -1 )
{ {
RageMatrixMultiply( &m_vpBones[i].mAbsolute, &m_vpBones[nParentBone].mAbsolute, &m_vpBones[i].mRelative ); RageMatrixMultiply( &m_vpBones[i].mAbsolute, &m_vpBones[nParentBone].mAbsolute, &m_vpBones[i].mRelative );
@@ -546,11 +546,11 @@ void Model::PlayAnimation( CString sAniName, float fPlayRate )
} }
// subtract out the bone's resting position // subtract out the bone's resting position
for ( unsigned i = 0; i < m_pGeometry->m_Meshes.size(); ++i ) for( unsigned i = 0; i < m_pGeometry->m_Meshes.size(); ++i )
{ {
msMesh *pMesh = &m_pGeometry->m_Meshes[i]; msMesh *pMesh = &m_pGeometry->m_Meshes[i];
vector<RageModelVertex> &Vertices = pMesh->Vertices; vector<RageModelVertex> &Vertices = pMesh->Vertices;
for (unsigned j = 0; j < Vertices.size(); j++) for( unsigned j = 0; j < Vertices.size(); j++ )
{ {
// 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;
@@ -663,7 +663,7 @@ void Model::SetBones( const msAnimation* pAnimation, float fFrame, vector<myBone
} }
pLastRotationKey = pRotationKey; pLastRotationKey = pRotationKey;
} }
if (pLastRotationKey != 0 && pThisRotationKey != 0) if( pLastRotationKey != 0 && pThisRotationKey != 0 )
{ {
const float s = SCALE( fFrame, pLastRotationKey->fTime, pThisRotationKey->fTime, 0, 1 ); const float s = SCALE( fFrame, pLastRotationKey->fTime, pThisRotationKey->fTime, 0, 1 );
@@ -674,12 +674,12 @@ void Model::SetBones( const msAnimation* pAnimation, float fFrame, vector<myBone
RageMatrixFromQuat( &m, q ); RageMatrixFromQuat( &m, q );
} }
else if (pLastRotationKey == 0) else if( pLastRotationKey == 0 )
{ {
vRot = pThisRotationKey->Rotation; vRot = pThisRotationKey->Rotation;
RageMatrixAngles( &m, vRot ); RageMatrixAngles( &m, vRot );
} }
else if (pThisRotationKey == 0) else if( pThisRotationKey == 0 )
{ {
vRot = pLastRotationKey->Rotation; vRot = pLastRotationKey->Rotation;
RageMatrixAngles( &m, vRot ); RageMatrixAngles( &m, vRot );
stepmania/src/Transition.cpp
-3
View File
@@ -1,9 +1,6 @@
#include "global.h" #include "global.h"
#include "Transition.h" #include "Transition.h"
#include "RageUtil.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "Screen.h"
#include "GameState.h"
/* /*