From 0a961c49c8548f541a6b3cab2ae520f45f211bc6 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 30 Nov 2005 23:29:16 +0000
Subject: [PATCH] Revert cropping. 
 "scaletocover,0,0,SCREEN_WIDTH,SCREEN_HEIGHT" achieves the same effect.

---
 stepmania/src/Actor.cpp | 40 ----------------------------------------
 stepmania/src/Actor.h   |  5 ++---
 2 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/stepmania/src/Actor.cpp b/stepmania/src/Actor.cpp
index 18e600deab..d7a258be79 100644
--- a/stepmania/src/Actor.cpp
+++ b/stepmania/src/Actor.cpp
@@ -823,44 +823,6 @@ void Actor::ScaleTo( const RectF &rect, StretchType st )
 	SetZoom( fNewZoom );
 }
 
-/* Crop the actor to fit the specified aspect ratio. */
-void Actor::CropToAspectRatio( float fAspect )
-{
-	float fActualAspect = GetUnzoomedWidth() / GetUnzoomedHeight();
-	if( fActualAspect > fAspect )
-	{
-		/* The actual aspect ratio is wider than fAspect. */
-		float fCropTo = fAspect / fActualAspect; /* .75 = crop to 75% size */
-		float fCropBy = 1-fCropTo;
-		SetCropLeft( fCropBy/2 );
-		SetCropRight( fCropBy/2 );
-	}
-	else
-	{
-		/* The actual aspect ratio is taller than fAspect. */
-		float fCropTo = fActualAspect / fAspect;
-		float fCropBy = 1-fCropTo;
-		SetCropTop( fCropBy/2 );
-		SetCropBottom( fCropBy/2 );
-	}
-}
-
-/* Zoom the uncropped region to the given size. */
-void Actor::ZoomToWidth( float zoom )
-{
-	float fWidth = GetUnzoomedWidth();
-	fWidth *= 1-(GetCropLeft()+GetCropRight());
-	SetZoomX( zoom / fWidth );
-}
-
-void Actor::ZoomToHeight( float zoom )
-{
-	float fHeight = GetUnzoomedHeight();
-	fHeight *= 1-(GetCropTop()+GetCropBottom());
-	SetZoomY( zoom / fHeight );
-}
-
-
 void Actor::SetHorizAlignString( const CString &s )
 {
 	if     (s.CompareNoCase("left")==0)		this->SetHorizAlign( align_left ); /* call derived */
@@ -1381,7 +1343,6 @@ public:
 	static int croptop( T* p, lua_State *L )		{ p->SetCropTop(FArg(1)); return 0; }
 	static int cropright( T* p, lua_State *L )		{ p->SetCropRight(FArg(1)); return 0; }
 	static int cropbottom( T* p, lua_State *L )		{ p->SetCropBottom(FArg(1)); return 0; }
-	static int croptoaspectratio( T* p, lua_State *L )	{ p->CropToAspectRatio(FArg(1)); return 0; }
 	static int fadeleft( T* p, lua_State *L )		{ p->SetFadeLeft(FArg(1)); return 0; }
 	static int fadetop( T* p, lua_State *L )		{ p->SetFadeTop(FArg(1)); return 0; }
 	static int faderight( T* p, lua_State *L )		{ p->SetFadeRight(FArg(1)); return 0; }
@@ -1519,7 +1480,6 @@ public:
 		ADD_METHOD( croptop );
 		ADD_METHOD( cropright );
 		ADD_METHOD( cropbottom );
-		ADD_METHOD( croptoaspectratio );
 		ADD_METHOD( fadeleft );
 		ADD_METHOD( fadetop );
 		ADD_METHOD( faderight );
diff --git a/stepmania/src/Actor.h b/stepmania/src/Actor.h
index ff22c85c99..8a6fead0d5 100644
--- a/stepmania/src/Actor.h
+++ b/stepmania/src/Actor.h
@@ -145,8 +145,8 @@ public:
 	void  SetZoomY( float zoom )	{ DestTweenState().scale.y = zoom; }
 	void  SetZoomZ( float zoom )	{ DestTweenState().scale.z = zoom; }
 	void  ZoomTo( float fX, float fY )	{ ZoomToWidth(fX); ZoomToHeight(fY); }
-	void  ZoomToWidth( float zoom );
-	void  ZoomToHeight( float zoom );
+	void  ZoomToWidth( float zoom )	{ SetZoomX( zoom / GetUnzoomedWidth() ); }
+	void  ZoomToHeight( float zoom ){ SetZoomY( zoom / GetUnzoomedHeight() ); }
 
 	float GetRotationX()			{ return DestTweenState().rotation.x; }
 	float GetRotationY()			{ return DestTweenState().rotation.y; }
@@ -224,7 +224,6 @@ public:
 	void ScaleToCover( const RectF &rect )		{ ScaleTo( rect, cover ); }
 	void ScaleToFitInside( const RectF &rect )	{ ScaleTo( rect, fit_inside); };
 	void ScaleTo( const RectF &rect, StretchType st );
-	void CropToAspectRatio( float fAspect );
 
 	void StretchTo( const RectF &rect );