Skip to content

Commit ad40252

Browse files
authored
Merge pull request #10 from LykenSol/fix-playing-marble
Use vec4 shorthand in playing_marble.
2 parents 3668c43 + 1c97bc7 commit ad40252

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

shaders/src/playing_marble.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
99
use crate::Channel;
1010
use shared::*;
11-
use spirv_std::glam::{vec2, vec3, Mat2, Vec2, Vec3, Vec3Swizzles, Vec4, Vec4Swizzles};
11+
use spirv_std::glam::{vec2, vec3, vec4, Mat2, Vec2, Vec3, Vec3Swizzles, Vec4, Vec4Swizzles};
1212

1313
// Note: This cfg is incorrect on its surface, it really should be "are we compiling with std", but
1414
// we tie #[no_std] above to the same condition, so it's fine.
@@ -110,7 +110,7 @@ impl<C0: Channel> Inputs<C0> {
110110
let vv: Vec3 = (uu.cross(ww)).normalize();
111111
let rd: Vec3 = (p.x * uu + p.y * vv + 4.0 * ww).normalize();
112112

113-
let tmm: Vec2 = i_sphere(ro, rd, Vec4::new(0.0, 0.0, 0.0, 2.0));
113+
let tmm: Vec2 = i_sphere(ro, rd, vec4(0.0, 0.0, 0.0, 2.0));
114114
// raymarch
115115
let mut col: Vec3 = self.raymarch(ro, rd, tmm);
116116
if tmm.x < 0.0 {

0 commit comments

Comments
 (0)