robin/vbspview
1
0
Fork 0
mirror of https://codeberg.org/icewind/vbspview.git synced 2026-06-03 10:14:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

mmap the bsp

Browse source
This commit is contained in:
Robin Appelman 2022-03-19 21:30:12 +01:00
commit cb2310fd67
3 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/main.rs
View file

@ -5,7 +5,8 @@ use camera::FirstPerson;
use itertools::Either;
use loader::Loader;
use std::env::args;
use std::fs;
use std::path::Path;
use std::time::Instant;
use thiserror::Error;
use three_d::*;
use tracing_subscriber::{prelude::*, EnvFilter};
@ -72,13 +73,9 @@ fn main() -> Result<(), Error> {
..Default::default()
})?;
let data = fs::read(&file)?;
let bsp = Bsp::read(&data)?;
let world_model = bsp.models().next().ok_or(Error::Other("No world model"))?;
let context = window.gl().unwrap();
let cpu_mesh = model_to_mesh(world_model);
let (cpu_mesh, bsp) = load_world(file.as_ref())?;
let forward_pipeline = ForwardPipeline::new(&context).unwrap();
let mut camera = Camera::new_perspective(
&context,
@ -360,6 +357,16 @@ fn prop_to_mesh(model: &vmdl::Model) -> CPUMesh {
mesh
}
fn load_world(path: &Path) -> Result<(CPUMesh, Bsp), Error> {
use mmarinus::{perms, Kind};
let map = Kind::Private.load::<perms::Read, _>(path).unwrap();
let bsp = Bsp::read(map.as_ref())?;
let world_model = bsp.models().next().ok_or(Error::Other("No world model"))?;
Ok((model_to_mesh(world_model), bsp))
}
fn merge_meshes<I: IntoIterator<Item = CPUMesh>>(meshes: I) -> CPUMesh {
let mut positions = Vec::new();
let mut normals = Vec::new();