Skip to content

Commit 7412b0e

Browse files
committed
add HDR image loader
Using the `image` crate, HDR images can be loaded into RGBA-f32 textures.
1 parent fb9f04b commit 7412b0e

File tree

7 files changed

+52
-3
lines changed

7 files changed

+52
-3
lines changed

CREDITS.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@
1414

1515
## Assets
1616

17-
* Generic RPG Pack (CC0 license) by [Bakudas](https://twitter.com/bakudas) and [Gabe Fern](https://twitter.com/_Gabrielfer)
17+
* Generic RPG Pack (CC0 license) by [Bakudas](https://twitter.com/bakudas) and [Gabe Fern](https://twitter.com/_Gabrielfer)
18+
* Environment maps (`.hdr` files) from [HDRIHaven](https://hdrihaven.com) (CC0 license)
1.46 MB
Binary file not shown.

crates/bevy_render/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ spirv-reflect = "0.2.3"
2222
glsl-to-spirv = { git = "https://github.com/cart/glsl-to-spirv" }
2323
# TODO: move this to its own crate
2424
png = "0.16.0"
25+
image = "0.23"
2526

2627
# misc
2728
log = { version = "0.4", features = ["release_max_level_info"] }

crates/bevy_render/src/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ use render_graph::{
3838
};
3939
use renderer::{AssetRenderResourceBindings, RenderResourceBindings};
4040
use std::ops::Range;
41-
use texture::{PngTextureLoader, TextureResourceSystemState};
41+
use texture::{HdrTextureLoader, PngTextureLoader, TextureResourceSystemState};
4242

4343
pub mod stage {
4444
/// Stage where render resources are set up
@@ -75,6 +75,7 @@ impl AppPlugin for RenderPlugin {
7575
.add_asset::<Texture>()
7676
.add_asset::<Shader>()
7777
.add_asset::<PipelineDescriptor>()
78+
.add_asset_loader::<Texture, HdrTextureLoader>()
7879
.add_asset_loader::<Texture, PngTextureLoader>()
7980
.register_component::<Camera>()
8081
.register_component::<Draw>()
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
use super::{Texture, TextureFormat};
2+
use anyhow::Result;
3+
use bevy_asset::AssetLoader;
4+
use bevy_math::Vec2;
5+
use std::path::Path;
6+
7+
#[derive(Clone, Default)]
8+
pub struct HdrTextureLoader;
9+
10+
impl AssetLoader<Texture> for HdrTextureLoader {
11+
fn from_bytes(&self, _asset_path: &Path, bytes: Vec<u8>) -> Result<Texture> {
12+
let format = TextureFormat::Rgba32Float;
13+
debug_assert_eq!(
14+
format.pixel_size(),
15+
4 * 4 * 1,
16+
"Format should have 32bit x 4 size"
17+
);
18+
19+
let decoder = image::hdr::HdrDecoder::new(bytes.as_slice())?;
20+
let info = decoder.metadata();
21+
let rgb_data = decoder.read_image_hdr()?;
22+
let mut rgba_data = Vec::with_capacity(rgb_data.len() * format.pixel_size());
23+
24+
for rgb in rgb_data {
25+
let alpha = 1.0f32;
26+
27+
rgba_data.extend_from_slice(&rgb.0[0].to_ne_bytes());
28+
rgba_data.extend_from_slice(&rgb.0[1].to_ne_bytes());
29+
rgba_data.extend_from_slice(&rgb.0[2].to_ne_bytes());
30+
rgba_data.extend_from_slice(&alpha.to_ne_bytes());
31+
}
32+
33+
Ok(Texture::new(
34+
Vec2::new(info.width as f32, info.height as f32),
35+
rgba_data,
36+
format,
37+
))
38+
}
39+
fn extensions(&self) -> &[&str] {
40+
static EXTENSIONS: &[&str] = &["hdr"];
41+
EXTENSIONS
42+
}
43+
}

crates/bevy_render/src/texture/mod.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
mod hdr_texture_loader;
12
mod png_texture_loader;
23
mod sampler_descriptor;
34
mod texture;
45
mod texture_descriptor;
56
mod texture_dimension;
67

8+
pub use hdr_texture_loader::*;
79
pub use png_texture_loader::*;
810
pub use sampler_descriptor::*;
911
pub use texture::*;

crates/bevy_render/src/texture/texture.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ impl Texture {
6767
self.size = size;
6868
let width = size.x() as usize;
6969
let height = size.y() as usize;
70-
self.data.resize(width * height * self.format.pixel_size(), 0);
70+
self.data
71+
.resize(width * height * self.format.pixel_size(), 0);
7172
}
7273

7374
pub fn texture_resource_system(

0 commit comments

Comments
 (0)