From 65df309d327bd597090a389101fb8fe63e6a2735 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Wed, 31 Dec 2003 07:49:30 +0000
Subject: [PATCH] add collapse left transform

---
 stepmania/src/NoteDataUtil.cpp | 19 +++++++++++++++++++
 stepmania/src/NoteDataUtil.h   |  1 +
 stepmania/src/ScreenEdit.cpp   |  3 ++-
 stepmania/src/ScreenEdit.h     |  2 +-
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/stepmania/src/NoteDataUtil.cpp b/stepmania/src/NoteDataUtil.cpp
index 41fec4c507..ffca1f57b4 100644
--- a/stepmania/src/NoteDataUtil.cpp
+++ b/stepmania/src/NoteDataUtil.cpp
@@ -1110,6 +1110,25 @@ void NoteDataUtil::CollapseToOne( NoteData &in )
 	in.Convert2sAnd3sToHoldNotes();
 }
 
+void NoteDataUtil::CollapseLeft( NoteData &in )
+{
+	in.ConvertHoldNotesTo2sAnd3s();
+	int max_row = in.GetLastRow();
+	for( int r=0; r<=max_row; r++ )
+	{
+		int iNumTracksFilled = 0;
+		for( int t=0; t<in.GetNumTracks(); t++ )
+			if( in.GetTapNote(t,r) != TAP_EMPTY )
+			{
+				TapNote tn = in.GetTapNote(t,r);
+				in.SetTapNote(t, r, TAP_EMPTY);
+				in.SetTapNote(iNumTracksFilled, r, tn);
+				iNumTracksFilled++;
+			}
+	}
+	in.Convert2sAnd3sToHoldNotes();
+}
+
 void NoteDataUtil::ShiftLeft( NoteData &in )
 {
 	in.ConvertHoldNotesTo4s();
diff --git a/stepmania/src/NoteDataUtil.h b/stepmania/src/NoteDataUtil.h
index 4b44f87c86..7317af187a 100644
--- a/stepmania/src/NoteDataUtil.h
+++ b/stepmania/src/NoteDataUtil.h
@@ -66,6 +66,7 @@ namespace NoteDataUtil
 	void ClearLeft( NoteData &in );
 	void ClearRight( NoteData &in );
 	void CollapseToOne( NoteData &in );
+	void CollapseLeft( NoteData &in );
 	void ShiftLeft( NoteData &in );
 	void ShiftRight( NoteData &in );
 
diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 4fcf504ccc..32b9c46f97 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -162,7 +162,7 @@ static const MenuRow g_AreaMenuItems[] =
 	{ "Quantize",					true, 0, { "4TH","8TH","12TH","16TH","24TH","32ND","48TH","64TH" } },
 	{ "Turn",						true, 0, { "Left","Right","Mirror","Shuffle","Super Shuffle" } },
 	{ "Transform",					true, 0, { "NoHolds","NoMines","Little","Wide","Big","Quick","Skippy","Mines","Echo","Planted","Stomp","Twister" } },
-	{ "Alter",						true, 0, { "Backwards","Swap Sides","Copy Left To Right","Copy Right To Left","Clear Left","Clear Right","Collapse To One","Shift Left","Shift Right" } },
+	{ "Alter",						true, 0, { "Backwards","Swap Sides","Copy Left To Right","Copy Right To Left","Clear Left","Clear Right","Collapse To One","Collapse Left","Shift Left","Shift Right" } },
 	{ "Tempo",						true, 0, { "Compress 2x","Compress 3->2","Compress 4->3","Expand 3->4","Expand 2->3","Expand 2x" } },
 	{ "Play selection",				true, 0, { NULL } },
 	{ "Record in selection",		true, 0, { NULL } },
@@ -1608,6 +1608,7 @@ void ScreenEdit::HandleAreaMenuChoice( AreaMenuChoice c, int* iAnswers )
 				case clear_left:			NoteDataUtil::ClearLeft( m_Clipboard );			break;
 				case clear_right:			NoteDataUtil::ClearRight( m_Clipboard );		break;
 				case collapse_to_one:		NoteDataUtil::CollapseToOne( m_Clipboard );		break;
+				case collapse_left:			NoteDataUtil::CollapseLeft( m_Clipboard );		break;
 				case shift_left:			NoteDataUtil::ShiftLeft( m_Clipboard );			break;
 				case shift_right:			NoteDataUtil::ShiftRight( m_Clipboard );		break;
 				default:		ASSERT(0);
diff --git a/stepmania/src/ScreenEdit.h b/stepmania/src/ScreenEdit.h
index 8b6b2b2b64..2da288840f 100644
--- a/stepmania/src/ScreenEdit.h
+++ b/stepmania/src/ScreenEdit.h
@@ -134,7 +134,7 @@ public:
 	void HandleAreaMenuChoice( AreaMenuChoice c, int* iAnswers );
 	enum TurnType { left, right, mirror, shuffle, super_shuffle, NUM_TURN_TYPES };
 	enum TransformType { noholds, nomines, little, wide, big, quick, skippy, mines, echo, planted, stomp, twister, NUM_TRANSFORM_TYPES };
-	enum AlterType { backwards, swap_sides, copy_left_to_right, copy_right_to_left, clear_left, clear_right, collapse_to_one, shift_left, shift_right, NUM_ALTER_TYPES };
+	enum AlterType { backwards, swap_sides, copy_left_to_right, copy_right_to_left, clear_left, clear_right, collapse_to_one, collapse_left, shift_left, shift_right, NUM_ALTER_TYPES };
 	// MD 11/02/03 - added additional tempo adjusts which make "sense"
 	enum TempoType { compress_2x, compress_3_2, compress_4_3, expand_4_3, expand_3_2, expand_2x, NUM_TEMPO_TYPES };