-
Notifications
You must be signed in to change notification settings - Fork 35
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
Patch 1 #8
Open
bmschmidt
wants to merge
9
commits into
glslify:master
Choose a base branch
from
bmschmidt:patch-1
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Patch 1 #8
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
acfac6e
Fix cubic-in-out above .5
bmschmidt 3f952b5
Avoid less than zero to pow call.
bmschmidt 029472f
Powerless formulation
bmschmidt 84a88bd
Powerless formulation
bmschmidt ec17198
Update quartic-in-out.glsl
bmschmidt a83e5f7
fix functions, add debug code
bmschmidt 4a0320b
fix visual test shader name
bmschmidt c0e8d7e
Merge branch 'fix_debug' into patches
bmschmidt beab0fa
avoid negative pow; quintic -> quintic; fix tests;
bmschmidt File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,9 @@ | ||
float cubicInOut(float t) { | ||
return t < 0.5 | ||
? 4.0 * t * t * t | ||
: 0.5 * pow(2.0 * t - 2.0, 3.0) + 1.0; | ||
if (t < 0.5) { | ||
return 4.0 * t * t * t; | ||
} | ||
float u = 1.0 - t; | ||
return 1.0 - 4.0 * u * u * u; | ||
} | ||
|
||
#pragma glslify: export(cubicInOut) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,9 @@ | ||
float quarticInOut(float t) { | ||
return t < 0.5 | ||
? +8.0 * pow(t, 4.0) | ||
: -8.0 * pow(t - 1.0, 4.0) + 1.0; | ||
if (t < 0.5) { | ||
return 8.0 * t * t * t * t; | ||
} | ||
float u = 1.0 - t; | ||
return 1.0 - 8.0 * u * u * u * u; | ||
} | ||
|
||
#pragma glslify: export(quarticInOut) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
float quarticOut(float t) { | ||
return pow(t - 1.0, 3.0) * (1.0 - t) + 1.0; | ||
float u = 1.0 - t; | ||
return 1.0 - u * u * u * u; | ||
} | ||
|
||
#pragma glslify: export(quarticOut) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||||
---|---|---|---|---|---|---|---|---|
@@ -1,7 +1,9 @@ | ||||||||
float qinticInOut(float t) { | ||||||||
return t < 0.5 | ||||||||
? +16.0 * pow(t, 5.0) | ||||||||
: -0.5 * pow(2.0 * t - 2.0, 5.0) + 1.0; | ||||||||
float quinticInOut(float t) { | ||||||||
if (t < 0.5) { | ||||||||
return 16.0 * t * t * t * t * t; | ||||||||
} | ||||||||
float u = 1.0 - t; | ||||||||
return 1.0 - 16.0 * u * u * u * u * u; | ||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||
} | ||||||||
|
||||||||
#pragma glslify: export(qinticInOut) | ||||||||
#pragma glslify: export(quinticInOut) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||||
---|---|---|---|---|---|---|---|---|
@@ -1,5 +1,5 @@ | ||||||||
float qinticIn(float t) { | ||||||||
return pow(t, 5.0); | ||||||||
float quinticIn(float t) { | ||||||||
return t*t*t*t*t; | ||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||
} | ||||||||
|
||||||||
#pragma glslify: export(qinticIn) | ||||||||
#pragma glslify: export(quinticIn) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.