From e6df8499e5677f29e9f4ecf692407df3e46b440e Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Thu, 29 Oct 2015 11:01:39 -0700 Subject: [PATCH] Move some stuff around... --- Math/Math/Vector.swift | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Math/Math/Vector.swift b/Math/Math/Vector.swift index 9fbabf9..069a675 100644 --- a/Math/Math/Vector.swift +++ b/Math/Math/Vector.swift @@ -107,18 +107,8 @@ public struct Vector3: Vector { data[2] = value } } - - // MARK: Operators - - public func cross(rhs: Vector3) -> Vector3 { - return Vector3(x: data[1] * rhs.data[2] - data[2] * rhs.data[1], - y: data[2] * rhs.data[0] - data[0] * rhs.data[2], - z: data[0] * rhs.data[1] - data[1] * rhs.data[0]) - } } -//------------------------------------------------------------------------------ - public struct Vector4: Vector { private var data: [Float] @@ -180,6 +170,14 @@ extension Vector { } } +extension Vector3 { + public func cross(rhs: Vector3) -> Vector3 { + return Vector3(x: data[1] * rhs.data[2] - data[2] * rhs.data[1], + y: data[2] * rhs.data[0] - data[0] * rhs.data[2], + z: data[0] * rhs.data[1] - data[1] * rhs.data[0]) + } +} + public prefix func -(v: T) -> T { var out = v for i in 0..