Merge branch 'degroote22-patch-1'

This commit is contained in:
Andy Hanson
2017-10-16 10:11:03 -07:00
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -70,7 +70,7 @@ outVec2 = vec2.negate(outVec2, vec2A);
outVec2 = vec2.inverse(outVec2, vec2A);
outVec2 = vec2.normalize(outVec2, vec2A);
outVal = vec2.dot(vec2A, vec2B);
outVec2 = vec2.cross(outVec2, vec2A, vec2B);
outVec2 = vec2.cross(outVec3, vec2A, vec2B);
outVec2 = vec2.lerp(outVec2, vec2A, vec2B, 0.5);
outVec2 = vec2.random(outVec2);
outVec2 = vec2.random(outVec2, 5.0);
@@ -432,7 +432,7 @@ outVec2 = _vec2.negate(outVec2, vec2A);
outVec2 = _vec2.inverse(outVec2, vec2A);
outVec2 = _vec2.normalize(outVec2, vec2A);
outVal = _vec2.dot(vec2A, vec2B);
outVec2 = _vec2.cross(outVec2, vec2A, vec2B);
outVec2 = _vec2.cross(outVec3, vec2A, vec2B);
outVec2 = _vec2.lerp(outVec2, vec2A, vec2B, 0.5);
outVec2 = _vec2.random(outVec2);
outVec2 = _vec2.random(outVec2, 5.0);
+1 -1
View File
@@ -343,7 +343,7 @@ declare module 'gl-matrix' {
* @param b the second operand
* @returns out
*/
public static cross(out: vec2, a: vec2 | number[], b: vec2 | number[]): vec2;
public static cross(out: vec3, a: vec2 | number[], b: vec2 | number[]): vec2;
/**
* Performs a linear interpolation between two vec2's