viral-viewer-2 4.7.2 → 4.7.3

package/dist/components/worker-script/load-model-worker-3.script.js

@@ -13536,10 +13536,8 @@ function workerFunction() {
                 instancingColor: IS_INSTANCEDMESH && object.instanceColor !== null,
                 supportsVertexTextures: SUPPORTS_VERTEX_TEXTURES,
                 outputColorSpace: currentRenderTarget === null ?
-                    renderer.outputColorSpace :
-                    currentRenderTarget.isXRRenderTarget === true ?
-                        currentRenderTarget.texture.colorSpace :
-                        LinearSRGBColorSpace,
+                    renderer.outputColorSpace : currentRenderTarget.isXRRenderTarget === true ?
+                    currentRenderTarget.texture.colorSpace : LinearSRGBColorSpace,
                 map: HAS_MAP,
                 matcap: HAS_MATCAP,
                 envMap: HAS_ENVMAP,
@@ -14647,9 +14645,7 @@ function workerFunction() {
                     }
                 }
                 if (shadow.map === null || toVSM === true || fromVSM === true) {
-                    const pars = this.type !== VSMShadowMap ?
-                        { minFilter: NearestFilter, magFilter: NearestFilter } :
-                        {};
+                    const pars = this.type !== VSMShadowMap ? { minFilter: NearestFilter, magFilter: NearestFilter } : {};
                     if (shadow.map !== null) {
                         shadow.map.dispose();
                     }
@@ -16517,8 +16513,7 @@ function workerFunction() {
             }
             else {
                 const textures = renderTarget.isWebGLMultipleRenderTargets === true ?
-                    renderTarget.texture :
-                    [renderTarget.texture];
+                    renderTarget.texture : [renderTarget.texture];
                 for (let i = 0; i < textures.length; i++) {
                     const texture = textures[i];
                     const glFormat = utils.convert(texture.format, texture.colorSpace);
@@ -16741,8 +16736,7 @@ function workerFunction() {
         function updateRenderTargetMipmap(renderTarget) {
             const supportsMips = isPowerOfTwo$1(renderTarget) || isWebGL2;
             const textures = renderTarget.isWebGLMultipleRenderTargets === true ?
-                renderTarget.texture :
-                [renderTarget.texture];
+                renderTarget.texture : [renderTarget.texture];
             for (let i = 0, il = textures.length; i < il; i++) {
                 const texture = textures[i];
                 if (textureNeedsGenerateMipmaps(texture, supportsMips)) {
@@ -16761,8 +16755,7 @@ function workerFunction() {
                 renderTarget.samples > 0 &&
                 useMultisampledRTT(renderTarget) === false) {
                 const textures = renderTarget.isWebGLMultipleRenderTargets ?
-                    renderTarget.texture :
-                    [renderTarget.texture];
+                    renderTarget.texture : [renderTarget.texture];
                 const width = renderTarget.width;
                 const height = renderTarget.height;
                 let mask = _gl.COLOR_BUFFER_BIT;
@@ -17571,8 +17564,7 @@ function workerFunction() {
                             renderer.capabilities.isWebGL2 === false) {
                             const layerInit = {
                                 antialias: session.renderState.layers === undefined ?
-                                    attributes.antialias :
-                                    true,
+                                    attributes.antialias : true,
                                 alpha: true,
                                 depth: attributes.depth,
                                 stencil: attributes.stencil,
@@ -18303,8 +18295,7 @@ function workerFunction() {
                 if (hasUniformChanged(uniform, i, cache) === true) {
                     const offset = uniform.__offset;
                     const values = Array.isArray(uniform.value) ?
-                        uniform.value :
-                        [uniform.value];
+                        uniform.value : [uniform.value];
                     let arrayOffset = 0;
                     for (let i = 0; i < values.length; i++) {
                         const value = values[i];
@@ -18365,8 +18356,7 @@ function workerFunction() {
                 }
                 else {
                     const cachedObjects = Array.isArray(cache[index]) ?
-                        cache[index] :
-                        [cache[index]];
+                        cache[index] : [cache[index]];
                     const values = Array.isArray(value) ? value : [value];
                     for (let i = 0; i < cachedObjects.length; i++) {
                         const cachedObject = cachedObjects[i];
@@ -18393,8 +18383,7 @@ function workerFunction() {
                     storage: 0, // bytes
                 };
                 const values = Array.isArray(uniform.value) ?
-                    uniform.value :
-                    [uniform.value];
+                    uniform.value : [uniform.value];
                 for (let j = 0, jl = values.length; j < jl; j++) {
                     const value = values[j];
                     const info = getUniformSize(value);
@@ -19230,8 +19219,7 @@ function workerFunction() {
                     _transmissionRenderTarget = new WebGLRenderTarget(1024, 1024, {
                         generateMipmaps: true,
                         type: extensions.has("EXT_color_buffer_half_float") ?
-                            HalfFloatType :
-                            UnsignedByteType,
+                            HalfFloatType : UnsignedByteType,
                         minFilter: LinearMipmapLinearFilter,
                         samples: isWebGL2 && antialias === true ? 4 : 0,
                     });
@@ -34100,12 +34088,19 @@ which can be placed in CurveUtils.
                 const instancedMesh = new InstancedMesh(mergedGeometry, new MeshBasicMaterial(), data.Instances.length);
                 instancedMesh.userData.Instances = [];
                 instancedMesh.userData.MaterialIds = [];
+                let geometries = solids.map(x => x.geometry);
+                mergedGeometry = mergeGeometries(geometries, true);
                 for (let index = 0; index < solids.length; index++) {
                     const solid = solids[index];
-                    const startVertexCount = index == 0 ? 0 : mergedGeometry.attributes.position.count;
-                    mergedGeometry = mergedGeometry.merge(solid.geometry);
-                    const endVertexCount = mergedGeometry.attributes.position.count;
-                    mergedGeometry.groups.addGroup(startVertexCount, endVertexCount, index);
+                    // const startVertexCount =
+                    //     index == 0 ? 0 : mergedGeometry.attributes.position.count;
+                    // mergedGeometry = mergedGeometry.merge(solid.geometry);
+                    // const endVertexCount = mergedGeometry.attributes.position.count;
+                    // mergedGeometry.groups.addGroup(
+                    //     startVertexCount,
+                    //     endVertexCount,
+                    //     index
+                    // );
                     instancedMesh.userData.MaterialIds.push(solid.userData.MaterialId);
                     // group.add(instancedMesh);
                 }