Hartmut/PixSpace
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

added more features back

Browse source
This commit is contained in:
Hartmut Seichter 2022-11-17 20:10:49 +01:00
parent b9d631d912
commit 348d7dce45
2 changed files with 65 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

87
src/main.rs
View file

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

48
src/offaxis.rs
View file

@ -1,7 +1,7 @@
use bevy::prelude::*; use bevy::prelude::*;
use bevy::render::primitives::Frustum;
use bevy::render::camera::{Camera, CameraProjection}; use bevy::render::camera::{Camera, CameraProjection};
use bevy::render::primitives::Frustum;
use bevy::render::view::VisibleEntities; use bevy::render::view::VisibleEntities;
#[derive(Component)] #[derive(Component)]
@ -14,9 +14,7 @@ pub struct OffAxisProjection {
impl CameraProjection for OffAxisProjection { impl CameraProjection for OffAxisProjection {
fn get_projection_matrix(&self) -> Mat4 { fn get_projection_matrix(&self) -> Mat4 {
println!("Here we go!"); 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 // what to do on window resize
@ -39,12 +37,16 @@ impl CameraProjection for OffAxisProjection {
impl Default for OffAxisProjection { impl Default for OffAxisProjection {
fn default() -> Self { 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) { 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 // We need all the components that Bevy's built-in camera bundles would add
@ -56,36 +58,32 @@ pub fn camera_setup(mut commands: Commands) {
..default() ..default()
}; };
print!("Setup {0}",line!()); print!("Setup {0}", line!());
// position the camera like bevy would do by default for 2D: // position the camera like bevy would do by default for 2D:
let transform = Transform::from_xyz(0.0, 0.0, projection.far - 0.1); let transform = Transform::from_xyz(0.0, 0.0, projection.far - 0.1);
// frustum construction code copied from Bevy // 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(
let frustum = Frustum::from_view_projection(
&view_projection, &view_projection,
&transform.translation, &transform.translation,
&transform.back(), &transform.back(),
projection.far, projection.far,
); );
print!("Setup {0}",line!()); print!("Setup {0}\n", line!());
// commands.spawn_bundle((
// camera,
// projection,
// frustum,
// VisibleEntities::default(),
// transform,
// GlobalTransform::default(),
// // Camera2d,
// )
// );
print!("Setup {0}",line!()); commands.spawn((
camera,
projection,
frustum,
VisibleEntities::default(),
transform,
GlobalTransform::default(),
));
print!("Setup {0}\t{1}\n", line!(), file!());
} }
// fn main() { // fn main() {