added more features back

src/main.rs

@@ -1,13 +1,12 @@
+use crate::scene::*;
 use bevy::{prelude::*, window::PresentMode};
-use crate::scene::{*};
 
-mod scene;
 mod offaxis;
+mod scene;
 
 fn main() {
     App::new()
-    .insert_resource(ClearColor(Color::rgb(0.0,0.1,0.9)))
+        .insert_resource(ClearColor(Color::rgb(0.0, 0.1, 0.9)))
-
         // .insert_resource(WindowDescriptor{
         //     title: "PixSpace".to_string(),
         //     width: 1280.0,
@@ -15,9 +14,9 @@ fn main() {
         //     present_mode: PresentMode::AutoVsync,
         //     ..Default::default()
         // })
-
         .add_plugins(DefaultPlugins.set(WindowPlugin {
             window: WindowDescriptor {
+                title: "PixSpace".to_string(),
                 width: 1280.0,
                 height: 720.0,
                 present_mode: PresentMode::AutoVsync,
@@ -25,9 +24,9 @@ fn main() {
             },
             ..default()
         }))
-    .add_plugins(DefaultPlugins)
+        // .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(
@@ -38,11 +37,9 @@ fn main() {
         .add_startup_system(build_scene)
         .add_system(print_positions)
         .run();
-    }
+}
 
-
+fn cycle_msaa(input: Res<Input<KeyCode>>, mut msaa: ResMut<Msaa>) {
-
-    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");
@@ -52,4 +49,4 @@ fn main() {
             msaa.samples = 4;
         }
     }
-    }
+}

src/offaxis.rs

@@ -1,7 +1,7 @@
 use bevy::prelude::*;
 
-use bevy::render::primitives::Frustum;
 use bevy::render::camera::{Camera, CameraProjection};
+use bevy::render::primitives::Frustum;
 use bevy::render::view::VisibleEntities;
 
 #[derive(Component)]
@@ -14,9 +14,7 @@ pub struct OffAxisProjection {
 impl CameraProjection for OffAxisProjection {
     fn get_projection_matrix(&self) -> Mat4 {
         println!("Here we go!");
-        Mat4::orthographic_rh(
+        Mat4::orthographic_rh(-self.aspect, self.aspect, -1.0, 1.0, self.near, self.far)
-            -self.aspect, self.aspect, -1.0, 1.0, self.near, self.far
-        )
     }
 
     // what to do on window resize
@@ -39,12 +37,16 @@ impl CameraProjection for OffAxisProjection {
 
 impl Default for OffAxisProjection {
     fn default() -> Self {
-        Self { near: 0.0, far: 1000.0, aspect: 1.0 }
+        Self {
+            near: 0.0,
+            far: 1000.0,
+            aspect: 1.0,
+        }
     }
 }
 
 pub fn camera_setup(mut commands: Commands) {
-    print!("Setup {0}",line!());
+    print!("Setup {0}", line!());
 
     // We need all the components that Bevy's built-in camera bundles would add
 
@@ -56,13 +58,12 @@ pub fn camera_setup(mut commands: Commands) {
         ..default()
     };
 
-    print!("Setup {0}",line!());
+    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 =
+    let view_projection = projection.get_projection_matrix() * transform.compute_matrix().inverse();
-        projection.get_projection_matrix() * transform.compute_matrix().inverse();
 
     let frustum = Frustum::from_view_projection(
         &view_projection,
@@ -71,21 +72,18 @@ pub fn camera_setup(mut commands: Commands) {
         projection.far,
     );
 
-    print!("Setup {0}",line!());
+    print!("Setup {0}\n", line!());
 
-    // commands.spawn_bundle((
+    commands.spawn((
-    //     camera,
+        camera,
-    //     projection,
+        projection,
-    //     frustum,
+        frustum,
-    //     VisibleEntities::default(),
+        VisibleEntities::default(),
-    //     transform,
+        transform,
-    //     GlobalTransform::default(),
+        GlobalTransform::default(),
-    //     // Camera2d,
+    ));
-    // )
-    // );
-
-	print!("Setup {0}",line!());
 
+    print!("Setup {0}\t{1}\n", line!(), file!());
 }
 
 // fn main() {