Merge pull request #10 from ten3roberts/dev-ivy

Merge development branch for better ivy integration

.github/workflows/deploy.yml

@@ -26,7 +26,7 @@ jobs:
           targets: wasm32-unknown-unknown
       - run: wasm-pack build --release --target web --out-dir public/pkg
       - name: Upload Artefact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: demo
           path: ./violet-demo/public
@@ -36,7 +36,7 @@ jobs:
     if: github.event_name == 'push' && ${{ github.ref == 'refs/heads/main' }}
     steps:
       - name: Download demo
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: demo
           path: dist/demo

.github/workflows/rust.yml

@@ -38,7 +38,7 @@ jobs:
           uses: actions-rs/cargo@v1
           with:
             command: nextest
-            args: run --all-features
+            args: run --workspace --all-features
 
   test_miri:
       runs-on: ubuntu-latest
@@ -59,7 +59,7 @@ jobs:
           uses: actions-rs/cargo@v1
           with:
             command: miri
-            args: nextest run
+            args: nextest run --workspace
 
 
   clippy:

assets/shaders/border_shader.wgsl

@@ -16,6 +16,7 @@ struct VertexOutput {
 struct Object {
     world_matrix: mat4x4<f32>,
     color: vec4<f32>,
+    corner_radius: f32,
 }
 
 struct Globals {

assets/shaders/debug_indicator.wgsl

@@ -16,6 +16,7 @@ struct VertexOutput {
 struct Object {
     world_matrix: mat4x4<f32>,
     color: vec4<f32>,
+    corner_radius: f32,
 }
 
 struct Globals {
@@ -38,7 +39,7 @@ var fill_image: texture_2d<f32>;
 fn vs_main(in: VertexInput) -> VertexOutput {
     var out: VertexOutput;
     let object = objects[in.instance];
-    let scale =     (object.world_matrix * vec4(1.0, 1.0, 0.0, 0.0)).xy;
+    let scale = (object.world_matrix * vec4(1.0, 1.0, 0.0, 0.0)).xy;
     out.pos = globals.viewproj * object.world_matrix * vec4<f32>(in.pos, 1.0);
     out.color = object.color;
     out.tex_coord = in.tex_coord;
@@ -65,7 +66,7 @@ fn fs_main(in: VertexOutput) -> @location(0) vec4<f32> {
     //     to_nearest.x > in.scale.x - border_size || to_nearest.y > in.scale.y - border_size) {
     //         border = 1.0;
     // }
-    if (dot(to_nearest, vec2(1.0)) < border_size) {
+    if dot(to_nearest, vec2(1.0)) < border_size {
         border = 1.0;
     }
 

assets/shaders/solid.wgsl

@@ -9,11 +9,15 @@ struct VertexOutput {
     @builtin(position) pos: vec4<f32>,
     @location(0) color: vec4<f32>,
     @location(1) tex_coord: vec2<f32>,
+    @location(2) frag_pos: vec3<f32>,
+    @location(3) frag_scale: vec3<f32>,
+    @location(4) corner_radius: f32,
 }
 
 struct Object {
     world_matrix: mat4x4<f32>,
     color: vec4<f32>,
+    corner_radius: f32,
 }
 
 struct Globals {
@@ -36,14 +40,39 @@ var fill_image: texture_2d<f32>;
 fn vs_main(in: VertexInput) -> VertexOutput {
     var out: VertexOutput;
     let object = objects[in.instance];
+
+
+    let scale = vec3(object.world_matrix[0][0], object.world_matrix[1][1], object.world_matrix[2][2]);
+
     out.pos = globals.viewproj * object.world_matrix * vec4<f32>(in.pos, 1.0);
     out.color = object.color;
     out.tex_coord = in.tex_coord;
+    out.frag_pos = in.pos;
+    out.frag_scale = abs(scale);
+    out.corner_radius = object.corner_radius;
 
     return out;
 }
 
 @fragment
 fn fs_main(in: VertexOutput) -> @location(0) vec4<f32> {
-    return in.color * textureSample(fill_image, default_sampler, in.tex_coord);
+    let width = in.frag_scale.x / 2;
+    let height = in.frag_scale.y / 2;
+
+    var alpha = 1f;
+    let corner_radius = min(in.corner_radius, min(width, height));
+    if corner_radius != 0.0 {
+        let midsegment = vec2(width - corner_radius, height - corner_radius);
+
+        let local_pos = ((in.frag_pos.xy - 0.5) * in.frag_scale.xy);
+
+        let corner_pos = midsegment * sign(local_pos);
+
+        let inside_corner = max((vec2(width, height) - corner_radius) - abs(local_pos), vec2(0f));
+
+        let corner_cutout = smoothstep(-1f, 1f, corner_radius - length(local_pos - corner_pos)) + inside_corner.x + inside_corner.y;
+        alpha = min(corner_cutout, 1.0);
+    }
+
+    return in.color * textureSample(fill_image, default_sampler, in.tex_coord) * vec4(1f, 1f, 1f, alpha);
 }

assets/shaders/text.wgsl

@@ -14,6 +14,7 @@ struct VertexOutput {
 struct Object {
     world_matrix: mat4x4<f32>,
     color: vec4<f32>,
+    corner_radius: f32,
 }
 
 struct Globals {