@@ -53,23 +53,7 @@ fun coordinate2D(xy: DoubleArray) = Coordinate2D(xy[0], xy[1])
53
53
* @param y The supplier to the y value.
54
54
* @return The 2D coordinate.
55
55
*/
56
- fun coordinate2D (x : () -> Int , y : () -> Int ): Coordinate2D = Coordinate2D (x(), y())
57
-
58
- /* *
59
- * Creates a 2D coordinate.
60
- * @param x The supplier to the x value.
61
- * @param y The supplier to the y value.
62
- * @return The 2D coordinate.
63
- */
64
- fun coordinate2D (x : () -> Float , y : () -> Float ): Coordinate2D = Coordinate2D (x().toDouble(), y().toDouble())
65
-
66
- /* *
67
- * Creates a 2D coordinate.
68
- * @param x The supplier to the x value.
69
- * @param y The supplier to the y value.
70
- * @return The 2D coordinate.
71
- */
72
- fun coordinate2D (x : () -> Double , y : () -> Double ): Coordinate2D = Coordinate2D (x(), y())
56
+ fun coordinate2D (x : () -> Number , y : () -> Number ): Coordinate2D = Coordinate2D (x().toDouble(), y().toDouble())
73
57
74
58
// Coordinate3D
75
59
@@ -128,22 +112,4 @@ fun coordinate3D(xyz: DoubleArray) = Coordinate3D(xyz[0], xyz[1], xyz[2])
128
112
* @param z The supplier to the z value.
129
113
* @return The 3D coordinate.
130
114
*/
131
- fun coordinate3D (x : () -> Int , y : () -> Int , z : () -> Int ): Coordinate3D = Coordinate3D (x(), y(), z())
132
-
133
- /* *
134
- * Creates a 3D coordinate.
135
- * @param x The supplier to the x value.
136
- * @param y The supplier to the y value.
137
- * @param z The supplier to the z value.
138
- * @return The 3D coordinate.
139
- */
140
- fun coordinate3D (x : () -> Float , y : () -> Float , z : () -> Float ): Coordinate3D = Coordinate3D (x().toDouble(), y().toDouble(), z().toDouble())
141
-
142
- /* *
143
- * Creates a 3D coordinate.
144
- * @param x The supplier to the x value.
145
- * @param y The supplier to the y value.
146
- * @param z The supplier to the z value.
147
- * @return The 3D coordinate.
148
- */
149
- fun coordinate3D (x : () -> Double , y : () -> Double , z : () -> Double ): Coordinate3D = Coordinate3D (x(), y(), z())
115
+ fun coordinate3D (x : () -> Number , y : () -> Number , z : () -> Number ): Coordinate3D = Coordinate3D (x().toDouble(), y().toDouble(), z().toDouble())
0 commit comments