diff --git a/BAKKA Editor/Chart.h b/BAKKA Editor/Chart.h index 52012cf..02f6fef 100644 --- a/BAKKA Editor/Chart.h +++ b/BAKKA Editor/Chart.h @@ -3,10 +3,35 @@ #include #include +enum NoteType { + TouchNoBonus = 1, + TouchBonus = 2, + SnapRedNoBonus = 3, + SnapBlueNoBonus = 4, + SlideOrangeNoBonus = 5, + SlideOrangeBonus = 6, + SlideGreenNoBonus = 7, + SlideGreenBonus = 8, + HoldStartNoBonus = 9, + HoldMiddle = 10, + HoldEnd = 11, + MaskAdd = 12, + MaskRemove = 13, + EndOfChart = 14, + Chain = 16, + TouchBonusFlair = 20, + SnapRedBonusFlair = 21, + SnapBlueBonusFlair = 22, + SlideOrangeBonusFlair = 23, + SlideGreenBonusFlair = 24, + HoldStartBonusFlair = 25, + ChainBonusFlair = 26, +}; + struct NotesNode { int beat; int subBeat; - int noteType; + NoteType noteType; int position; int size; int holdChange; diff --git a/BAKKA Editor/MyForm.h b/BAKKA Editor/MyForm.h index 2b70e8b..8ae2ef3 100644 --- a/BAKKA Editor/MyForm.h +++ b/BAKKA Editor/MyForm.h @@ -22,8 +22,8 @@ std::string songFilePath = ""; std::string chartFilePath = ""; std::string tickFilePath = "se_tick.ogg"; int SelectedLineType = 1; -int SelectedNoteType = 1; -int SelectedNoteTypeVisual = 1; +NoteType SelectedNoteType = TouchNoBonus; +NoteType SelectedNoteTypeVisual = TouchNoBonus; std::list::iterator viewNotesITR = theChart.Notes.begin(); std::list::iterator viewGimmicksITR = theChart.PreChart.begin(); std::list::iterator holdNoteitr = theChart.Notes.end(); @@ -59,48 +59,17 @@ int findLine(std::list::iterator nextNode) { return outputLine; } -bool isHold(int note) { - switch (note) { - case 1: - return false; - case 2: - return false; - case 3: - return false; - case 4: - return false; - case 5: - return false; - case 6: - return false; - case 7: - return false; - case 8: - return false; - case 9: +bool isHold(NoteType note) { + switch (note) + { + case HoldStartNoBonus: + case HoldMiddle: + case HoldEnd: + case HoldStartBonusFlair: return true; - case 10: - return true; - case 11: - return true; - case 16: - return false; - case 20: - return false; - case 21: - return false; - case 22: - return false; - case 23: - return false; - case 24: - return false; - case 25: - return true; - case 26: + default: return false; } - return false; } bool sortNotesListByBeat(const NotesNode& lhs, const NotesNode& rhs) { if (lhs.beat < rhs.beat) @@ -411,6 +380,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool this->exitToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem()); this->viewToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem()); this->showCursorToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem()); + this->showCursorDuringPlaybackToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem()); this->aboutToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem()); this->TapButton = (gcnew System::Windows::Forms::Button()); this->OrangeButton = (gcnew System::Windows::Forms::Button()); @@ -550,7 +520,6 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool this->backgroundWorker1 = (gcnew System::ComponentModel::BackgroundWorker()); this->backgroundWorker2 = (gcnew System::ComponentModel::BackgroundWorker()); this->panel1 = (gcnew System::Windows::Forms::Panel()); - this->showCursorDuringPlaybackToolStripMenuItem = (gcnew System::Windows::Forms::ToolStripMenuItem()); this->menuStrip->SuspendLayout(); this->NoteTypeBox->SuspendLayout(); (cli::safe_cast(this->VisualHispeed))->BeginInit(); @@ -661,6 +630,12 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool resources->ApplyResources(this->showCursorToolStripMenuItem, L"showCursorToolStripMenuItem"); this->showCursorToolStripMenuItem->Click += gcnew System::EventHandler(this, &MyForm::showCursorToolStripMenuItem_Click); // + // showCursorDuringPlaybackToolStripMenuItem + // + this->showCursorDuringPlaybackToolStripMenuItem->Name = L"showCursorDuringPlaybackToolStripMenuItem"; + resources->ApplyResources(this->showCursorDuringPlaybackToolStripMenuItem, L"showCursorDuringPlaybackToolStripMenuItem"); + this->showCursorDuringPlaybackToolStripMenuItem->Click += gcnew System::EventHandler(this, &MyForm::showCursorDuringPlaybackToolStripMenuItem_Click); + // // aboutToolStripMenuItem // this->aboutToolStripMenuItem->Name = L"aboutToolStripMenuItem"; @@ -757,7 +732,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool this->BonusFlairRadioButton->Name = L"BonusFlairRadioButton"; this->ToolTip->SetToolTip(this->BonusFlairRadioButton, resources->GetString(L"BonusFlairRadioButton.ToolTip")); this->BonusFlairRadioButton->UseVisualStyleBackColor = true; - this->BonusFlairRadioButton->CheckedChanged += gcnew System::EventHandler(this, &MyForm::BonusFlairRadioButton_CheckedChanged); + this->BonusFlairRadioButton->CheckedChanged += gcnew System::EventHandler(this, &MyForm::NoteRadioButton_CheckedChanged); // // BonusGetRadioButton // @@ -765,7 +740,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool this->BonusGetRadioButton->Name = L"BonusGetRadioButton"; this->ToolTip->SetToolTip(this->BonusGetRadioButton, resources->GetString(L"BonusGetRadioButton.ToolTip")); this->BonusGetRadioButton->UseVisualStyleBackColor = true; - this->BonusGetRadioButton->CheckedChanged += gcnew System::EventHandler(this, &MyForm::BonusGetRadioButton_CheckedChanged); + this->BonusGetRadioButton->CheckedChanged += gcnew System::EventHandler(this, &MyForm::NoteRadioButton_CheckedChanged); // // NoBonusRadioButton // @@ -774,7 +749,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool this->NoBonusRadioButton->Name = L"NoBonusRadioButton"; this->NoBonusRadioButton->TabStop = true; this->NoBonusRadioButton->UseVisualStyleBackColor = true; - this->NoBonusRadioButton->CheckedChanged += gcnew System::EventHandler(this, &MyForm::NoBonusRadioButton_CheckedChanged); + this->NoBonusRadioButton->CheckedChanged += gcnew System::EventHandler(this, &MyForm::NoteRadioButton_CheckedChanged); // // EndHoldBox // @@ -1682,12 +1657,6 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool this->panel1->Controls->Add(this->CurrentObjectText); this->panel1->Name = L"panel1"; // - // showCursorDuringPlaybackToolStripMenuItem - // - this->showCursorDuringPlaybackToolStripMenuItem->Name = L"showCursorDuringPlaybackToolStripMenuItem"; - resources->ApplyResources(this->showCursorDuringPlaybackToolStripMenuItem, L"showCursorDuringPlaybackToolStripMenuItem"); - this->showCursorDuringPlaybackToolStripMenuItem->Click += gcnew System::EventHandler(this, &MyForm::showCursorDuringPlaybackToolStripMenuItem_Click); - // // MyForm // this->AllowDrop = true; @@ -2095,37 +2064,37 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool GimmickValueLabel->Text = "N/A"; } } - std::string refreshCurrentNoteLabel(int currentNoteType) { - //CurrentObjectText->ForeColor = returnColor(currentNoteType); - switch (currentNoteType) { - case 1: + std::string refreshCurrentNoteLabel(NoteType currentNoteType) { + switch (currentNoteType) + { + case TouchNoBonus: return "Touch (No Bonus)"; - case 2: + case TouchBonus: return "Touch (Bonus Get)"; - case 3: + case SnapRedNoBonus: return "Snap (R) (No Bonus)"; - case 4: + case SnapBlueNoBonus: return "Snap (B) (No Bonus)"; - case 5: + case SlideOrangeNoBonus: return "Slide (O) (No Bonus)"; - case 6: + case SlideOrangeBonus: return "Slide (O) (Bonus Get)"; - case 7: + case SlideGreenNoBonus: return "Slide (G) (No Bonus)"; - case 8: + case SlideGreenBonus: return "Slide (G) (Bonus Get)"; - case 9: + case HoldStartNoBonus: return "Hold Start (No Bonus)"; - case 10: + case HoldMiddle: if (EndHoldBox->Checked) { return "Hold End"; } else { return "Hold Middle"; } - case 11: + case HoldEnd: return "Hold End"; - case 12: + case MaskAdd: if (MaskClockwise->Checked) { return "Mask Add (Clockwise)"; } @@ -2135,7 +2104,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool else { return "Mask Add (From Center)"; } - case 13: + case MaskRemove: if (MaskClockwise->Checked) { return "Mask Remove (Clockwise)"; } @@ -2145,75 +2114,78 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool else { return "Mask Remove (To Center)"; } - case 14: + case EndOfChart: return "End Of Chart"; - case 16: + case Chain: return "Chain"; - case 20: + case TouchBonusFlair: return "Touch (Bonus With Flair)"; - case 21: + case SnapRedBonusFlair: return "Snap (R) (Bonus With Flair)"; - case 22: + case SnapBlueBonusFlair: return "Snap (B) (Bonus With Flair)"; - case 23: + case SlideOrangeBonusFlair: return "Slide (O) (Bonus With Flair)"; - case 24: + case SlideGreenBonusFlair: return "Slide (G) (Bonus With Flair)"; - case 25: + case HoldStartBonusFlair: return "Hold Start (Bonus With Flair)"; - case 26: + case ChainBonusFlair: return "Chain (Bonus With Flair)"; + default: + return "None Selected"; } - return "None Selected"; } - std::string refreshCurrentNoteViewLabel(int currentNoteType) { - switch (currentNoteType) { - case 1: + std::string refreshCurrentNoteViewLabel(NoteType currentNoteType) { + switch (currentNoteType) + { + case TouchNoBonus: return "Touch (No Bonus)"; - case 2: + case TouchBonus: return "Touch (Bonus Get)"; - case 3: + case SnapRedNoBonus: return "Snap (R) (No Bonus)"; - case 4: + case SnapBlueNoBonus: return "Snap (B) (No Bonus)"; - case 5: + case SlideOrangeNoBonus: return "Slide (O) (No Bonus)"; - case 6: + case SlideOrangeBonus: return "Slide (O) (Bonus Get)"; - case 7: + case SlideGreenNoBonus: return "Slide (G) (No Bonus)"; - case 8: + case SlideGreenBonus: return "Slide (G) (Bonus Get)"; - case 9: + case HoldStartNoBonus: return "Hold Start (No Bonus)"; - case 10: + case HoldMiddle: return "Hold Middle"; - case 11: + case HoldEnd: return "Hold End"; - case 12: + case MaskAdd: return "Mask Add"; - case 13: + case MaskRemove: return "Mask Remove"; - case 14: + case EndOfChart: return "End Of Chart"; - case 16: + case Chain: return "Chain"; - case 20: + case TouchBonusFlair: return "Touch (Bonus With Flair)"; - case 21: + case SnapRedBonusFlair: return "Snap (R) (Bonus With Flair)"; - case 22: + case SnapBlueBonusFlair: return "Snap (B) (Bonus With Flair)"; - case 23: + case SlideOrangeBonusFlair: return "Slide (O) (Bonus With Flair)"; - case 24: + case SlideGreenBonusFlair: return "Slide (G) (Bonus With Flair)"; - case 25: + case HoldStartBonusFlair: return "Hold Start (Bonus With Flair)"; - case 26: + case ChainBonusFlair: return "Chain (Bonus With Flair)"; + default: + return "List Empty"; } - return "List Empty"; } void refreshNotesView() { if (!theChart.Notes.empty()) { @@ -2229,7 +2201,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool PosNum->Value = viewNotesITR->position; SizeNum->Value = viewNotesITR->size; SelectedNoteTypeVisual = viewNotesITR->noteType; - if (SelectedNoteTypeVisual != 10 && SelectedNoteTypeVisual != 11 && SelectedNoteTypeVisual != 9 && SelectedNoteTypeVisual != 25) { + if (SelectedNoteTypeVisual != HoldMiddle && SelectedNoteTypeVisual != HoldEnd && SelectedNoteTypeVisual != HoldStartNoBonus && SelectedNoteTypeVisual != HoldStartBonusFlair) { SelectedLineType = 1; SelectedNoteType = viewNotesITR->noteType; } @@ -2539,6 +2511,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool int subBeat; int type; int lineTemp; + int noteTemp; std::map Holds; NotesNode tempNotes; PreChartNode tempPCNode; @@ -2550,11 +2523,12 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool case 1: tempNotes.beat = beat; tempNotes.subBeat = subBeat; - chartFile >> tempNotes.noteType >> lineTemp >> tempNotes.position >> tempNotes.size >> tempNotes.holdChange; - if (tempNotes.noteType == 12 || tempNotes.noteType == 13) { + noteTemp = (int)tempNotes.noteType; + chartFile >> noteTemp >> lineTemp >> tempNotes.position >> tempNotes.size >> tempNotes.holdChange; + if (tempNotes.noteType == MaskAdd || tempNotes.noteType == MaskRemove) { chartFile >> tempNotes.BGType; } - if (tempNotes.noteType == 9 || tempNotes.noteType == 10 || tempNotes.noteType == 25) { + if (tempNotes.noteType == HoldStartNoBonus || tempNotes.noteType == HoldMiddle || tempNotes.noteType == HoldStartBonusFlair) { chartFile >> Holds[lineTemp]; } theChart.Notes.push_back(tempNotes); @@ -2638,23 +2612,23 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool tempNotesNode.holdChange = 1; switch (SelectedNoteType) { - case 9: + case HoldStartNoBonus: if (EndHoldBox->Checked) { CurrentObjectText->Text = "Hold End"; } else { CurrentObjectText->Text = "Hold Middle"; } - SelectedNoteType = 10; + SelectedNoteType = HoldMiddle; break; - case 10: + case HoldMiddle: if (EndHoldBox->Checked) { - SelectedNoteType = 11; + SelectedNoteType = HoldEnd; tempNotesNode.noteType = SelectedNoteType; break; } break; - case 12: + case MaskAdd: if (MaskClockwise->Checked) { tempNotesNode.BGType = 1; } @@ -2665,7 +2639,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool tempNotesNode.BGType = 2; } break; - case 13: + case MaskRemove: if (MaskClockwise->Checked) { tempNotesNode.BGType = 1; } @@ -2676,23 +2650,23 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool tempNotesNode.BGType = 2; } break; - case 25: + case HoldStartBonusFlair: if (EndHoldBox->Checked) { CurrentObjectText->Text = "Hold End"; } else { CurrentObjectText->Text = "Hold Middle"; } - SelectedNoteType = 10; + SelectedNoteType = HoldMiddle; break; } - if (SelectedNoteType == 11) { + if (SelectedNoteType == HoldEnd) { if (BonusFlairRadioButton->Checked) { - SelectedNoteType = 25; + SelectedNoteType = HoldStartBonusFlair; CurrentObjectText->Text = "Hold Start (Bonus With Flair)"; } else { - SelectedNoteType = 9; + SelectedNoteType = HoldStartNoBonus; CurrentObjectText->Text = "Hold Start (No Bonus)"; } } @@ -2839,15 +2813,15 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool saveToolStripMenuItem_Click(sender, e); } private: System::Void TapButton_Click(System::Object^ sender, System::EventArgs^ e) { - if (SelectedNoteType != 10) { + if (SelectedNoteType != HoldMiddle) { if (BonusGetRadioButton->Checked) { - SelectedNoteType = 2; + SelectedNoteType = TouchBonus; } else if (BonusFlairRadioButton->Checked) { - SelectedNoteType = 20; + SelectedNoteType = TouchBonusFlair; } else { - SelectedNoteType = 1; + SelectedNoteType = TouchNoBonus; } CurrentObjectText->Text = stdStringToSystemString(refreshCurrentNoteLabel(SelectedNoteType)); SelectedNoteTypeVisual = SelectedNoteType; @@ -2856,15 +2830,15 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool RefreshPaint(); } private: System::Void OrangeButton_Click(System::Object^ sender, System::EventArgs^ e) { - if (SelectedNoteType != 10) { + if (SelectedNoteType != HoldMiddle) { if (BonusGetRadioButton->Checked) { - SelectedNoteType = 6; + SelectedNoteType = SlideOrangeBonus; } else if (BonusFlairRadioButton->Checked) { - SelectedNoteType = 23; + SelectedNoteType = SlideOrangeBonusFlair; } else { - SelectedNoteType = 5; + SelectedNoteType = SlideOrangeNoBonus; } CurrentObjectText->Text = stdStringToSystemString(refreshCurrentNoteLabel(SelectedNoteType)); SelectedNoteTypeVisual = SelectedNoteType; @@ -2873,15 +2847,15 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool RefreshPaint(); } private: System::Void GreenButton_Click(System::Object^ sender, System::EventArgs^ e) { - if (SelectedNoteType != 10) { + if (SelectedNoteType != HoldMiddle) { if (BonusGetRadioButton->Checked == true) { - SelectedNoteType = 8; + SelectedNoteType = SlideGreenBonus; } else if (BonusFlairRadioButton->Checked) { - SelectedNoteType = 24; + SelectedNoteType = SlideGreenBonusFlair; } else { - SelectedNoteType = 7; + SelectedNoteType = SlideGreenNoBonus; } CurrentObjectText->Text = stdStringToSystemString(refreshCurrentNoteLabel(SelectedNoteType)); SelectedNoteTypeVisual = SelectedNoteType; @@ -2890,12 +2864,12 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool RefreshPaint(); } private: System::Void RedButton_Click(System::Object^ sender, System::EventArgs^ e) { - if (SelectedNoteType != 10) { + if (SelectedNoteType != HoldMiddle) { if (BonusFlairRadioButton->Checked) { - SelectedNoteType = 21; + SelectedNoteType = SnapRedBonusFlair; } else { - SelectedNoteType = 3; + SelectedNoteType = SnapRedNoBonus; } CurrentObjectText->Text = stdStringToSystemString(refreshCurrentNoteLabel(SelectedNoteType)); SelectedNoteTypeVisual = SelectedNoteType; @@ -2904,12 +2878,12 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool RefreshPaint(); } private: System::Void BlueButton_Click(System::Object^ sender, System::EventArgs^ e) { - if (SelectedNoteType != 10) { + if (SelectedNoteType != HoldMiddle) { if (BonusFlairRadioButton->Checked) { - SelectedNoteType = 22; + SelectedNoteType = SnapBlueBonusFlair; } else { - SelectedNoteType = 4; + SelectedNoteType = SnapBlueNoBonus; } CurrentObjectText->Text = stdStringToSystemString(refreshCurrentNoteLabel(SelectedNoteType)); SelectedNoteTypeVisual = SelectedNoteType; @@ -2918,12 +2892,12 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool RefreshPaint(); } private: System::Void YellowButton_Click(System::Object^ sender, System::EventArgs^ e) { - if (SelectedNoteType != 10) { + if (SelectedNoteType != HoldMiddle) { if (BonusFlairRadioButton->Checked) { - SelectedNoteType = 26; + SelectedNoteType = ChainBonusFlair; } else { - SelectedNoteType = 16; + SelectedNoteType = Chain; } CurrentObjectText->Text = stdStringToSystemString(refreshCurrentNoteLabel(SelectedNoteType)); SelectedNoteTypeVisual = SelectedNoteType; @@ -2932,8 +2906,8 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool RefreshPaint(); } private: System::Void EndChartButton_Click(System::Object^ sender, System::EventArgs^ e) { - if (SelectedNoteType != 10) { - SelectedNoteType = 14; + if (SelectedNoteType != HoldMiddle) { + SelectedNoteType = EndOfChart; CurrentObjectText->Text = stdStringToSystemString(refreshCurrentNoteLabel(SelectedNoteType)); SelectedNoteTypeVisual = SelectedNoteType; SelectedLineType = 1; @@ -2941,12 +2915,12 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool RefreshPaint(); } private: System::Void HoldButton_Click(System::Object^ sender, System::EventArgs^ e) { - if (SelectedNoteType != 10) { + if (SelectedNoteType != HoldMiddle) { if (BonusFlairRadioButton->Checked) { - SelectedNoteType = 25; + SelectedNoteType = HoldStartBonusFlair; } else { - SelectedNoteType = 9; + SelectedNoteType = HoldStartNoBonus; } CurrentObjectText->Text = stdStringToSystemString(refreshCurrentNoteLabel(SelectedNoteType)); SelectedNoteTypeVisual = SelectedNoteType; @@ -2955,12 +2929,12 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool RefreshPaint(); } private: System::Void Mask_Click(System::Object^ sender, System::EventArgs^ e) { - if (SelectedNoteType != 10) { + if (SelectedNoteType != HoldMiddle) { if (AddMask->Checked) { - SelectedNoteType = 12; + SelectedNoteType = MaskAdd; } else { - SelectedNoteType = 13; + SelectedNoteType = MaskRemove; } CurrentObjectText->Text = stdStringToSystemString(refreshCurrentNoteLabel(SelectedNoteType)); SelectedNoteTypeVisual = SelectedNoteType; @@ -2969,194 +2943,124 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool RefreshPaint(); } private: System::Void BPMChange_Click(System::Object^ sender, System::EventArgs^ e) { - if (SelectedNoteType != 10) { + if (SelectedNoteType != HoldMiddle) { CurrentObjectText->Text = "BPM Change"; SelectedLineType = 2; } RefreshPaint(); } private: System::Void TimeSignature_Click(System::Object^ sender, System::EventArgs^ e) { - if (SelectedNoteType != 10) { + if (SelectedNoteType != HoldMiddle) { CurrentObjectText->Text = "Time Signature Change"; SelectedLineType = 3; } RefreshPaint(); } private: System::Void Hispeed_Click(System::Object^ sender, System::EventArgs^ e) { - if (SelectedNoteType != 10) { + if (SelectedNoteType != HoldMiddle) { CurrentObjectText->Text = "Hi-Speed Change"; SelectedLineType = 5; } RefreshPaint(); } private: System::Void Stop_Click(System::Object^ sender, System::EventArgs^ e) { - if (SelectedNoteType != 10) { + if (SelectedNoteType != HoldMiddle) { CurrentObjectText->Text = "Stop"; SelectedLineType = 9; } RefreshPaint(); } private: System::Void Reverse_Click(System::Object^ sender, System::EventArgs^ e) { - if (SelectedNoteType != 10) { + if (SelectedNoteType != HoldMiddle) { CurrentObjectText->Text = "Reverse"; SelectedLineType = 6; } RefreshPaint(); } private: System::Void EndHoldBox_CheckedChanged(System::Object^ sender, System::EventArgs^ e) { - if (SelectedNoteType == 10) { + if (SelectedNoteType == HoldMiddle) { CurrentObjectText->Text = stdStringToSystemString(refreshCurrentNoteLabel(SelectedNoteType)); SelectedNoteTypeVisual = SelectedNoteType; } RefreshPaint(); } - private: System::Void NoBonusRadioButton_CheckedChanged(System::Object^ sender, System::EventArgs^ e) { + private: System::Void NoteRadioButton_CheckedChanged(System::Object^ sender, System::EventArgs^ e) { if (SelectedLineType == 1) { switch (SelectedNoteType) { - case 2: + case TouchNoBonus: + case TouchBonus: + case TouchBonusFlair: if (NoBonusRadioButton->Checked) { - SelectedNoteType = 1; + SelectedNoteType = TouchNoBonus; } - break; - case 6: - if (NoBonusRadioButton->Checked) { - SelectedNoteType = 5; - } - break; - case 8: - if (NoBonusRadioButton->Checked) { - SelectedNoteType = 7; - } - break; - case 20: - if (NoBonusRadioButton->Checked) { - SelectedNoteType = 1; - } - break; - case 21: - if (NoBonusRadioButton->Checked) { - SelectedNoteType = 3; - } - break; - case 22: - if (NoBonusRadioButton->Checked) { - SelectedNoteType = 4; - } - break; - case 23: - if (NoBonusRadioButton->Checked) { - SelectedNoteType = 5; - } - break; - case 24: - if (NoBonusRadioButton->Checked) { - SelectedNoteType = 7; - } - break; - case 25: - if (NoBonusRadioButton->Checked) { - SelectedNoteType = 9; - } - break; - case 26: - if (NoBonusRadioButton->Checked) { - SelectedNoteType = 16; - } - break; - } - CurrentObjectText->Text = stdStringToSystemString(refreshCurrentNoteLabel(SelectedNoteType)); - SelectedNoteTypeVisual = SelectedNoteType; - } - } - private: System::Void BonusGetRadioButton_CheckedChanged(System::Object^ sender, System::EventArgs^ e) { - if (SelectedLineType == 1) { - switch (SelectedNoteType) { - case 1: if (BonusGetRadioButton->Checked) { - SelectedNoteType = 2; + SelectedNoteType = TouchBonus; + } + if (BonusFlairRadioButton->Checked) { + SelectedNoteType = TouchBonusFlair; } break; - case 5: + break; + case SlideOrangeNoBonus: + case SlideOrangeBonus: + case SlideOrangeBonusFlair: + if (NoBonusRadioButton->Checked) { + SelectedNoteType = SlideOrangeNoBonus; + } if (BonusGetRadioButton->Checked) { - SelectedNoteType = 6; + SelectedNoteType = SlideOrangeBonus; + } + if (BonusFlairRadioButton->Checked) { + SelectedNoteType = SlideOrangeBonusFlair; } break; - case 7: + case SlideGreenNoBonus: + case SlideGreenBonus: + case SlideGreenBonusFlair: + if (NoBonusRadioButton->Checked) { + SelectedNoteType = SlideGreenNoBonus; + } if (BonusGetRadioButton->Checked) { - SelectedNoteType = 8; + SelectedNoteType = SlideGreenBonus; } - break; - case 20: - if (BonusGetRadioButton->Checked) { - SelectedNoteType = 2; - } - break; - case 23: - if (BonusGetRadioButton->Checked) { - SelectedNoteType = 6; - } - break; - case 24: - if (BonusGetRadioButton->Checked) { - SelectedNoteType = 8; - } - break; - } - CurrentObjectText->Text = stdStringToSystemString(refreshCurrentNoteLabel(SelectedNoteType)); - SelectedNoteTypeVisual = SelectedNoteType; - } - } - private: System::Void BonusFlairRadioButton_CheckedChanged(System::Object^ sender, System::EventArgs^ e) { - if (SelectedLineType == 1) { - switch (SelectedNoteType) { - case 1: if (BonusFlairRadioButton->Checked) { - SelectedNoteType = 20; + SelectedNoteType = SlideGreenBonusFlair; } break; - case 2: + case SnapRedNoBonus: + case SnapRedBonusFlair: + if (NoBonusRadioButton->Checked) { + SelectedNoteType = SnapRedNoBonus; + } if (BonusFlairRadioButton->Checked) { - SelectedNoteType = 20; + SelectedNoteType = SnapRedBonusFlair; } break; - case 3: + case SnapBlueNoBonus: + case SnapBlueBonusFlair: + if (NoBonusRadioButton->Checked) { + SelectedNoteType = SnapBlueNoBonus; + } if (BonusFlairRadioButton->Checked) { - SelectedNoteType = 21; + SelectedNoteType = SnapBlueBonusFlair; } break; - case 4: + case HoldStartNoBonus: + case HoldStartBonusFlair: + if (NoBonusRadioButton->Checked) { + SelectedNoteType = HoldStartNoBonus; + } if (BonusFlairRadioButton->Checked) { - SelectedNoteType = 22; + SelectedNoteType = HoldStartBonusFlair; } break; - case 5: - if (BonusFlairRadioButton->Checked) { - SelectedNoteType = 23; + case Chain: + case ChainBonusFlair: + if (NoBonusRadioButton->Checked) { + SelectedNoteType = Chain; } - break; - case 6: if (BonusFlairRadioButton->Checked) { - SelectedNoteType = 23; - } - break; - case 7: - if (BonusFlairRadioButton->Checked) { - SelectedNoteType = 24; - } - break; - case 8: - if (BonusFlairRadioButton->Checked) { - SelectedNoteType = 24; - } - break; - case 9: - if (BonusFlairRadioButton->Checked) { - SelectedNoteType = 25; - } - break; - case 16: - if (BonusFlairRadioButton->Checked) { - SelectedNoteType = 26; + SelectedNoteType = ChainBonusFlair; } break; } @@ -3166,9 +3070,9 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool } private: System::Void AddMask_CheckedChanged(System::Object^ sender, System::EventArgs^ e) { if (SelectedLineType == 1) { - if (SelectedNoteType == 13) { + if (SelectedNoteType == MaskRemove) { if (AddMask->Checked) { - SelectedNoteType = 12; + SelectedNoteType = MaskAdd; } } CurrentObjectText->Text = stdStringToSystemString(refreshCurrentNoteLabel(SelectedNoteType)); @@ -3178,9 +3082,9 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool } private: System::Void RemoveMask_CheckedChanged(System::Object^ sender, System::EventArgs^ e) { if (SelectedLineType == 1) { - if (SelectedNoteType == 12) { + if (SelectedNoteType == MaskAdd) { if (RemoveMask->Checked) { - SelectedNoteType = 13; + SelectedNoteType = MaskRemove; } } CurrentObjectText->Text = stdStringToSystemString(refreshCurrentNoteLabel(SelectedNoteType)); @@ -3311,10 +3215,10 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool bool holdDelete = false; do { std::list::iterator viewNotesITRtemp = viewNotesITR; - if (viewNotesITRtemp->noteType == 9 || viewNotesITRtemp->noteType == 25) { //deletes hold from start until it's all gone + if (viewNotesITRtemp->noteType == HoldStartNoBonus || viewNotesITRtemp->noteType == HoldStartBonusFlair) { //deletes hold from start until it's all gone holdDelete = true; while (holdDelete) { - if (viewNotesITRtemp->noteType == 11) { + if (viewNotesITRtemp->noteType == HoldEnd) { if (viewNotesITR == theChart.Notes.begin()) { viewNotesITR++; } @@ -3338,9 +3242,9 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool else { viewNotesITR--; } - SelectedNoteType = 9; + SelectedNoteType = HoldStartNoBonus; if (BonusFlairRadioButton->Checked) - SelectedNoteType = 25; + SelectedNoteType = HoldStartBonusFlair; CurrentObjectText->Text = stdStringToSystemString(refreshCurrentNoteLabel(SelectedNoteType)); theChart.Notes.erase(viewNotesITRtemp); holdDelete = false; @@ -3349,12 +3253,12 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool } holdDelete = false; } - else if (viewNotesITRtemp->noteType == 10) { + else if (viewNotesITRtemp->noteType == HoldMiddle) { holdDelete = true; viewNotesITRtemp = viewNotesITRtemp->prevNode; viewNotesITR = viewNotesITRtemp; } - else if (viewNotesITRtemp->noteType == 11) { + else if (viewNotesITRtemp->noteType == HoldEnd) { holdDelete = true; viewNotesITRtemp = viewNotesITRtemp->prevNode; viewNotesITR = viewNotesITRtemp; @@ -3379,48 +3283,38 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool } private: System::Void saveFileDialog_FileOk(System::Object^ sender, System::ComponentModel::CancelEventArgs^ e) { } - Color returnColor(int noteType) { - switch (noteType) { - case 1: + Color returnColor(NoteType noteType) { + switch (noteType) + { + case TouchNoBonus: + case TouchBonus: + case TouchBonusFlair: return TapButton->BackColor; - case 2: - return TapButton->BackColor; - case 3: + case SnapRedNoBonus: + case SnapRedBonusFlair: return RedButton->BackColor; - case 4: + case SnapBlueNoBonus: + case SnapBlueBonusFlair: return BlueButton->BackColor; - case 5: + case SlideOrangeNoBonus: + case SlideOrangeBonus: + case SlideOrangeBonusFlair: return OrangeButton->BackColor; - case 6: - return OrangeButton->BackColor; - case 7: + case SlideGreenNoBonus: + case SlideGreenBonus: + case SlideGreenBonusFlair: return GreenButton->BackColor; - case 8: - return GreenButton->BackColor; - case 9: + case HoldStartNoBonus: + case HoldMiddle: + case HoldEnd: + case HoldStartBonusFlair: return HoldButton->BackColor; - case 10: - return HoldButton->BackColor; - case 11: - return HoldButton->BackColor; - case 16: - return YellowButton->BackColor; - case 20: - return TapButton->BackColor; - case 21: - return RedButton->BackColor; - case 22: - return BlueButton->BackColor; - case 23: - return OrangeButton->BackColor; - case 24: - return GreenButton->BackColor; - case 25: - return HoldButton->BackColor; - case 26: + case Chain: + case ChainBonusFlair: return YellowButton->BackColor; + default: + return Color::Transparent; } - return Color::Transparent; } private: System::Void MyForm_Paint(System::Object^ sender, System::Windows::Forms::PaintEventArgs^ e) { /* MOVED TO PANEL PAINT @@ -3907,10 +3801,10 @@ private: System::Windows::Forms::ToolStripMenuItem^ showCursorDuringPlaybackTool //Draw selected mask if (SelectedLineType == 1 && Rect.Width >= 1) { - if (SelectedNoteTypeVisual == 12) { + if (SelectedNoteTypeVisual == MaskAdd) { bufferedGfx->Graphics->FillPie(MaskBrush, Rect, startAngle, arcLength); } - if (SelectedNoteTypeVisual == 13) { + if (SelectedNoteTypeVisual == MaskRemove) { bufferedGfx->Graphics->FillPie(MaskRemoveBrush, Rect, startAngle, arcLength); } } diff --git a/BAKKA Editor/MyForm.resx b/BAKKA Editor/MyForm.resx index e12786c..f210e5e 100644 --- a/BAKKA Editor/MyForm.resx +++ b/BAKKA Editor/MyForm.resx @@ -4274,6 +4274,12 @@ Viewed Note System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + showCursorDuringPlaybackToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + aboutToolStripMenuItem @@ -4334,12 +4340,6 @@ Viewed Note System.ComponentModel.BackgroundWorker, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - showCursorDuringPlaybackToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - MyForm