From 6debd2c0a230d623c06869ca4c4f13519f53eb5d Mon Sep 17 00:00:00 2001 From: metamuffin Date: Fri, 14 Mar 2025 11:20:02 +0100 Subject: improve PPtr functions --- src/classes/mesh.rs | 1 + src/classes/pptr.rs | 34 ++++++++++++++++++++++++++++------ src/classes/transform.rs | 2 +- 3 files changed, 30 insertions(+), 7 deletions(-) (limited to 'src/classes') diff --git a/src/classes/mesh.rs b/src/classes/mesh.rs index b8b9e90..f0b2173 100644 --- a/src/classes/mesh.rs +++ b/src/classes/mesh.rs @@ -85,6 +85,7 @@ impl FromValue for Mesh { }) } } + impl Mesh { pub fn read_indecies(&self) -> Vec<[u32; 3]> { if self.index_format == 0 { diff --git a/src/classes/pptr.rs b/src/classes/pptr.rs index d6e4bb6..30f37ad 100644 --- a/src/classes/pptr.rs +++ b/src/classes/pptr.rs @@ -1,11 +1,17 @@ -use super::HValue; -use crate::object::{Value, parser::FromValue}; +use crate::{ + object::{Value, parser::FromValue}, + serialized_file::SerializedFile, +}; use anyhow::{Result, anyhow, bail}; +use log::debug; use serde::Serialize; -use std::marker::PhantomData; +use std::{ + io::{Read, Seek}, + marker::PhantomData, +}; #[derive(Debug, Serialize)] -pub struct PPtr { +pub struct PPtr { #[serde(skip, default)] _class: PhantomData, pub class: String, @@ -36,8 +42,8 @@ impl FromValue for PPtr { } } -impl PPtr { - pub fn cast(self) -> PPtr { +impl PPtr { + pub fn cast(self) -> PPtr { PPtr { _class: PhantomData, class: self.class, @@ -45,4 +51,20 @@ impl PPtr { path_id: self.path_id, } } + pub fn is_null(&self) -> bool { + self.path_id == 0 && self.file_id == 0 + } + pub fn load(&self, file: &mut SerializedFile) -> Result { + debug!( + "loading PPtr<{}> file_id={} path_id={}", + self.class, self.file_id, self.path_id + ); + let ob = file + .objects + .iter() + .find(|o| o.path_id == self.path_id) + .ok_or(anyhow!("object with path id {} not found", self.path_id))? + .to_owned(); + file.read_object(ob)?.parse() + } } diff --git a/src/classes/transform.rs b/src/classes/transform.rs index 2ec515a..880eb9a 100644 --- a/src/classes/transform.rs +++ b/src/classes/transform.rs @@ -29,7 +29,7 @@ impl FromValue for Transform { .as_vector() .unwrap() .into_iter() - .map(|e| PPtr::from_value(e).unwrap().cast()) + .map(|e| PPtr::from_value(e).unwrap()) .collect(), }) } -- cgit v1.2.3-70-g09d2