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.

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

Animations #484

Merged
merged 90 commits into from
Nov 5, 2023
Merged

Animations #484

merged 90 commits into from
Nov 5, 2023

Conversation

FallenCharlotte
Copy link
Contributor

I think all the bugs are fixed now

Copy link
Owner

@Caeden117 Caeden117 left a comment

Choose a reason for hiding this comment

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

got some room left to cook but i like what im seeing here


clip(isDithered(IN.ScreenPosition.xy / IN.ScreenPosition.w, alpha));

return color; // float4(inputData.bakedGI,1);
return color * 2; // float4(inputData.bakedGI,1);
Copy link
Owner

Choose a reason for hiding this comment

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

Whats the reason behind multiplying color output by 2?

Choose a reason for hiding this comment

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

https://discord.com/channels/702230714585710602/892494185909870602/1121697679391596586

With arrows using the note shader (for dissolve), they looked very gray. Multiplying by 2 makes the arrows look white, and makes the notes slightly more vibrant.

return a;
}

// I should never be allowed to use a profiler
Copy link
Owner

Choose a reason for hiding this comment

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

goood... goood....

Assets/__Scripts/Beatmap/Animations/PointDefinition.cs Outdated Show resolved Hide resolved
Assets/__Scripts/Beatmap/Animations/PointDefinition.cs Outdated Show resolved Hide resolved
Assets/__Scripts/Beatmap/Animations/PointDefinition.cs Outdated Show resolved Hide resolved
/// <summary>
/// https://answers.unity.com/questions/1594750/is-there-a-premade-triangle-asset.html
/// </summary>
private static Mesh CreateTriangleMesh()
Copy link
Owner

Choose a reason for hiding this comment

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

might be smart to just recreate this triangle in Blender so we never have to touch meshes ourselves

Assets/__Scripts/Beatmap/Containers/NoteContainer.cs Outdated Show resolved Hide resolved
Assets/__Scripts/Beatmap/Containers/NoteContainer.cs Outdated Show resolved Hide resolved
Assets/__Scripts/Beatmap/V2/V2Difficulty.cs Outdated Show resolved Hide resolved
Assets/__Scripts/MapEditor/UI/UIMode.cs Outdated Show resolved Hide resolved
@XAce1337manX
Copy link
Collaborator

Oh look, new merge conflicts.
Hopefully this should be the last time you'll need to fix a merge conflict or rebase.

@FallenCharlotte
Copy link
Contributor Author

Rebase done

Also, @Caeden117 one of your commits, b1adfee, deleted the changelog file q, was this intended?

@XAce1337manX
Copy link
Collaborator

Wall appearance is bugged. It appears to be constant size regardless of editor scale.
image
image

@FallenCharlotte
Copy link
Contributor Author

Fixed the wall thing

@Caeden117 Caeden117 merged commit 3bf773f into Caeden117:dev Nov 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants