Merge branch 'main' of ssh://code.technotecture.net:39753/Hartmut/PixSpace

Cargo.toml

@@ -6,5 +6,5 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-bevy = "0.8" # make sure this is the latest version
+bevy = "0.9.0"
 # vrpn = "0.1.0" # not compatible with 2021

src/main.rs

@@ -1,4 +1,5 @@
-use bevy::prelude::*;
+use bevy::{prelude::*, window::PresentMode};
+use crate::scene::{*};
 
 mod scene;
 mod offaxis;
@@ -6,25 +7,49 @@ mod offaxis;
 fn main() {
     App::new()
     .insert_resource(ClearColor(Color::rgb(0.0,0.1,0.9)))
-    .insert_resource(WindowDescriptor{
+
-        title: "PixSpace".to_string(),
+    // .insert_resource(WindowDescriptor{
-        width: 1280.0,
+    //     title: "PixSpace".to_string(),
-        height: 800.0,
+    //     width: 1280.0,
-        ..Default::default()
+    //     height: 800.0,
-    })
+    //     present_mode: PresentMode::AutoVsync,
+    //     ..Default::default()
+    // })
+
+    .add_plugins(DefaultPlugins.set(WindowPlugin {
+        window: WindowDescriptor {
+          width: 1280.0,
+          height: 720.0,
+          present_mode: PresentMode::AutoVsync,
+          ..default()
+        },
+        ..default()
+      }))
     .add_plugins(DefaultPlugins)
     .add_plugin(scene::BuildScenePlugin)
-    .add_startup_system(offaxis::camera_setup)
+    // .add_startup_system(offaxis::camera_setup)
     .add_system(bevy::window::close_on_esc)
+    .add_system(cycle_msaa)
         // .add_system_to_stage(
             // CoreStage::PostUpdate,
             // camera_system::<offaxis::OffAxisProjection>,
         // )
     // .add_system(hello_world)
-    // .add_startup_system(add_scene)
+    .add_startup_system(build_scene)
-    // .add_system(print_positions)
+    .add_system(print_positions)
     .run();
     }
 
 
 
+    fn cycle_msaa(input: Res<Input<KeyCode>>, mut msaa: ResMut<Msaa>) {
+        if input.just_pressed(KeyCode::M) {
+            if msaa.samples == 4 {
+                info!("Not using MSAA");
+                msaa.samples = 1;
+            } else {
+                info!("Using 4x MSAA");
+                msaa.samples = 4;
+            }
+        }
+    }

src/offaxis.rs

@@ -1,8 +1,8 @@
 use bevy::prelude::*;
 
-// use bevy::render::primitives::Frustum;
+use bevy::render::primitives::Frustum;
-use bevy::render::camera::{Camera, CameraProjection, DepthCalculation};
+use bevy::render::camera::{Camera, CameraProjection};
-// use bevy::render::view::VisibleEntities;
+use bevy::render::view::VisibleEntities;
 
 #[derive(Component)]
 pub struct OffAxisProjection {
@@ -24,13 +24,13 @@ impl CameraProjection for OffAxisProjection {
         self.aspect = width / height;
     }
 
-    fn depth_calculation(&self) -> DepthCalculation {
+    // fn depth_calculation(&self) -> DepthCalculation {
-        // for 2D (camera doesn't rotate)
+    //     // for 2D (camera doesn't rotate)
-        DepthCalculation::ZDifference
+    //     DepthCalculation::ZDifference
 
-        // otherwise
+    //     // otherwise
-        //DepthCalculation::Distance
+    //     //DepthCalculation::Distance
-    }
+    // }
 
     fn far(&self) -> f32 {
         self.far
@@ -44,39 +44,48 @@ impl Default for OffAxisProjection {
 }
 
 pub fn camera_setup(mut commands: Commands) {
+    print!("Setup {0}",line!());
+
     // We need all the components that Bevy's built-in camera bundles would add
 
     let projection = OffAxisProjection::default();
+
     let camera = Camera {
         // near: projection.near,
         // far: projection.far,
         ..default()
     };
-    /*
+
+    print!("Setup {0}",line!());
+
     // position the camera like bevy would do by default for 2D:
     let transform = Transform::from_xyz(0.0, 0.0, projection.far - 0.1);
     // frustum construction code copied from Bevy
     let view_projection =
         projection.get_projection_matrix() * transform.compute_matrix().inverse();
-    let frustum = Frustum::from_view_projection(
+    
+	let frustum = Frustum::from_view_projection(
         &view_projection,
         &transform.translation,
         &transform.back(),
         projection.far,
-    );
+    	);
 
-    commands.spawn_bundle((
+    print!("Setup {0}",line!());
-        camera,
+    
-        projection,
+    // commands.spawn_bundle((
-        frustum,
+    //     camera,
-        VisibleEntities::default(),
+    //     projection,
-        transform,
+    //     frustum,
-        GlobalTransform::default(),
+    //     VisibleEntities::default(),
-        Camera2d,
+    //     transform,
-    )
+    //     GlobalTransform::default(),
-    );
+    //     // Camera2d,
+    // )
+    // );
+
+	print!("Setup {0}",line!());
 
-    */
 }
 
 // fn main() {

src/scene.rs

@@ -4,24 +4,28 @@ pub struct BuildScenePlugin;
 
 impl Plugin for BuildScenePlugin {
     fn build(&self, app: &mut App) {
-        app
+        app.add_startup_system(build_scene) // actual scene
-        .add_startup_system(build_scene)
+        .add_system(print_positions); // debugging
-        .add_system(print_positions);
     }
 }
 
-
 #[derive(Component)]
 struct Person;
 
 #[derive(Component)]
-struct Position { x: f32, y: f32 }
+pub struct Position { x: f32, y: f32 }
 
 
-fn build_scene(mut commands: Commands)  {
+pub fn build_scene(mut commands: Commands)  {
-    commands.spawn()
+    commands.spawn((
-    .insert(Person)
+        Person,
-    .insert(Position { x: 10.0, y: 10.0 } );
+        Position { x: 10.0, y: 10.0 }
+
+    )        
+    );
+    // commands.spawn()
+    // .insert(Person)
+    // .insert(Position { x: 10.0, y: 10.0 } );
 
     // camera
     // commands.spawn_bundle(OffAxisProjection {
@@ -30,9 +34,10 @@ fn build_scene(mut commands: Commands)  {
     // });
 }
 
-fn print_positions(query : Query<&Position>) {
+pub fn print_positions(query : Query<&Position>) {
-    for position in query.iter() {
+    for _position in query.iter() {
 
+        _ = 33;
         // println!("position {:?} {:?}", position.x, position.y)
     
     }