Skip to content

Group all solid triangles independently of color #1538

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.

Sign up for GitHub

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

Merged
hecrj merged 6 commits into from
Nov 28, 2022
Merged

Group all solid triangles independently of color #1538

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
33c3c0c
Group all solid triangles independently of color
hecrj Nov 13, 2022
c81eaf5
Replace magic constants in `glow::triangle`
hecrj Nov 16, 2022
94988bb
Implement `From` traits for `Style` in `canvas`
hecrj Nov 28, 2022
6331505
Merge branch 'master' into group-solid-triangles
hecrj Nov 28, 2022
324d60d
Re-introduce the `geometry` example
hecrj Nov 28, 2022
bb2bf06
Derive `Default` for `Rainbow` in `geometry` example
hecrj Nov 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 glow/src/shader/common/triangle.vert → glow/src/shader/common/gradient.vert
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions glow/src/shader/common/triangle.frag → glow/src/shader/common/solid.frag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ out vec4 fragColor;
#define gl_FragColor fragColor
#endif

uniform vec4 color;
in vec4 v_Color;

void main() {
gl_FragColor = color;
gl_FragColor = v_Color;
}
11 changes: 11 additions & 0 deletions glow/src/shader/common/solid.vert
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
uniform mat4 u_Transform;

in vec2 i_Position;
in vec4 i_Color;

out vec4 v_Color;

void main() {
gl_Position = u_Transform * vec4(i_Position, 0.0, 1.0);
v_Color = i_Color;
}
Loading