Can load scene based on command line parameter. Meshes now load properly. Issue was caused by bevyengine/bevy#3604

Author: sdfgeoff

Makefile

@@ -5,6 +5,7 @@ assets:
 	rm -r assets || true
 	blender -b test_scenes/Cube.blend --python export.py -- --output-file="assets/scenes/Cube.scn" --log-level=DEBUG
 	blender -b test_scenes/PhysicsTest.blend --python export.py -- --output-file="assets/scenes/PhysicsTest.scn" --log-level=DEBUG
+	blender -b test_scenes/Heirarchy.blend --python export.py -- --output-file="assets/scenes/Heirarchy.scn" --log-level=DEBUG
 
 run:
-	cargo run --example scenes
+	cargo run --example scenes -- scenes/PhysicsTest.scn

blender_bevy_toolkit/core_definitions/mesh.py

@@ -76,9 +76,9 @@ def serialize_mesh(obj):
                 if mesh.uv_layers:
 
                     uv_raw = mesh.uv_layers[0].data[loop_index].uv
-                    uv = (uv_raw[0], uv_raw[1], 0.0)
+                    uv = (uv_raw[0], uv_raw[1])
                 else:
-                    uv = (0.0, 0.0, 0.0)
+                    uv = (0.0, 0.0)
 
                 dedup = (position, normal, uv)
                 if dedup not in dedup_data_lookup:
@@ -112,7 +112,7 @@ def serialize_mesh(obj):
         for normal in normals:
             out_data += struct.pack("fff", *normal)
         for uv in uv0:
-            out_data += struct.pack("fff", *uv)
+            out_data += struct.pack("ff", *uv)
         for index in indices:
             out_data += struct.pack("III", *index)
 

examples/scenes/main.rs

@@ -2,6 +2,8 @@
 use bevy::prelude::*;
 use bevy_rapier3d::physics::{NoUserData, RapierPhysicsPlugin};
 use blender_bevy_toolkit::BlendLoadPlugin;
+use std::env;
+
 
 fn spawn_scene(
     mut commands: Commands,
@@ -23,12 +25,21 @@ fn spawn_scene(
         ..Default::default()
     });
 
-    let scene_handle: Handle<DynamicScene> = asset_server.load("scenes/PhysicsTest.scn");
+    let args: Vec<String> = env::args().collect();
+
+    if args.len() != 2 {
+        println!("Please specify a scene file to load. For example:\n cargo run --example scenes -- scenes/Heirarchy.scn");
+        std::process::exit(1);
+    }
+
+    println!("Running scene: {}", args[1]);
+
+    let scene_handle: Handle<DynamicScene> = asset_server.load(args[1].as_str());
     scene_spawner.spawn_dynamic(scene_handle);
 }
 
 fn main() {
-    println!("Running example scenes");
+    
 
     App::new()
         .add_plugins(DefaultPlugins)

src/blend_collection.rs

@@ -2,9 +2,8 @@ use bevy::prelude::*;
 
 /// This component loads another collection and spawns it as a child
 /// of the entity with this component
-#[derive(Reflect, Default)]
+#[derive(Reflect, Default, Component)]
 #[reflect(Component)]
-#[derive(Component)]
 pub struct BlendCollectionLoader {
     path: String,
 }

src/blend_label.rs

@@ -1,9 +1,8 @@
 use bevy::prelude::*;
 
 /// Component that contains the name of the object
-#[derive(Reflect, Default)]
+#[derive(Reflect, Default, Component)]
 #[reflect(Component)]
-#[derive(Component)]
 pub struct BlendLabel {
     pub name: String,
 }

src/blend_mesh.rs

@@ -6,14 +6,14 @@ use bevy::{
 };
 use std::convert::TryInto;
 
-#[derive(Reflect, Default)]
+#[derive(Reflect, Default, Component)]
 #[reflect(Component)] // this tells the reflect derive to also reflect component behaviors
-#[derive(Component)]
 pub struct BlendMeshLoader {
     path: String,
 }
 
 type FVec3Arr = Vec<[f32; 3]>;
+type FVec2Arr = Vec<[f32; 2]>;
 
 pub fn blend_mesh_loader(
     mut commands: Commands,
@@ -79,14 +79,15 @@ pub fn load_mesh(data: &[u8]) -> Mesh {
     let indices = Indices::U32(indices);
 
     let mut mesh = Mesh::new(PrimitiveTopology::TriangleList);
-    mesh.set_indices(Some(indices));
+    
     mesh.set_attribute(Mesh::ATTRIBUTE_POSITION, positions);
     mesh.set_attribute(Mesh::ATTRIBUTE_NORMAL, normals);
     mesh.set_attribute(Mesh::ATTRIBUTE_UV_0, uv0s);
-
+    mesh.set_indices(Some(indices));
     mesh
 }
 
+
 /// Reads a f32 from a buffer
 fn get_f32(arr: &[u8]) -> f32 {
     f32::from_le_bytes(arr[0..4].try_into().unwrap())
@@ -108,6 +109,17 @@ fn parse_vec3_array(data: &[u8], num_elements: usize) -> Vec<[f32; 3]> {
     }
     out_array
 }
+/// Converts a slice of u8's into a vec of f32;s
+fn parse_vec2_array(data: &[u8], num_elements: usize) -> Vec<[f32; 2]> {
+    let mut out_array = Vec::with_capacity(num_elements);
+    for i in 0..num_elements {
+        out_array.push([
+            get_f32(&data[i * 12..]),
+            get_f32(&data[(i * 8 + 4)..]),
+        ]);
+    }
+    out_array
+}
 /// Converts a slice of u8's into a vec of u16's
 fn parse_u32_array(data: &[u8], num_elements: usize) -> Vec<u32> {
     let mut out_array = Vec::with_capacity(num_elements);
@@ -120,18 +132,18 @@ fn parse_u32_array(data: &[u8], num_elements: usize) -> Vec<u32> {
 /// Converts the bytes of a binary stl file into a vector of face indices,
 /// vertices and vertex normals.
 /// Expects correctly formatted STL files
-fn extact_buffers_from_mesh(mesh: &[u8]) -> (Vec<u32>, FVec3Arr, FVec3Arr, FVec3Arr) {
+fn extact_buffers_from_mesh(mesh: &[u8]) -> (Vec<u32>, FVec3Arr, FVec3Arr, FVec2Arr) {
     let num_verts = u16::from_le_bytes(mesh[0..2].try_into().unwrap()) as usize;
     let num_faces = u16::from_le_bytes(mesh[2..4].try_into().unwrap()) as usize;
 
     let verts_start = 4;
     let normals_start = verts_start + num_verts * 4 * 3;
     let uv0_start = normals_start + num_verts * 4 * 3;
-    let indices_start = uv0_start + num_verts * 4 * 3;
+    let indices_start = uv0_start + num_verts * 4 * 2;
 
     let positions = parse_vec3_array(&mesh[verts_start..], num_verts);
     let normals = parse_vec3_array(&mesh[normals_start..], num_verts);
-    let uv0 = parse_vec3_array(&mesh[uv0_start..], num_verts);
+    let uv0 = parse_vec2_array(&mesh[uv0_start..], num_verts);
     let indices = parse_u32_array(&mesh[indices_start..], num_faces * 3);
 
     (indices, positions, normals, uv0)

src/rapier_physics.rs

@@ -6,9 +6,8 @@ use std::convert::TryInto;
 
 use smallvec;
 
-#[derive(Reflect, Default)]
+#[derive(Reflect, Default, Component)]
 #[reflect(Component)]
-#[derive(Component)]
 /// A RigidBodyDescription is only present until the body_description_to_builder system runs,
 /// upon which it is converted to a rapier::dynamics::RigidBodyBuilder with matching properties.
 /// Then the bevy rapier plugin converts that into a RigidBodyHandle component for the purpose
@@ -141,9 +140,8 @@ pub fn body_description_to_builder(
 }
 
 /// Maps to a [`ColliderBundle`]
-#[derive(Reflect, Default, Debug)]
+#[derive(Reflect, Default, Debug, Component)]
 #[reflect(Component)]
-#[derive(Component)]
 pub struct ColliderDescription {
     /// Maps to [`ColliderMaterial`] friction
     friction: f32,