From 878f7c9ebb269a7e4dec7984dbcf30cb2b49fa56 Mon Sep 17 00:00:00 2001 From: Kiana Sheibani Date: Tue, 15 Oct 2024 14:17:55 -0400 Subject: [PATCH] style: stop renaming external crate --- src/camera.rs | 6 ++---- src/main.rs | 4 +--- src/object/bound.rs | 4 +--- src/object/plane.rs | 6 ++---- src/object/point_light.rs | 4 +--- src/object/sphere.rs | 6 ++---- src/object/triangle.rs | 6 ++---- src/render.rs | 2 -- src/util.rs | 6 ++---- 9 files changed, 13 insertions(+), 31 deletions(-) diff --git a/src/camera.rs b/src/camera.rs index d479ef3..1e14362 100644 --- a/src/camera.rs +++ b/src/camera.rs @@ -1,7 +1,5 @@ -extern crate nalgebra as na; - -use na::geometry::{Point2, Point3}; -use na::*; +use nalgebra::geometry::{Point2, Point3}; +use nalgebra::*; use crate::util::Ray; diff --git a/src/main.rs b/src/main.rs index e3757fb..839ee33 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,10 +1,8 @@ -extern crate nalgebra as na; - use std::fs::File; use std::io::Write; use std::time::Instant; -use na::*; +use nalgebra::*; mod camera; use camera::*; diff --git a/src/object/bound.rs b/src/object/bound.rs index d368650..d86c0ce 100644 --- a/src/object/bound.rs +++ b/src/object/bound.rs @@ -1,7 +1,5 @@ -extern crate nalgebra as na; - // use na::distance; -use na::geometry::Point3; +use nalgebra::geometry::Point3; use crate::util::*; diff --git a/src/object/plane.rs b/src/object/plane.rs index c761ce6..fa5a89f 100644 --- a/src/object/plane.rs +++ b/src/object/plane.rs @@ -1,7 +1,5 @@ -extern crate nalgebra as na; - -use na::geometry::Point3; -use na::*; +use nalgebra::geometry::Point3; +use nalgebra::*; use super::{bound::*, Surface}; use crate::util::*; diff --git a/src/object/point_light.rs b/src/object/point_light.rs index b8e7b58..2476d22 100644 --- a/src/object/point_light.rs +++ b/src/object/point_light.rs @@ -1,6 +1,4 @@ -extern crate nalgebra as na; - -use na::*; +use nalgebra::*; use super::*; use crate::util::*; diff --git a/src/object/sphere.rs b/src/object/sphere.rs index 3838c61..d5b1d8a 100644 --- a/src/object/sphere.rs +++ b/src/object/sphere.rs @@ -1,9 +1,7 @@ -extern crate nalgebra as na; - use std::f64::consts::PI; -use na::geometry::Point3; -use na::*; +use nalgebra::geometry::Point3; +use nalgebra::*; use super::{bound::*, Surface}; use crate::util::*; diff --git a/src/object/triangle.rs b/src/object/triangle.rs index 205cb18..8e0187f 100644 --- a/src/object/triangle.rs +++ b/src/object/triangle.rs @@ -1,9 +1,7 @@ -extern crate nalgebra as na; - use std::cmp::Ordering; -use na::geometry::Point3; -use na::*; +use nalgebra::geometry::Point3; +use nalgebra::*; use super::{bound::*, Surface}; use crate::util::*; diff --git a/src/render.rs b/src/render.rs index c17f2d8..f72f50e 100644 --- a/src/render.rs +++ b/src/render.rs @@ -1,5 +1,3 @@ -extern crate nalgebra as na; - use std::cmp::Ordering; use std::f64::consts::PI; diff --git a/src/util.rs b/src/util.rs index 08e43b3..30e7577 100644 --- a/src/util.rs +++ b/src/util.rs @@ -1,9 +1,7 @@ -extern crate nalgebra as na; - use std::ops::{Add, Mul}; -use na::geometry::Point3; -use na::*; +use nalgebra::geometry::Point3; +use nalgebra::*; pub type Point3f = Point3; pub type Vector3f = Vector3;