From bbdf1358461c09945719082d09613abb73d0e499 Mon Sep 17 00:00:00 2001 From: Mugen87 Date: Sat, 16 Jun 2018 12:13:20 +0200 Subject: [PATCH] Layers: Added serialization/ deserialization --- src/core/Object3D.js | 7 +++++++ src/loaders/ObjectLoader.js | 1 + 2 files changed, 8 insertions(+) diff --git a/src/core/Object3D.js b/src/core/Object3D.js index 0c2c04369c..95ed64f41f 100644 --- a/src/core/Object3D.js +++ b/src/core/Object3D.js @@ -663,6 +663,13 @@ Object3D.prototype = Object.assign( Object.create( EventDispatcher.prototype ), if ( this.matrixAutoUpdate === false ) object.matrixAutoUpdate = false; + if ( this.layers.mask !== 1 ) { + + object.layers = {}; + object.layers.mask = this.layers.mask; + + } + // function serialize( library, element ) { diff --git a/src/loaders/ObjectLoader.js b/src/loaders/ObjectLoader.js index f7adc4efe8..83e5abbc4d 100644 --- a/src/loaders/ObjectLoader.js +++ b/src/loaders/ObjectLoader.js @@ -865,6 +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.children !== undefined ) { -- GitLab