Update to rc.1.

Author: komadori

Cargo.toml

@@ -11,7 +11,7 @@ keywords = ["gamedev", "bevy", "outline"]
 categories = ["game-engines", "rendering"]
 
 [dependencies]
-bevy = { git = "https://github.com/komadori/bevy", rev = "b9d71f0f63da437423a94da6080cef41356fbd8f", default-features = false, features = [
+bevy = { version = "0.19.0-rc.1", default-features = false, features = [
     "std",
     "async_executor",
     "bevy_log",
@@ -35,7 +35,7 @@ reflect = []
 world_serialisation = ["bevy/bevy_world_serialization"]
 
 [dev-dependencies]
-bevy = { git = "https://github.com/komadori/bevy", rev = "b9d71f0f63da437423a94da6080cef41356fbd8f", default-features = false, features = [
+bevy = { version = "0.19.0-rc.1", default-features = false, features = [
     "gltf_animation",
     "bevy_anti_alias",
     "bevy_gltf",

src/outline.wgsl

@@ -1,6 +1,6 @@
 #import bevy_render::view::View
 #import bevy_render::maths
-#import bevy_pbr::mesh_types::SkinnedMesh
+#import bevy_pbr::mesh_types::{SkinnedMesh, MorphAttributes, MorphDescriptor, MorphWeights}
 #import bevy_pbr::skinning::joint_matrices
 #import bevy_mod_outline::common::{OutlineViewUniform, VertexOutput}
 
@@ -39,7 +39,6 @@ struct Vertex {
 var<uniform> view_uniform: OutlineViewUniform;
 
 #import bevy_pbr::skinning
-#import bevy_pbr::morph
 
 #ifdef INSTANCE_BATCH_SIZE
 @group(1) @binding(0) var<uniform> mesh: array<Instance, #{INSTANCE_BATCH_SIZE}u>;
@@ -48,19 +47,85 @@ var<uniform> view_uniform: OutlineViewUniform;
 #endif
 
 #ifdef MORPH_TARGETS
+#ifdef SKINS_USE_UNIFORM_BUFFERS
+@group(2) @binding(2) var<uniform> morph_weights: MorphWeights;
+@group(2) @binding(3) var morph_targets: texture_3d<f32>;
+#else
+@group(2) @binding(2) var<storage> morph_weights: array<f32>;
+@group(2) @binding(3) var<storage> morph_targets: array<MorphAttributes>;
+@group(2) @binding(8) var<storage> morph_descriptors: array<MorphDescriptor>;
+#endif
+
+fn morph_layer_count(descriptor_index: u32) -> u32 {
+#ifdef SKINS_USE_UNIFORM_BUFFERS
+    let dimensions = textureDimensions(morph_targets);
+    return u32(dimensions.z);
+#else
+    return morph_descriptors[descriptor_index].weight_count;
+#endif
+}
+
+fn morph_weight_at(weight_index: u32, descriptor_index: u32) -> f32 {
+#ifdef SKINS_USE_UNIFORM_BUFFERS
+    let i = weight_index;
+    return morph_weights.weights[i / 4u][i % 4u];
+#else
+    let weights_offset = morph_descriptors[descriptor_index].current_weights_offset;
+    return morph_weights[weights_offset + weight_index];
+#endif
+}
+
+#ifdef SKINS_USE_UNIFORM_BUFFERS
+const morph_position_offset: u32 = 0u;
+const morph_total_component_count: u32 = 9u;
+
+fn morph_component_texture_coord(vertex_index: u32, component_offset: u32) -> vec2<u32> {
+    let width = u32(textureDimensions(morph_targets).x);
+    let component_index = morph_total_component_count * vertex_index + component_offset;
+    return vec2<u32>(component_index % width, component_index / width);
+}
+
+fn morph_pixel(vertex: u32, component: u32, weight: u32) -> f32 {
+    let coord = morph_component_texture_coord(vertex, component);
+    return textureLoad(morph_targets, vec3(coord, weight), 0).r;
+}
+
+fn morph(vertex_index: u32, component_offset: u32, weight_index: u32) -> vec3<f32> {
+    return vec3<f32>(
+        morph_pixel(vertex_index, component_offset, weight_index),
+        morph_pixel(vertex_index, component_offset + 1u, weight_index),
+        morph_pixel(vertex_index, component_offset + 2u, weight_index),
+    );
+}
+
+fn morph_position(vertex_index: u32, weight_index: u32, instance_index: u32) -> vec3<f32> {
+    return morph(vertex_index, morph_position_offset, weight_index);
+}
+#else
+fn get_morph_target(vertex_index: u32, weight_index: u32, descriptor_index: u32) -> MorphAttributes {
+    let targets_offset = morph_descriptors[descriptor_index].targets_offset;
+    let vertex_count = morph_descriptors[descriptor_index].vertex_count;
+    return morph_targets[targets_offset + weight_index * vertex_count + vertex_index];
+}
+
+fn morph_position(vertex_index: u32, weight_index: u32, descriptor_index: u32) -> vec3<f32> {
+    return get_morph_target(vertex_index, weight_index, descriptor_index).position;
+}
+#endif
+
 fn morph_vertex(vertex_in: Vertex, instance_index: u32) -> Vertex {
     var vertex = vertex_in;
     let first_vertex = mesh[instance_index].first_vertex_index;
     var morph_index = mesh[instance_index].current_morph_index;
     let vertex_index = vertex.index - first_vertex;
 
-    let weight_count = bevy_pbr::morph::layer_count(morph_index);
+    let weight_count = morph_layer_count(morph_index);
     for (var i: u32 = 0u; i < weight_count; i ++) {
-        let weight = bevy_pbr::morph::weight_at(i, morph_index);
+        let weight = morph_weight_at(i, morph_index);
         if weight == 0.0 {
             continue;
         }
-        vertex.position += weight * bevy_pbr::morph::morph_position(vertex_index, i, morph_index);
+        vertex.position += weight * morph_position(vertex_index, i, morph_index);
     }
     return vertex;
 }