add toJSON functions

jwu · jwu · commit 1d29b20d7bd0 · 2017-07-28T15:46:28.000+08:00
diff --git a/lib/color3.js b/lib/color3.js
@@ -1,11 +1,21 @@
 import { EPSILON } from './utils';
 
+let _tmp = new Array(3);
+
 class _color3 {
   constructor(r, g, b) {
     this.r = r;
     this.g = g;
     this.b = b;
   }
+
+  toJSON() {
+    _tmp[0] = this.r;
+    _tmp[1] = this.g;
+    _tmp[2] = this.b;
+
+    return _tmp;
+  }
 }
 
 /**
diff --git a/lib/color4.js b/lib/color4.js
@@ -1,12 +1,23 @@
 import { EPSILON } from './utils';
 
+let _tmp = new Array(4);
+
 class _color4 {
   constructor(r, g, b, a) {
     this.r = r;
     this.g = g;
     this.b = b;
     this.a = a;
   }
+
+  toJSON() {
+    _tmp[0] = this.r;
+    _tmp[1] = this.g;
+    _tmp[2] = this.b;
+    _tmp[3] = this.a;
+
+    return _tmp;
+  }
 }
 
 /**
diff --git a/lib/mat2.js b/lib/mat2.js
@@ -1,12 +1,23 @@
 import { EPSILON } from './utils';
 
+let _tmp = new Array(4);
+
 class _mat2 {
   constructor(m00, m01, m02, m03) {
     this.m00 = m00;
     this.m01 = m01;
     this.m02 = m02;
     this.m03 = m03;
   }
+
+  toJSON() {
+    _tmp[0] = this.m00;
+    _tmp[1] = this.m01;
+    _tmp[2] = this.m02;
+    _tmp[3] = this.m03;
+
+    return _tmp;
+  }
 }
 
 /**
diff --git a/lib/mat23.js b/lib/mat23.js
@@ -1,5 +1,7 @@
 import { EPSILON } from './utils';
 
+let _tmp = new Array(6);
+
 class _mat23 {
   constructor(m00, m01, m02, m03, m04, m05) {
     this.m00 = m00;
@@ -9,6 +11,17 @@ class _mat23 {
     this.m04 = m04;
     this.m05 = m05;
   }
+
+  toJSON() {
+    _tmp[0] = this.m00;
+    _tmp[1] = this.m01;
+    _tmp[2] = this.m02;
+    _tmp[3] = this.m03;
+    _tmp[4] = this.m04;
+    _tmp[5] = this.m05;
+
+    return _tmp;
+  }
 }
 
 /**
diff --git a/lib/mat3.js b/lib/mat3.js
@@ -1,6 +1,8 @@
 import { EPSILON } from './utils';
 import vec3 from './vec3';
 
+let _tmp = new Array(9);
+
 class _mat3 {
   constructor(m00, m01, m02, m03, m04, m05, m06, m07, m08) {
     this.m00 = m00;
@@ -13,6 +15,20 @@ class _mat3 {
     this.m07 = m07;
     this.m08 = m08;
   }
+
+  toJSON() {
+    _tmp[0] = this.m00;
+    _tmp[1] = this.m01;
+    _tmp[2] = this.m02;
+    _tmp[3] = this.m03;
+    _tmp[4] = this.m04;
+    _tmp[5] = this.m05;
+    _tmp[6] = this.m06;
+    _tmp[7] = this.m07;
+    _tmp[8] = this.m08;
+
+    return _tmp;
+  }
 }
 
 /**
diff --git a/lib/mat4.js b/lib/mat4.js
@@ -1,5 +1,7 @@
 import { EPSILON } from './utils';
 
+let _tmp = new Array(16);
+
 class _mat4 {
   constructor(
     m00, m01, m02, m03,
@@ -24,6 +26,27 @@ class _mat4 {
     this.m14 = m14;
     this.m15 = m15;
   }
+
+  toJSON() {
+    _tmp[0] = this.m00;
+    _tmp[1] = this.m01;
+    _tmp[2] = this.m02;
+    _tmp[3] = this.m03;
+    _tmp[4] = this.m04;
+    _tmp[5] = this.m05;
+    _tmp[6] = this.m06;
+    _tmp[7] = this.m07;
+    _tmp[8] = this.m08;
+    _tmp[9] = this.m09;
+    _tmp[10] = this.m10;
+    _tmp[11] = this.m11;
+    _tmp[12] = this.m12;
+    _tmp[13] = this.m13;
+    _tmp[14] = this.m14;
+    _tmp[15] = this.m15;
+
+    return _tmp;
+  }
 }
 
 /**
diff --git a/lib/quat.js b/lib/quat.js
@@ -2,13 +2,24 @@ import vec3 from './vec3';
 import vec4 from './vec4';
 import mat3 from './mat3';
 
+let _tmp = new Array(4);
+
 class _quat {
   constructor(x, y, z, w) {
     this.x = x;
     this.y = y;
     this.z = z;
     this.w = w;
   }
+
+  toJSON() {
+    _tmp[0] = this.x;
+    _tmp[1] = this.y;
+    _tmp[2] = this.z;
+    _tmp[3] = this.w;
+
+    return _tmp;
+  }
 }
 
 /**
@@ -36,7 +47,9 @@ quat.create = function () {
  * @returns {quat} a new quaternion
  * @function
  */
-quat.new = vec4.new;
+quat.new = function (x, y, z, w) {
+  return new _quat(x, y, z, w);
+};
 
 /**
  * Creates a new quat initialized with values from an existing quaternion
@@ -45,7 +58,9 @@ quat.new = vec4.new;
  * @returns {quat} a new quaternion
  * @function
  */
-quat.clone = vec4.clone;
+quat.clone = function (a) {
+  return new _quat(a.x, a.y, a.z, a.w);
+};
 
 /**
  * Copy the values from one quat to another
diff --git a/lib/vec2.js b/lib/vec2.js
@@ -1,10 +1,19 @@
 import { EPSILON, random } from './utils';
 
+let _tmp = new Array(2);
+
 class _vec2 {
   constructor(x, y) {
     this.x = x;
     this.y = y;
   }
+
+  toJSON() {
+    _tmp[0] = this.x;
+    _tmp[1] = this.y;
+
+    return _tmp;
+  }
 }
 
 /**
diff --git a/lib/vec3.js b/lib/vec3.js
@@ -1,11 +1,21 @@
 import { EPSILON, random } from './utils';
 
+let _tmp = new Array(3);
+
 class _vec3 {
   constructor(x, y, z) {
     this.x = x;
     this.y = y;
     this.z = z;
   }
+
+  toJSON() {
+    _tmp[0] = this.x;
+    _tmp[1] = this.y;
+    _tmp[2] = this.z;
+
+    return _tmp;
+  }
 }
 
 /**
diff --git a/lib/vec4.js b/lib/vec4.js
@@ -1,12 +1,23 @@
 import { EPSILON, random } from './utils';
 
+let _tmp = new Array(4);
+
 class _vec4 {
   constructor(x, y, z, w) {
     this.x = x;
     this.y = y;
     this.z = z;
     this.w = w;
   }
+
+  toJSON() {
+    _tmp[0] = this.x;
+    _tmp[1] = this.y;
+    _tmp[2] = this.z;
+    _tmp[3] = this.w;
+
+    return _tmp;
+  }
 }
 
 /**
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vmath",
-  "version": "1.4.4",
+  "version": "1.4.5",
   "description": "Yet another gl-matrix: faster and smaller",
   "main": "dist/vmath.js",
   "module" : "index.js",
diff --git a/test/color3.spec.js b/test/color3.spec.js
@@ -326,5 +326,14 @@ tap.test('color3', t => {
     t.end();
   });
 
+  t.test('JSON.stringify', t => {
+    t.equal(
+      JSON.stringify({ colorA, colorB }),
+      '{"colorA":[1,2,3],"colorB":[4,5,6]}'
+    );
+
+    t.end();
+  });
+
   t.end();
 });
diff --git a/test/color4.spec.js b/test/color4.spec.js
@@ -329,5 +329,14 @@ tap.test('color4', t => {
     t.end();
   });
 
+  t.test('JSON.stringify', t => {
+    t.equal(
+      JSON.stringify({ colorA, colorB }),
+      '{"colorA":[1,2,3,4],"colorB":[5,6,7,8]}'
+    );
+
+    t.end();
+  });
+
   t.end();
 });
diff --git a/test/mat2.spec.js b/test/mat2.spec.js
@@ -438,5 +438,14 @@ tap.test('mat2', t => {
     t.end();
   });
 
+  t.test('JSON.stringify', t => {
+    t.equal(
+      JSON.stringify({ matA, matB }),
+      '{"matA":[1,2,3,4],"matB":[5,6,7,8]}'
+    );
+
+    t.end();
+  });
+
   t.end();
 });
diff --git a/test/mat23.spec.js b/test/mat23.spec.js
@@ -437,5 +437,14 @@ tap.test('mat23', t => {
     t.end();
   });
 
+  t.test('JSON.stringify', t => {
+    t.equal(
+      JSON.stringify({ matA, matB }),
+      '{"matA":[1,2,3,4,5,6],"matB":[7,8,9,10,11,12]}'
+    );
+
+    t.end();
+  });
+
   t.end();
 });
diff --git a/test/mat3.spec.js b/test/mat3.spec.js
@@ -575,5 +575,14 @@ tap.test('mat3', t => {
     t.end();
   });
 
+  t.test('JSON.stringify', t => {
+    t.equal(
+      JSON.stringify({ matA, matB }),
+      '{"matA":[1,0,0,0,1,0,1,2,1],"matB":[1,0,0,0,1,0,3,4,1]}'
+    );
+
+    t.end();
+  });
+
   t.end();
 });
diff --git a/test/mat4.spec.js b/test/mat4.spec.js
@@ -788,5 +788,14 @@ tap.test('mat4', t => {
     t.end();
   });
 
+  t.test('JSON.stringify', t => {
+    t.equal(
+      JSON.stringify({ matA, matB }),
+      '{"matA":[1,0,0,0,0,1,0,0,0,0,1,0,1,2,3,1],"matB":[1,0,0,0,0,1,0,0,0,0,1,0,4,5,6,1]}'
+    );
+
+    t.end();
+  });
+
   t.end();
 });
diff --git a/test/quat.spec.js b/test/quat.spec.js
@@ -799,5 +799,14 @@ tap.test('quat', t => {
     t.end();
   });
 
+  t.test('JSON.stringify', t => {
+    t.equal(
+      JSON.stringify({ quatA, quatB }),
+      '{"quatA":[1,2,3,4],"quatB":[5,6,7,8]}'
+    );
+
+    t.end();
+  });
+
   t.end();
 });
diff --git a/test/vec2.spec.js b/test/vec2.spec.js
diff --git a/test/vec3.spec.js b/test/vec3.spec.js
diff --git a/test/vec4.spec.js b/test/vec4.spec.js
