physics extension and fixes

1 files changed, 7 insertions, 16 deletions

diff --git a/client/src/shader.wgsl b/client/src/shader.wgsl
index eb5530c..3f93223 100644
--- a/client/src/shader.wgsl
+++ b/client/src/shader.wgsl
@@ -14,19 +14,14 @@
 //    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 struct VertexIn {
-    @location(0) x: f32,
-    @location(1) y: f32,
-    @location(2) z: f32,
-    @location(3) nx: f32,
-    @location(4) ny: f32,
-    @location(5) nz: f32,
-    @location(6) u: f32,
-    @location(7) v: f32,
+    @location(0) position: vec3<f32>,
+    @location(1) normal: vec3<f32>,
+    @location(2) texcoord: vec2<f32>,
 }
 struct VertexOut {
     @builtin(position) clip: vec4<f32>,
     @location(0) normal: vec3<f32>,
-    @location(1) uv: vec2<f32>,
+    @location(1) texcoord: vec2<f32>,
 }
 
 @group(0) @binding(0) var tex_albedo: texture_2d<f32>;
@@ -35,15 +30,11 @@ var<push_constant> project: mat4x4<f32>;
 
 @vertex
 fn vs_main(vi: VertexIn) -> VertexOut {
-    var clip = project * vec4(vi.x, vi.y, vi.z, 1.);
-    let vo = VertexOut(
-        clip,
-        vec3(vi.nx, vi.ny, vi.nz),
-        vec2(vi.u, vi.v),
-    );
+    var clip = project * vec4(vi.position, 1.);
+    let vo = VertexOut(clip, vi.normal, vi.texcoord);
     return vo;
 }
 @fragment
 fn fs_main(vo: VertexOut) -> @location(0) vec4<f32> {
-    return textureSample(tex_albedo, tex_albedo_sampler, vo.uv);
+    return textureSample(tex_albedo, tex_albedo_sampler, vo.texcoord);
 }