render: Fix vertex shader positions

ruffle-rs · Feb 8, 2025 · c272872 · c272872
1 parent 1744962
commit c272872
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/render/wgpu/shaders/blend/alpha.wgsl b/render/wgpu/shaders/blend/alpha.wgsl
@@ -12,8 +12,8 @@ struct VertexOutput {
 
 @vertex
 fn main_vertex(in: common__VertexInput) -> VertexOutput {
-    let pos = common__globals.view_matrix * transforms.world_matrix * vec4<f32>(in.position.x, in.position.y, 1.0, 1.0);
-    let uv = vec2<f32>((pos.x + 1.0) / 2.0, -((pos.y - 1.0) / 2.0));
+    let pos = common__globals.view_matrix * transforms.world_matrix * vec4<f32>(in.position.x, in.position.y, 0.0, 1.0);
+    let uv = vec2<f32>(in.position.xy);
     return VertexOutput(pos, uv);
 }
 

diff --git a/render/wgpu/shaders/blend/darken.wgsl b/render/wgpu/shaders/blend/darken.wgsl
@@ -12,8 +12,8 @@ struct VertexOutput {
 
 @vertex
 fn main_vertex(in: common__VertexInput) -> VertexOutput {
-    let pos = common__globals.view_matrix * transforms.world_matrix * vec4<f32>(in.position.x, in.position.y, 1.0, 1.0);
-    let uv = vec2<f32>((pos.x + 1.0) / 2.0, -((pos.y - 1.0) / 2.0));
+    let pos = common__globals.view_matrix * transforms.world_matrix * vec4<f32>(in.position.x, in.position.y, 0.0, 1.0);
+    let uv = vec2<f32>(in.position.xy);
     return VertexOutput(pos, uv);
 }
 

diff --git a/render/wgpu/shaders/blend/difference.wgsl b/render/wgpu/shaders/blend/difference.wgsl
@@ -12,8 +12,8 @@ struct VertexOutput {
 
 @vertex
 fn main_vertex(in: common__VertexInput) -> VertexOutput {
-    let pos = common__globals.view_matrix * transforms.world_matrix * vec4<f32>(in.position.x, in.position.y, 1.0, 1.0);
-    let uv = vec2<f32>((pos.x + 1.0) / 2.0, -((pos.y - 1.0) / 2.0));
+    let pos = common__globals.view_matrix * transforms.world_matrix * vec4<f32>(in.position.x, in.position.y, 0.0, 1.0);
+    let uv = vec2<f32>(in.position.xy);
     return VertexOutput(pos, uv);
 }
 

diff --git a/render/wgpu/shaders/blend/erase.wgsl b/render/wgpu/shaders/blend/erase.wgsl
@@ -12,8 +12,8 @@ struct VertexOutput {
 
 @vertex
 fn main_vertex(in: common__VertexInput) -> VertexOutput {
-    let pos = common__globals.view_matrix * transforms.world_matrix * vec4<f32>(in.position.x, in.position.y, 1.0, 1.0);
-    let uv = vec2<f32>((pos.x + 1.0) / 2.0, -((pos.y - 1.0) / 2.0));
+    let pos = common__globals.view_matrix * transforms.world_matrix * vec4<f32>(in.position.x, in.position.y, 0.0, 1.0);
+    let uv = vec2<f32>(in.position.xy);
     return VertexOutput(pos, uv);
 }
 

diff --git a/render/wgpu/shaders/blend/hardlight.wgsl b/render/wgpu/shaders/blend/hardlight.wgsl
@@ -12,8 +12,8 @@ struct VertexOutput {
 
 @vertex
 fn main_vertex(in: common__VertexInput) -> VertexOutput {
-    let pos = common__globals.view_matrix * transforms.world_matrix * vec4<f32>(in.position.x, in.position.y, 1.0, 1.0);
-    let uv = vec2<f32>((pos.x + 1.0) / 2.0, -((pos.y - 1.0) / 2.0));
+    let pos = common__globals.view_matrix * transforms.world_matrix * vec4<f32>(in.position.x, in.position.y, 0.0, 1.0);
+    let uv = vec2<f32>(in.position.xy);
     return VertexOutput(pos, uv);
 }
 

diff --git a/render/wgpu/shaders/blend/invert.wgsl b/render/wgpu/shaders/blend/invert.wgsl
@@ -12,8 +12,8 @@ struct VertexOutput {
 
 @vertex
 fn main_vertex(in: common__VertexInput) -> VertexOutput {
-    let pos = common__globals.view_matrix * transforms.world_matrix * vec4<f32>(in.position.x, in.position.y, 1.0, 1.0);
-    let uv = vec2<f32>((pos.x + 1.0) / 2.0, -((pos.y - 1.0) / 2.0));
+    let pos = common__globals.view_matrix * transforms.world_matrix * vec4<f32>(in.position.x, in.position.y, 0.0, 1.0);
+    let uv = vec2<f32>(in.position.xy);
     return VertexOutput(pos, uv);
 }
 

diff --git a/render/wgpu/shaders/blend/lighten.wgsl b/render/wgpu/shaders/blend/lighten.wgsl
@@ -12,8 +12,8 @@ struct VertexOutput {
 
 @vertex
 fn main_vertex(in: common__VertexInput) -> VertexOutput {
-    let pos = common__globals.view_matrix * transforms.world_matrix * vec4<f32>(in.position.x, in.position.y, 1.0, 1.0);
-    let uv = vec2<f32>((pos.x + 1.0) / 2.0, -((pos.y - 1.0) / 2.0));
+    let pos = common__globals.view_matrix * transforms.world_matrix * vec4<f32>(in.position.x, in.position.y, 0.0, 1.0);
+    let uv = vec2<f32>(in.position.xy);
     return VertexOutput(pos, uv);
 }
 

diff --git a/render/wgpu/shaders/blend/multiply.wgsl b/render/wgpu/shaders/blend/multiply.wgsl
@@ -12,8 +12,8 @@ struct VertexOutput {
 
 @vertex
 fn main_vertex(in: common__VertexInput) -> VertexOutput {
-    let pos = common__globals.view_matrix * transforms.world_matrix * vec4<f32>(in.position.x, in.position.y, 1.0, 1.0);
-    let uv = vec2<f32>((pos.x + 1.0) / 2.0, -((pos.y - 1.0) / 2.0));
+    let pos = common__globals.view_matrix * transforms.world_matrix * vec4<f32>(in.position.x, in.position.y, 0.0, 1.0);
+    let uv = vec2<f32>(in.position.xy);
     return VertexOutput(pos, uv);
 }
 

diff --git a/render/wgpu/shaders/blend/overlay.wgsl b/render/wgpu/shaders/blend/overlay.wgsl
@@ -12,8 +12,8 @@ struct VertexOutput {
 
 @vertex
 fn main_vertex(in: common__VertexInput) -> VertexOutput {
-    let pos = common__globals.view_matrix * transforms.world_matrix * vec4<f32>(in.position.x, in.position.y, 1.0, 1.0);
-    let uv = vec2<f32>((pos.x + 1.0) / 2.0, -((pos.y - 1.0) / 2.0));
+    let pos = common__globals.view_matrix * transforms.world_matrix * vec4<f32>(in.position.x, in.position.y, 0.0, 1.0);
+    let uv = vec2<f32>(in.position.xy);
     return VertexOutput(pos, uv);
 }