Cargo.lock

@@ -381,12 +381,6 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
 
-[[package]]
-name = "either"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e5e8f6c15a24b9a3ee5efec809ccd006d3b30e8b3bb63c39af737c7f87daa1d"
-
 [[package]]
 name = "equivalent"
 version = "1.0.2"
@@ -635,7 +629,6 @@ version = "0.1.0"
 dependencies = [
  "bytemuck",
  "glam",
- "itertools",
  "pollster",
  "wgpu",
  "winit",
@@ -663,15 +656,6 @@ dependencies = [
  "hashbrown 0.16.1",
 ]
 
-[[package]]
-name = "itertools"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b4baf93f58d4425749ca49a51c50ebab072c5df6994d08fed93541c331481dc"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "jni"
 version = "0.21.1"

Cargo.toml

@@ -20,7 +20,6 @@ opt-level = 3
 [dependencies]
 bytemuck = { version = "1.25.2", features = ["derive"] }
 glam = { version = "0.30.9", features = ["bytemuck"] }
-itertools = "0.15.0"
 pollster = "0.4.0"
 wgpu = "27.0.1"
 winit = "0.30.12"

src/camera.rs

@@ -31,7 +31,7 @@ impl OrbitalCamera {
 		// X -> -Z
 		// Y -> -X
 		// Z -> Y
-		Mat4::from_translation(vec3(0., 0., -self.distance))
+		Mat4::from_translation(vec3(0., 0., self.distance))
 			* Mat4::from_cols_array_2d(&[
 				[0., 0., -1., 0.],
 				[-1., 0., 0., 0.],
@@ -40,7 +40,7 @@ impl OrbitalCamera {
 			]) * Mat4::from_euler(
 			glam::EulerRot::ZYZ,
 			0.,
-			-self.position_pitch,
+			self.position_pitch,
 			-self.position_yaw,
 		)
 	}

src/lib.rs

@@ -130,7 +130,7 @@ impl Core {
 			position_pitch: args.light_pitch,
 			distance: 1.,
 		};
-		let perspective = Mat4::perspective_rh(std::f32::consts::FRAC_PI_3, aspect, 1e1, 1e3);
+		let perspective = Mat4::perspective_lh(std::f32::consts::FRAC_PI_3, aspect, 1e1, 1e3);
 		self.pipeline.set_look(
 			&self.queue,
 			render::LookParams {

src/mesh.rs

@@ -1,7 +1,6 @@
-use std::f32::consts::{FRAC_PI_3, PI};
+use std::f32::consts::PI;
 
 use glam::{Mat2, Vec3, Vec3Swizzles, vec2, vec3};
-use itertools::Itertools;
 
 pub type Face = [usize; 3];
 
@@ -94,67 +93,16 @@ pub fn shell(shape: &crate::ShapeArgs) -> Mesh {
 }
 
 pub fn solid(shape: &crate::ShapeArgs) -> Mesh {
-	let r = shape.base_diameter / 2.0;
+	let sides = shape.sides as usize;
 
-	let mut mesh = Mesh::default();
+	let mut mesh = shell(shape);
 
-	let mut pts = Vec::new();
-	for a in 0..3 {
-		let angle = 2.0 * a as f32 * FRAC_PI_3;
-		let (y, x) = angle.sin_cos();
-		pts.push(vec2(x, y));
-	}
-	mesh.vertices
-		.extend(pts.iter().map(|pt| r * vec3(pt.x, pt.y, 0.0)));
-	mesh.faces.push([0, 2, 1]);
-	let n_layers = 4;
-	for layer in 1..n_layers {
-		let mut new_pts = Vec::new();
-		let z0 = 1.0 - 3.0f32.powf(-(layer - 1) as f32);
-		let z = 1.0 - 3.0f32.powf(-layer as f32);
-		for [a, b] in pts.iter().copied().circular_array_windows() {
-			let along = b - a;
-			let across = -along.perp();
-			let c = (2. * a + b) / 3.;
-			let d = (a + 2. * b) / 3.;
-			let mid = (a + b) / 2.;
-			let e = mid + across * (1.0f32 / 12.).sqrt();
-			new_pts.push(a);
-			new_pts.push(c);
-			new_pts.push(e);
-			new_pts.push(d);
-			let base = mesh.vertices.len();
-			mesh.vertices
-				.extend([a, mid, b].map(|pt| r * vec3(pt.x, pt.y, z0)));
-			mesh.vertices
-				.extend([a, c, e, d, b].map(|pt| r * vec3(pt.x, pt.y, z)));
-			mesh.faces.extend(
-				[
-					[0, 4, 3],
-					[0, 1, 4],
-					[1, 5, 4],
-					[1, 6, 5],
-					[1, 2, 6],
-					[2, 7, 6],
-				]
-				.map(|face| face.map(|index| base + index)),
-			);
-		}
-		pts = new_pts;
-	}
-	{
-		let z0 = 1.0 - 3.0f32.powf(-(n_layers - 1) as f32);
-		let z = 1.0 - 3.0f32.powf(-n_layers as f32);
-		for [a, b] in pts.iter().copied().circular_array_windows() {
-			let base = mesh.vertices.len();
-			mesh.vertices
-				.extend([a, b].map(|pt| r * vec3(pt.x, pt.y, z0)));
-			mesh.vertices
-				.extend([a, b].map(|pt| r * vec3(pt.x, pt.y, z)));
-			mesh.faces
-				.extend([[0, 3, 2], [0, 1, 3]].map(|face| face.map(|index| base + index)));
-		}
-	}
+	let mut bottom = disc_faces(0, sides);
+	flip_faces(&mut bottom);
+	mesh.faces.extend(bottom);
+
+	let top = disc_faces(mesh.vertices.len() - sides, sides);
+	mesh.faces.extend(top);
 
 	mesh
 }
@@ -195,5 +143,9 @@ pub fn cup(shape: &crate::ShapeArgs) -> Mesh {
 }
 
 pub fn make(shape: &crate::ShapeArgs) -> Mesh {
-	solid(shape)
+	match shape.mode {
+		crate::Mode::Solid => solid(shape),
+		crate::Mode::Shell => cup(shape),
+		crate::Mode::Mesh => Default::default(), // TODO implement
+	}
 }

src/render.rs

@@ -88,7 +88,7 @@ impl Pipeline {
 			},
 			primitive: wgpu::PrimitiveState {
 				topology: wgpu::PrimitiveTopology::TriangleList,
-				front_face: wgpu::FrontFace::Ccw,
+				front_face: wgpu::FrontFace::Cw,
 				cull_mode: Some(wgpu::Face::Back),
 				..Default::default()
 			},

ui/src/main_window.cxx

@@ -57,7 +57,7 @@ void Hyperboloid::updateView() {
 		.background = { color.redF(), color.greenF(), color.blueF(), 1.00 },
 		.camera_yaw = qDegreesToRadians((float)m_ui->camYaw->value()),
 		.camera_pitch = qDegreesToRadians((float)m_ui->camPitch->value()),
-		.light_yaw = qDegreesToRadians(-135.0f),
+		.light_yaw = 0.0,
 		.light_pitch = qDegreesToRadians((float)m_ui->lightPitch->value()),
 	};
 	m_ui->viewport->setView(args);

ui/src/main_window.ui

@@ -221,13 +221,13 @@
            <double>4.000000000000000</double>
           </property>
           <property name="maximum">
-           <double>200.000000000000000</double>
+           <double>100.000000000000000</double>
           </property>
           <property name="stepType">
            <enum>QAbstractSpinBox::StepType::AdaptiveDecimalStepType</enum>
           </property>
           <property name="value">
-           <double>100.000000000000000</double>
+           <double>36.000000000000000</double>
           </property>
          </widget>
         </item>