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,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(
-self.aspect, self.aspect, -1.0, 1.0, self.near, self.far
)
Mat4::orthographic_rh(-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,36 +58,32 @@ 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 =
projection.get_projection_matrix() * transform.compute_matrix().inverse();
let frustum = Frustum::from_view_projection(
let view_projection = projection.get_projection_matrix() * transform.compute_matrix().inverse();
let frustum = Frustum::from_view_projection(
&view_projection,
&transform.translation,
&transform.back(),
projection.far,
);
);
print!("Setup {0}",line!());
// commands.spawn_bundle((
// camera,
// projection,
// frustum,
// VisibleEntities::default(),
// transform,
// GlobalTransform::default(),
// // Camera2d,
// )
// );
print!("Setup {0}\n", line!());
print!("Setup {0}",line!());
commands.spawn((
camera,
projection,
frustum,
VisibleEntities::default(),
transform,
GlobalTransform::default(),
));
print!("Setup {0}\t{1}\n", line!(), file!());
}
// fn main() {