15 Commits
Author SHA1 Message Date
Goatgarien 3b4e02e77f updated to vs2022? 2022-09-09 02:26:15 -07:00
Goatgarien 75449f4f54 icon 2022-05-25 00:54:14 -07:00
Goatgarien 75927decb7 redo works 2022-05-24 02:27:57 -07:00
Goatgarien c6e94fd82e undo works 2022-05-24 02:02:01 -07:00
Goatgarien ff47d1d75c some name changes 2022-05-23 18:39:45 -07:00
Goatgarien 9d2ad26176 Name changes & removed the "made by goatgarien" text 2022-05-23 00:13:23 -07:00
Goatgarien 8d64b3afa7 Merge pull request #7 from YellowberryHN/ui-rework
rearrange UI + various fixes
2022-05-22 23:07:54 -07:00
Zsolt Zitting 5ead805191 git moment 2022-05-22 23:14:00 -06:00
Zsolt Zitting e0abc89450 fixed merge conflict with new enum types 2022-05-22 23:02:08 -06:00
Goatgarien 70513c0a36 Merge pull request #6 from veroxzik/rewrite/note-structure
Create Note and Gimmick Enums.
2022-05-22 16:53:59 -07:00
Zsolt Zitting 215f13793c fix for showing cursor when clicking and dragging 2022-05-22 16:42:40 -06:00
Zsolt Zitting 3f173e43c7 rearrange UI + various fixes 2022-05-22 16:04:46 -06:00
veroxzik f3d41d5634 Fixed chart parsing.
Replaced more hardcoded numbers with Enums.
2022-05-01 12:25:08 -04:00
veroxzik 64e3b2d62b Change GimmickType to Enum. 2022-05-01 10:05:37 -04:00
veroxzik 66c5dba042 Change NoteType to Enum, Code Consolidation 2022-05-01 00:20:02 -04:00
5 changed files with 2834 additions and 1422 deletions
+4 -4
View File
@@ -30,28 +30,28 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CLRSupport>true</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CLRSupport>true</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CLRSupport>true</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CLRSupport>true</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
+55 -4
View File
@@ -3,10 +3,39 @@
#include <iterator>
#include <list>
enum NoteType {
TouchNoBonus = 1,
TouchBonus = 2,
SnapRedNoBonus = 3,
SnapBlueNoBonus = 4,
SlideOrangeNoBonus = 5,
SlideOrangeBonus = 6,
SlideGreenNoBonus = 7,
SlideGreenBonus = 8,
HoldStartNoBonus = 9,
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,
SlideOrangeBonusFlair = 23,
SlideGreenBonusFlair = 24,
HoldStartBonusFlair = 25,
ChainBonusFlair = 26,
};
struct NotesNode {
int measure;
int beat;
int subBeat;
int noteType;
NoteType noteType;
int position;
int size;
int holdChange;
@@ -15,10 +44,23 @@ struct NotesNode {
std::list<NotesNode>::iterator prevNode;
};
enum GimmickType {
NoGimmick = 1,
BpmChange = 2,
TimeSignatureChange = 3,
//Stop = 4, //No clue what this does
HiSpeedChange = 5,
ReverseStart = 6,
ReverseEnd = 7,
ReverseNoteEnd = 8,
StopStart = 9,
StopEnd = 10,
};
struct PreChartNode {
int measure;
int beat;
int subBeat;
int type;
GimmickType type;
double BPM; //2
int beatDiv1; //3
int beatDiv2; //3
@@ -32,4 +74,13 @@ struct Chart {
double offset;
double movieOffset;
std::string songFileName;
};
struct Operation {
int operationType; //1=insert, 2=delete, 3=edit
int objectType; //1=Note, 2=Gimmick
std::list<NotesNode> oldNote; //only used for edit
std::list<PreChartNode> oldGimmick; //only used for edit
std::list<NotesNode> Note;
std::list<PreChartNode> Gimmick;
};
+938 -605
View File
File diff suppressed because it is too large Load Diff
+1837 -809
View File
File diff suppressed because it is too large Load Diff
Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 83 KiB