rayzor

diff src/vmath.h @ 12:d94a69933a71

lots of stuff, can't remember
author John Tsiombikas <nuclear@member.fsf.org>
date Sat, 12 Apr 2014 23:28:24 +0300
parents a826bf0fb169
children be616b58df99
line diff
     1.1 --- a/src/vmath.h	Thu Apr 10 08:42:33 2014 +0300
     1.2 +++ b/src/vmath.h	Sat Apr 12 23:28:24 2014 +0300
     1.3 @@ -47,6 +47,11 @@
     1.4  	return Vector3(a.x - b.x, a.y - b.y, a.z - b.z);
     1.5  }
     1.6  
     1.7 +inline Vector3 operator *(const Vector3 &a, const Vector3 &b)
     1.8 +{
     1.9 +	return Vector3(a.x * b.x, a.y * b.y, a.z * b.z);
    1.10 +}
    1.11 +
    1.12  inline Vector3 operator *(const Vector3 &v, float s)
    1.13  {
    1.14  	return Vector3(v.x * s, v.y * s, v.z * s);
    1.15 @@ -65,7 +70,7 @@
    1.16  inline Vector3 cross(const Vector3 &a, const Vector3 &b)
    1.17  {
    1.18  	return Vector3(a.y * b.z - a.z * b.y,
    1.19 -			a.z * b.z - a.x * b.z,
    1.20 +			a.z * b.x - a.x * b.z,
    1.21  			a.x * b.y - a.y * b.x);
    1.22  }
    1.23