Skip to content
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

Jump to bottom

nuh uh (for real this time) #45

Merged
merged 2 commits into from
Feb 12, 2024
Merged

nuh uh (for real this time) #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42d3e2d
nuh uh
Yasu3D Feb 11, 2024
529760b
fix hold note rendering bug
Yasu3D Feb 11, 2024
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
3 changes: 1 addition & 2 deletions BAKKA_Editor/Audio/Hitsounds.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@

public bool LoadError()
{
if (userSettings.SoundSettings.HitsoundEnabled && !hitsoundSample.Loaded

Check warning on line 44 in BAKKA_Editor/Audio/Hitsounds.cs

View workflow job for this annotation

GitHub Actions / build (win-x64) 

Dereference of a possibly null reference.

Check warning on line 44 in BAKKA_Editor/Audio/Hitsounds.cs

View workflow job for this annotation

GitHub Actions / build (osx-arm64) 

Dereference of a possibly null reference.

Check warning on line 44 in BAKKA_Editor/Audio/Hitsounds.cs

View workflow job for this annotation

GitHub Actions / build (osx-x64) 

Dereference of a possibly null reference.
||(userSettings.SoundSettings.HitsoundSwipeEnabled && !hitsoundSwipeSample.Loaded)

Check warning on line 45 in BAKKA_Editor/Audio/Hitsounds.cs

View workflow job for this annotation

GitHub Actions / build (win-x64) 

Dereference of a possibly null reference.

Check warning on line 45 in BAKKA_Editor/Audio/Hitsounds.cs

View workflow job for this annotation

GitHub Actions / build (osx-arm64) 

Dereference of a possibly null reference.

Check warning on line 45 in BAKKA_Editor/Audio/Hitsounds.cs

View workflow job for this annotation

GitHub Actions / build (osx-x64) 

Dereference of a possibly null reference.
|| (userSettings.SoundSettings.HitsoundBonusEnabled && !hitsoundBonusSample.Loaded)

Check warning on line 46 in BAKKA_Editor/Audio/Hitsounds.cs

View workflow job for this annotation

GitHub Actions / build (win-x64) 

Dereference of a possibly null reference.

Check warning on line 46 in BAKKA_Editor/Audio/Hitsounds.cs

View workflow job for this annotation

GitHub Actions / build (osx-arm64) 

Dereference of a possibly null reference.

Check warning on line 46 in BAKKA_Editor/Audio/Hitsounds.cs

View workflow job for this annotation

GitHub Actions / build (osx-x64) 

Dereference of a possibly null reference.
|| (userSettings.SoundSettings.HitsoundFlairEnabled && !hitsoundFlairSample.Loaded))

Check warning on line 47 in BAKKA_Editor/Audio/Hitsounds.cs

View workflow job for this annotation

GitHub Actions / build (win-x64) 

Dereference of a possibly null reference.

Check warning on line 47 in BAKKA_Editor/Audio/Hitsounds.cs

View workflow job for this annotation

GitHub Actions / build (osx-arm64) 

Dereference of a possibly null reference.

Check warning on line 47 in BAKKA_Editor/Audio/Hitsounds.cs

View workflow job for this annotation

GitHub Actions / build (osx-x64) 

Dereference of a possibly null reference.
return true;

return false;
Expand Down Expand Up @@ -74,8 +74,7 @@
if (note.NoteType is NoteType.EndOfChart or
NoteType.MaskAdd or
NoteType.MaskRemove or
NoteType.HoldJoint or
NoteType.HoldEnd
NoteType.HoldJoint
) return;

if (note.BeatInfo.MeasureDecimal > lastMeasure)
Expand Down
9 changes: 6 additions & 3 deletions BAKKA_Editor/Rendering/RenderEngine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
private readonly SkCircleView circleView;
private UserSettings userSettings;

public RenderEngine(SkCircleView skCircleView, UserSettings settings)

Check warning on line 17 in BAKKA_Editor/Rendering/RenderEngine.cs

View workflow job for this annotation

GitHub Actions / build (osx-x64) 

Non-nullable field 'canvas' must contain a non-null value when exiting constructor. Consider declaring the field as nullable.
{
brushes = new Brushes(settings);
circleView = skCircleView;
Expand Down Expand Up @@ -648,12 +648,15 @@
var arc2StartAngle = newStartAngle + newArcLength;
var arc2ArcLength = -newArcLength;

// crop arcs to the right size
// crop arcs
if (note.Size != 60)
{
arc1StartAngle += 1.5f;
arc2StartAngle -= 1.5f;
arc1ArcLength -= 3.0f;
}
if (note.PrevReferencedNote.Size != 60)
{
arc2StartAngle -= 1.5f;
arc2ArcLength += 3.0f;
}

Expand All @@ -671,7 +674,7 @@
var arc1StartAngle = currentInfo.StartAngle;
var arc1ArcLength = currentInfo.ArcAngle;

// crop arcs to the right size
// crop arcs
if (note.Size != 60)
{
arc1StartAngle += 1.5f;
Expand Down
Loading