hal8174/ray-tracing2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Textures working a little bit

Browse source
This commit is contained in:
hal8174 2025-08-16 01:35:52 +02:00
parent 1196cb7758
commit 2476d2d49a
Signed by: hal8174
SSH key fingerprint: SHA256:JwuqS+eVfISfKr+DkDQ6NWAbGd1jFAHkPpCM1yCnlTs
7 changed files with 407 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

39
ray-tracing-pbrt-scene/src/lib.rs
View file

@ -25,9 +25,9 @@ struct Lexer {
}
impl Lexer {
fn new(path: impl AsRef<Path>) -> Result<Self> {
fn new(path: PathBuf, base_path: PathBuf) -> Result<Self> {
Ok(Self {
input: Tokenizer::new(path)?,
input: Tokenizer::new(path, base_path)?,
})
}
}
@ -396,7 +396,7 @@ impl Lexer {
"Rotate" => Some(parse_rotate(&mut self.input)),
"Transform" => Some(parse_transform(&mut self.input).map(Statement::Transform)),
"Texture" => Some(
texture::parse_texture(&mut self.input)
texture::parse_texture(&mut self.input, textures)
.map(|(name, texture)| Statement::Texture(name, texture)),
),
"ConcatTransform" => {
@ -545,23 +545,25 @@ impl<I: Iterator<Item = Result<u8, std::io::Error>>> Iterator for BytesToChar<I>
}
}
struct Parser<P> {
path: P,
inner: Option<Box<Parser<PathBuf>>>,
struct Parser {
path: PathBuf,
base_path: PathBuf,
inner: Option<Box<Parser>>,
iter: Lexer,
}
impl<P: AsRef<Path> + std::fmt::Debug> Parser<P> {
fn new(path: P) -> Result<Self> {
impl Parser {
fn new(path: PathBuf, base_path: PathBuf) -> Result<Self> {
Ok(Self {
iter: Lexer::new(path.as_ref())?,
iter: Lexer::new(path.clone(), base_path.clone())?,
base_path,
path,
inner: None,
})
}
}
impl<P: AsRef<Path>> Parser<P> {
impl Parser {
fn next(
&mut self,
textures: &HashMap<String, Arc<dyn PbrtTexture>>,
@ -575,8 +577,8 @@ impl<P: AsRef<Path>> Parser<P> {
match self.iter.next(textures) {
Some(Ok(Statement::Include(s))) => {
let path = self.path.as_ref().parent().unwrap().join(s);
self.inner = Some(Box::new(Parser::new(path).unwrap()));
let path = self.path.parent().unwrap().join(s);
self.inner = Some(Box::new(Parser::new(path, self.base_path.clone()).unwrap()));
self.next(textures)
}
@ -670,7 +672,13 @@ fn inner_parse_pbrt(path: impl AsRef<Path> + std::fmt::Debug) -> Result<Pbrt> {
// unwrap on context.last() ok because context is never empty
let mut context_ctm = vec![AffineTransform::identity()];
let mut parser = Parser::new(path)?;
let mut parser = Parser::new(
path.as_ref().to_path_buf(),
path.as_ref()
.parent()
.ok_or_else(|| miette!("parent from file not found"))?
.to_path_buf(),
)?;
// parse global settings
@ -761,10 +769,15 @@ fn inner_parse_pbrt(path: impl AsRef<Path> + std::fmt::Debug) -> Result<Pbrt> {
Statement::Unknown(s, _items) => {
eprintln!("Unknown statement: {s}")
}
Statement::Texture(name, texture) => {
textures.insert(name, texture);
}
s => bail!("unexpected statemnet in world settings: {s:?}"),
}
}
dbg!(textures);
Ok(pbrt)
}