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

Added Speed Variable #29

Merged
merged 16 commits into from
Jan 12, 2018
Merged

Added Speed Variable #29

merged 16 commits into from
Jan 12, 2018

Conversation

TsunaMoo
Copy link
Contributor

@TsunaMoo TsunaMoo commented Jan 3, 2018

Maybe be done a bit crudely.

@avail
Copy link

avail commented Jan 6, 2018

indentation! tabs vs spaces!

@@ -88,7 +91,7 @@ Shader "CubedParadox/Flat Lit Toon Rainbow" {
////// Lighting:
float attenuation = LIGHT_ATTENUATION(i);
float4 _MainTex_var = tex2D(_MainTex,TRANSFORM_TEX(i.uv0, _MainTex));
float4 node_1939 = _Time + _TimeEditor;
float4 node_1939 = _Time*_Speed + _TimeEditor;
Copy link

@avail avail Jan 6, 2018

Choose a reason for hiding this comment

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

also put a space here: (_Time * _Speed) + _TimeEditor

@TsunaMoo
Copy link
Contributor Author

TsunaMoo commented Jan 7, 2018

updated as requested.

@TCL987 TCL987 changed the base branch from master to development January 12, 2018 06:28
@TCL987 TCL987 changed the base branch from development to rainbowshadersspeed January 12, 2018 06:31
@cubedparadox cubedparadox merged commit eb84564 into cubedparadox:rainbowshadersspeed Jan 12, 2018
@cubedparadox
Copy link
Owner

IMPORTANT: This shader is deprecated, I'm accepting this pull request for now, but will be replacing the rainbow shader with an updated variant in the future, built ontop of the latest toon shader and with a few new rainbow settings.

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