Matrix scaling methods

Author: HexagonNico

src/main/scala/vecmatlib/matrix/Mat3d.scala

@@ -263,7 +263,15 @@ object Mat3d {
   )
 
   /**
-   * Returns a 3x3 scaling matrix with the given scale.
+   * Returns a 3x3 scaling matrix with the given scale on all three axes.
+   *
+   * @param scale Scale on all three axes
+   * @return A 3x3 scaling matrix
+   */
+  def scaling(scale: Double): Mat3d = scaling(scale, scale, scale)
+
+  /**
+   * Returns a 3x3 scaling matrix with the given scale on the x and y axes and a scale of 1 on the z axis.
    *
    * @param x Scale on the x axis
    * @param y Scale on the y axis
@@ -280,10 +288,10 @@ object Mat3d {
   def scaling(v: Vec3d): Mat3d = scaling(v.x, v.y, v.z)
 
   /**
-   * Returns a 3x3 scaling matrix with the given scale.
+   * Returns a 3x3 scaling matrix with the given scale on the x and y axes and a scale of 1 on the z axis.
    *
    * @param v The scale vector
    * @return A 3x3 scaling matrix
    */
-  def scaling(v: Vec2d): Mat3d = scaling(v.x, v.y, 1.0f)
+  def scaling(v: Vec2d): Mat3d = scaling(v.x, v.y)
 }

src/main/scala/vecmatlib/matrix/Mat3f.scala

@@ -263,7 +263,15 @@ object Mat3f {
   )
 
   /**
-   * Returns a 3x3 scaling matrix with the given scale.
+   * Returns a 3x3 scaling matrix with the given scale on all three axes.
+   *
+   * @param scale Scale on all three axes
+   * @return A 3x3 scaling matrix
+   */
+  def scaling(scale: Float): Mat3f = scaling(scale, scale, scale)
+
+  /**
+   * Returns a 3x3 scaling matrix with the given scale on the x and y axes and a scale of 1 on the z axis.
    *
    * @param x Scale on the x axis
    * @param y Scale on the y axis
@@ -280,7 +288,7 @@ object Mat3f {
   def scaling(v: Vec3f): Mat3f = scaling(v.x, v.y, v.z)
 
   /**
-   * Returns a 3x3 scaling matrix with the given scale.
+   * Returns a 3x3 scaling matrix with the given scale on the x and y axes and a scale of 1 on the z axis.
    *
    * @param v The scale vector
    * @return A 3x3 scaling matrix

src/main/scala/vecmatlib/matrix/Mat4d.scala

@@ -1,6 +1,6 @@
 package vecmatlib.matrix
 
-import vecmatlib.vector.{Vec3d, Vec4d}
+import vecmatlib.vector.{Vec2d, Vec3d, Vec4d}
 
 /**
  * 4x4 double matrix.
@@ -239,6 +239,15 @@ object Mat4d {
     0.0, 0.0, 0.0, 1.0
   )
 
+  /**
+   * Returns a 4x4 translation matrix with the given translation on the x and y axes.
+   *
+   * @param x X component of the translation
+   * @param y Y component of the translation
+   * @return A 4x4 translation matrix
+   */
+  def translation(x: Double, y: Double): Mat4d = translation(x, y, 0.0)
+
   /**
    * Returns a 4x4 translation matrix with the given translation.
    *
@@ -247,6 +256,14 @@ object Mat4d {
    */
   def translation(v: Vec3d): Mat4d = translation(v.x, v.y, v.z)
 
+  /**
+   * Returns a 4x4 translation matrix with the given translation on the x and y axes.
+   *
+   * @param v The translation vector
+   * @return A 4x4 translation matrix
+   */
+  def translation(v: Vec2d): Mat4d = translation(v.x, v.y)
+
   /**
    * Returns a 4x4 rotation matrix with the given rotation on the x axis.
    *
@@ -319,11 +336,36 @@ object Mat4d {
     0.0, 0.0, 0.0, 1.0
   )
 
+  /**
+   * Returns a 4x4 scaling matrix with the given scale on all three axes.
+   *
+   * @param scale Scale on all three axes
+   * @return A 4x4 scaling matrix
+   */
+  def scaling(scale: Double): Mat4d = scaling(scale, scale, scale)
+
+  /**
+   * Returns a 4x4 scaling matrix with the given scale on the x and y axes and a scale of 1 on the z axis.
+   *
+   * @param x Scale on the x axis
+   * @param y Scale on the y axis
+   * @return A 4x4 scaling matrix
+   */
+  def scaling(x: Double, y: Double): Mat4d = scaling(x, y, 1.0)
+
   /**
    * Returns a 4x4 scaling matrix with the given scale.
    *
    * @param v The scale vector
    * @return A 4x4 scaling matrix
    */
   def scaling(v: Vec3d): Mat4d = scaling(v.x, v.y, v.z)
+
+  /**
+   * Returns a 4x4 scaling matrix with the given scale on the x and y axes and a scale of 1 on the z axis.
+   *
+   * @param v The scale vector
+   * @return A 4x4 scaling matrix
+   */
+  def scaling(v: Vec2d): Mat4d = scaling(v.x, v.y)
 }

src/main/scala/vecmatlib/matrix/Mat4f.scala

@@ -1,6 +1,6 @@
 package vecmatlib.matrix
 
-import vecmatlib.vector.{Vec3f, Vec4f}
+import vecmatlib.vector.{Vec2f, Vec3f, Vec4f}
 
 /**
  * 4x4 float matrix.
@@ -239,6 +239,15 @@ object Mat4f {
     0.0f, 0.0f, 0.0f, 1.0f
   )
 
+  /**
+   * Returns a 4x4 translation matrix with the given translation on the x and y axes.
+   *
+   * @param x X component of the translation
+   * @param y Y component of the translation
+   * @return A 4x4 translation matrix
+   */
+  def translation(x: Float, y: Float): Mat4f = translation(x, y, 0.0f)
+
   /**
    * Returns a 4x4 translation matrix with the given translation.
    *
@@ -247,6 +256,14 @@ object Mat4f {
    */
   def translation(v: Vec3f): Mat4f = translation(v.x, v.y, v.z)
 
+  /**
+   * Returns a 4x4 translation matrix with the given translation on the x and y axes.
+   *
+   * @param v The translation vector
+   * @return A 4x4 translation matrix
+   */
+  def translation(v: Vec2f): Mat4f = translation(v.x, v.y)
+
   /**
    * Returns a 4x4 rotation matrix with the given rotation on the x axis.
    *
@@ -319,11 +336,36 @@ object Mat4f {
     0.0f, 0.0f, 0.0f, 1.0f
   )
 
+  /**
+   * Returns a 4x4 scaling matrix with the given scale on all three axes.
+   *
+   * @param scale Scale on all three axes
+   * @return A 4x4 scaling matrix
+   */
+  def scaling(scale: Float): Mat4f = scaling(scale, scale, scale)
+
+  /**
+   * Returns a 4x4 scaling matrix with the given scale on the x and y axes and a scale of 1 on the z axis.
+   *
+   * @param x Scale on the x axis
+   * @param y Scale on the y axis
+   * @return A 4x4 scaling matrix
+   */
+  def scaling(x: Float, y: Float): Mat4f = scaling(x, y, 1.0f)
+
   /**
    * Returns a 4x4 scaling matrix with the given scale.
    *
    * @param v The scale vector
    * @return A 4x4 scaling matrix
    */
   def scaling(v: Vec3f): Mat4f = scaling(v.x, v.y, v.z)
+
+  /**
+   * Returns a 4x4 scaling matrix with the given scale on the x and y axes and a scale of 1 on the z axis.
+   *
+   * @param v The scale vector
+   * @return A 4x4 scaling matrix
+   */
+  def scaling(v: Vec2f): Mat4f = scaling(v.x, v.y)
 }

src/test/scala/vecmatlib/matrix/Mat2fSuite.scala

@@ -1,7 +1,7 @@
 package vecmatlib.matrix
 
 import org.scalatest.funsuite.AnyFunSuite
-import vecmatlib.vector.{Vec2f, Vec3f}
+import vecmatlib.vector.Vec2f
 
 class Mat2fSuite extends AnyFunSuite {
 

src/test/scala/vecmatlib/matrix/Mat3fSuite.scala

@@ -1,7 +1,7 @@
 package vecmatlib.matrix
 
 import org.scalatest.funsuite.AnyFunSuite
-import vecmatlib.vector.{Vec3d, Vec3f, Vec3i}
+import vecmatlib.vector.Vec3f
 
 class Mat3fSuite extends AnyFunSuite {