summaryrefslogtreecommitdiff
path: root/alligator_render/examples/bunnymark.rs
diff options
context:
space:
mode:
authorMicha White <botahamec@outlook.com>2023-02-05 10:28:43 -0500
committerMicha White <botahamec@outlook.com>2023-02-05 10:28:43 -0500
commit4b789a715cf7b42f5ae282b8218976fd577664be (patch)
tree91b17110d2928f56e146e3308cbdd944bbaf5c69 /alligator_render/examples/bunnymark.rs
parent9fd7d6689d5d90679e4b0c12e463ef4e2f8bf515 (diff)
Move texture atlas out of alligator_resources
Diffstat (limited to 'alligator_render/examples/bunnymark.rs')
-rw-r--r--alligator_render/examples/bunnymark.rs31
1 files changed, 16 insertions, 15 deletions
diff --git a/alligator_render/examples/bunnymark.rs b/alligator_render/examples/bunnymark.rs
index ab38b5e..f9aed1a 100644
--- a/alligator_render/examples/bunnymark.rs
+++ b/alligator_render/examples/bunnymark.rs
@@ -1,9 +1,7 @@
-use std::{num::NonZeroU32, time::Instant};
+use std::{num::NonZeroU32, sync::Arc, time::Instant};
-use alligator_render::{
- ImageFormat, Instance, InstanceId, RenderWindowConfig, Renderer, TextureId,
-};
-use alligator_resources::texture::{TextureManager, TextureManagerConfig};
+use alligator_render::{Instance, InstanceId, RenderWindowConfig, Renderer};
+use alligator_resources::texture::{ImageFormat, TextureId, TextureManager, TextureManagerConfig};
fn xorshift_plus(seed: &mut [u64; 2]) -> u64 {
let mut t = seed[0];
@@ -88,10 +86,16 @@ impl State {
}
for _ in 0..=(fps as u64 * 50) {
- let texture_x = renderer.textures().texture_x(self.texture_id).unwrap();
- let texture_y = renderer.textures().texture_x(self.texture_id).unwrap();
- let texture_height = renderer.textures().texture_height(self.texture_id).unwrap();
- let texture_width = renderer.textures().texture_width(self.texture_id).unwrap();
+ let texture_x = renderer.textures_mut().texture_x(self.texture_id).unwrap();
+ let texture_y = renderer.textures_mut().texture_x(self.texture_id).unwrap();
+ let texture_height = renderer
+ .textures_mut()
+ .texture_height(self.texture_id)
+ .unwrap();
+ let texture_width = renderer
+ .textures_mut()
+ .texture_width(self.texture_id)
+ .unwrap();
let instance_id = renderer.instances_mut().push_instance(Instance {
texture_coordinates: [texture_x, texture_y],
texture_size: [texture_width, texture_height],
@@ -137,15 +141,12 @@ fn main() {
let texture_config = TextureManagerConfig {
initial_capacity: 1,
max_size: 10_000,
- atlas_width: 100,
- atlas_height: 100,
};
let bunny = include_bytes!("res/bunny.ff");
- let texture_manager = TextureManager::new(&texture_config);
- let mut renderer = Renderer::new(&render_config, texture_manager).unwrap();
- let texture_id = renderer
- .textures_mut()
+ let texture_manager = Arc::new(TextureManager::new(&texture_config));
+ let renderer = Renderer::new(&render_config, texture_manager.clone()).unwrap();
+ let texture_id = texture_manager
.load_from_memory(bunny, ImageFormat::Farbfeld)
.unwrap();