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

C;CLCC config menu UI #81

Merged
merged 59 commits into from
Jan 19, 2025
Merged

Conversation

PringlesGang
Copy link
Contributor

Will implement the UI for the C;CLCC config menu
(Will do the actual implementation in a separate PR once this is done)

@PringlesGang PringlesGang force-pushed the cclcc-config-ui branch 3 times, most recently from b8099dd to 178457c Compare October 20, 2024 21:23
@PringlesGang PringlesGang force-pushed the cclcc-config-ui branch 2 times, most recently from 1429654 to 0e5370f Compare November 13, 2024 00:05
@PringlesGang PringlesGang force-pushed the cclcc-config-ui branch 2 times, most recently from ada7dda to 5be3b53 Compare December 18, 2024 23:41
@KKhanhH KKhanhH marked this pull request as ready for review January 3, 2025 02:34
@KKhanhH KKhanhH self-assigned this Jan 3, 2025
src/games/cclcc/optionsmenu.cpp Outdated Show resolved Hide resolved
src/games/cclcc/optionsmenu.cpp Outdated Show resolved Hide resolved
src/games/cclcc/optionsmenu.cpp Outdated Show resolved Hide resolved
src/games/cclcc/optionsmenu.h Outdated Show resolved Hide resolved
src/ui/widget.h Outdated Show resolved Hide resolved
src/ui/widgets/cclcc/optionsentry.cpp Outdated Show resolved Hide resolved
src/util.h Outdated Show resolved Hide resolved
src/vm/inst_misc.cpp Show resolved Hide resolved
constexpr int columns = 3;
constexpr int entries = 12;
for (int i = 0; i < entries; i++) {
glm::vec2 pos = VoicePosition;
Copy link
Collaborator

Choose a reason for hiding this comment

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

You're shadowing pos here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh yeah that can just reuse the old pos. Thanks for the heads-up

}

void OptionsMenu::Render() {
if (State != Hidden && ScrWork[SW_SYSSUBMENUCT] >= 32 &&
ScrWork[SW_SYSSUBMENUNO] == 5) {
// glm::vec4 col(1.0f, 1.0f, 1.0f, FadeAnimation.Progress);
Renderer->DrawSprite(BackgroundSprite, glm::vec2(0.0f));
glm::vec4 col(1.0f, 1.0f, 1.0f, FadeAnimation.Progress);
Copy link
Collaborator

Choose a reason for hiding this comment

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

Since everything is already being made const, it might not be a bad idea to make col const and maskTint const with const glm::vec4 maskTint = col * glm::vec4{glm::vec3{1}, (float)0xa0 / 0x100}};

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good one

@KKhanhH KKhanhH merged commit dedbf63 into CommitteeOfZero:master Jan 19, 2025
11 checks passed
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.

2 participants