StrafesNET/snf
3
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update common

Browse Source
This commit is contained in:
Quaternions 2024-01-29 22:56:20 -08:00
parent ce6f8074a9
commit 708c0c48ef
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -77,7 +77,7 @@ dependencies = [
[[package]] [[package]]
name = "strafesnet_common" name = "strafesnet_common"
version = "0.1.0" version = "0.1.0"
source = "git+https://git.itzana.me/StrafesNET/common?rev=434ca29aef7e3015c9ca1ed45de8fef42e33fdfb#434ca29aef7e3015c9ca1ed45de8fef42e33fdfb" source = "git+https://git.itzana.me/StrafesNET/common?rev=5ee826d9487b5e2bea4b3cf99a68ce9a95d72f72#5ee826d9487b5e2bea4b3cf99a68ce9a95d72f72"
dependencies = [ dependencies = [
"glam", "glam",
] ]

2
Cargo.toml
View File

@ -7,4 +7,4 @@ edition = "2021"
[dependencies] [dependencies]
binrw = "0.13.3" binrw = "0.13.3"
strafesnet_common = { git = "https://git.itzana.me/StrafesNET/common", rev = "434ca29aef7e3015c9ca1ed45de8fef42e33fdfb" } strafesnet_common = { git = "https://git.itzana.me/StrafesNET/common", rev = "5ee826d9487b5e2bea4b3cf99a68ce9a95d72f72" }

9
src/map.rs
View File

@ -1,3 +1,5 @@
use strafesnet_common::model;
use strafesnet_common::gameplay_modes;
use binrw::{BinReaderExt, binrw}; use binrw::{BinReaderExt, binrw};
pub enum Error{ pub enum Error{
@ -85,12 +87,13 @@ struct Region{
#[bw(try_calc(u32::try_from(models.len())))] #[bw(try_calc(u32::try_from(models.len())))]
model_count:u32, model_count:u32,
#[br(count=model_count)] #[br(count=model_count)]
models:Vec<model::ModelInstance>, models:Vec<model::Model>,
} }
pub struct StreamableMap<R:BinReaderExt>{ pub struct StreamableMap<R:BinReaderExt>{
file:crate::file::File<R>, file:crate::file::File<R>,
style:physics::StyleModifiers,//probably should move this out of physics //this includes every platform... move the unconstrained datas to their appropriate data block?
modes:gameplay_modes::Modes,
bvh:BvhNode, bvh:BvhNode,
node_id_to_block_id:Vec<crate::file::BlockId>, node_id_to_block_id:Vec<crate::file::BlockId>,
//do not need this? return only new data with load_node //do not need this? return only new data with load_node
@ -101,7 +104,7 @@ impl<R:BinReaderExt> StreamableMap<R>{
pub(crate) fn new(file:crate::file::File<R>)->Result<Self,Error>{ pub(crate) fn new(file:crate::file::File<R>)->Result<Self,Error>{
Err(Error::InvalidHeader) Err(Error::InvalidHeader)
} }
pub fn load_node(&mut self,node_id:BvhNodeId)->Result<Vec<model::ModelInstance>,Error>{ pub fn load_node(&mut self,node_id:BvhNodeId)->Result<Vec<model::Model>,Error>{
//load region from disk //load region from disk
//parse the models and determine what resources need to be loaded //parse the models and determine what resources need to be loaded
//load resources into self.resources //load resources into self.resources