TGA-Loader raus, alles PNG
Der einzige verbliebene TGA-Nutzen — UI, Fonts, Platzhalter — läuft jetzt über engine::image::load (derselbe PNG-Decoder wie für die .glb). engine::tga ist damit weg. - image::load(path): PNG von der Platte, Format per Signatur. - Fonts/Cursor/Ornamente/Platzhalter als .png (Fonts + UI neu aus dem Quellmaterial exportiert, placeholder aus der alten .tga konvertiert). - Test loads_the_real_project_assets deckt die fünf Projekt-Assets ab. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0196AM4UyAJEXVtPvp5DdKr8
This commit is contained in:
co-authored by
Claude Sonnet 5
parent
fc3494466e
commit
b72b90c50d
+8
-8
@@ -29,9 +29,9 @@ use winit::event_loop::{ActiveEventLoop, ControlFlow, EventLoop};
|
||||
use winit::keyboard::{KeyCode, PhysicalKey};
|
||||
use winit::window::{CursorGrabMode, Window, WindowId};
|
||||
|
||||
use crate::engine::image::Image;
|
||||
use crate::engine::image::{self, Image};
|
||||
use crate::engine::player;
|
||||
use crate::engine::{assets, gltf, model, tga, wav};
|
||||
use crate::engine::{assets, gltf, model, wav};
|
||||
use crate::session::{FrameInput, Mode, Session};
|
||||
use gpu::Gpu;
|
||||
use math::Mat4;
|
||||
@@ -106,12 +106,12 @@ pub fn run(mut session: Session, maps_dir: &str) {
|
||||
// Autorinnen-Content sind sie Projekt-Assets: fehlen sie, ist die
|
||||
// Installation kaputt und es darf scheitern.
|
||||
let load_keyed = |p: &str| {
|
||||
ui::key_luminance(&tga::load(&assets::path(p)).expect("UI-Textur (Projekt-Asset)"))
|
||||
ui::key_luminance(&image::load(&assets::path(p)).expect("UI-Textur (Projekt-Asset)"))
|
||||
};
|
||||
// Font-Atlanten zuerst keyen, daraus die Glyph-Breiten messen (Font),
|
||||
// dann dieselben Bilder in die GPU-Texturliste übernehmen.
|
||||
let ega_img = load_keyed("assets/textures/fonts/oldschool-ega-8x14.tga");
|
||||
let cga_img = load_keyed("assets/textures/fonts/oldschool-cga-8x8.tga");
|
||||
let ega_img = load_keyed("assets/textures/fonts/oldschool-ega-8x14.png");
|
||||
let cga_img = load_keyed("assets/textures/fonts/oldschool-cga-8x8.png");
|
||||
let fonts = font::Fonts {
|
||||
ega: font::Font::ega(ui::FONT_EGA, &ega_img),
|
||||
cga: font::Font::cga(ui::FONT_CGA, &cga_img),
|
||||
@@ -120,8 +120,8 @@ pub fn run(mut session: Session, maps_dir: &str) {
|
||||
ui::white_pixel(),
|
||||
ega_img,
|
||||
cga_img,
|
||||
load_keyed("assets/textures/ui/cursors.tga"),
|
||||
load_keyed("assets/textures/ui/panel_ornaments.tga"),
|
||||
load_keyed("assets/textures/ui/cursors.png"),
|
||||
load_keyed("assets/textures/ui/panel_ornaments.png"),
|
||||
];
|
||||
|
||||
// stdin auf einem eigenen Thread: er darf blockieren, der Main-Thread
|
||||
@@ -203,7 +203,7 @@ fn load_sound(name: &str) -> Option<audio::Sound> {
|
||||
/// Projekt-Asset: fehlt sie, ist die Installation kaputt und es darf scheitern.
|
||||
fn placeholder() -> Image {
|
||||
let name = props::FALLBACK_TEXTURE;
|
||||
tga::load(&assets::path(&format!("assets/textures/{name}.tga")))
|
||||
image::load(&assets::path(&format!("assets/textures/{name}.png")))
|
||||
.expect("Platzhalter-Textur (Projekt-Asset)")
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user