Skip to content

Commit ee7c54a

Browse files
lulusukilulusuki
authored
Merge pull request #63 from lulusuki/workflow
Cleanup & Structure updates
2 parents ce3beeb + 6f2f1f8 commit ee7c54a

10 files changed

Lines changed: 189 additions & 80 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ name: CI
22

33
on:
44
pull_request:
5-
types:
6-
- opened
75
workflow_dispatch:
86

97
jobs:
@@ -66,8 +64,8 @@ jobs:
6664
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # Dotnet 4.0.2
6765
with:
6866
dotnet-version: 10.0.x
69-
67+
cache: true
7068
- name: Restore dependencies
71-
run: dotnet restore
69+
run: dotnet restore --locked-mode
7270
- name: Format
7371
run: dotnet format --verify-no-changes Rhythia.csproj

‎Rhythia.csproj‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
11
<Project Sdk="Godot.NET.Sdk/4.6.2">
2-
<PropertyGroup>
3-
<TargetFramework>net10.0</TargetFramework>
4-
<TargetFramework Condition=" '$(GodotTargetPlatform)' == 'android' ">net10.0</TargetFramework>
5-
<EnableDynamicLoading>true</EnableDynamicLoading>
6-
<LangVersion>preview</LangVersion>
7-
</PropertyGroup>
8-
<ItemGroup>
9-
<None Include=".editorconfig" />
10-
</ItemGroup>
11-
<ItemGroup>
12-
<PackageReference Include="DiscordRichPresence" Version="1.6.1.70" />
13-
<PackageReference Include="Godot.NET.Sdk" Version="4.5.0" />
14-
<PackageReference Include="Semver" Version="3.0.0" />
15-
<PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
16-
<PackageReference Include="Tomlyn" Version="0.20.0" />
17-
<PackageReference Include="Updatum" Version="1.3.2" />
18-
</ItemGroup>
19-
</Project>
2+
<PropertyGroup>
3+
<TargetFramework>net10.0</TargetFramework>
4+
<TargetFramework Condition=" '$(GodotTargetPlatform)' == 'android' ">net10.0</TargetFramework>
5+
<EnableDynamicLoading>true</EnableDynamicLoading>
6+
<LangVersion>preview</LangVersion>
7+
</PropertyGroup>
8+
<ItemGroup>
9+
<None Include=".editorconfig" />
10+
</ItemGroup>
11+
<PropertyGroup>
12+
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
13+
</PropertyGroup>
14+
<ItemGroup>
15+
<PackageReference Include="DiscordRichPresence" Version="1.6.1.70" />
16+
<PackageReference Include="Godot.NET.Sdk" Version="4.5.0" />
17+
<PackageReference Include="Semver" Version="3.0.0" />
18+
<PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
19+
<PackageReference Include="Tomlyn" Version="0.20.0" />
20+
<PackageReference Include="Updatum" Version="1.3.2" />
21+
</ItemGroup>
22+
</Project>
23+

‎Rhythia.sln‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎Rhythia.slnx‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Solution>
2+
<Configurations>
3+
<BuildType Name="Debug" />
4+
<BuildType Name="ExportDebug" />
5+
<BuildType Name="ExportRelease" />
6+
</Configurations>
7+
<Project Path="Rhythia.csproj" />
8+
</Solution>

‎packages.lock.json‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
{
2+
"version": 1,
3+
"dependencies": {
4+
"net10.0": {
5+
"DiscordRichPresence": {
6+
"type": "Direct",
7+
"requested": "[1.6.1.70, )",
8+
"resolved": "1.6.1.70",
9+
"contentHash": "yho1fdhbsedICHdfHe/Tu3IX6a5oj4fiPFL0keZStlsh7T/FrdjcwZZ7C1uC2HUvcXbFh+VEJvcbo1W66QtkUg==",
10+
"dependencies": {
11+
"Newtonsoft.Json": "13.0.1"
12+
}
13+
},
14+
"Godot.NET.Sdk": {
15+
"type": "Direct",
16+
"requested": "[4.5.0, )",
17+
"resolved": "4.5.0",
18+
"contentHash": "PYPVsaq5knx4qj2dbvdnnHE7qva9Of1ALM1Y3EuiBEV/9ZmNeApE/J/eobI7WNbc6OZ/SKRLiPgglw59QbSj9w=="
19+
},
20+
"Godot.SourceGenerators": {
21+
"type": "Direct",
22+
"requested": "[4.6.2, )",
23+
"resolved": "4.6.2",
24+
"contentHash": "CqSn9E38CqCvHARIpZXzYw/KkDKkrGjCYjRrKq3kTAIsDGOOZ/W9wiVnfbvmTpER7gbbrFKAd6WA201ELBynQw=="
25+
},
26+
"GodotSharp": {
27+
"type": "Direct",
28+
"requested": "[4.6.2, )",
29+
"resolved": "4.6.2",
30+
"contentHash": "yWYaxRtawrYOQ6TZqKovkw6IN3jNWLTjfrL+pvoGdprvGT7LOYdBCwy0OU7rSfzTn48Rr4IuyuZoSuC0Cp2JeA=="
31+
},
32+
"GodotSharpEditor": {
33+
"type": "Direct",
34+
"requested": "[4.6.2, )",
35+
"resolved": "4.6.2",
36+
"contentHash": "WbxolK7BIzSl7d8jhTQQSwZ7JEf+6RHeaZWa6aw7f/qXsN/hXzFSgQvpKxGrLo0icQlowjvF0NomnYO5owMG7w==",
37+
"dependencies": {
38+
"GodotSharp": "4.6.2"
39+
}
40+
},
41+
"Semver": {
42+
"type": "Direct",
43+
"requested": "[3.0.0, )",
44+
"resolved": "3.0.0",
45+
"contentHash": "9jZCicsVgTebqkAujRWtC9J1A5EQVlu0TVKHcgoCuv345ve5DYf4D1MjhKEnQjdRZo6x/vdv6QQrYFs7ilGzLA==",
46+
"dependencies": {
47+
"Microsoft.Extensions.Primitives": "5.0.1"
48+
}
49+
},
50+
"sqlite-net-pcl": {
51+
"type": "Direct",
52+
"requested": "[1.9.172, )",
53+
"resolved": "1.9.172",
54+
"contentHash": "go533+huyvg5bOMmCpX+DyvLrcVRiEBIpqEiDHgXRijWIBBNkWnyMr/w+5ZzrUArKY+4ApucsbBnFtP3QITrJg==",
55+
"dependencies": {
56+
"SQLitePCLRaw.bundle_green": "2.1.2"
57+
}
58+
},
59+
"Tomlyn": {
60+
"type": "Direct",
61+
"requested": "[0.20.0, )",
62+
"resolved": "0.20.0",
63+
"contentHash": "Z8TmFcz6oeULVSVGDvbF1h+gnCoy/6NbWrlsQg9f2i+lzqXtUoU4+2RJIm8/s/14uSu0OqTv6JcSngTw3tlkTQ=="
64+
},
65+
"Updatum": {
66+
"type": "Direct",
67+
"requested": "[1.3.2, )",
68+
"resolved": "1.3.2",
69+
"contentHash": "P10SUrVLzZ0u2X9sYLsAzIDpK73HuXyu6saUWWgoWM+hL2gbHXId6/APwd1Lwz59q/sKPhaZzMRZqDtgcOxbow==",
70+
"dependencies": {
71+
"Octokit": "14.0.0"
72+
}
73+
},
74+
"Microsoft.Extensions.Primitives": {
75+
"type": "Transitive",
76+
"resolved": "5.0.1",
77+
"contentHash": "5WPSmL4YeP7eW+Vc8XZ4DwjYWBAiSwDV9Hm63JJWcz1Ie3Xjv4KuJXzgCstj48LkLfVCYa7mLcx7y+q6yqVvtw=="
78+
},
79+
"Newtonsoft.Json": {
80+
"type": "Transitive",
81+
"resolved": "13.0.1",
82+
"contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A=="
83+
},
84+
"Octokit": {
85+
"type": "Transitive",
86+
"resolved": "14.0.0",
87+
"contentHash": "jGOuTH1l+TCpJH+fwYOp7USzHDuGfN1jKbLz3J2COwyn+wL08eynvpnM6rY2qkzIEXum3PN2p2QkP3BW/p9Qcw=="
88+
},
89+
"SQLitePCLRaw.bundle_green": {
90+
"type": "Transitive",
91+
"resolved": "2.1.2",
92+
"contentHash": "e2FRX87YHoSer+tLFX9P/povHLK0uH7UcdimHRPnfTSam+NZChVVXjBxe1MYnyBGlwX5dSs5sTlDg/yZBM7iVw==",
93+
"dependencies": {
94+
"SQLitePCLRaw.lib.e_sqlite3": "2.1.2",
95+
"SQLitePCLRaw.provider.e_sqlite3": "2.1.2"
96+
}
97+
},
98+
"SQLitePCLRaw.core": {
99+
"type": "Transitive",
100+
"resolved": "2.1.2",
101+
"contentHash": "A8EBepVqY2lnAp3a8jnhbgzF2tlj2S3HcJQGANTYg/TbYbKa8Z5cM1h74An/vy0svhfzT7tVY0sFmUglLgv+2g=="
102+
},
103+
"SQLitePCLRaw.lib.e_sqlite3": {
104+
"type": "Transitive",
105+
"resolved": "2.1.2",
106+
"contentHash": "zibGtku8M4Eea1R3ZCAxc86QbNvyEN17mAcQkvWKBuHvRpMiK2g5anG4R5Be7cWKSd1i6baYz8y4dMMAKcXKPg=="
107+
},
108+
"SQLitePCLRaw.provider.e_sqlite3": {
109+
"type": "Transitive",
110+
"resolved": "2.1.2",
111+
"contentHash": "lxCZarZdvAsMl2zw9bXHrXK6RxVhB4b23iTFhCOdHFhxfbsxLxWf+ocvswJwR/9Wh/E//ddMi+wJGqUKV7VwoA==",
112+
"dependencies": {
113+
"SQLitePCLRaw.core": "2.1.2"
114+
}
115+
}
116+
}
117+
}
118+
}

‎scripts/FileInitializer.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ public override void _Ready()
1313
objExporter = new Node();
1414
AddChild(objExporter);
1515
objExporter.SetScript(script);
16-
16+
1717
// Temporary for 0.1.2 as the mesh's faces were fixed
1818
if (File.Exists($"{Constants.USER_FOLDER}/meshes/squircle.obj"))
1919
{
2020
File.Delete($"{Constants.USER_FOLDER}/meshes/squircle.obj");
2121
}
22-
22+
2323
deepCopy();
2424
}
2525

‎scripts/map/Map.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public Note[] TryParseNotes()
9292
return [];
9393
}
9494
}
95-
95+
9696
private Texture2D getCover()
9797
{
9898
string path = $"{MapUtil.MapsCacheFolder}/{Name}";

‎scripts/scenes/LegacyRunner.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -918,15 +918,15 @@ public override void _Process(double delta)
918918
{
919919
return;
920920
}
921-
921+
922922
if (isPauseRampActive())
923923
{
924924
updatePauseStateEachFrame(delta);
925925
}
926926
else if (CurrentAttempt.Progress > 0 && CurrentAttempt.Progress < MapLength && !CurrentAttempt.Stopped)
927927
{
928928
double audioDelay = CurrentAttempt.Progress - 1000 * (SoundManager.Song.GetPlaybackPosition() + AudioServer.GetTimeSinceLastMix());
929-
929+
930930
if (Math.Abs(audioDelay / CurrentAttempt.Speed) > Math.Max(40, delta))
931931
{
932932
SoundManager.Song.PitchScale = (float)Math.Clamp(CurrentAttempt.Speed + audioDelay / 1000, Math.Max(0.01, CurrentAttempt.Speed - 0.5), CurrentAttempt.Speed + 0.5);
@@ -1635,7 +1635,7 @@ private static void updatePauseStateEachFrame(double delta)
16351635
pauseHoldTime += (float)delta;
16361636
pauseState = Math.Max(0, pauseState - (float)(delta / pauseHoldDuration));
16371637
pauseHudControl.SetProgress(Math.Clamp(1f - pauseState, 0f, 1f));
1638-
1638+
16391639
if (CurrentAttempt.Map.AudioBuffer != null && musicStarted && SoundManager.Song.Playing && getTargetMusicVolumeDb() > float.NegativeInfinity)
16401640
{
16411641
SoundManager.Song.VolumeDb = Mathf.Lerp(getTargetMusicVolumeDb() - 60, getTargetMusicVolumeDb(), 1 - pauseState);

‎scripts/skinning/SkinManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ private static Shader loadShader(string skinPath)
218218
private static ArrayMesh loadMesh(string path)
219219
{
220220
bool exists = ResourceLoader.Exists(path) || Godot.FileAccess.FileExists(path);
221-
221+
222222
return exists ? Util.Misc.OBJParser.Call("load_obj", path).As<ArrayMesh>() : GD.Load<ArrayMesh>("res://user/meshes/squircle.obj");
223223
}
224224

‎scripts/spaces/Tunnel.cs‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,36 @@ namespace Spaces;
44

55
public partial class Tunnel : BaseSpace
66
{
7-
private SettingsProfile settings;
8-
private StandardMaterial3D tileMaterial;
9-
private StandardMaterial3D ringMaterialA;
10-
private StandardMaterial3D ringMaterialB;
11-
private Node3D rings;
12-
13-
private const float ring_loop_end = 52.5f;
14-
15-
public override void _Ready()
16-
{
17-
base._Ready();
18-
19-
settings = SettingsManager.Instance.Settings;
20-
rings = GetNode<Node3D>("Rings");
21-
22-
tileMaterial = (GetNode<MeshInstance3D>("Road").Mesh as PlaneMesh).Material as StandardMaterial3D;
23-
ringMaterialA = (rings.GetChild<MeshInstance3D>(0).Mesh as PlaneMesh).Material as StandardMaterial3D;
24-
ringMaterialB = (rings.GetChild<MeshInstance3D>(1).Mesh as PlaneMesh).Material as StandardMaterial3D;
25-
}
26-
27-
public override void _Process(double delta)
28-
{
29-
base._Process(delta);
30-
31-
// Ring movement
32-
rings.Position = Vector3.Back * (float)(Time.GetTicksMsec() / 1000f * settings.ApproachRate / 2) % ring_loop_end;
33-
34-
// Hit FX
35-
tileMaterial.AlbedoColor = NoteHitColor;
36-
ringMaterialA.AlbedoColor = NoteHitColor;
37-
ringMaterialB.AlbedoColor = NoteHitColor;
38-
}
7+
private SettingsProfile settings;
8+
private StandardMaterial3D tileMaterial;
9+
private StandardMaterial3D ringMaterialA;
10+
private StandardMaterial3D ringMaterialB;
11+
private Node3D rings;
12+
13+
private const float ring_loop_end = 52.5f;
14+
15+
public override void _Ready()
16+
{
17+
base._Ready();
18+
19+
settings = SettingsManager.Instance.Settings;
20+
rings = GetNode<Node3D>("Rings");
21+
22+
tileMaterial = (GetNode<MeshInstance3D>("Road").Mesh as PlaneMesh).Material as StandardMaterial3D;
23+
ringMaterialA = (rings.GetChild<MeshInstance3D>(0).Mesh as PlaneMesh).Material as StandardMaterial3D;
24+
ringMaterialB = (rings.GetChild<MeshInstance3D>(1).Mesh as PlaneMesh).Material as StandardMaterial3D;
25+
}
26+
27+
public override void _Process(double delta)
28+
{
29+
base._Process(delta);
30+
31+
// Ring movement
32+
rings.Position = Vector3.Back * (float)(Time.GetTicksMsec() / 1000f * settings.ApproachRate / 2) % ring_loop_end;
33+
34+
// Hit FX
35+
tileMaterial.AlbedoColor = NoteHitColor;
36+
ringMaterialA.AlbedoColor = NoteHitColor;
37+
ringMaterialB.AlbedoColor = NoteHitColor;
38+
}
3939
}

0 commit comments

Comments
 (0)