Skip to content

Commit bf08b30

Browse files
uvcat7uvcat7
committed
2 parents 8223d82 + afef11c commit bf08b30

25 files changed

+287
-196
lines changed

‎bin/assets/NotoSansJP-Medium.ttf‎

5.19 MB
Binary file not shown.

‎bin/assets/bokutachi no gothic 2.otf‎

-1.72 MB
Binary file not shown.

‎build/VisualStudio/ArrowVortex.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@
166166
<MultiProcessorCompilation>false</MultiProcessorCompilation>
167167
<ObjectFileName>$(IntDir)\dummy\dummy\%(RelativeDir)\</ObjectFileName>
168168
<AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>
169+
<LanguageStandard>stdcpp14</LanguageStandard>
169170
</ClCompile>
170171
<Link>
171172
<AdditionalDependencies>mad_debug.lib;libogg_debug.lib;libvorbis_debug.lib;libvorbisfile_debug.lib;freetype_debug.lib;winmm.lib;opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

‎build/VisualStudio/ArrowVortex.vcxproj.filters‎

Lines changed: 105 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,109 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
4-
<ResourceCompile Include="ArrowVortex.rc" />
5-
</ItemGroup>
6-
<ItemGroup>
7-
<Filter Include="Core">
8-
<UniqueIdentifier>{ee92bdcc-b19d-4aa7-9620-9a71cd56b491}</UniqueIdentifier>
9-
</Filter>
10-
<Filter Include="Dialogs">
11-
<UniqueIdentifier>{22b8b79a-7d6e-43d2-9b9c-9cda2881defd}</UniqueIdentifier>
12-
</Filter>
13-
<Filter Include="Editor">
14-
<UniqueIdentifier>{dbfe20f7-dae6-439e-bd5f-76d60d4714a1}</UniqueIdentifier>
15-
</Filter>
16-
<Filter Include="Simfile">
17-
<UniqueIdentifier>{0d290bef-42bf-499d-bc12-dc339b3d2006}</UniqueIdentifier>
18-
</Filter>
19-
<Filter Include="System">
20-
<UniqueIdentifier>{7eca6184-a8b2-4f24-8a25-7939a01043a4}</UniqueIdentifier>
21-
</Filter>
22-
<Filter Include="Editor\Audio">
23-
<UniqueIdentifier>{3e6fe2c3-dbb4-4929-8df1-03277491e836}</UniqueIdentifier>
24-
</Filter>
25-
<Filter Include="Editor\Audio\Formats">
26-
<UniqueIdentifier>{78eebc1c-d572-440c-ba19-534aaad9f1d8}</UniqueIdentifier>
27-
</Filter>
28-
<Filter Include="Core\Graphics">
29-
<UniqueIdentifier>{389e980a-532d-441e-a3dc-524071c076f5}</UniqueIdentifier>
30-
</Filter>
31-
<Filter Include="Core\Gui">
32-
<UniqueIdentifier>{1d75427b-8906-47c7-ab5c-89f6156fcb90}</UniqueIdentifier>
33-
</Filter>
34-
<Filter Include="Editor\Editing">
35-
<UniqueIdentifier>{bba63472-a529-462e-bc71-3bdac385e68c}</UniqueIdentifier>
36-
</Filter>
37-
<Filter Include="Editor\Interface">
38-
<UniqueIdentifier>{c63f2cf8-e190-467f-92ef-efaf87e5afcb}</UniqueIdentifier>
39-
</Filter>
40-
<Filter Include="Managers">
41-
<UniqueIdentifier>{7e0ec208-8141-4a26-a8f7-c694e4772b23}</UniqueIdentifier>
42-
</Filter>
43-
<Filter Include="Simfile\Formats">
44-
<UniqueIdentifier>{032ccee9-69fb-4c3f-8724-8c85dd9c3a85}</UniqueIdentifier>
45-
</Filter>
4+
<ClCompile Include="..\..\src\Core\ByteStream.cpp" />
5+
<ClCompile Include="..\..\src\Core\Canvas.cpp" />
6+
<ClCompile Include="..\..\src\Core\GuiDialog.cpp" />
7+
<ClCompile Include="..\..\src\Core\Draw.cpp" />
8+
<ClCompile Include="..\..\src\Core\FontData.cpp" />
9+
<ClCompile Include="..\..\src\Core\FontManager.cpp" />
10+
<ClCompile Include="..\..\src\Core\Gui.cpp" />
11+
<ClCompile Include="..\..\src\Core\GuiContext.cpp" />
12+
<ClCompile Include="..\..\src\Core\GuiManager.cpp" />
13+
<ClCompile Include="..\..\src\Core\GuiDraw.cpp" />
14+
<ClCompile Include="..\..\src\Core\ImageLoader.cpp" />
15+
<ClCompile Include="..\..\src\Core\Input.cpp" />
16+
<ClCompile Include="..\..\src\Core\QuadBatch.cpp" />
17+
<ClCompile Include="..\..\src\Core\Renderer.cpp" />
18+
<ClCompile Include="..\..\src\Core\Shader.cpp" />
19+
<ClCompile Include="..\..\src\Core\Slot.cpp" />
20+
<ClCompile Include="..\..\src\Core\String.cpp" />
21+
<ClCompile Include="..\..\src\Core\StringUtils.cpp" />
22+
<ClCompile Include="..\..\src\Core\Text.cpp" />
23+
<ClCompile Include="..\..\src\Core\TextDraw.cpp" />
24+
<ClCompile Include="..\..\src\Core\TextLayout.cpp" />
25+
<ClCompile Include="..\..\src\Core\Texture.cpp" />
26+
<ClCompile Include="..\..\src\Core\TextureImpl.cpp" />
27+
<ClCompile Include="..\..\src\Core\Utils.cpp" />
28+
<ClCompile Include="..\..\src\Core\WideString.cpp" />
29+
<ClCompile Include="..\..\src\Core\GuiWidget.cpp" />
30+
<ClCompile Include="..\..\src\Core\WidgetsColor.cpp" />
31+
<ClCompile Include="..\..\src\Core\WidgetsLayout.cpp" />
32+
<ClCompile Include="..\..\src\Core\WidgetsScroll.cpp" />
33+
<ClCompile Include="..\..\src\Core\WidgetsSelect.cpp" />
34+
<ClCompile Include="..\..\src\Core\WidgetsSimple.cpp" />
35+
<ClCompile Include="..\..\src\Core\WidgetsText.cpp" />
36+
<ClCompile Include="..\..\src\Core\Xmr.cpp" />
37+
<ClCompile Include="..\..\src\Dialogs\AdjustSync.cpp" />
38+
<ClCompile Include="..\..\src\Dialogs\AdjustTempo.cpp" />
39+
<ClCompile Include="..\..\src\Dialogs\AdjustTempoSM5.cpp" />
40+
<ClCompile Include="..\..\src\Dialogs\ChartList.cpp" />
41+
<ClCompile Include="..\..\src\Dialogs\ChartProperties.cpp" />
42+
<ClCompile Include="..\..\src\Dialogs\CustomSnap.cpp" />
43+
<ClCompile Include="..\..\src\Dialogs\DancingBot.cpp" />
44+
<ClCompile Include="..\..\src\Dialogs\Dialog.cpp" />
45+
<ClCompile Include="..\..\src\Dialogs\GenerateNotes.cpp" />
46+
<ClCompile Include="..\..\src\Dialogs\NewChart.cpp" />
47+
<ClCompile Include="..\..\src\Dialogs\SongProperties.cpp" />
48+
<ClCompile Include="..\..\src\Dialogs\TempoBreakdown.cpp" />
49+
<ClCompile Include="..\..\src\Dialogs\WaveformSettings.cpp" />
50+
<ClCompile Include="..\..\src\Dialogs\Zoom.cpp" />
51+
<ClCompile Include="..\..\src\Editor\Action.cpp" />
52+
<ClCompile Include="..\..\src\Editor\Aubio.cpp" />
53+
<ClCompile Include="..\..\src\Editor\Butterworth.cpp" />
54+
<ClCompile Include="..\..\src\Editor\Common.cpp" />
55+
<ClCompile Include="..\..\src\Editor\ConvertToOgg.cpp" />
56+
<ClCompile Include="..\..\src\Editor\Editing.cpp" />
57+
<ClCompile Include="..\..\src\Editor\Editor.cpp" />
58+
<ClCompile Include="..\..\src\Editor\FFT.cpp" />
59+
<ClCompile Include="..\..\src\Editor\FindOnsets.cpp" />
60+
<ClCompile Include="..\..\src\Editor\FindTempo.cpp" />
61+
<ClCompile Include="..\..\src\Editor\History.cpp" />
62+
<ClCompile Include="..\..\src\Editor\LoadMp3.cpp" />
63+
<ClCompile Include="..\..\src\Editor\LoadOgg.cpp" />
64+
<ClCompile Include="..\..\src\Editor\LoadWav.cpp" />
65+
<ClCompile Include="..\..\src\Editor\Menubar.cpp" />
66+
<ClCompile Include="..\..\src\Editor\Minimap.cpp" />
67+
<ClCompile Include="..\..\src\Editor\Music.cpp" />
68+
<ClCompile Include="..\..\src\Editor\Notefield.cpp" />
69+
<ClCompile Include="..\..\src\Editor\RatingEstimator.cpp" />
70+
<ClCompile Include="..\..\src\Editor\Selection.cpp" />
71+
<ClCompile Include="..\..\src\Editor\Shortcuts.cpp" />
72+
<ClCompile Include="..\..\src\Editor\Sound.cpp" />
73+
<ClCompile Include="..\..\src\Editor\Statusbar.cpp" />
74+
<ClCompile Include="..\..\src\Editor\StreamGenerator.cpp" />
75+
<ClCompile Include="..\..\src\Editor\TempoBoxes.cpp" />
76+
<ClCompile Include="..\..\src\Editor\TextOverlay.cpp" />
77+
<ClCompile Include="..\..\src\Editor\View.cpp" />
78+
<ClCompile Include="..\..\src\Editor\Waveform.cpp" />
79+
<ClCompile Include="..\..\src\Managers\ChartMan.cpp" />
80+
<ClCompile Include="..\..\src\Managers\MetadataMan.cpp" />
81+
<ClCompile Include="..\..\src\Managers\NoteMan.cpp" />
82+
<ClCompile Include="..\..\src\Managers\NoteskinMan.cpp" />
83+
<ClCompile Include="..\..\src\Managers\SimfileMan.cpp" />
84+
<ClCompile Include="..\..\src\Managers\StyleMan.cpp" />
85+
<ClCompile Include="..\..\src\Managers\TempoMan.cpp" />
86+
<ClCompile Include="..\..\src\Simfile\Chart.cpp" />
87+
<ClCompile Include="..\..\src\Simfile\LoadDwi.cpp" />
88+
<ClCompile Include="..\..\src\Simfile\NoteList.cpp" />
89+
<ClCompile Include="..\..\src\Simfile\Notes.cpp" />
90+
<ClCompile Include="..\..\src\Simfile\Parsing.cpp" />
91+
<ClCompile Include="..\..\src\Simfile\LoadOsu.cpp" />
92+
<ClCompile Include="..\..\src\Simfile\LoadSm.cpp" />
93+
<ClCompile Include="..\..\src\Simfile\SaveOsu.cpp" />
94+
<ClCompile Include="..\..\src\Simfile\SaveSm.cpp" />
95+
<ClCompile Include="..\..\src\Simfile\SegmentGroup.cpp" />
96+
<ClCompile Include="..\..\src\Simfile\SegmentList.cpp" />
97+
<ClCompile Include="..\..\src\Simfile\Segments.cpp" />
98+
<ClCompile Include="..\..\src\Simfile\Simfile.cpp" />
99+
<ClCompile Include="..\..\src\Simfile\Tempo.cpp" />
100+
<ClCompile Include="..\..\src\Simfile\TimingData.cpp" />
101+
<ClCompile Include="..\..\src\Simfile\Testing.cpp" />
102+
<ClCompile Include="..\..\src\System\Debug.cpp" />
103+
<ClCompile Include="..\..\src\System\File.cpp" />
104+
<ClCompile Include="..\..\src\System\Mixer.cpp" />
105+
<ClCompile Include="..\..\src\System\System.cpp" />
106+
<ClCompile Include="..\..\src\System\Thread.cpp" />
46107
</ItemGroup>
47108
<ItemGroup>
48109
<ClCompile Include="..\..\src\Core\Input.cpp">
@@ -654,4 +715,4 @@
654715
<Filter>Dialogs</Filter>
655716
</ClInclude>
656717
</ItemGroup>
657-
</Project>
718+
</Project>

‎src/Dialogs/AdjustTempo.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ WgSpinner* DialogAdjustTempo::myCreateWidgetRow(StringRef label, int y, double&
6363

6464
WgSpinner* spinner = myLayout.add<WgSpinner>(label);
6565
spinner->value.bind(&val);
66-
spinner->setPrecision(3, 3);
66+
spinner->setPrecision(3, 6);
6767
spinner->onChange.bind(this, &DialogAdjustTempo::onAction, action + 0);
6868
spinner->setTooltip(tooltips2[isBPM]);
6969

@@ -105,7 +105,7 @@ void DialogAdjustTempo::myCreateWidgets()
105105
WgSpinner* spinner = myLayout.add<WgSpinner>("Offset in beats");
106106
spinner->setRange(0.0, 100000.0);
107107
spinner->value.bind(&myBeatsToInsert);
108-
spinner->setPrecision(3, 3);
108+
spinner->setPrecision(3, 6);
109109
spinner->setTooltip("Number of beats to insert or remove");
110110

111111
WgCycleButton* cycle = myLayout.add<WgCycleButton>("Apply offset to");

‎src/Dialogs/SongProperties.cpp‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,16 @@ void DialogSongProperties::myCreateWidgets()
128128
findBanner->text.set("{g:search}");
129129
findBanner->setTooltip("Search the stepfile directory for banner images");
130130

131-
myLayout.row().col(72).col(342);
131+
//myLayout.row().col(72).col(342);
132132

133133
w = CreateField(myLayout, "CD Title", myCdTitle, [](String& s){ gMetadata->setCdTitlePath(s); });
134134
w->setTooltip("Path of the CD title image (logo of the simfile author)\nRecommended size: around 64x48 (DDR/ITG)");
135135

136+
auto findCDTitle = myLayout.add<WgButton>();
137+
findCDTitle->onPress.bind(this, &DialogSongProperties::onFindCdTitle);
138+
findCDTitle->text.set("{g:search}");
139+
findCDTitle->setTooltip("Search the stepfile directory for CD title images");
140+
136141
myLayout.row().col(418);
137142
myLayout.add<WgSeperator>();
138143
myLayout.row().col(72).col(96).col(16).col(96).col(94).col(24);
@@ -349,6 +354,19 @@ void DialogSongProperties::onFindBG()
349354
}
350355
}
351356

357+
void DialogSongProperties::onFindCdTitle()
358+
{
359+
String path = gMetadata->findCdTitleFile();
360+
if (path.empty())
361+
{
362+
HudNote("Could not find any CD Title art...");
363+
}
364+
else
365+
{
366+
gMetadata->setCdTitlePath(path);
367+
}
368+
}
369+
352370
void DialogSongProperties::mySetDisplayBpm()
353371
{
354372
switch(myDisplayBpmType)

‎src/Dialogs/SongProperties.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ class DialogSongProperties : public EditorDialog
2424
void onFindMusic();
2525
void onFindBanner();
2626
void onFindBG();
27+
void onFindCdTitle();
2728

2829
private:
2930
struct BannerWidget;

‎src/Editor/Action.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,8 +368,6 @@ void Action::perform(Type action)
368368
gTextOverlay->show(TextOverlay::DEBUG_LOG);
369369
CASE(SHOW_ABOUT)
370370
gTextOverlay->show(TextOverlay::ABOUT);
371-
CASE(SHOW_DONATE)
372-
gTextOverlay->show(TextOverlay::DONATE);
373371
}};
374372

375373
if(action >= FILE_OPEN_RECENT_BEGIN && action < FILE_OPEN_RECENT_END)

‎src/Editor/Action.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,6 @@ namespace Action {
205205
SHOW_MESSAGE_LOG,
206206
SHOW_DEBUG_LOG,
207207
SHOW_ABOUT,
208-
SHOW_DONATE,
209208
};
210209

211210
// Performs the action associated with the action type.

‎src/Editor/Editor.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ EditorImpl()
166166
myBackgroundStyle = BG_STYLE_STRETCH;
167167
myDefaultSaveFormat = SIM_SM;
168168

169-
myFontPath = "assets/bokutachi no gothic 2.otf";
169+
myFontPath = "assets/NotoSansJP-Medium.ttf";
170170
myFontSize = 13;
171171
}
172172

@@ -320,7 +320,8 @@ void loadSettings(XmrDoc& settings)
320320
interface->get("fontSize", &myFontSize);
321321

322322
const char* path = interface->get("fontPath");
323-
if(path) myFontPath = path;
323+
FileReader testPath;
324+
if(path && testPath.open(path)) myFontPath = path;
324325
}
325326
}
326327

0 commit comments

Comments
 (0)