提交 362c802e 编写于 作者: M Mugen87

Object3D: Simplify layers serialization one more time

上级 0d19af32
......@@ -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;
......
......@@ -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 ) {
......
......@@ -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 ]
}
]
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册