Skip to content

Commit a0e25d1

Browse files
authored
Merge pull request #18 from LykenSol/Xds3zN
Ported "Raymarching - Primitives" (https://www.shadertoy.com/view/Xds3zN).
2 parents f0e53b6 + 5424be8 commit a0e25d1

File tree

2 files changed

+862
-0
lines changed

2 files changed

+862
-0
lines changed

shaders/src/lib.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ pub mod morphing;
2121
pub mod phantom_star;
2222
pub mod playing_marble;
2323
pub mod protean_clouds;
24+
pub mod raymarching_primitives;
2425
pub mod seascape;
2526
pub mod soft_shadow_variation;
2627
pub mod tileable_water_caustic;
@@ -161,6 +162,13 @@ pub fn fs(constants: &ShaderConstants, mut frag_coord: Vec2) -> Vec4 {
161162
channel1: ConstantColor { color: Vec4::one() },
162163
})
163164
.main_image(&mut color, frag_coord),
165+
18 => raymarching_primitives::Inputs {
166+
resolution,
167+
frame: (time * 60.0) as i32,
168+
time,
169+
mouse,
170+
}
171+
.main_image(&mut color, frag_coord),
164172
_ => {}
165173
}
166174
pow(color.truncate(), 2.2).extend(color.w)

0 commit comments

Comments
 (0)