Skip to content

Commit fff9e03

Browse files
committed
[update] the triangles demo to be a lambda example.
1 parent e34f870 commit fff9e03

8 files changed

Lines changed: 12 additions & 62 deletions

File tree

Cargo.lock

Lines changed: 0 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ members = [
55
"lambda",
66
"crates/lambda-platform",
77
"crates/lambda-args",
8-
"tools/triangles_demo",
98
"tools/obj_loader"
109
]
1110

lambda/assets/shaders/triangles.frag

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#extension GL_ARB_separate_shader_objects : enable
33

44
layout(location = 0) in vec4 vertex_color;
5+
56
layout(location = 0) out vec4 fragment_color;
67

78
void main() {
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
#version 450
22
#extension GL_ARB_separate_shader_objects : enable
33

4-
layout(push_constant) uniform PushConstants {
4+
layout(push_constant) uniform PushConstant {
55
vec4 color;
66
vec2 pos;
77
vec2 scale;
8-
} push_constants;
8+
} pcs;
99

1010
layout(location = 0) out vec4 vertex_color;
1111

1212
vec2 positions[3] = vec2[](
13-
vec2(0.0, -0.5),
14-
vec2(-0.5, 0.5),
15-
vec2(0.5, 0.5)
16-
);
13+
vec2(0.0, -0.5),
14+
vec2(-0.5, 0.5),
15+
vec2(0.5, 0.5)
16+
);
1717

1818
void main() {
19-
vec2 pos = positions[gl_VertexIndex] * push_constants.scale;
20-
vertex_color = push_constants.color;
21-
gl_Position = vec4((post + push_constants.pos), 0.0, 1.0);
19+
vec2 position = positions[gl_VertexIndex] * pcs.scale;
20+
vertex_color = pcs.color;
21+
gl_Position = vec4((position + pcs.pos), 0.0, 1.0);
2222
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,14 +220,14 @@ impl Default for TrianglesComponent {
220220
fn default() -> Self {
221221
// Specify virtual shaders to use for rendering
222222
let triangle_vertex = VirtualShader::Source {
223-
source: include_str!("../assets/triangles.vert").to_string(),
223+
source: include_str!("../assets/shaders/triangles.vert").to_string(),
224224
kind: ShaderKind::Vertex,
225225
name: String::from("triangles"),
226226
entry_point: String::from("main"),
227227
};
228228

229229
let triangle_fragment = VirtualShader::Source {
230-
source: include_str!("../assets/triangles.frag").to_string(),
230+
source: include_str!("../assets/shaders/triangles.frag").to_string(),
231231
kind: ShaderKind::Fragment,
232232
name: String::from("triangles"),
233233
entry_point: String::from("main"),

tools/triangles_demo/Cargo.toml

Lines changed: 0 additions & 11 deletions
This file was deleted.

tools/triangles_demo/assets/triangles.frag

Lines changed: 0 additions & 10 deletions
This file was deleted.

tools/triangles_demo/assets/triangles.vert

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)