From bbe9d5993bb922ad6b33a21c3557143cecaf960d Mon Sep 17 00:00:00 2001 From: Irene Knapp Date: Sun, 9 Aug 2026 20:09:35 -0700 Subject: abstract over bundled assets yay build script stuff :) Force-Push: yes Change-Id: I694651febb02f42dac904f0dfbf4089c33ef937e --- src/main.rs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/main.rs') diff --git a/src/main.rs b/src/main.rs index b4f7970..607b0d8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,6 @@ #![deny(unsafe_code)] use crate::error::*; +use crate::assets::asset; use crate::graphics::{ Permanent, ForReinit, Render, Model, Texture }; use crate::graphics::scene::generate_scene_commands; use crate::graphics::window_dressing::{ @@ -22,6 +23,7 @@ use winit::event::WindowEvent; use winit::event_loop::{ ActiveEventLoop, EventLoop }; use winit::window::WindowId; +mod assets { include!(concat!(env!("OUT_DIR"), "/assets.rs")); } mod error; mod files; mod graphics; @@ -68,14 +70,17 @@ impl Surreality { let (permanent, for_reinit, enable_anisotropy, enable_swapchain) = Permanent::new(event_loop)?; - let (texture, mip_count) = load_png(&permanent)?; + let png = asset("textures/forest_leaves_04_diff.png")?; + let (texture, mip_count) = load_png(png, &permanent)?; if enable_swapchain.0 { let window_dressing = WindowDressing::new(&permanent, &for_reinit, enable_anisotropy, mip_count)?; let mut render = Render::new(&permanent, &for_reinit, &window_dressing, &texture)?; - let model = load_obj(&permanent)?; + + let obj = asset("models/teapot.obj")?; + let model = load_obj(obj, &permanent)?; render.set_model(model); *self.window_dressing.get_mut() = Some(window_dressing); -- cgit 1.4.1