added more features back

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

View file

@ -1,55 +1,52 @@
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(WindowDescriptor{
// title: "PixSpace".to_string(),
// width: 1280.0,
// 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_system(bevy::window::close_on_esc)
.add_system(cycle_msaa)
.insert_resource(ClearColor(Color::rgb(0.0, 0.1, 0.9)))
// .insert_resource(WindowDescriptor{
// title: "PixSpace".to_string(),
// width: 1280.0,
// height: 800.0,
// 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,
..default()
},
..default()
}))
// .add_plugins(DefaultPlugins)
.add_plugin(scene::BuildScenePlugin)
.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>,
// CoreStage::PostUpdate,
// camera_system::<offaxis::OffAxisProjection>,
// )
// .add_system(hello_world)
.add_startup_system(build_scene)
.add_system(print_positions)
.run();
}
// .add_system(hello_world)
.add_startup_system(build_scene)
.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;
}
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;
}
}
}
}