diff --git a/BAKKA Editor/Chart.h b/BAKKA Editor/Chart.h index f9b28af..b350af2 100644 --- a/BAKKA Editor/Chart.h +++ b/BAKKA Editor/Chart.h @@ -13,12 +13,16 @@ enum NoteType { SlideGreenNoBonus = 7, SlideGreenBonus = 8, HoldStartNoBonus = 9, - HoldMiddle = 10, + HoldJoint = 10, HoldEnd = 11, MaskAdd = 12, MaskRemove = 13, EndOfChart = 14, + //MaskSameTime = 15, Chain = 16, + //MaskLane = 17, + //TutorialTag = 18, + //BarLine = 19, TouchBonusFlair = 20, SnapRedBonusFlair = 21, SnapBlueBonusFlair = 22, @@ -29,8 +33,8 @@ enum NoteType { }; struct NotesNode { + int measure; int beat; - int subBeat; NoteType noteType; int position; int size; @@ -53,8 +57,8 @@ enum GimmickType { }; struct PreChartNode { + int measure; int beat; - int subBeat; GimmickType type; double BPM; //2 int beatDiv1; //3 diff --git a/BAKKA Editor/MyForm.h b/BAKKA Editor/MyForm.h index 63669b9..3214efb 100644 --- a/BAKKA Editor/MyForm.h +++ b/BAKKA Editor/MyForm.h @@ -29,8 +29,8 @@ std::list::iterator viewGimmicksITR = theChart.PreChart.begin(); std::list::iterator holdNoteitr = theChart.Notes.end(); std::map>> mapOfMasks; //measure, list of masks std::map> mapOfNotes; //measure, list of notes -std::map mapOfTimeBetweenMeasures; //current beat, milliseconds beatween beats -std::map mapOfBeatAtTime; //milliseconds start time, beat start time +std::map mapOfTimeBetweenMeasures; //current measure, milliseconds beatween beats +std::map mapOfBeatAtTime; //milliseconds start time, measure start time std::map mapOfBPMatTime; //measure start time, BPM at time std::map> mapOfTSatTime; //measure start time, Time Signature at time bool alreadyRefreshed = false; @@ -63,7 +63,7 @@ bool isHold(NoteType note) { switch (note) { case HoldStartNoBonus: - case HoldMiddle: + case HoldJoint: case HoldEnd: case HoldStartBonusFlair: return true; @@ -72,17 +72,17 @@ bool isHold(NoteType note) { } } bool sortNotesListByBeat(const NotesNode& lhs, const NotesNode& rhs) { - if (lhs.beat < rhs.beat) + if (lhs.measure < rhs.measure) return true; - else if ((lhs.beat == rhs.beat) && (lhs.subBeat < rhs.subBeat)) + else if ((lhs.measure == rhs.measure) && (lhs.beat < rhs.beat)) return true; else return false; } bool sortPreChartListByBeat(const PreChartNode& lhs, const PreChartNode& rhs) { - if (lhs.beat < rhs.beat) + if (lhs.measure < rhs.measure) return true; - else if ((lhs.beat == rhs.beat) && (lhs.subBeat < rhs.subBeat)) + else if ((lhs.measure == rhs.measure) && (lhs.beat < rhs.beat)) return true; return false; } @@ -1782,7 +1782,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip for (std::list::iterator viewMasksITR = theChart.Notes.begin(); viewMasksITR != theChart.Notes.end(); viewMasksITR++) { if (viewMasksITR->noteType == MaskAdd || viewMasksITR->noteType == MaskRemove) { - float currentTime = (float)viewMasksITR->beat + ((float)viewMasksITR->subBeat / 1920.f); + float currentTime = (float)viewMasksITR->measure + ((float)viewMasksITR->beat / 1920.f); int maskStart, maskEnd; maskStart = viewMasksITR->position; maskEnd = viewMasksITR->position + viewMasksITR->size; @@ -1904,14 +1904,16 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip void refreshMapofNotes() { mapOfNotes.clear(); for (std::list::iterator NotesITR = theChart.Notes.begin(); NotesITR != theChart.Notes.end(); NotesITR++) { - float currentTime = (float)NotesITR->beat + ((float)NotesITR->subBeat / 1920.f); + float currentTime = (float)NotesITR->measure + ((float)NotesITR->beat / 1920.f); if (NotesITR->noteType != 12 || NotesITR->noteType != 13) { NotesNode tempnode; + tempnode.measure = NotesITR->measure; tempnode.beat = NotesITR->beat; - tempnode.subBeat = NotesITR->subBeat; tempnode.noteType = NotesITR->noteType; tempnode.position = NotesITR->position; tempnode.size = NotesITR->size; + tempnode.nextNode = NotesITR->nextNode; + tempnode.prevNode = NotesITR->prevNode; mapOfNotes[currentTime].push_back(tempnode); } } @@ -1932,7 +1934,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip if (!theChart.PreChart.empty()) { for (std::list::iterator viewGimmicksITR = theChart.PreChart.begin(); viewGimmicksITR != theChart.PreChart.end(); viewGimmicksITR++) { - float currentTime = (float)viewGimmicksITR->beat + ((float)viewGimmicksITR->subBeat / 1920.f); + float currentTime = (float)viewGimmicksITR->measure + ((float)viewGimmicksITR->beat / 1920.f); if (viewGimmicksITR->type == BpmChange || viewGimmicksITR->type == TimeSignatureChange) { // First run through fills maps of BPMs and Time Signatures //make current time values in maps current to what the PreChart list is saying if(viewGimmicksITR->type == BpmChange) @@ -2014,9 +2016,9 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip } void refreshGimmickView() { if (!theChart.PreChart.empty()) { - GimmickBeatLabel->Text = ((viewGimmicksITR)->beat).ToString(); + GimmickBeatLabel->Text = ((viewGimmicksITR)->measure).ToString(); - int num1 = (viewGimmicksITR)->subBeat; + int num1 = (viewGimmicksITR)->beat; int num2 = 1920; std::string subBeatString = subBeatValueDisplay(num1, num2); GimmickSubBeatLabel->Text = stdStringToSystemString(subBeatString); @@ -2085,12 +2087,12 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip return "Slide (G) [Bonus]"; case HoldStartNoBonus: return "Hold Start"; - case HoldMiddle: + case HoldJoint: if (EndHoldBox->Checked) { return "Hold End"; } else { - return "Hold Middle"; + return "Hold Joint"; } case HoldEnd: return "Hold End"; @@ -2157,8 +2159,8 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip return "Slide (G) [Bonus]"; case HoldStartNoBonus: return "Hold Start"; - case HoldMiddle: - return "Hold Middle"; + case HoldJoint: + return "Hold Joint"; case HoldEnd: return "Hold End"; case MaskAdd: @@ -2189,9 +2191,9 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip } void refreshNotesView() { if (!theChart.Notes.empty()) { - NotesBeatLabel->Text = ((viewNotesITR)->beat).ToString(); + NotesBeatLabel->Text = ((viewNotesITR)->measure).ToString(); - float num1 = (viewNotesITR)->subBeat; + float num1 = (viewNotesITR)->beat; float num2 = 1920; std::string subBeatString = subBeatValueDisplay(num1, num2); NotesSubBeatLabel->Text = stdStringToSystemString(subBeatString); @@ -2201,7 +2203,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip PosNum->Value = viewNotesITR->position; SizeNum->Value = viewNotesITR->size; SelectedNoteTypeVisual = viewNotesITR->noteType; - if (SelectedNoteTypeVisual != HoldMiddle && SelectedNoteTypeVisual != HoldEnd && SelectedNoteTypeVisual != HoldStartNoBonus && SelectedNoteTypeVisual != HoldStartBonusFlair) { + if (SelectedNoteTypeVisual != HoldJoint && SelectedNoteTypeVisual != HoldEnd && SelectedNoteTypeVisual != HoldStartNoBonus && SelectedNoteTypeVisual != HoldStartBonusFlair) { SelectedLineType = NoGimmick; SelectedNoteType = viewNotesITR->noteType; } @@ -2209,8 +2211,8 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip } if (MatchTimeCheckBox->Checked) { noteRefresh = true; - MeasureNum->Value = viewNotesITR->beat; - BeatNum2->Value = (int)subBeatValue2(num1, num2); //change 2 first so that 1 doesnt become larger and make it round up to the next beat + MeasureNum->Value = viewNotesITR->measure; + BeatNum2->Value = (int)subBeatValue2(num1, num2); //change 2 first so that 1 doesnt become larger and make it round up to the next measure BeatNum1->Value = (int)subBeatValue1(num1, num2); noteRefresh = false; refreshThePaint = true; @@ -2384,8 +2386,8 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip << "#BODY\n"; for (std::list::iterator itr = theChart.PreChart.begin(); itr != theChart.PreChart.end(); itr++) { - chartFile << std::right << std::fixed << std::setw(4) << (itr)->beat - << std::right << std::fixed << std::setw(5) << (itr)->subBeat + chartFile << std::right << std::fixed << std::setw(4) << (itr)->measure + << std::right << std::fixed << std::setw(5) << (itr)->beat << std::right << std::fixed << std::setw(5) << (itr)->type; switch ((itr)->type) { case 2: @@ -2406,8 +2408,8 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip int line = 0; for (std::list::iterator itr = theChart.Notes.begin(); itr != theChart.Notes.end(); itr++) { - chartFile << std::right << std::fixed << std::setw(4) << (itr)->beat - << std::right << std::fixed << std::setw(5) << (itr)->subBeat + chartFile << std::right << std::fixed << std::setw(4) << (itr)->measure + << std::right << std::fixed << std::setw(5) << (itr)->beat << std::right << std::fixed << std::setw(5) << 1 << std::right << std::fixed << std::setw(5) << (itr)->noteType << std::right << std::fixed << std::setw(5) << line @@ -2507,8 +2509,8 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip songTrackSlider->Minimum = (int)(theChart.offset * 1000.f); } + int measure; int beat; - int subBeat; GimmickType type; int typeTemp; int lineTemp; @@ -2517,55 +2519,55 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip NotesNode tempNotes; PreChartNode tempPCNode; while (!chartFile.eof()) { - chartFile >> beat >> subBeat >> typeTemp; + chartFile >> measure >> beat >> typeTemp; type = (GimmickType)typeTemp; if (chartFile.eof()) break; switch (type) { case NoGimmick: + tempNotes.measure = measure; tempNotes.beat = beat; - tempNotes.subBeat = subBeat; chartFile >> noteTemp >> lineTemp >> tempNotes.position >> tempNotes.size >> tempNotes.holdChange; tempNotes.noteType = (NoteType)noteTemp; if (tempNotes.noteType == MaskAdd || tempNotes.noteType == MaskRemove) { chartFile >> tempNotes.BGType; } - if (tempNotes.noteType == HoldStartNoBonus || tempNotes.noteType == HoldMiddle || tempNotes.noteType == HoldStartBonusFlair) { + if (tempNotes.noteType == HoldStartNoBonus || tempNotes.noteType == HoldJoint || tempNotes.noteType == HoldStartBonusFlair) { chartFile >> Holds[lineTemp]; } theChart.Notes.push_back(tempNotes); break; case BpmChange: + tempPCNode.measure = measure; tempPCNode.beat = beat; - tempPCNode.subBeat = subBeat; tempPCNode.type = type; chartFile >> tempPCNode.BPM; theChart.PreChart.push_back(tempPCNode); - if (beat == 0 && subBeat == 0) { + if (measure == 0 && beat == 0) { InitialBPMNum->Value = (System::Decimal)tempPCNode.BPM; } break; case TimeSignatureChange: + tempPCNode.measure = measure; tempPCNode.beat = beat; - tempPCNode.subBeat = subBeat; tempPCNode.type = type; chartFile >> tempPCNode.beatDiv1 >> tempPCNode.beatDiv2; theChart.PreChart.push_back(tempPCNode); - if (beat == 0 && subBeat == 0) { + if (measure == 0 && beat == 0) { InitTimeSigNum1->Value = (System::Decimal)tempPCNode.beatDiv1; InitTimeSigNum2->Value = (System::Decimal)tempPCNode.beatDiv2; } break; case HiSpeedChange: + tempPCNode.measure = measure; tempPCNode.beat = beat; - tempPCNode.subBeat = subBeat; tempPCNode.type = type; chartFile >> tempPCNode.hiSpeed; theChart.PreChart.push_back(tempPCNode); break; default: + tempPCNode.measure = measure; tempPCNode.beat = beat; - tempPCNode.subBeat = subBeat; tempPCNode.type = type; theChart.PreChart.push_back(tempPCNode); } @@ -2606,8 +2608,8 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip PreChartNode tempPreChartNode; if (SelectedLineType == NoGimmick) { - tempNotesNode.beat = (int)MeasureNum->Value; - tempNotesNode.subBeat = std::round((1920.f / (float)BeatNum2->Value) * (float)BeatNum1->Value); + tempNotesNode.measure = (int)MeasureNum->Value; + tempNotesNode.beat = std::round((1920.f / (float)BeatNum2->Value) * (float)BeatNum1->Value); tempNotesNode.noteType = SelectedNoteType; tempNotesNode.position = (int)PosNum->Value; tempNotesNode.size = (int)SizeNum->Value; @@ -2619,11 +2621,11 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip CurrentObjectText->Text = "Hold End"; } else { - CurrentObjectText->Text = "Hold Middle"; + CurrentObjectText->Text = "Hold Joint"; } - SelectedNoteType = HoldMiddle; + SelectedNoteType = HoldJoint; break; - case HoldMiddle: + case HoldJoint: if (EndHoldBox->Checked) { SelectedNoteType = HoldEnd; tempNotesNode.noteType = SelectedNoteType; @@ -2657,9 +2659,9 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip CurrentObjectText->Text = "Hold End"; } else { - CurrentObjectText->Text = "Hold Middle"; + CurrentObjectText->Text = "Hold Joint"; } - SelectedNoteType = HoldMiddle; + SelectedNoteType = HoldJoint; break; } if (SelectedNoteType == HoldEnd) { @@ -2674,7 +2676,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip } theChart.Notes.push_back(tempNotesNode); - float currentTime = (float)tempNotesNode.beat + ((float)tempNotesNode.subBeat / 1920); + float currentTime = (float)tempNotesNode.measure + ((float)tempNotesNode.beat / 1920); mapOfNotes[currentTime].push_back(tempNotesNode); if (!theChart.Notes.empty()) { viewNotesITR = theChart.Notes.end(); @@ -2685,7 +2687,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip viewNotesITR->nextNode = theChart.Notes.end(); holdNoteitr = viewNotesITR; break; - case HoldMiddle: + case HoldJoint: viewNotesITR->prevNode = holdNoteitr; viewNotesITR->prevNode->nextNode = viewNotesITR; viewNotesITR->nextNode = theChart.Notes.end(); @@ -2712,18 +2714,18 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip refreshNotesView(); } else { - tempPreChartNode.beat = (int)MeasureNum->Value; - tempPreChartNode.subBeat = std::round((1920.f / (float)BeatNum2->Value) * (float)BeatNum1->Value); + tempPreChartNode.measure = (int)MeasureNum->Value; + tempPreChartNode.beat = std::round((1920.f / (float)BeatNum2->Value) * (float)BeatNum1->Value); tempPreChartNode.type = SelectedLineType; if (SelectedLineType == BpmChange) { //BPM Change - if (tempPreChartNode.beat == 0 && tempPreChartNode.subBeat == 0) { + if (tempPreChartNode.measure == 0 && tempPreChartNode.beat == 0) { InitialBPMNum->Value = BPMChangeNum->Value; } tempPreChartNode.BPM = (double)BPMChangeNum->Value; theChart.PreChart.push_back(tempPreChartNode); } if (SelectedLineType == TimeSignatureChange) { //Time Signature Change - if (tempPreChartNode.beat == 0 && tempPreChartNode.subBeat == 0) { + if (tempPreChartNode.measure == 0 && tempPreChartNode.beat == 0) { InitTimeSigNum1->Value = TimeSigNum1->Value; InitTimeSigNum2->Value = TimeSigNum2->Value; } @@ -2738,21 +2740,21 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip if (SelectedLineType == ReverseStart) { //Reverse theChart.PreChart.push_back(tempPreChartNode); - tempPreChartNode.beat = (int)ReverseEnd1MeasureNum->Value; - tempPreChartNode.subBeat = std::round((1920.f / (float)ReverseEnd1BeatNum2->Value) * (float)ReverseEnd1BeatNum1->Value); + tempPreChartNode.measure = (int)ReverseEnd1MeasureNum->Value; + tempPreChartNode.beat = std::round((1920.f / (float)ReverseEnd1BeatNum2->Value) * (float)ReverseEnd1BeatNum1->Value); tempPreChartNode.type = ReverseMiddle; theChart.PreChart.push_back(tempPreChartNode); - tempPreChartNode.beat = (int)ReverseEnd2MeasureNum->Value; - tempPreChartNode.subBeat = std::round((1920.f / (float)ReverseEnd2BeatNum2->Value) * (float)ReverseEnd2BeatNum1->Value); + tempPreChartNode.measure = (int)ReverseEnd2MeasureNum->Value; + tempPreChartNode.beat = std::round((1920.f / (float)ReverseEnd2BeatNum2->Value) * (float)ReverseEnd2BeatNum1->Value); tempPreChartNode.type = ReverseEnd; theChart.PreChart.push_back(tempPreChartNode); } if (SelectedLineType == StopStart) { //Stop theChart.PreChart.push_back(tempPreChartNode); - tempPreChartNode.beat = (int)StopEndMeasureNum->Value; - tempPreChartNode.subBeat = std::round((1920.f / (float)StopEndBeatNum2->Value) * (float)StopEndBeatNum1->Value); + tempPreChartNode.measure = (int)StopEndMeasureNum->Value; + tempPreChartNode.beat = std::round((1920.f / (float)StopEndBeatNum2->Value) * (float)StopEndBeatNum1->Value); tempPreChartNode.type = StopEnd; theChart.PreChart.push_back(tempPreChartNode); } @@ -2775,11 +2777,11 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip std::list::iterator itr; for (itr = theChart.PreChart.begin(); itr != theChart.PreChart.end(); ++itr) { - if ((itr)->type == BpmChange && (itr)->beat == 0 && (itr)->subBeat == 0) { + if ((itr)->type == BpmChange && (itr)->measure == 0 && (itr)->beat == 0) { (itr)->BPM = (double)InitialBPMNum->Value; BPMFound = true; } - if ((itr)->type == TimeSignatureChange && (itr)->beat == 0 && (itr)->subBeat == 0) { + if ((itr)->type == TimeSignatureChange && (itr)->measure == 0 && (itr)->beat == 0) { (itr)->beatDiv1 = (int)InitTimeSigNum1->Value; (itr)->beatDiv2 = (int)InitTimeSigNum2->Value; TimeSigFound = true; @@ -2788,8 +2790,8 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip PreChartNode tempPreChartNode; if (!BPMFound) { + tempPreChartNode.measure = 0; tempPreChartNode.beat = 0; - tempPreChartNode.subBeat = 0; tempPreChartNode.type = BpmChange; tempPreChartNode.BPM = (double)InitialBPMNum->Value; theChart.PreChart.push_back(tempPreChartNode); @@ -2797,8 +2799,8 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip viewGimmicksITR--; } if (!TimeSigFound) { + tempPreChartNode.measure = 0; tempPreChartNode.beat = 0; - tempPreChartNode.subBeat = 0; tempPreChartNode.type = TimeSignatureChange; tempPreChartNode.beatDiv1 = (int)InitTimeSigNum1->Value; tempPreChartNode.beatDiv2 = (int)InitTimeSigNum2->Value; @@ -2815,7 +2817,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip saveToolStripMenuItem_Click(sender, e); } private: System::Void TapButton_Click(System::Object^ sender, System::EventArgs^ e) { - if (SelectedNoteType != HoldMiddle) { + if (SelectedNoteType != HoldJoint) { if (BonusGetRadioButton->Checked) { SelectedNoteType = TouchBonus; } @@ -2832,7 +2834,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip RefreshPaint(); } private: System::Void OrangeButton_Click(System::Object^ sender, System::EventArgs^ e) { - if (SelectedNoteType != HoldMiddle) { + if (SelectedNoteType != HoldJoint) { if (BonusGetRadioButton->Checked) { SelectedNoteType = SlideOrangeBonus; } @@ -2849,7 +2851,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip RefreshPaint(); } private: System::Void GreenButton_Click(System::Object^ sender, System::EventArgs^ e) { - if (SelectedNoteType != HoldMiddle) { + if (SelectedNoteType != HoldJoint) { if (BonusGetRadioButton->Checked == true) { SelectedNoteType = SlideGreenBonus; } @@ -2866,7 +2868,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip RefreshPaint(); } private: System::Void RedButton_Click(System::Object^ sender, System::EventArgs^ e) { - if (SelectedNoteType != HoldMiddle) { + if (SelectedNoteType != HoldJoint) { if (BonusFlairRadioButton->Checked) { SelectedNoteType = SnapRedBonusFlair; } @@ -2880,7 +2882,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip RefreshPaint(); } private: System::Void BlueButton_Click(System::Object^ sender, System::EventArgs^ e) { - if (SelectedNoteType != HoldMiddle) { + if (SelectedNoteType != HoldJoint) { if (BonusFlairRadioButton->Checked) { SelectedNoteType = SnapBlueBonusFlair; } @@ -2894,7 +2896,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip RefreshPaint(); } private: System::Void YellowButton_Click(System::Object^ sender, System::EventArgs^ e) { - if (SelectedNoteType != HoldMiddle) { + if (SelectedNoteType != HoldJoint) { if (BonusFlairRadioButton->Checked) { SelectedNoteType = ChainBonusFlair; } @@ -2908,7 +2910,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip RefreshPaint(); } private: System::Void EndChartButton_Click(System::Object^ sender, System::EventArgs^ e) { - if (SelectedNoteType != HoldMiddle) { + if (SelectedNoteType != HoldJoint) { SelectedNoteType = EndOfChart; CurrentObjectText->Text = stdStringToSystemString(refreshCurrentNoteLabel(SelectedNoteType)); SelectedNoteTypeVisual = SelectedNoteType; @@ -2917,7 +2919,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip RefreshPaint(); } private: System::Void HoldButton_Click(System::Object^ sender, System::EventArgs^ e) { - if (SelectedNoteType != HoldMiddle) { + if (SelectedNoteType != HoldJoint) { if (BonusFlairRadioButton->Checked) { SelectedNoteType = HoldStartBonusFlair; } @@ -2931,7 +2933,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip RefreshPaint(); } private: System::Void MaskButton_Click(System::Object^ sender, System::EventArgs^ e) { - if (SelectedNoteType != HoldMiddle) { + if (SelectedNoteType != HoldJoint) { if (AddMask->Checked) { SelectedNoteType = MaskAdd; } @@ -2945,42 +2947,42 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip RefreshPaint(); } private: System::Void BPMChange_Click(System::Object^ sender, System::EventArgs^ e) { - if (SelectedNoteType != HoldMiddle) { + if (SelectedNoteType != HoldJoint) { CurrentObjectText->Text = "BPM Change"; SelectedLineType = BpmChange; } RefreshPaint(); } private: System::Void TimeSignature_Click(System::Object^ sender, System::EventArgs^ e) { - if (SelectedNoteType != HoldMiddle) { + if (SelectedNoteType != HoldJoint) { CurrentObjectText->Text = "Time Signature Change"; SelectedLineType = TimeSignatureChange; } RefreshPaint(); } private: System::Void Hispeed_Click(System::Object^ sender, System::EventArgs^ e) { - if (SelectedNoteType != HoldMiddle) { + if (SelectedNoteType != HoldJoint) { CurrentObjectText->Text = "Hi-Speed Change"; SelectedLineType = HiSpeedChange; } RefreshPaint(); } private: System::Void Stop_Click(System::Object^ sender, System::EventArgs^ e) { - if (SelectedNoteType != HoldMiddle) { + if (SelectedNoteType != HoldJoint) { CurrentObjectText->Text = "Stop"; SelectedLineType = StopStart; } RefreshPaint(); } private: System::Void Reverse_Click(System::Object^ sender, System::EventArgs^ e) { - if (SelectedNoteType != HoldMiddle) { + if (SelectedNoteType != HoldJoint) { CurrentObjectText->Text = "Reverse"; SelectedLineType = ReverseStart; } RefreshPaint(); } private: System::Void EndHoldBox_CheckedChanged(System::Object^ sender, System::EventArgs^ e) { - if (SelectedNoteType == HoldMiddle) { + if (SelectedNoteType == HoldJoint) { CurrentObjectText->Text = stdStringToSystemString(refreshCurrentNoteLabel(SelectedNoteType)); SelectedNoteTypeVisual = SelectedNoteType; } @@ -3251,7 +3253,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip } holdDelete = false; } - else if (viewNotesITRtemp->noteType == HoldMiddle) { + else if (viewNotesITRtemp->noteType == HoldJoint) { holdDelete = true; viewNotesITRtemp = viewNotesITRtemp->prevNode; viewNotesITR = viewNotesITRtemp; @@ -3303,7 +3305,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip case SlideGreenBonusFlair: return GreenButton->BackColor; case HoldStartNoBonus: - case HoldMiddle: + case HoldJoint: case HoldEnd: case HoldStartBonusFlair: return HoldButton->BackColor; @@ -3642,8 +3644,8 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip } private: System::Void NextBeatButton_Click(System::Object^ sender, System::EventArgs^ e) { if (!theChart.Notes.empty()) { - int initialBeat = viewNotesITR->beat; - while (viewNotesITR->beat == initialBeat) { + int initialBeat = viewNotesITR->measure; + while (viewNotesITR->measure == initialBeat) { viewNotesITR++; if (viewNotesITR == theChart.Notes.end()) { viewNotesITR = theChart.Notes.begin(); @@ -3655,8 +3657,8 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip } private: System::Void PrevBeatButton_Click(System::Object^ sender, System::EventArgs^ e) { if (!theChart.Notes.empty()) { - int initialBeat = viewNotesITR->beat; - while (viewNotesITR->beat == initialBeat) { + int initialBeat = viewNotesITR->measure; + while (viewNotesITR->measure == initialBeat) { if (viewNotesITR != theChart.Notes.begin()) { viewNotesITR--; } @@ -3674,8 +3676,8 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip } private: System::Void EditNoteButton_Click(System::Object^ sender, System::EventArgs^ e) { if (!isHold(SelectedNoteType)) { - viewNotesITR->beat = (int)MeasureNum->Value; - viewNotesITR->subBeat = ((1920 / (int)BeatNum2->Value) * (int)BeatNum1->Value); + viewNotesITR->measure = (int)MeasureNum->Value; + viewNotesITR->beat = ((1920 / (int)BeatNum2->Value) * (int)BeatNum1->Value); viewNotesITR->noteType = SelectedNoteType; viewNotesITR->position = (int)PosNum->Value; viewNotesITR->size = (int)SizeNum->Value; @@ -3991,9 +3993,9 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip bufferedGfx->Render(e->Graphics); } bool islistITREqualToViewITR(std::list::iterator listITR) { - if (listITR->beat != viewNotesITR->beat) + if (listITR->measure != viewNotesITR->measure) return false; - if (listITR->subBeat != viewNotesITR->subBeat) + if (listITR->beat != viewNotesITR->beat) return false; if (listITR->noteType != viewNotesITR->noteType) return false; @@ -4152,7 +4154,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip listOfNotesAtCurrentMeasure = mapOfNotes[currentMeasure]; } if (!listOfNotesAtCurrentMeasure.empty()) { - float measureAtListTime = listOfNotesAtCurrentMeasure.begin()->beat + (listOfNotesAtCurrentMeasure.begin()->subBeat / 1920.f); + float measureAtListTime = listOfNotesAtCurrentMeasure.begin()->measure + (listOfNotesAtCurrentMeasure.begin()->beat / 1920.f); if (measureAtListTime <= currentMeasure && measureAtListTime >= (currentMeasure - updateIntToMeasure)) { for (std::list::iterator listofNotesitr = listOfNotesAtCurrentMeasure.begin(); listofNotesitr != listOfNotesAtCurrentMeasure.end(); listofNotesitr++) { switch (listofNotesitr->noteType) { @@ -4233,7 +4235,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip } private: System::Void CirclePanel_MouseWheel(System::Object^ sender, System::Windows::Forms::MouseEventArgs^ e) { if (Control::ModifierKeys == Keys::Alt) { - // Shift beat division by standard musical quantizations + // Shift measure division by standard musical quantizations // TODO: take into account time signature? if (BeatNum2->Value < 2) { if (e->Delta > 0) { @@ -4269,7 +4271,7 @@ private: System::Windows::Forms::ToolStripMenuItem^ highlightViewedNoteToolStrip } else { - // Scroll by one beat at a time + // Scroll by one measure at a time if (e->Delta > 0) { BeatNum1->Value++; } diff --git a/BAKKA Editor/MyForm.resx b/BAKKA Editor/MyForm.resx index de7faee..a03ebd0 100644 --- a/BAKKA Editor/MyForm.resx +++ b/BAKKA Editor/MyForm.resx @@ -124,6 +124,49 @@ Segoe UI, 9pt + + 37, 20 + + + File + + + 44, 20 + + + View + + + 52, 20 + + + About + + + 0, 0 + + + 1142, 24 + + + + 0 + + + Menu Strip + + + menuStrip + + + System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 13 + Ctrl+N @@ -167,12 +210,6 @@ Exit - - 37, 20 - - - File - 230, 22 @@ -191,49 +228,12 @@ Highlight Viewed Note - - 44, 20 - - - View - 181, 22 About BAKKA Editor - - 52, 20 - - - About - - - 0, 0 - - - 1142, 24 - - - - 0 - - - Menu Strip - - - menuStrip - - - System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 13 - True @@ -420,6 +420,9 @@ 8 + + 124, 17 + True @@ -438,9 +441,6 @@ Hold (H) - - 124, 17 - After first insert of a hold, you must continue adding to the hold until end. @@ -490,6 +490,78 @@ otherwise it will crash. 4 + + BonusFlairRadioButton + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoteTypeBox + + + 0 + + + BonusGetRadioButton + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoteTypeBox + + + 1 + + + NoBonusRadioButton + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoteTypeBox + + + 2 + + + EndHoldBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoteTypeBox + + + 3 + + + 12, 27 + + + 97, 346 + + + 14 + + + Note Types + + + NoteTypeBox + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + True @@ -615,30 +687,9 @@ Tap, Orange Flicks, and Green Flicks 3 - - 12, 27 - - - 97, 346 - - - 14 - - - Note Types - - - NoteTypeBox - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 4 - + + 124, 17 + 7, 48 @@ -1281,6 +1332,54 @@ Default: 0.5 (1/2 of a measure) 2 + + RemoveMask + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GimmickBox + + + 5 + + + AddMask + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GimmickBox + + + 6 + + + 115, 27 + + + 110, 253 + + + 15 + + + Gimmick Types + + + GimmickBox + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + True @@ -1338,33 +1437,309 @@ Default: 0.5 (1/2 of a measure) 6 - - 115, 27 - - - 110, 253 - - - 15 - - - Gimmick Types - - - GimmickBox - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 3 - Top, Right + + ReverseEnd2BeatNum2 + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GimmickSettingsBox + + + 0 + + + label12 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GimmickSettingsBox + + + 1 + + + ReverseEnd2BeatNum1 + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GimmickSettingsBox + + + 2 + + + ReverseEnd2MeasureNum + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GimmickSettingsBox + + + 3 + + + ReverseEnd1BeatNum2 + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GimmickSettingsBox + + + 4 + + + label11 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GimmickSettingsBox + + + 5 + + + ReverseEnd1BeatNum1 + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GimmickSettingsBox + + + 6 + + + ReverseEnd1MeasureNum + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GimmickSettingsBox + + + 7 + + + StopEndMeasureNum + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GimmickSettingsBox + + + 8 + + + StopEndBeatNum2 + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GimmickSettingsBox + + + 9 + + + label10 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GimmickSettingsBox + + + 10 + + + StopEndBeatNum1 + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GimmickSettingsBox + + + 11 + + + HiSpeedChangeNum + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GimmickSettingsBox + + + 12 + + + TimeSigNum2 + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GimmickSettingsBox + + + 13 + + + label9 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GimmickSettingsBox + + + 14 + + + TimeSigNum1 + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GimmickSettingsBox + + + 15 + + + BPMChangeNum + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GimmickSettingsBox + + + 16 + + + label8 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GimmickSettingsBox + + + 17 + + + label7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GimmickSettingsBox + + + 18 + + + label6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GimmickSettingsBox + + + 19 + + + label5 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GimmickSettingsBox + + + 20 + + + label4 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GimmickSettingsBox + + + 21 + + + label3 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GimmickSettingsBox + + + 22 + + + 864, 189 + + + 266, 176 + + + 23 + + + Gimmick Settings + + + GimmickSettingsBox + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 11 + 218, 150 @@ -1968,33 +2343,165 @@ Default: 0.5 (1/2 of a measure) 22 - - 864, 189 - - - 266, 176 - - - 23 - - - Gimmick Settings - - - GimmickSettingsBox - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 11 - Top, Right + + InitialSetSave + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + InitialSettingsPane + + + 0 + + + MovieOffsetNum + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + InitialSettingsPane + + + 1 + + + label17 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + InitialSettingsPane + + + 2 + + + OffsetNum + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + InitialSettingsPane + + + 3 + + + label16 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + InitialSettingsPane + + + 4 + + + InitTimeSigNum2 + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + InitialSettingsPane + + + 5 + + + label15 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + InitialSettingsPane + + + 6 + + + InitTimeSigNum1 + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + InitialSettingsPane + + + 7 + + + label14 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + InitialSettingsPane + + + 8 + + + InitialBPMNum + + + System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + InitialSettingsPane + + + 9 + + + label13 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + InitialSettingsPane + + + 10 + + + 864, 27 + + + 266, 160 + + + 24 + + + Initial Chart Settings + + + InitialSettingsPane + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 10 + Bottom @@ -2292,30 +2799,6 @@ Default: 0.5 (1/2 of a measure) 10 - - 864, 27 - - - 266, 160 - - - 24 - - - Initial Chart Settings - - - InitialSettingsPane - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 10 - True @@ -2349,6 +2832,66 @@ Default: 0.5 (1/2 of a measure) 6 + + MaskCenter + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + MaskSettingsBox + + + 0 + + + MaskCClockwise + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + MaskSettingsBox + + + 1 + + + MaskClockwise + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + MaskSettingsBox + + + 2 + + + 115, 286 + + + 110, 87 + + + 26 + + + Mask Setting + + + MaskSettingsBox + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 9 + True @@ -2430,30 +2973,6 @@ Default: 0.5 (1/2 of a measure) 2 - - 115, 286 - - - 110, 87 - - - 26 - - - Mask Setting - - - MaskSettingsBox - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 9 - True @@ -2490,6 +3009,162 @@ Default: 0.5 (1/2 of a measure) True + + GimmickValueLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + PreChartViewBox + + + 0 + + + GimmickTypeLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + PreChartViewBox + + + 1 + + + GimmickSubBeatLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + PreChartViewBox + + + 2 + + + GimmickBeatLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + PreChartViewBox + + + 3 + + + label22 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + PreChartViewBox + + + 4 + + + label21 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + PreChartViewBox + + + 5 + + + label20 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + PreChartViewBox + + + 6 + + + label19 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + PreChartViewBox + + + 7 + + + NextGimmickButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + PreChartViewBox + + + 8 + + + PrevGimmickButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + PreChartViewBox + + + 9 + + + DeleteGimmickButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + PreChartViewBox + + + 10 + + + 847, 643 + + + 283, 132 + + + 28 + + + Gimmicks View + + + PreChartViewBox + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 8 + True @@ -2814,33 +3489,261 @@ Default: 0.5 (1/2 of a measure) 10 - - 847, 643 - - - 283, 132 - - - 28 - - - Gimmicks View - - - PreChartViewBox - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 8 - Bottom, Right + + PrevBeatButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NotesViewBox + + + 1 + + + NextBeatButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NotesViewBox + + + 2 + + + MatchNoteCheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NotesViewBox + + + 3 + + + MatchTimeCheckBox + + + System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NotesViewBox + + + 4 + + + NotesMaskLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NotesViewBox + + + 5 + + + NotesSizeLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NotesViewBox + + + 6 + + + NotesPosLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NotesViewBox + + + 7 + + + NotesTypeLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NotesViewBox + + + 8 + + + NotesSubBeatLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NotesViewBox + + + 9 + + + NotesBeatLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NotesViewBox + + + 10 + + + label28 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NotesViewBox + + + 11 + + + label27 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NotesViewBox + + + 12 + + + label26 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NotesViewBox + + + 13 + + + label25 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NotesViewBox + + + 14 + + + label24 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NotesViewBox + + + 15 + + + label23 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NotesViewBox + + + 16 + + + NextNoteButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NotesViewBox + + + 17 + + + PrevNoteButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NotesViewBox + + + 18 + + + DeleteNoteButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NotesViewBox + + + 19 + + + 892, 371 + + + 238, 266 + + + 29 + + + Notes View + + + NotesViewBox + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + NoControl @@ -3411,30 +4314,6 @@ Default: 0.5 (1/2 of a measure) 19 - - 892, 371 - - - 238, 266 - - - 29 - - - Notes View - - - NotesViewBox - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - 216, 17 @@ -3447,6 +4326,54 @@ Default: 0.5 (1/2 of a measure) mer files (*.mer)|*.mer|All Files (*.*)|*.* + + SizeTrackBar + + + System.Windows.Forms.TrackBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + CurrentNoteBox + + + 5 + + + PosTrackBar + + + System.Windows.Forms.TrackBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + CurrentNoteBox + + + 6 + + + 12, 430 + + + 213, 149 + + + 31 + + + Current Note Settings + + + CurrentNoteBox + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 + 53, 79 @@ -3489,30 +4416,6 @@ Default: 0.5 (1/2 of a measure) 6 - - 12, 430 - - - 213, 149 - - - 31 - - - Current Note Settings - - - CurrentNoteBox - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 7 - 491, 20 @@ -3585,25 +4488,6 @@ Default: 0.5 (1/2 of a measure) Bottom, Left - - True - - - Microsoft Sans Serif, 9.75pt, style=Bold - - - 91, 55 - - - 64, 32 - - - 47 - - - Song -Volume: - VolumeLabel @@ -3616,15 +4500,6 @@ Volume: 1 - - 161, 59 - - - 162, 45 - - - 46 - SongVolume @@ -3637,21 +4512,6 @@ Volume: 3 - - True - - - 97, 102 - - - 86, 13 - - - 45 - - - Select File (.ogg) - songFileName @@ -3664,18 +4524,6 @@ Volume: 4 - - 6, 19 - - - 75, 23 - - - 34 - - - Play (P) - PlayButton @@ -3688,15 +4536,6 @@ Volume: 5 - - 87, 19 - - - 630, 45 - - - 36 - songTrackSlider @@ -3709,18 +4548,6 @@ Volume: 7 - - 6, 48 - - - 75, 23 - - - 37 - - - Select Song - selectSongFile @@ -4252,6 +5079,154 @@ Volume: System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 6, 19 + + + 75, 23 + + + 34 + + + Play (P) + + + PlayButton + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + SongPlaybackBox + + + 5 + + + 87, 19 + + + 630, 45 + + + 36 + + + songTrackSlider + + + System.Windows.Forms.TrackBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + SongPlaybackBox + + + 7 + + + 6, 48 + + + 75, 23 + + + 37 + + + Select Song + + + selectSongFile + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + SongPlaybackBox + + + 8 + + + True + + + Microsoft Sans Serif, 9.75pt, style=Bold + + + 91, 55 + + + 64, 32 + + + 47 + + + Song +Volume: + + + VolumeLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + SongPlaybackBox + + + 1 + + + 161, 59 + + + 162, 45 + + + 46 + + + SongVolume + + + System.Windows.Forms.TrackBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + SongPlaybackBox + + + 3 + + + True + + + 97, 102 + + + 86, 13 + + + 45 + + + Select File (.ogg) + + + songFileName + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + SongPlaybackBox + + + 4 + 650, 20