瀏覽代碼

Object3D: Simplify layers serialization one more time

Mugen87 7 年之前
父節點
當前提交
362c802e14
共有 3 個文件被更改,包括 5 次插入11 次删除
  1. 1 1
      src/core/Object3D.js
  2. 1 1
      src/loaders/ObjectLoader.js
  3. 3 9
      test/unit/src/core/Object3D.tests.js

+ 1 - 1
src/core/Object3D.js

@@ -659,7 +659,7 @@ Object3D.prototype = Object.assign( Object.create( EventDispatcher.prototype ),
 		if ( this.renderOrder !== 0 ) object.renderOrder = this.renderOrder;
 		if ( JSON.stringify( this.userData ) !== '{}' ) object.userData = this.userData;
 
-		object.layers = { mask: this.layers.mask };
+		object.layers = this.layers.mask;
 		object.matrix = this.matrix.toArray();
 
 		if ( this.matrixAutoUpdate === false ) object.matrixAutoUpdate = false;

+ 1 - 1
src/loaders/ObjectLoader.js

@@ -865,7 +865,7 @@ Object.assign( ObjectLoader.prototype, {
 		if ( data.frustumCulled !== undefined ) object.frustumCulled = data.frustumCulled;
 		if ( data.renderOrder !== undefined ) object.renderOrder = data.renderOrder;
 		if ( data.userData !== undefined ) object.userData = data.userData;
-		if ( data.layers !== undefined ) object.layers.mask = data.layers.mask;
+		if ( data.layers !== undefined ) object.layers.mask = data.layers;
 
 		if ( data.children !== undefined ) {
 

+ 3 - 9
test/unit/src/core/Object3D.tests.js

@@ -512,25 +512,19 @@ export default QUnit.module( 'Core', () => {
 					"receiveShadow": true,
 					"visible": false,
 					"userData": { "foo": "bar" },
-					"layers": {
-		      	"mask": 1
-			    },
+					"layers": 1,
 					"matrix": [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ],
 					"children": [
 						{
 							"uuid": "5D4E9AE8-DA61-4912-A575-71A5BE3D72CD",
 							"type": "Object3D",
-							"layers": {
-								"mask": 1
-							},
+							"layers": 1,
 							"matrix": [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ],
 							"children": [
 								{
 									"uuid": "B43854B3-E970-4E85-BD41-AAF8D7BFA189",
 									"type": "Object3D",
-									"layers": {
-										"mask": 1
-									},
+									"layers": 1,
 									"matrix": [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ]
 								}
 							]