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

no message

Browse Source
This commit is contained in:
Chris Danford
2003-07-05 05:34:16 +00:00
parent 987c51c0b6
commit 2636a34acb
4 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/MusicWheel.cpp
+1 -1
View File
@@ -594,7 +594,7 @@ void MusicWheel::GetItemPosition( float fPosOffsetsFromMiddle, float& fX_out, fl
{ {
fRotationX_out = SCALE(fPosOffsetsFromMiddle,-7,+7,+PI/2.f,-PI/2.f); fRotationX_out = SCALE(fPosOffsetsFromMiddle,-7,+7,+PI/2.f,-PI/2.f);
printf( "fRotationX_out = %f\n", fRotationX_out ); // printf( "fRotationX_out = %f\n", fRotationX_out );
float radius = 200; float radius = 200;
stepmania/src/RageBitmapTexture.cpp
+18 -5
View File
@@ -298,11 +298,22 @@ apply_color_key:
CreateFrameRects(); CreateFrameRects();
/* Enforce frames in the image have even dimensions. Otherwise,
* pixel/texel alignment will be off. //
* If it looks like the artist intentionally blanked the image // Enforce frames in the image have even dimensions. Otherwise,
* by making it very tiny, then don't run the check. */ // pixel/texel alignment will be off.
if( this->GetSourceWidth()>2 || this->GetSourceHeight()>2 ) //
bool bRunCheck = true;
// Don't check if the artist intentionally blanked the image by making it very tiny.
if( this->GetSourceWidth()<=2 || this->GetSourceHeight()<=2 )
bRunCheck = false;
// HACK: Don't check song graphics. Many of them are weird dimensions.
if( (actualID.filename.length()>=6 && actualID.filename.Left(6)=="Songs/") )
bRunCheck = false;
if( bRunCheck )
{ {
float fFrameWidth = this->GetSourceWidth() / (float)this->GetFramesWide(); float fFrameWidth = this->GetSourceWidth() / (float)this->GetFramesWide();
float fFrameHeight = this->GetSourceHeight() / (float)this->GetFramesHigh(); float fFrameHeight = this->GetSourceHeight() / (float)this->GetFramesHigh();
@@ -327,6 +338,8 @@ apply_color_key:
} }
} }
SDL_FreeSurface( img ); SDL_FreeSurface( img );
/* See if the apparent "size" is being overridden. */ /* See if the apparent "size" is being overridden. */
stepmania/src/ScreenSandbox.cpp
+2 -2
View File
@@ -28,11 +28,11 @@ ScreenSandbox::ScreenSandbox() : Screen("ScreenSandbox")
m_quad1.SetDiffuse( RageColor(0,0,1,1) ); m_quad1.SetDiffuse( RageColor(0,0,1,1) );
m_quad1.SetZ( 0 ); m_quad1.SetZ( 0 );
m_quad1.SetUseZBuffer( true ); m_quad1.SetUseZBuffer( true );
// this->AddChild( &m_quad1 ); this->AddChild( &m_quad1 );
m_quad2.StretchTo( RectI(SCREEN_LEFT, SCREEN_TOP, SCREEN_RIGHT, SCREEN_BOTTOM) ); m_quad2.StretchTo( RectI(SCREEN_LEFT, SCREEN_TOP, SCREEN_RIGHT, SCREEN_BOTTOM) );
m_quad2.SetDiffuse( RageColor(0,1,0,1) ); m_quad2.SetDiffuse( RageColor(0,1,0,1) );
m_quad2.SetZ( 1 ); m_quad2.SetZ( -1 );
m_quad2.SetUseZBuffer( true ); m_quad2.SetUseZBuffer( true );
this->AddChild( &m_quad2 ); this->AddChild( &m_quad2 );
stepmania/src/ScreenSelectMusic.cpp
+1 -1
View File
@@ -95,7 +95,7 @@ ScreenSelectMusic::ScreenSelectMusic() : Screen("ScreenSelectMusic")
m_sprBannerMask.Load( THEME->GetPathToG("ScreenSelectMusic banner mask") ); m_sprBannerMask.Load( THEME->GetPathToG("ScreenSelectMusic banner mask") );
m_sprBannerMask.SetBlendMode( BLEND_NO_EFFECT ); // don't draw to color buffer m_sprBannerMask.SetBlendMode( BLEND_NO_EFFECT ); // don't draw to color buffer
m_sprBannerMask.SetUseZBuffer( true ); // do draw to the zbuffer m_sprBannerMask.SetUseZBuffer( true ); // do draw to the zbuffer
m_sprBannerMask.SetZ( m_sprBannerMask.GetZ()+0.05f ); m_sprBannerMask.SetZ( m_sprBannerMask.GetZ()+0.05f ); // closer to camera
this->AddChild( &m_sprBannerMask ); this->AddChild( &m_sprBannerMask );
// this is loaded SetSong and TweenToSong // this is loaded SetSong and TweenToSong