change rotations to degrees

This commit is contained in:
Glenn Maynard
2003-04-02 06:02:55 +00:00
parent 6bf0b0c304
commit 909565b026
6 changed files with 22 additions and 22 deletions
+12 -12
View File
@@ -172,14 +172,14 @@ PicturePage2Choice2OnCommand=vertalign,top;x,960;y,200
PicturePage2Choice2OffCommand=sleep,0.2;bouncebegin,0.3;zoomy,0
PicturePage2Choice3OnCommand=vertalign,top;x,1160;y,200
PicturePage2Choice3OffCommand=sleep,0.4;bouncebegin,0.3;zoomy,0
CursorOnCommand=diffuse,1,1,1,0;rotationz,6;zoom,4;linear,0.3;diffuse,1,1,1,1;rotationz,0;zoom,1;glowshift;effectperiod,0.5
CursorOnCommand=diffuse,1,1,1,0;rotationz,340;zoom,4;linear,0.3;diffuse,1,1,1,1;rotationz,0;zoom,1;glowshift;effectperiod,0.5
CursorChooseCommand=sleep,0.2;linear,0.2;xoffset,10;yoffset,10
CursorOffCommand=sleep,0.2;linear,0.3;zoom,0
CursorP1OffsetXFromPicture=-40
CursorP1OffsetYFromPicture=188
CursorP2OffsetXFromPicture=+40
CursorP2OffsetYFromPicture=188
ShadowOnCommand=diffuse,1,1,1,0;rotationz,6;zoom,4;linear,0.3;diffuse,1,1,1,1;rotationz,0;zoom,1
ShadowOnCommand=diffuse,1,1,1,0;rotationz,340;zoom,4;linear,0.3;diffuse,1,1,1,1;rotationz,0;zoom,1
ShadowChooseCommand=sleep,0.2;linear,0.2;diffuse,1,1,1,0
ShadowOffCommand=sleep,0.2;linear,0.3;diffuse,1,1,1,0
ShadowLengthX=10
@@ -557,43 +557,43 @@ BonusFrameP1OnCommand=x,96;y,256;diffuse,1,1,1,0;linear,0.7;diffuse,1,1,1,1
BonusFrameP1OffCommand=linear,0.7;diffuse,1,1,1,0
BonusFrameP2OnCommand=x,544;y,256;diffuse,1,1,1,0;linear,0.7;diffuse,1,1,1,1
BonusFrameP2OffCommand=linear,0.7;diffuse,1,1,1,0
BarPossible1P1OnCommand=horizalign,left;x,176;y,194;rotationz,3.1415;zoomx,0;sleep,0.2;linear,1.0;zoomx,1
BarPossible1P1OnCommand=horizalign,left;x,176;y,194;rotationz,180;zoomx,0;sleep,0.2;linear,1.0;zoomx,1
BarPossible1P1OffCommand=linear,0.7;diffuse,1,1,1,0
BarPossible1P2OnCommand=horizalign,left;x,466;y,194;rotationz,0;zoomx,0;sleep,0.2;linear,1.0;zoomx,1
BarPossible1P2OffCommand=linear,0.7;diffuse,1,1,1,0
BarPossible2P1OnCommand=horizalign,left;x,176;y,221;rotationz,3.1415;zoomx,0;sleep,0.3;linear,1.0;zoomx,1
BarPossible2P1OnCommand=horizalign,left;x,176;y,221;rotationz,180;zoomx,0;sleep,0.3;linear,1.0;zoomx,1
BarPossible2P1OffCommand=linear,0.7;diffuse,1,1,1,0
BarPossible2P2OnCommand=horizalign,left;x,466;y,221;rotationz,0;zoomx,0;sleep,0.3;linear,1.0;zoomx,1
BarPossible2P2OffCommand=linear,0.7;diffuse,1,1,1,0
BarPossible3P1OnCommand=horizalign,left;x,176;y,248;rotationz,3.1415;zoomx,0;sleep,0.4;linear,1.0;zoomx,1
BarPossible3P1OnCommand=horizalign,left;x,176;y,248;rotationz,180;zoomx,0;sleep,0.4;linear,1.0;zoomx,1
BarPossible3P1OffCommand=linear,0.7;diffuse,1,1,1,0
BarPossible3P2OnCommand=horizalign,left;x,466;y,248;rotationz,0;zoomx,0;sleep,0.4;linear,1.0;zoomx,1
BarPossible3P2OffCommand=linear,0.7;diffuse,1,1,1,0
BarPossible4P1OnCommand=horizalign,left;x,176;y,275;rotationz,3.1415;zoomx,0;sleep,1.0;linear,1.0;zoomx,1
BarPossible4P1OnCommand=horizalign,left;x,176;y,275;rotationz,180;zoomx,0;sleep,1.0;linear,1.0;zoomx,1
BarPossible4P1OffCommand=linear,0.7;diffuse,1,1,1,0
BarPossible4P2OnCommand=horizalign,left;x,466;y,275;rotationz,0;zoomx,0;sleep,1.0;linear,1.0;zoomx,1
BarPossible4P2OffCommand=linear,0.7;diffuse,1,1,1,0
BarPossible5P1OnCommand=horizalign,left;x,176;y,302;rotationz,3.1415;zoomx,0;sleep,0.6;linear,1.0;zoomx,1
BarPossible5P1OnCommand=horizalign,left;x,176;y,302;rotationz,180;zoomx,0;sleep,0.6;linear,1.0;zoomx,1
BarPossible5P1OffCommand=linear,0.7;diffuse,1,1,1,0
BarPossible5P2OnCommand=horizalign,left;x,466;y,302;rotationz,0;zoomx,0;sleep,0.6;linear,1.0;zoomx,1
BarPossible5P2OffCommand=linear,0.7;diffuse,1,1,1,0
BarActual1P1OnCommand=horizalign,left;x,176;y,194;rotationz,3.1415;zoomx,0;sleep,0.7;linear,1.0;zoomx,1
BarActual1P1OnCommand=horizalign,left;x,176;y,194;rotationz,180;zoomx,0;sleep,0.7;linear,1.0;zoomx,1
BarActual1P1OffCommand=linear,0.7;diffuse,1,1,1,0
BarActual1P2OnCommand=horizalign,left;x,466;y,194;rotationz,0;zoomx,0;sleep,0.7;linear,1.0;zoomx,1
BarActual1P2OffCommand=linear,0.7;diffuse,1,1,1,0
BarActual2P1OnCommand=horizalign,left;x,176;y,221;rotationz,3.1415;zoomx,0;sleep,0.8;linear,1.0;zoomx,1
BarActual2P1OnCommand=horizalign,left;x,176;y,221;rotationz,180;zoomx,0;sleep,0.8;linear,1.0;zoomx,1
BarActual2P1OffCommand=linear,0.7;diffuse,1,1,1,0
BarActual2P2OnCommand=horizalign,left;x,466;y,221;rotationz,0;zoomx,0;sleep,0.8;linear,1.0;zoomx,1
BarActual2P2OffCommand=linear,0.7;diffuse,1,1,1,0
BarActual3P1OnCommand=horizalign,left;x,176;y,248;rotationz,3.1415;zoomx,0;sleep,0.9;linear,1.0;zoomx,1
BarActual3P1OnCommand=horizalign,left;x,176;y,248;rotationz,180;zoomx,0;sleep,0.9;linear,1.0;zoomx,1
BarActual3P1OffCommand=linear,0.7;diffuse,1,1,1,0
BarActual3P2OnCommand=horizalign,left;x,466;y,248;rotationz,0;zoomx,0;sleep,0.9;linear,1.0;zoomx,1
BarActual3P2OffCommand=linear,0.7;diffuse,1,1,1,0
BarActual4P1OnCommand=horizalign,left;x,176;y,275;rotationz,3.1415;zoomx,0;sleep,1.0;linear,1.0;zoomx,1
BarActual4P1OnCommand=horizalign,left;x,176;y,275;rotationz,180;zoomx,0;sleep,1.0;linear,1.0;zoomx,1
BarActual4P1OffCommand=linear,0.7;diffuse,1,1,1,0
BarActual4P2OnCommand=horizalign,left;x,466;y,275;rotationz,0;zoomx,0;sleep,1.0;linear,1.0;zoomx,1
BarActual4P2OffCommand=linear,0.7;diffuse,1,1,1,0
BarActual5P1OnCommand=horizalign,left;x,176;y,302;rotationz,3.1415;zoomx,0;sleep,1.1;linear,1.0;zoomx,1
BarActual5P1OnCommand=horizalign,left;x,176;y,302;rotationz,180;zoomx,0;sleep,1.1;linear,1.0;zoomx,1
BarActual5P1OffCommand=linear,0.7;diffuse,1,1,1,0
BarActual5P2OnCommand=horizalign,left;x,466;y,302;rotationz,0;zoomx,0;sleep,1.1;linear,1.0;zoomx,1
BarActual5P2OffCommand=linear,0.7;diffuse,1,1,1,0
+2 -2
View File
@@ -321,8 +321,8 @@ void Actor::ScaleTo( const RectI &rect, StretchType st )
float rect_width = (float) rect.GetWidth();
float rect_height = (float) rect.GetHeight();
if( rect_width < 0 ) SetRotationY( PI );
if( rect_height < 0 ) SetRotationX( PI );
if( rect_width < 0 ) SetRotationY( 180 );
if( rect_height < 0 ) SetRotationX( 180 );
// center of the rectangle
float rect_cx = rect.left + rect_width/2;
+1 -1
View File
@@ -266,7 +266,7 @@ void BGAnimationLayer::LoadFromAniLayerFile( CString sPath )
{
m_Sprites[i].Load( sPath );
m_Sprites[i].SetZoom( randomf(0.2f,2) );
m_Sprites[i].SetRotationZ( randomf(0,PI*2) );
m_Sprites[i].SetRotationZ( randomf(0,360) );
}
}
break;
+1 -1
View File
@@ -204,7 +204,7 @@ void GrooveRadar::GrooveRadarValueMap::DrawPrimitives()
void GrooveRadar::GrooveRadarValueMap::TweenOnScreen()
{
SetZoom( 0.5f );
SetRotationZ( PI*4 );
SetRotationZ( 720 );
BeginTweening( 0.6f );
SetTweenZoom( 1 );
SetTweenRotationZ( 0 );
+3 -3
View File
@@ -785,12 +785,12 @@ void RageDisplay::Scale( float x, float y, float z )
void RageDisplay::RotateX( float r )
{
glRotatef(r* 180/PI, 1, 0, 0);
glRotatef(r, 1, 0, 0);
}
void RageDisplay::RotateY( float r )
{
glRotatef(r* 180/PI, 0, 1, 0);
glRotatef(r, 0, 1, 0);
}
void RageDisplay::RotateZ( float r )
@@ -798,7 +798,7 @@ void RageDisplay::RotateZ( float r )
// HACK: Rotation about (0,0,1) seems to be broken in many Voodoo3 drivers,
// but only while using orthographic projections. Strange...
// Adding a tiny X component fixes the problem. -Chris
glRotatef(r* 180/PI, 0.00001f, 0, 1);
glRotatef(r, 0.00001f, 0, 1);
}
void RageDisplay::smPostMultMatrixf( const RageMatrix &f )
+3 -3
View File
@@ -321,10 +321,10 @@ void ScreenSelectMusic::Update( float fDeltaTime )
}
}
float fNewRotation = m_sprCDTitle.GetRotationY()+PI*fDeltaTime/2;
fNewRotation = fmodf( fNewRotation, PI*2 );
float fNewRotation = m_sprCDTitle.GetRotationY()+180*fDeltaTime;
fNewRotation = fmodf( fNewRotation, 360 );
m_sprCDTitle.SetRotationY( fNewRotation );
if( fNewRotation > PI/2 && fNewRotation <= PI*3.0f/2 )
if( fNewRotation > 90 && fNewRotation <= 270 )
m_sprCDTitle.SetDiffuse( RageColor(0.2f,0.2f,0.2f,1) );
else
m_sprCDTitle.SetDiffuse( RageColor(1,1,1,1) );