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

Improve docs on TIME #3494

Merged
merged 1 commit into from
May 6, 2020
Merged

Improve docs on TIME #3494

merged 1 commit into from
May 6, 2020

Conversation

RandomShaper
Copy link
Member

And improve TIME.

(OMG, after two messed up PRs, I've finally been able to do it.)

| in float **TIME** | Global time, in seconds. |
| | It's subject to the rollover setting (which is 3,600 -1 hour- by default). |
+-----------------------+-----------------------------------------------------------------------------+
| in vec4 **MODULATE** | Final modulate color. |
Copy link
Member

Choose a reason for hiding this comment

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

The way you have defined MODULATE it is not a global built-in, it is a built in that is available in all three shader functions. Global built-ins are a special type that is accessible everywhere, including custom functions. They are only available in master, and are specified with "global" keyword. see godotengine/godot#37166

Copy link
Member Author

Choose a reason for hiding this comment

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

Understood.

But now I'm confused about master in this repo being for 3.2. Is that no longer true? If that's the case, I guess I can leave the changes to TIME here and move on MODULATE to a separate PR for 3.2.

Copy link
Member

Choose a reason for hiding this comment

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

I think master in this repo is for 4.0 because there is a separate 3.2 branch. So yea, maybe leave this PR with the time changes and then make another PR with the modulate changes for 3.2.

Copy link
Member

@mhilbrunner mhilbrunner May 5, 2020

Choose a reason for hiding this comment

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

Yeah, master here is for Godot 4.0 now. :)

Copy link
Member Author

Choose a reason for hiding this comment

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

PR updated to include only the TIME stuff.

Copy link
Member Author

Choose a reason for hiding this comment

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

BTW, the PR template says that master is fo 3.0. Maybe it needs an update.

@RandomShaper RandomShaper changed the title Document upcoming CI shader builtin MODULATE Improve docs on TIME May 5, 2020
@akien-mga akien-mga merged commit e614de2 into godotengine:master May 6, 2020
@akien-mga
Copy link
Member

Thanks!

@RandomShaper RandomShaper deleted the canvas_modulate branch May 6, 2020 12:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants