diff --git a/testing/bevy_example/Cargo.toml b/testing/bevy_example/Cargo.toml index 04043fb..4b8a556 100644 --- a/testing/bevy_example/Cargo.toml +++ b/testing/bevy_example/Cargo.toml @@ -8,9 +8,10 @@ license = "MIT OR Apache-2.0" bevy = { version = "0.13", features = ["dynamic_linking"] } bevy_gltf_blueprints = { path = "../../crates/bevy_gltf_blueprints" } bevy_registry_export = { path = "../../crates/bevy_registry_export" } -bevy_gltf_worlflow_examples_common_rapier = { path = "../../examples/common_rapier" } +# bevy_gltf_worlflow_examples_common_rapier = { path = "../../examples/common_rapier" } +bevy_gltf_worlflow_examples_common = { path = "../../examples/common" } -bevy_rapier3d = { version = "0.25.0", features = ["serde-serialize", "debug-render-3d", "enhanced-determinism"] } +#evy_rapier3d = { version = "0.25.0", features = ["serde-serialize", "debug-render-3d", "enhanced-determinism"] } bevy_asset_loader = { version = "0.20", features = ["standard_dynamic_assets"] } bevy_editor_pls = { version = "0.8" } rand = "0.8.5" diff --git a/testing/bevy_example/src/game/in_game.rs b/testing/bevy_example/src/game/in_game.rs index 86746ff..e3176c4 100644 --- a/testing/bevy_example/src/game/in_game.rs +++ b/testing/bevy_example/src/game/in_game.rs @@ -1,8 +1,8 @@ use bevy::prelude::*; use bevy_gltf_blueprints::{BluePrintBundle, BlueprintName, BlueprintPath, GameWorldTag}; -use bevy_gltf_worlflow_examples_common_rapier::{GameState, InAppRunning}; +use bevy_gltf_worlflow_examples_common::{GameState, InAppRunning}; -use bevy_rapier3d::prelude::Velocity; +//use bevy_rapier3d::prelude::Velocity; use rand::Rng; pub fn setup_game( @@ -69,10 +69,10 @@ pub fn spawn_test( // BlueprintName("Health_Pickup".to_string()), // SpawnHere, TransformBundle::from_transform(Transform::from_xyz(x, 2.0, y)), - Velocity { + /*Velocity { linvel: Vec3::new(vel_x, vel_y, vel_z), angvel: Vec3::new(0.0, 0.0, 0.0), - }, + },*/ )) .id(); commands.entity(world).add_child(new_entity); diff --git a/testing/bevy_example/src/game/mod.rs b/testing/bevy_example/src/game/mod.rs index 186af92..37e065c 100644 --- a/testing/bevy_example/src/game/mod.rs +++ b/testing/bevy_example/src/game/mod.rs @@ -13,7 +13,7 @@ use bevy::{ prelude::*, render::view::screenshot::ScreenshotManager, time::common_conditions::on_timer, window::PrimaryWindow, }; -use bevy_gltf_worlflow_examples_common_rapier::{AppState, GameState}; +use bevy_gltf_worlflow_examples_common::{AppState, GameState}; use json_writer::to_json_string; diff --git a/testing/bevy_example/src/main.rs b/testing/bevy_example/src/main.rs index a2d981d..cdee4ac 100644 --- a/testing/bevy_example/src/main.rs +++ b/testing/bevy_example/src/main.rs @@ -1,5 +1,5 @@ use bevy::prelude::*; -use bevy_gltf_worlflow_examples_common_rapier::CommonPlugin; +use bevy_gltf_worlflow_examples_common::CommonPlugin; mod core; use crate::core::*; diff --git a/testing/bevy_example/src/test_components.rs b/testing/bevy_example/src/test_components.rs index 2eb0656..d398964 100644 --- a/testing/bevy_example/src/test_components.rs +++ b/testing/bevy_example/src/test_components.rs @@ -117,6 +117,10 @@ pub struct VecOfVec3s2(Vec); #[reflect(Component)] pub struct VecOfColors(Vec); +#[derive(Component, Reflect, Default, Debug)] +#[reflect(Component)] +pub struct VecOfUints(Vec); + #[derive(Component, Reflect, Default, Debug)] #[reflect(Component)] pub struct AAAAddedCOMPONENT; @@ -196,6 +200,18 @@ pub struct ComponentAToFilterOut; #[reflect(Component)] pub struct ComponentBToFilterOut; +#[derive(Component, Reflect, Default, Debug)] +#[reflect(Component)] +pub struct ComponentWithFieldsOfIdenticalType{ + pub first: f32, + pub second: f32, + pub third: Vec, + pub fourth: Vec, +} +#[derive(Component, Reflect, Default, Debug)] +#[reflect(Component)] +pub struct ComponentWithFieldsOfIdenticalType2(f32, f32, f32); + pub struct ComponentsTestPlugin; impl Plugin for ComponentsTestPlugin { fn build(&self, app: &mut App) { @@ -227,6 +243,9 @@ impl Plugin for ComponentsTestPlugin { .register_type::>() .register_type::() .register_type::>() + .register_type::() + .register_type::>() + .register_type::() // .register_type::() .register_type::() .register_type::>() @@ -242,6 +261,9 @@ impl Plugin for ComponentsTestPlugin { .register_type::() .register_type::() .register_type::() + .register_type::() + .register_type::() + .add_plugins(MaterialPlugin::< ExtendedMaterial, >::default());