strips/voxelotl-engine
2
0
Fork 0
mirror of https://github.com/GayPizzaSpecifications/voxelotl-engine.git synced 2025-08-05 14:11:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

expand 2d maths classes

Browse Source
This commit is contained in:
a dinosaur
2024-09-13 17:11:46 +10:00
parent d7cb051fb7
commit c0de651947
4 changed files with 148 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Sources/Voxelotl/Math/Rectangle.swift
View File

@ -1,16 +1,16 @@
public struct Rect<T: AdditiveArithmetic>: Equatable {
var x: T, y: T, w: T, h: T
public struct Rect<T: AdditiveArithmetic & Hashable>: Hashable {
public var x: T, y: T, w: T, h: T
var origin: Point<T> {
public var origin: Point<T> {
get { .init(self.x, self.y) }
set(point) { self.x = point.x; self.y = point.y }
}
var size: Size<T> {
public var size: Size<T> {
get { .init(self.w, self.h) }
set(size) { self.w = size.w; self.h = size.h }
}
static var zero: Self { .init(origin: .zero, size: .zero) }
public static var zero: Self { .init(origin: .zero, size: .zero) }
init(x: T, y: T, width: T, height: T) {
self.x = x
@ -19,7 +19,7 @@ public struct Rect<T: AdditiveArithmetic>: Equatable {
self.h = height
}
init(origin: Point<T>, size: Size<T>) {
public init(origin: Point<T>, size: Size<T>) {
self.x = origin.x
self.y = origin.y
self.w = size.w
@ -37,3 +37,21 @@ public extension Rect where T: AdditiveArithmetic {
var up: T { y }
var down: T { y + h }
}
public extension Rect where T: BinaryInteger {
init<O: BinaryInteger>(_ other: Rect<O>) {
self.init(origin: Point<T>(other.origin), size: Size<T>(other.size))
}
init<O: BinaryFloatingPoint>(_ other: Rect<O>) {
self.init(origin: Point<T>(other.origin), size: Size<T>(other.size))
}
}
public extension Rect where T: BinaryFloatingPoint {
init<O: BinaryInteger>(_ other: Rect<O>) {
self.init(origin: Point<T>(other.origin), size: Size<T>(other.size))
}
init<O: BinaryFloatingPoint>(_ other: Rect<O>) {
self.init(origin: Point<T>(other.origin), size: Size<T>(other.size))
}
}