Texture needs to be copied all the Time.

This commit is contained in:
Stephan Rehfeld 2026-05-27 18:15:04 +02:00
parent 5065596f96
commit 585af00665
2 changed files with 78 additions and 13 deletions

View File

@ -1,20 +1,79 @@
use hello::geometry::Geometry; use hello::geometry::{self, Geometry, Sphere};
use hello::math::Mat4x4; use hello::math::{Mat4x4, Point3};
enum SceneGraphNode { #[derive(Clone)]
Geometry(Mat4x4, Geometry), struct RGB {
SubNode(Mat4x4, Box<SceneGraphNode>), red: f64,
green: f64,
blue: f64,
}
#[derive(Clone)]
struct Texture {
width: usize,
height: usize,
pixel: Vec<RGB>,
}
impl Texture {
fn load_texture() -> Texture {
let width = 640;
let height = 480;
let mut pixel = Vec::new();
for x in 0..width {
for y in 0..height {
pixel.push(RGB {
red: 1.0,
green: 1.0,
blue: 1.0,
});
}
}
Texture {
width,
height,
pixel,
}
}
}
struct RenderableGeometry {
transform: Mat4x4,
geometry: Geometry,
texture: Texture,
}
impl RenderableGeometry {
fn new(transform: Mat4x4, geometry: Geometry, texture: Texture) -> RenderableGeometry {
RenderableGeometry {
transform,
geometry,
texture,
}
}
} }
fn main() { fn main() {
let v1 = 5; let tex = Texture::load_texture();
let v2 = &v1;
let v3 = Box::new(v1);
println!("v1: {}", v1); let geo1 = RenderableGeometry::new(
println!("v2: {}", v2); Mat4x4::ident(),
println!("v3: {}", v3); Geometry::Sphere(Sphere::new(Point3::new(0.0, 0.0, 0.0), 1.0)),
tex.clone(),
);
assert_eq!(v1, *v2); let geo2 = RenderableGeometry::new(
assert_eq!(v1, *v3); Mat4x4::ident(),
Geometry::Sphere(Sphere::new(Point3::new(-2.0, 0.0, 0.0), 1.0)),
tex.clone(),
);
let geo3 = RenderableGeometry::new(
Mat4x4::ident(),
Geometry::Sphere(Sphere::new(Point3::new(2.0, 0.0, 0.0), 1.0)),
tex.clone(),
);
} }

View File

@ -94,6 +94,12 @@ pub struct Mat4x4 {
v: f64, v: f64,
} }
impl Mat4x4 {
pub fn ident() -> Mat4x4 {
Mat4x4 { v: 0.0 }
}
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;