From ccac1f414d564450b879cd47fe04e36916fe3211 Mon Sep 17 00:00:00 2001 From: STP Date: Fri, 24 Nov 2023 22:35:20 -0500 Subject: [PATCH] Added torus --- src/gui.rs | 4 ++-- src/scene.rs | 6 ++++++ src/state.rs | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/gui.rs b/src/gui.rs index 4f8dfcd..a79ae3b 100644 --- a/src/gui.rs +++ b/src/gui.rs @@ -2,7 +2,7 @@ use nalgebra::Point3; use pixels::{wgpu, PixelsContext}; use std::time::Instant; -const INIT_FILE: &str = "test.rhai"; +const INIT_FILE: &str = "scene.rhai"; const BUFFER_PROPORTION_INIT: f32 = 1.0; const BUFFER_PROPORTION_MIN: f32 = 0.5; @@ -16,7 +16,7 @@ const CAMERA_MIN: f32 = -10.0; const CAMERA_MAX: f32 = 10.0; const CAMERA_INIT: f32 = 5.0; -/// Manages all state required for rendering Dear ImGui over `Pixels`. +/// Manages all state required for rendering Dear ImGui over `Pixels`test. pub enum GuiEvent { BufferResize, CameraRelocate, diff --git a/src/scene.rs b/src/scene.rs index 2b491b0..11bd595 100644 --- a/src/scene.rs +++ b/src/scene.rs @@ -148,6 +148,12 @@ impl Scene { .register_type::() .register_fn("Rectangle", Rectangle::new) .register_fn("RectangleUnit", Rectangle::unit); + engine + .register_type::() + .register_fn("Steiner", SteinerSurface::new); + engine + .register_type::() + .register_fn("Torus", Torus::new); let scene: Scene = engine.eval_file(filename.into())?; Ok(scene) diff --git a/src/state.rs b/src/state.rs index dded643..f05d472 100644 --- a/src/state.rs +++ b/src/state.rs @@ -16,7 +16,7 @@ use winit::window::{Window, WindowBuilder}; const START_WIDTH: i32 = 800; const START_HEIGHT: i32 = 800; -const COLOUR_CLEAR: [u8; 4] = [0x22, 0x22, 0x11, 0xff]; +const COLOUR_CLEAR: [u8; 4] = [0x22, 0x00, 0x11, 0xff]; const INIT_FILE: &str = "test.rhai";