simplify skybox code
This commit is contained in:
parent
94d9d15705
commit
50e731a3ca
49
src/world.rs
49
src/world.rs
|
@ -2,43 +2,27 @@ use crate::camera;
|
||||||
use bevy::prelude::*;
|
use bevy::prelude::*;
|
||||||
use bevy::core_pipeline::Skybox;
|
use bevy::core_pipeline::Skybox;
|
||||||
use bevy::asset::LoadState;
|
use bevy::asset::LoadState;
|
||||||
use bevy::render::{
|
use bevy::render::render_resource::{TextureViewDescriptor, TextureViewDimension};
|
||||||
render_resource::{TextureViewDescriptor, TextureViewDimension},
|
|
||||||
renderer::RenderDevice,
|
|
||||||
texture::CompressedImageFormats,
|
|
||||||
};
|
|
||||||
|
|
||||||
#[derive(Resource)]
|
#[derive(Resource)]
|
||||||
pub struct Cubemap {
|
pub struct Cubemap {
|
||||||
is_loaded: bool,
|
is_loaded: bool,
|
||||||
index: usize,
|
|
||||||
image_handle: Handle<Image>,
|
image_handle: Handle<Image>,
|
||||||
}
|
}
|
||||||
|
|
||||||
const CUBEMAPS: &[(&str, CompressedImageFormats)] = &[
|
const CUBEMAP_PATH: &str = "textures/stars_cubemap.png";
|
||||||
(
|
|
||||||
"textures/stars_cubemap.png",
|
|
||||||
CompressedImageFormats::NONE,
|
|
||||||
),
|
|
||||||
];
|
|
||||||
|
|
||||||
pub fn setup(
|
pub fn setup(
|
||||||
mut commands: Commands,
|
mut commands: Commands,
|
||||||
asset_server: Res<AssetServer>,
|
asset_server: Res<AssetServer>,
|
||||||
) {
|
) {
|
||||||
let skybox_handle = asset_server.load(CUBEMAPS[0].0);
|
let skybox_handle = asset_server.load(CUBEMAP_PATH);
|
||||||
commands.spawn((
|
commands.spawn((
|
||||||
Camera3dBundle {
|
Camera3dBundle {
|
||||||
transform: Transform::from_xyz(0.0, 0.0, 8.0).looking_at(Vec3::ZERO, Vec3::Y),
|
transform: Transform::from_xyz(0.0, 0.0, 8.0).looking_at(Vec3::ZERO, Vec3::Y),
|
||||||
..default()
|
..default()
|
||||||
},
|
},
|
||||||
camera::CameraController::default(),
|
camera::CameraController::default(),
|
||||||
Skybox {
|
|
||||||
image: asset_server.load(CUBEMAPS[0].0).clone(),
|
|
||||||
brightness: 150.0,
|
|
||||||
},
|
|
||||||
));
|
|
||||||
commands.spawn((
|
|
||||||
Skybox {
|
Skybox {
|
||||||
image: skybox_handle.clone(),
|
image: skybox_handle.clone(),
|
||||||
brightness: 150.0,
|
brightness: 150.0,
|
||||||
|
@ -46,7 +30,6 @@ pub fn setup(
|
||||||
));
|
));
|
||||||
commands.insert_resource(Cubemap {
|
commands.insert_resource(Cubemap {
|
||||||
is_loaded: false,
|
is_loaded: false,
|
||||||
index: 0,
|
|
||||||
image_handle: skybox_handle,
|
image_handle: skybox_handle,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -54,32 +37,11 @@ pub fn setup(
|
||||||
pub fn load_cubemap_asset(
|
pub fn load_cubemap_asset(
|
||||||
mut cubemap: ResMut<Cubemap>,
|
mut cubemap: ResMut<Cubemap>,
|
||||||
asset_server: Res<AssetServer>,
|
asset_server: Res<AssetServer>,
|
||||||
render_device: Res<RenderDevice>,
|
|
||||||
) {
|
) {
|
||||||
let supported_compressed_formats =
|
cubemap.image_handle = asset_server.load(CUBEMAP_PATH);
|
||||||
CompressedImageFormats::from_features(render_device.features());
|
|
||||||
|
|
||||||
let mut new_index = cubemap.index;
|
|
||||||
for _ in 0..CUBEMAPS.len() {
|
|
||||||
new_index = (new_index + 1) % CUBEMAPS.len();
|
|
||||||
if supported_compressed_formats.contains(CUBEMAPS[new_index].1) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
info!("Skipping unsupported format: {:?}", CUBEMAPS[new_index]);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Skip swapping to the same texture. Useful for when ktx2, zstd, or compressed texture support
|
|
||||||
// is missing
|
|
||||||
if new_index == cubemap.index {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
cubemap.index = new_index;
|
|
||||||
cubemap.image_handle = asset_server.load(CUBEMAPS[cubemap.index].0);
|
|
||||||
cubemap.is_loaded = false;
|
cubemap.is_loaded = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
pub fn asset_loaded(
|
pub fn asset_loaded(
|
||||||
asset_server: Res<AssetServer>,
|
asset_server: Res<AssetServer>,
|
||||||
mut images: ResMut<Assets<Image>>,
|
mut images: ResMut<Assets<Image>>,
|
||||||
|
@ -87,10 +49,7 @@ pub fn asset_loaded(
|
||||||
mut skyboxes: Query<&mut Skybox>,
|
mut skyboxes: Query<&mut Skybox>,
|
||||||
) {
|
) {
|
||||||
if !cubemap.is_loaded && asset_server.load_state(&cubemap.image_handle) == LoadState::Loaded {
|
if !cubemap.is_loaded && asset_server.load_state(&cubemap.image_handle) == LoadState::Loaded {
|
||||||
info!("Swapping to {}...", CUBEMAPS[cubemap.index].0);
|
|
||||||
let image = images.get_mut(&cubemap.image_handle).unwrap();
|
let image = images.get_mut(&cubemap.image_handle).unwrap();
|
||||||
// NOTE: PNGs do not have any metadata that could indicate they contain a cubemap texture,
|
|
||||||
// so they appear as one texture. The following code reconfigures the texture as necessary.
|
|
||||||
if image.texture_descriptor.array_layer_count() == 1 {
|
if image.texture_descriptor.array_layer_count() == 1 {
|
||||||
image.reinterpret_stacked_2d_as_array(image.height() / image.width());
|
image.reinterpret_stacked_2d_as_array(image.height() / image.width());
|
||||||
image.texture_view_descriptor = Some(TextureViewDescriptor {
|
image.texture_view_descriptor = Some(TextureViewDescriptor {
|
||||||
|
|
Loading…
Reference in a new issue