From f1f947b9248a3449c6c70d47b45797d48f1249bf Mon Sep 17 00:00:00 2001
From: Yuri Edward <yuri6037@outlook.com>
Date: Tue, 19 Oct 2021 15:55:06 +0200
Subject: [PATCH] Added to_homogeneous

---
 src/geometry/scale.rs            | 15 ++++++++++-----
 src/geometry/scale_conversion.rs | 16 +++++++++++-----
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/geometry/scale.rs b/src/geometry/scale.rs
index 5fe36602..deb0116b 100755
--- a/src/geometry/scale.rs
+++ b/src/geometry/scale.rs
@@ -14,8 +14,8 @@ use abomonation::Abomonation;
 use crate::base::allocator::Allocator;
 use crate::base::dimension::{DimNameAdd, DimNameSum, U1};
 use crate::base::storage::Owned;
-use crate::base::{Const, DefaultAllocator, OMatrix, SVector, Scalar};
-use crate::ClosedDiv;
+use crate::base::{Const, DefaultAllocator, OMatrix, OVector, SVector, Scalar};
+use crate::{ClosedAdd, ClosedDiv};
 use crate::ClosedMul;
 
 use crate::geometry::Point;
@@ -208,11 +208,16 @@ impl<T: Scalar, const D: usize> Scale<T, D> {
     #[must_use]
     pub fn to_homogeneous(&self) -> OMatrix<T, DimNameSum<Const<D>, U1>, DimNameSum<Const<D>, U1>>
     where
-        T: Zero + One,
+        T: Zero + One + ClosedAdd + Clone,
         Const<D>: DimNameAdd<U1>,
-        DefaultAllocator: Allocator<T, DimNameSum<Const<D>, U1>, DimNameSum<Const<D>, U1>>,
+        DefaultAllocator: Allocator<T, DimNameSum<Const<D>, U1>, DimNameSum<Const<D>, U1>> + Allocator<T, DimNameSum<Const<D>, U1>, U1>,
     {
-        todo!();
+        let mut v = OVector::<T, DimNameSum<Const<D>, U1>>::zero();
+        for i in 0..D {
+            v[(i, 0)] = self.vector[(i, 0)].clone();
+        }
+        v[(D, 0)] = T::one();
+        return OMatrix::<T, DimNameSum<Const<D>, U1>, DimNameSum<Const<D>, U1>>::from_diagonal(&v);
     }
 
     /// Inverts `self` in-place.
diff --git a/src/geometry/scale_conversion.rs b/src/geometry/scale_conversion.rs
index ed8d4c7a..e6f8573b 100644
--- a/src/geometry/scale_conversion.rs
+++ b/src/geometry/scale_conversion.rs
@@ -10,7 +10,7 @@ use crate::base::{Const, DefaultAllocator, DimName, OMatrix, OVector, SVector, S
 use crate::geometry::{
     SuperTCategoryOf, TAffine, Transform, Scale
 };
-use crate::Point;
+use crate::{ClosedAdd, Point};
 
 /*
  * This file provides the following conversions:
@@ -50,7 +50,9 @@ where
     T2: RealField + SupersetOf<T1>,
     C: SuperTCategoryOf<TAffine>,
     Const<D>: DimNameAdd<U1>,
-    DefaultAllocator: Allocator<T1, DimNameSum<Const<D>, U1>, DimNameSum<Const<D>, U1>>
+    DefaultAllocator:
+        Allocator<T1, DimNameSum<Const<D>, U1>, DimNameSum<Const<D>, U1>>
+        + Allocator<T1, DimNameSum<Const<D>, U1>, U1>
         + Allocator<T2, DimNameSum<Const<D>, U1>, DimNameSum<Const<D>, U1>>,
 {
     #[inline]
@@ -75,7 +77,9 @@ where
     T1: RealField,
     T2: RealField + SupersetOf<T1>,
     Const<D>: DimNameAdd<U1>,
-    DefaultAllocator: Allocator<T1, DimNameSum<Const<D>, U1>, DimNameSum<Const<D>, U1>>
+    DefaultAllocator:
+        Allocator<T1, DimNameSum<Const<D>, U1>, DimNameSum<Const<D>, U1>>
+        + Allocator<T1, DimNameSum<Const<D>, U1>, U1>
         + Allocator<T2, DimNameSum<Const<D>, U1>, DimNameSum<Const<D>, U1>>,
     // + Allocator<T1, D>
     // + Allocator<T2, D>
@@ -108,12 +112,14 @@ where
     }
 }
 
-impl<T: Scalar + Zero + One, const D: usize> From<Scale<T, D>>
+impl<T: Scalar + Zero + One + ClosedAdd, const D: usize> From<Scale<T, D>>
     for OMatrix<T, DimNameSum<Const<D>, U1>, DimNameSum<Const<D>, U1>>
 where
     Const<D>: DimNameAdd<U1>,
     DefaultAllocator:
-        Allocator<T, DimNameSum<Const<D>, U1>, DimNameSum<Const<D>, U1>> + Allocator<T, Const<D>>,
+        Allocator<T, DimNameSum<Const<D>, U1>, DimNameSum<Const<D>, U1>>
+        + Allocator<T, DimNameSum<Const<D>, U1>, U1>
+        + Allocator<T, Const<D>>,
 {
     #[inline]
     fn from(t: Scale<T, D>) -> Self {