Skip to content

Add DWI Saving Support + Fix DWI Loading #278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
SilentMystification wants to merge 8 commits into from
Closed

Add DWI Saving Support + Fix DWI Loading #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
52c469f
Initial commit
SilentMystification May 10, 2026
d2662e4
Fix <>
SilentMystification May 10, 2026
7a133f5
Update SaveDwi.cpp
SilentMystification May 21, 2026
778f2bf
Remove example files
SilentMystification May 21, 2026
5718bc3
Whitespace update
SilentMystification May 21, 2026
d75f76b
Fix DWI loading bug where 64th notes were not being read correctly
SilentMystification May 21, 2026
2b52feb
improve quantization by making use of all bracket types
SilentMystification May 21, 2026
903f1b4
minor cleanup
SilentMystification May 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/settings/shortcuts.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FILE_OPEN = ctrl + o
FILE_SAVE = ctrl + s
FILE_SAVE_AS =
FILE_SAVE_AS = ctrl + shift + s

@SilentMystification SilentMystification May 21, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this makes sense as a default shortcut as many other programs use this exact combination to initiate the Save As flow.

FILE_CLOSE =

OPEN_DIALOG_SONG_PROPERTIES = shift + p
Expand Down
1 change: 1 addition & 0 deletions build/VisualStudio/ArrowVortex.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,7 @@
<ClCompile Include="..\..\src\Simfile\Parsing.cpp" />
<ClCompile Include="..\..\src\Simfile\LoadOsu.cpp" />
<ClCompile Include="..\..\src\Simfile\LoadSm.cpp" />
<ClCompile Include="..\..\src\Simfile\SaveDwi.cpp" />
<ClCompile Include="..\..\src\Simfile\SaveOsu.cpp" />
<ClCompile Include="..\..\src\Simfile\SaveSm.cpp" />
<ClCompile Include="..\..\src\Simfile\SegmentGroup.cpp" />
Expand Down
10 changes: 10 additions & 0 deletions src/Editor/Editor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ static const char saveFilters[] =
"Stepmania/ITG (*.sm)\0*.sm\0"
"Stepmania 5 (*.ssc)\0*.ssc\0"
"Osu!mania (*.osu)\0*.osu\0"
"Dance With Intensity (*.dwi)\0*.dwi\0"
"All Files (*.*)\0*.*\0";

static const int MAX_RECENT_FILES = 10;
Expand Down Expand Up @@ -596,6 +597,8 @@ bool saveSimfile(bool showSaveAsDialog)
filterIndex = 2; break;
case SIM_OSU:
filterIndex = 3; break;
case SIM_DWI:
filterIndex = 4; break;
};

// Show the save file dialog.
Expand All @@ -621,6 +624,9 @@ bool saveSimfile(bool showSaveAsDialog)
case 3:
saveFmt = SIM_OSU;
break;
case 4:
saveFmt = SIM_DWI;
break;
default:
if(tmp.hasExt("ssc"))
{
Expand All @@ -630,6 +636,10 @@ bool saveSimfile(bool showSaveAsDialog)
{
saveFmt = SIM_OSU;
}
else if(tmp.hasExt("dwi"))
{
saveFmt = SIM_DWI;
}
else
{
saveFmt = SIM_SM;
Expand Down
14 changes: 12 additions & 2 deletions src/Simfile/LoadDwi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,12 +199,12 @@ static bool ParseNotes(Simfile* sim, char* p, int numPads, int numCols, const ch
case '\r': ++n; break;
case '(': quantization = 12; ++n; break;
case '[': quantization = 8; ++n; break;
case '{': quantization = 4; ++n; break;
case '{': quantization = 3; ++n; break;
case '`': quantization = 1; ++n; break;
case ')':
case ']':
case '}':
case '\'': quantization = 32; ++n; break;
case '\'': quantization = 24; ++n; break;
default:
n = ReadNoteRow(n, chart->notes, row, map, holds, quantization);

@uvcat7 uvcat7 May 27, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's actually another bug here, though it would only have subtle effects when editing and copy/pasting: ReadNoteRow should be called with 192/quantization instead of quantization.

row += quantization;
Expand Down Expand Up @@ -349,6 +349,16 @@ static void ParseTag(Simfile* sim, String tag, char* val)
{
ParseDisplayBpm(sim->tempo, val);
}
else if(tag == "SAMPLESTART")
{
double v;
if(ParseVal(val, v)) sim->previewStart = v;
}
else if(tag == "SAMPLELENGTH")
{
double v;
if(ParseVal(val, v)) sim->previewLength = v;
}
}

// ===================================================================================
Expand Down
4 changes: 3 additions & 1 deletion src/Simfile/Parsing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ namespace Osu
};
namespace Dwi
{
bool LoadDwi(LOAD_ARGS); // Defined in LoadDwi.cpp
bool LoadDwi(LOAD_ARGS); // Defined in LoadDwi.cpp
bool SaveDwi(SAVE_ARGS); // Defined in SaveDwi.cpp
};

// ================================================================================================
Expand Down Expand Up @@ -238,6 +239,7 @@ bool SaveSimfile(const Simfile& sim, SimFormat format, bool backup)
case SIM_SM: return Sm::SaveSm(&sim, backup);
case SIM_SSC: return Sm::SaveSsc(&sim, backup);
case SIM_OSU: return Osu::SaveOsu(&sim, backup);
case SIM_DWI: return Dwi::SaveDwi(&sim, backup);
};
return false;
}
Expand Down
Loading
Loading