Migrate to Bevu 0.14.0-rc2

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bevy_basic_portals"
-version = "0.5.0"
+version = "0.6.0-dev"
 edition = "2021"
 categories = ["game-engines", "graphics", "rendering"]
 keywords = ["bevy", "portal", "mirror", "gamedev"]
@@ -11,23 +11,24 @@ repository = "https://github.com/Selene-Amanita/bevy_basic_portals"
 authors = ["Selene Amanita"]
 
 [dependencies]
-bevy_app = "0.13"
-bevy_asset = "0.13"
-bevy_core_pipeline = "0.13"
-bevy_ecs = "0.13"
-bevy_hierarchy = "0.13"
-bevy_math = "0.13"
-bevy_pbr = "0.13"
-bevy_reflect = "0.13" # Could potentially be under a feature?
-bevy_render = "0.13"
-bevy_transform = "0.13"
-bevy_window = "0.13"
+bevy_app = "0.14.0-rc.2"
+bevy_asset = "0.14.0-rc.2"
+bevy_color = "0.14.0-rc.2"
+bevy_core_pipeline = "0.14.0-rc.2"
+bevy_ecs = "0.14.0-rc.2"
+bevy_hierarchy = "0.14.0-rc.2"
+bevy_math = "0.14.0-rc.2"
+bevy_pbr = "0.14.0-rc.2"
+bevy_reflect = "0.14.0-rc.2" # Could potentially be under a feature?
+bevy_render = "0.14.0-rc.2"
+bevy_transform = "0.14.0-rc.2"
+bevy_window = "0.14.0-rc.2"
 tracing = { version = "0.1", default-features = false, features = ["std"] } # From bevy_utils
 # All of the above can be replaced by:
-# bevy = { version = "0.13", default-features = false, features = ["bevy_asset", "bevy_core_pipeline", "bevy_pbr", "bevy_render", ] }
+# bevy = { version = "0.14.0-rc.2", default-features = false, features = ["bevy_asset", "bevy_core_pipeline", "bevy_pbr", "bevy_render", ] }
 
 [dev-dependencies]
-bevy = { version = "0.13", default-features = false, features = [
+bevy = { version = "0.14.0-rc.2", default-features = false, features = [
  "bevy_asset",
  "bevy_core_pipeline",
  "bevy_pbr",

README.md

@@ -2,8 +2,8 @@
 
 [![crates.io](https://img.shields.io/crates/v/bevy_basic_portals)](https://crates.io/crates/bevy_basic_portals)
 [![docs.rs](https://img.shields.io/docsrs/bevy_basic_portals)](https://docs.rs/bevy_basic_portals/latest/bevy_basic_portals/)
-[![MIT/Apache 2.0](https://img.shields.io/badge/license-EUPL-blue.svg)](https://commission.europa.eu/content/european-union-public-licence_en)
-[![Bevy tracking](https://img.shields.io/badge/Bevy%20tracking-released%20version-lightblue)](https://github.com/bevyengine/bevy/blob/main/docs/plugins_guidelines.md#main-branch-tracking)
+[![NVPLv7+](https://img.shields.io/badge/license-NPLv7+-blue.svg)](https://git.pixie.town/thufie/npl-builder/src/branch/main/nvpl.md)
+[![Following released Bevy versions](https://img.shields.io/badge/Bevy%20tracking-released%20version-lightblue)](https://bevyengine.org/learn/quick-start/plugin-development/#main-branch-tracking)
 
 Bevy Basic Portals is a Bevy game engine plugin aimed to create portals.
 
@@ -78,6 +78,7 @@ if you want a bidirectional portal you can crate two portals manually
 ## Bevy versions
 | Bevy version | Bevy Basic Portals recommended version |
 |--------------|----------------------------------------|
+| 0.14.0-rc2 | 0.6.0-dev (not released on crates.io) |
 | 0.13.* | 0.5.0 |
 | 0.12.* | 0.4.0 |
 | 0.11.1 | 0.3.0 |

examples/cube/main.rs

@@ -3,6 +3,7 @@
 //! (This is what this crate was created for originally)
 
 use bevy::{
+ color::palettes::basic::*,
  prelude::*,
  render::{render_resource::Face, view::RenderLayers},
 };
@@ -55,7 +56,7 @@ fn setup(
  brightness: 10.,
  });
 
- commands.insert_resource(ClearColor(Color::rgb(0., 0., 0.)));
+ commands.insert_resource(ClearColor(Color::srgb(0., 0., 0.)));
 
  // Scenes
  let portal_mesh = meshes.add(Mesh::from(Rectangle::new(
@@ -72,26 +73,26 @@ fn setup(
  let spawn_portal_up = Vec3::Y;
  let render_layer = RenderLayers::layer(1);
  let shape = meshes.add(Cuboid::new(5., 5., 5.));
- let color = Color::YELLOW;
- scenes::setup_portal_cube_face(
+ let color = YELLOW.into();
+ scenes::setup_scene_test(
  &mut commands,
  spawn_portal_dir,
  spawn_portal_up,
- main_camera,
- render_layer,
+ &render_layer,
  portal_mesh.clone(),
- true,
+ wall_material.clone(),
+ shape.clone(),
+ debug_material.clone(),
+ color,
  );
- scenes::setup_scene_test(
+ scenes::setup_portal_cube_face(
  &mut commands,
  spawn_portal_dir,
  spawn_portal_up,
+ main_camera,
  render_layer,
  portal_mesh.clone(),
- wall_material.clone(),
- shape.clone(),
- debug_material.clone(),
- color,
+ true,
  );
 
  // Back scene
@@ -102,34 +103,18 @@ fn setup(
  Vec3::new(1., 4., 1.),
  Vec3::new(-1., -1., -2.),
  ));
- let color = Color::BLUE;
- scenes::setup_portal_cube_face(
- &mut commands,
- spawn_portal_dir,
- spawn_portal_up,
- main_camera,
- render_layer,
- portal_mesh.clone(),
- true,
- );
+ let color = BLUE.into();
  scenes::setup_scene_test(
  &mut commands,
  spawn_portal_dir,
  spawn_portal_up,
- render_layer,
+ &render_layer,
  portal_mesh.clone(),
  wall_material.clone(),
  shape.clone(),
  debug_material.clone(),
  color,
  );
-
- // Right scene
- let spawn_portal_dir = Vec3::X;
- let spawn_portal_up = Vec3::Y;
- let render_layer = RenderLayers::layer(3);
- let shape = meshes.add(Capsule3d::new(3., 3.));
- let color = Color::GREEN;
  scenes::setup_portal_cube_face(
  &mut commands,
  spawn_portal_dir,
@@ -139,51 +124,51 @@ fn setup(
  portal_mesh.clone(),
  true,
  );
+
+ // Right scene
+ let spawn_portal_dir = Vec3::X;
+ let spawn_portal_up = Vec3::Y;
+ let render_layer = RenderLayers::layer(3);
+ let shape = meshes.add(Capsule3d::new(3., 3.));
+ let color = GREEN.into();
  scenes::setup_scene_test(
  &mut commands,
  spawn_portal_dir,
  spawn_portal_up,
- render_layer,
+ &render_layer,
  portal_mesh.clone(),
  wall_material.clone(),
  shape.clone(),
  debug_material.clone(),
  color,
  );
-
- // Left scene
- let spawn_portal_dir = -Vec3::X;
- let spawn_portal_up = Vec3::Y;
- let render_layer = RenderLayers::layer(4);
- let shape = meshes.add(Capsule3d::new(3., 3.));
- let color = Color::FUCHSIA;
  scenes::setup_portal_cube_face(
  &mut commands,
  spawn_portal_dir,
  spawn_portal_up,
  main_camera,
  render_layer,
  portal_mesh.clone(),
- false,
+ true,
  );
+
+ // Left scene
+ let spawn_portal_dir = -Vec3::X;
+ let spawn_portal_up = Vec3::Y;
+ let render_layer = RenderLayers::layer(4);
+ let shape = meshes.add(Capsule3d::new(3., 3.));
+ let color = FUCHSIA.into();
  scenes::setup_scene_test(
  &mut commands,
  spawn_portal_dir,
  spawn_portal_up,
- render_layer,
+ &render_layer,
  portal_mesh.clone(),
  wall_material.clone(),
  shape.clone(),
  debug_material.clone(),
  color,
  );
-
- // Up scene
- let spawn_portal_dir = Vec3::Y;
- let spawn_portal_up = -Vec3::Z;
- let render_layer = RenderLayers::layer(5);
- let shape = meshes.add(Cuboid::new(5., 5., 5.));
- let color = Color::RED;
  scenes::setup_portal_cube_face(
  &mut commands,
  spawn_portal_dir,
@@ -193,24 +178,24 @@ fn setup(
  portal_mesh.clone(),
  false,
  );
+
+ // Up scene
+ let spawn_portal_dir = Vec3::Y;
+ let spawn_portal_up = -Vec3::Z;
+ let render_layer = RenderLayers::layer(5);
+ let shape = meshes.add(Cuboid::new(5., 5., 5.));
+ let color = RED.into();
  scenes::setup_scene_test(
  &mut commands,
  spawn_portal_dir,
  spawn_portal_up,
- render_layer,
+ &render_layer,
  portal_mesh.clone(),
  wall_material.clone(),
  shape.clone(),
  debug_material.clone(),
  color,
  );
-
- // Down scene
- let spawn_portal_dir = -Vec3::Y;
- let spawn_portal_up = -Vec3::Z;
- let render_layer = RenderLayers::layer(6);
- let shape = meshes.add(Torus::new(2.5, 3.5));
- let color = Color::CYAN;
  scenes::setup_portal_cube_face(
  &mut commands,
  spawn_portal_dir,
@@ -220,15 +205,31 @@ fn setup(
  portal_mesh.clone(),
  false,
  );
+
+ // Down scene
+ let spawn_portal_dir = -Vec3::Y;
+ let spawn_portal_up = -Vec3::Z;
+ let render_layer = RenderLayers::layer(6);
+ let shape = meshes.add(Torus::new(2.5, 3.5));
+ let color = AQUA.into();
  scenes::setup_scene_test(
  &mut commands,
  spawn_portal_dir,
  spawn_portal_up,
- render_layer,
+ &render_layer,
  portal_mesh.clone(),
  wall_material.clone(),
  shape.clone(),
  debug_material.clone(),
  color,
  );
+ scenes::setup_portal_cube_face(
+ &mut commands,
+ spawn_portal_dir,
+ spawn_portal_up,
+ main_camera,
+ render_layer,
+ portal_mesh.clone(),
+ false,
+ );
 }

examples/cube/scenes.rs

@@ -56,7 +56,7 @@ pub fn setup_scene_test(
  commands: &mut Commands,
  spawn_portal_dir: Vec3,
  spawn_portal_up: Vec3,
- render_layer: RenderLayers,
+ render_layer: &RenderLayers,
  wall_mesh: Handle<Mesh>,
  wall_material: Handle<StandardMaterial>,
  shape: Handle<Mesh>,
@@ -84,7 +84,7 @@ pub fn setup_scene_test(
  transform: shape_transform,
  ..default()
  },
- render_layer,
+ render_layer.clone(),
  ));
 
  // Light
@@ -102,35 +102,35 @@ pub fn setup_scene_test(
  transform: light_transform,
  ..default()
  },
- render_layer,
+ render_layer.clone(),
  ));
 
  // Walls
  let walls_center_rotation = vec![
  // back
- (Vec3::new(0., 0., -PORTAL_SIZE), Vec3::Y, 0.),
+ (Vec3::new(0., 0., -PORTAL_SIZE), Dir3::Y, 0.),
  // left
  (
  Vec3::new(-PORTAL_SIZE / 2., 0., -PORTAL_SIZE / 2.),
- Vec3::Y,
+ Dir3::Y,
  PI / 2.,
  ),
  // right
  (
  Vec3::new(PORTAL_SIZE / 2., 0., -PORTAL_SIZE / 2.),
- Vec3::Y,
+ Dir3::Y,
  -PI / 2.,
  ),
  // up
  (
  Vec3::new(0., PORTAL_SIZE / 2., -PORTAL_SIZE / 2.),
- Vec3::X,
+ Dir3::X,
  PI / 2.,
  ),
  // down
  (
  Vec3::new(0., -PORTAL_SIZE / 2., -PORTAL_SIZE / 2.),
- Vec3::X,
+ Dir3::X,
  -PI / 2.,
  ),
  ];
@@ -144,7 +144,7 @@ pub fn setup_scene_test(
  material: wall_material.clone(),
  ..default()
  },
- render_layer,
+ render_layer.clone(),
  ));
  }
  });

examples/mirror/main.rs

@@ -30,7 +30,7 @@ fn setup(
  color: Color::WHITE,
  brightness: 400.,
  });
- commands.insert_resource(ClearColor(Color::rgb(0.1, 0.1, 0.2)));
+ commands.insert_resource(ClearColor(Color::srgb(0.1, 0.1, 0.2)));
 
  // Camera
  let pivot = Vec3::ZERO;

examples/moving/main.rs

@@ -112,7 +112,7 @@ fn move_portal_and_destination(
  let mut camera_transform = camera_query.get_single_mut().unwrap();
 
  let time = time.elapsed().as_millis() % TIME_STOP;
- let (portal_translation, portal_rotation, destination_translation, destination_rotation, camera_scale) = 
+ let (portal_translation, portal_rotation, destination_translation, destination_rotation, camera_scale) =
  // Portal translation
  if (TIME0..TIME1).contains(&time) {
  (

examples/shapes/main.rs

@@ -50,7 +50,7 @@ fn setup(
  brightness: 300.,
  });
 
- commands.insert_resource(ClearColor(Color::rgb(0., 0., 0.)));
+ commands.insert_resource(ClearColor(Color::srgb(0., 0., 0.)));
 
  // Sphere
  let debug_material = materials.add(textures::debug_material(&mut images, 3, Some(Face::Back)));