Skip to content

Commit 055f2ef

Browse files
committed
Now loads and displays something with bevy 0.6
1 parent 823b25f commit 055f2ef

File tree

9 files changed

+1038
-1182
lines changed

9 files changed

+1038
-1182
lines changed

Cargo.lock

Lines changed: 847 additions & 1066 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[package]
22
name = "blender_bevy_toolkit"
3-
version = "0.1.0"
3+
version = "0.2.0"
44
authors = ["Geoffrey Irons <[email protected]>"]
5-
edition = "2018"
5+
edition = "2021"
66
license = "MIT"
77

88
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -13,7 +13,8 @@ serde = {version = "1", features = ["derive"]}
1313
smallvec = { version = "1.4", features = ["serde"] }
1414

1515
[dependencies.bevy]
16-
version="0.5.0"
16+
version="0.6.0"
17+
# default-features=false
1718

1819
[dependencies.bevy_rapier3d]
19-
version="0.9.0"
20+
version="0.12.0"

examples/scenes/main.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! This example loads the various test scenes
22
use bevy::prelude::*;
3-
use bevy_rapier3d::physics::RapierPhysicsPlugin;
3+
use bevy_rapier3d::physics::{NoUserData, RapierPhysicsPlugin};
44
use blender_bevy_toolkit::BlendLoadPlugin;
55

66
fn spawn_scene(
@@ -18,7 +18,7 @@ fn spawn_scene(
1818
});
1919

2020
// Create a Light
21-
commands.spawn().insert_bundle(LightBundle {
21+
commands.spawn().insert_bundle(PointLightBundle {
2222
transform: Transform::from_translation(Vec3::new(0.0, 8.0, 0.0)),
2323
..Default::default()
2424
});
@@ -30,10 +30,10 @@ fn spawn_scene(
3030
fn main() {
3131
println!("Running example scenes");
3232

33-
App::build()
33+
App::new()
3434
.add_plugins(DefaultPlugins)
35-
.add_plugin(RapierPhysicsPlugin)
35+
.add_plugin(RapierPhysicsPlugin::<NoUserData>::default())
3636
.add_plugin(BlendLoadPlugin::default())
3737
.add_startup_system(spawn_scene.system())
3838
.run();
39-
}
39+
}

export.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ def export_all(args):
2323

2424
logging.basicConfig(level=config.log_level)
2525

26-
2726
try:
2827
import blender_bevy_toolkit
2928
print("WARNING: Plugin is installed in blender, using installed version for export")

src/blend_collection.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ use bevy::prelude::*;
44
/// of the entity with this component
55
#[derive(Reflect, Default)]
66
#[reflect(Component)]
7+
#[derive(Component)]
78
pub struct BlendCollectionLoader {
89
path: String,
910
}

src/blend_label.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use bevy::prelude::*;
33
/// Component that contains the name of the object
44
#[derive(Reflect, Default)]
55
#[reflect(Component)]
6+
#[derive(Component)]
67
pub struct BlendLabel {
78
pub name: String,
89
}

src/blend_mesh.rs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
use bevy::{
22
asset::{AssetLoader, LoadContext},
33
prelude::*,
4-
render::{mesh::Indices, pipeline::PrimitiveTopology},
4+
render::{mesh::Indices, render_resource::PrimitiveTopology},
55
utils::BoxedFuture,
66
};
77
use std::convert::TryInto;
88

99
#[derive(Reflect, Default)]
1010
#[reflect(Component)] // this tells the reflect derive to also reflect component behaviors
11+
#[derive(Component)]
1112
pub struct BlendMeshLoader {
1213
path: String,
1314
}
@@ -40,11 +41,13 @@ pub fn blend_mesh_loader(
4041
commands.entity(entity).insert_bundle((
4142
bundle.mesh,
4243
bundle.material,
43-
bundle.main_pass,
44-
bundle.draw,
45-
bundle.visible,
46-
bundle.render_pipelines,
44+
// bundle.main_pass,
45+
// bundle.draw,
46+
bundle.visibility,
47+
bundle.computed_visibility,
48+
// bundle.render_pipelines,
4749
));
50+
//commands.entity(entity).insert_bundle(bundle);
4851
}
4952
}
5053

src/lib.rs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,21 @@ impl BlendLoadPlugin {
1515
}
1616

1717
impl Plugin for BlendLoadPlugin {
18-
fn build(&self, app: &mut AppBuilder) {
18+
fn build(&self, app: &mut App) {
1919
app.register_type::<blend_label::BlendLabel>();
2020
app.register_type::<blend_collection::BlendCollectionLoader>();
21+
2122
app.register_type::<blend_mesh::BlendMeshLoader>();
2223
app.register_type::<rapier_physics::RigidBodyDescription>();
23-
app.register_type::<rapier_physics::ColliderDescription>();
24-
24+
25+
2526
app.init_asset_loader::<blend_mesh::BlendMeshAssetLoader>();
2627

2728
app.add_system(blend_collection::blend_collection_loader.system());
2829
app.add_system(blend_mesh::blend_mesh_loader.system());
29-
app.add_system(rapier_physics::body_description_to_builder.system());
30-
app.add_system(rapier_physics::collider_description_to_builder.system());
30+
31+
app.register_type::<rapier_physics::ColliderDescription>();
32+
// app.add_system(rapier_physics::body_description_to_builder.system());
33+
// app.add_system(rapier_physics::collider_description_to_builder.system());
3134
}
3235
}

0 commit comments

Comments
 (0)