viral-viewer-2 4.8.0 → 4.8.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/camera/viral-camera.d.ts +1 -1
- package/dist/components/camera/viral-camera.js +2 -2
- package/dist/components/camera/viral-camera.js.map +1 -1
- package/dist/components/loader/viral-three.loader.d.ts +1 -1
- package/dist/components/post-processing/post-processing-renderer.d.ts +3 -14
- package/dist/components/post-processing/post-processing-renderer.js +7 -46
- package/dist/components/post-processing/post-processing-renderer.js.map +1 -1
- package/dist/components/scene/viral-scene.d.ts +1 -1
- package/dist/components/scene/viral-scene.js +1 -0
- package/dist/components/scene/viral-scene.js.map +1 -1
- package/dist/components/worker-script/load-model-worker-3.script.js +29 -13
- package/dist/components/worker-script/load-model-worker-3.script.js.map +1 -1
- package/dist/threejs-addon/gltf-loader.d.ts +1 -1
- package/dist/threejs-addon/n8ao/n8ao.d.ts +276 -0
- package/dist/threejs-addon/n8ao/n8ao.js +1952 -0
- package/dist/threejs-addon/n8ao/n8ao.js.map +1 -0
- package/dist/threejs-addon/post-processing/outline-pass.d.ts +7 -7
- package/dist/threejs-addon/post-processing/pass.d.ts +1 -1
- package/dist/threejs-addon/post-processing/sao-pass.d.ts +5 -5
- package/dist/threejs-addon/post-processing/ssaa-render-pass.d.ts +1 -1
- package/dist/threejs-addon/post-processing/unreal-bloom-pass.d.ts +3 -3
- package/dist/threejs-addon/transform-control.d.ts +3 -3
- package/package.json +4 -3
|
@@ -22,7 +22,7 @@ export declare class ViralCamera {
|
|
|
22
22
|
focusModelByName(objectName?: string): void;
|
|
23
23
|
getState(): ViralViewerState | null;
|
|
24
24
|
restoreState(state: ViralViewerState): void;
|
|
25
|
-
clientToWorld(): import("three").Intersection<Object3D<import("three").
|
|
25
|
+
clientToWorld(): import("three").Intersection<Object3D<import("three").Object3DEventMap>>[] | null;
|
|
26
26
|
worldToClient(point: Vector3): Vector3 | null;
|
|
27
27
|
private castRay;
|
|
28
28
|
updateMainCamera(): void;
|
|
@@ -30,7 +30,7 @@ class ViralCamera {
|
|
|
30
30
|
this.setupCamera();
|
|
31
31
|
}
|
|
32
32
|
setupCamera() {
|
|
33
|
-
this.camera = new three_1.PerspectiveCamera(60, this.targetElement.offsetWidth / this.targetElement.offsetHeight, 0.
|
|
33
|
+
this.camera = new three_1.PerspectiveCamera(60, this.targetElement.offsetWidth / this.targetElement.offsetHeight, 0.1, 2000000);
|
|
34
34
|
this.camera.position.set(0, 0, 2);
|
|
35
35
|
if (this.viralViewerApi.options && this.viralViewerApi.options.cameraZUp) {
|
|
36
36
|
this.camera.up.set(0, 0, 1);
|
|
@@ -60,7 +60,7 @@ class ViralCamera {
|
|
|
60
60
|
});
|
|
61
61
|
}
|
|
62
62
|
});
|
|
63
|
-
this.viralViewerApi.viralRenderer.postProcessingRenderer.
|
|
63
|
+
this.viralViewerApi.viralRenderer.postProcessingRenderer.initN8aoPass(this.viralViewerApi.viralScene.scene, this.camera);
|
|
64
64
|
// this.anim();
|
|
65
65
|
}
|
|
66
66
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"viral-camera.js","sourceRoot":"","sources":["../../../src/components/camera/viral-camera.ts"],"names":[],"mappings":";;;AAAA,qDAA6C;AAC7C,uCAAgG;AAEhG,iCAae;AACf,MAAM,aAAa,GAAG;IAClB,OAAO,EAAE,eAAO;IAChB,OAAO,EAAE,eAAO;IAChB,OAAO,EAAE,eAAO;IAChB,UAAU,EAAE,kBAAU;IACtB,OAAO,EAAE,eAAO;IAChB,SAAS,EAAE,iBAAS;IACpB,IAAI,EAAE,YAAI;IACV,MAAM,EAAE,cAAM;IACd,SAAS,EAAE,iBAAS;IACpB,SAAS,EAAE,iBAAS;CACvB,CAAC;AAGF,MAAa,WAAW;IAQpB,YAAmB,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;QAPjD,cAAS,GAAc,IAAI,iBAAS,EAAE,CAAC;QACvC,WAAM,GAA6B,IAAI,CAAC;QACxC,mBAAc,GAA0B,IAAI,CAAC;QAE7C,YAAO,GAAY,KAAK,CAAC;QAsJzB,uBAAuB;QACf,2BAAsB,GAA2B,EAAE,CAAC;QACpD,4BAAuB,GAA2B,EAAE,CAAC;QApJzD,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC;QAC3D,IAAI,CAAC,WAAW,EAAE,CAAC;IACvB,CAAC;IACM,WAAW;QACd,IAAI,CAAC,MAAM,GAAG,IAAI,yBAAiB,CAAC,EAAE,EAAE,IAAI,CAAC,aAAa,CAAC,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"viral-camera.js","sourceRoot":"","sources":["../../../src/components/camera/viral-camera.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,6 @@ export declare class ViralThreeLoader {
|
|
|
6
6
|
objectLoader: ObjectLoader;
|
|
7
7
|
gltfLoader: GLTFLoader;
|
|
8
8
|
constructor(viralViewerApi: ViralViewerApi);
|
|
9
|
-
parseObject(data: any): import("three").Object3D<import("three").
|
|
9
|
+
parseObject(data: any): import("three").Object3D<import("three").Object3DEventMap>;
|
|
10
10
|
loadGLTF(url: string, loaded?: (data: any) => void, onProgress?: (data: any) => void, onError?: (data: any) => void): void;
|
|
11
11
|
}
|
|
@@ -1,22 +1,11 @@
|
|
|
1
1
|
import { Camera, Scene, WebGLRenderer } from "three";
|
|
2
2
|
import { EffectComposer } from "../../threejs-addon/post-processing/effect-composer";
|
|
3
|
-
import {
|
|
4
|
-
import { SAOPass } from "../../threejs-addon/post-processing/sao-pass";
|
|
5
|
-
import { ShaderPass } from "../../threejs-addon/post-processing/shader-pass";
|
|
3
|
+
import { N8AOPass } from "../../threejs-addon/n8ao/n8ao";
|
|
6
4
|
export declare class PostProcessingRenderer {
|
|
7
5
|
private renderer;
|
|
8
6
|
composer: EffectComposer;
|
|
9
|
-
|
|
10
|
-
saoPass: SAOPass | null;
|
|
11
|
-
shaderPass: ShaderPass | null;
|
|
12
|
-
colorCorrectionPass: ShaderPass | null;
|
|
7
|
+
na8oPass: N8AOPass | null;
|
|
13
8
|
constructor(renderer: WebGLRenderer);
|
|
14
9
|
render(): void;
|
|
15
|
-
|
|
16
|
-
initSAOPass(scene: Scene, camera: Camera): void;
|
|
17
|
-
turnOnSAOPass(): void;
|
|
18
|
-
initShaderPass(): void;
|
|
19
|
-
turnOnShaderPass(): void;
|
|
20
|
-
initCorrectionColorPass(): void;
|
|
21
|
-
turnOnCorrectionColorPass(): void;
|
|
10
|
+
initN8aoPass(scene: Scene, camera: Camera): void;
|
|
22
11
|
}
|
|
@@ -2,61 +2,22 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.PostProcessingRenderer = void 0;
|
|
4
4
|
const effect_composer_1 = require("../../threejs-addon/post-processing/effect-composer");
|
|
5
|
-
const
|
|
6
|
-
const sao_pass_1 = require("../../threejs-addon/post-processing/sao-pass");
|
|
7
|
-
const shader_pass_1 = require("../../threejs-addon/post-processing/shader-pass");
|
|
8
|
-
const fxaa_shader_1 = require("../../threejs-addon/shaders/fxaa-shader");
|
|
9
|
-
const color_correction_shader_1 = require("../../threejs-addon/shaders/color-correction-shader");
|
|
5
|
+
const n8ao_1 = require("../../threejs-addon/n8ao/n8ao");
|
|
10
6
|
class PostProcessingRenderer {
|
|
11
7
|
constructor(renderer) {
|
|
12
8
|
this.renderer = renderer;
|
|
13
|
-
this.
|
|
14
|
-
this.saoPass = null;
|
|
15
|
-
this.shaderPass = null;
|
|
16
|
-
this.colorCorrectionPass = null;
|
|
9
|
+
this.na8oPass = null;
|
|
17
10
|
this.composer = new effect_composer_1.EffectComposer(this.renderer);
|
|
18
11
|
this.composer.setSize(window.innerWidth, window.innerHeight);
|
|
19
12
|
}
|
|
20
13
|
render() {
|
|
21
14
|
this.composer.render();
|
|
22
15
|
}
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
}
|
|
29
|
-
initSAOPass(scene, camera) {
|
|
30
|
-
if (!this.saoPass) {
|
|
31
|
-
this.saoPass = new sao_pass_1.SAOPass(scene, camera, true, true);
|
|
32
|
-
this.saoPass.resolution.set(8192, 8192);
|
|
33
|
-
this.saoPass.params.saoBias = 0.5;
|
|
34
|
-
this.saoPass.params.saoIntensity = 0.0012;
|
|
35
|
-
this.saoPass.params.saoScale = 0.3;
|
|
36
|
-
this.saoPass.params.saoKernelRadius = 40;
|
|
37
|
-
this.saoPass.params.saoMinResolution = 0;
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
turnOnSAOPass() {
|
|
41
|
-
this.composer.addPass(this.saoPass);
|
|
42
|
-
}
|
|
43
|
-
initShaderPass() {
|
|
44
|
-
this.shaderPass = new shader_pass_1.ShaderPass(fxaa_shader_1.FXAAShader);
|
|
45
|
-
const pixelRatio = this.renderer.getPixelRatio();
|
|
46
|
-
this.shaderPass.material.uniforms["resolution"].value.x =
|
|
47
|
-
1 / (window.innerWidth * pixelRatio);
|
|
48
|
-
this.shaderPass.material.uniforms["resolution"].value.y =
|
|
49
|
-
1 / (window.innerHeight * pixelRatio);
|
|
50
|
-
}
|
|
51
|
-
turnOnShaderPass() {
|
|
52
|
-
this.composer.addPass(this.shaderPass);
|
|
53
|
-
// this.composer.addPass(this.colorCorrectionPass);
|
|
54
|
-
}
|
|
55
|
-
initCorrectionColorPass() {
|
|
56
|
-
this.colorCorrectionPass = new shader_pass_1.ShaderPass(color_correction_shader_1.ColorCorrectionShader);
|
|
57
|
-
}
|
|
58
|
-
turnOnCorrectionColorPass() {
|
|
59
|
-
this.composer.addPass(this.colorCorrectionPass);
|
|
16
|
+
initN8aoPass(scene, camera) {
|
|
17
|
+
this.na8oPass = new n8ao_1.N8AOPass(scene, camera);
|
|
18
|
+
this.na8oPass.configuration.denoiseRadius = 12;
|
|
19
|
+
this.na8oPass.configuration.intensity = 5;
|
|
20
|
+
this.composer.addPass(this.na8oPass);
|
|
60
21
|
}
|
|
61
22
|
}
|
|
62
23
|
exports.PostProcessingRenderer = PostProcessingRenderer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"post-processing-renderer.js","sourceRoot":"","sources":["../../../src/components/post-processing/post-processing-renderer.ts"],"names":[],"mappings":";;;AACA,yFAAqF;AACrF,
|
|
1
|
+
{"version":3,"file":"post-processing-renderer.js","sourceRoot":"","sources":["../../../src/components/post-processing/post-processing-renderer.ts"],"names":[],"mappings":";;;AACA,yFAAqF;AACrF,wDAAyD;AACzD,MAAa,sBAAsB;IAGjC,YAAoB,QAAuB;QAAvB,aAAQ,GAAR,QAAQ,CAAe;QAD3C,aAAQ,GAAoB,IAAI,CAAC;QAE/B,IAAI,CAAC,QAAQ,GAAG,IAAI,gCAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IAC/D,CAAC;IAEM,MAAM;QACX,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;IACzB,CAAC;IAEM,YAAY,CAAC,KAAY,EAAE,MAAc;QAC9C,IAAI,CAAC,QAAQ,GAAG,IAAI,eAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC5C,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,aAAa,GAAG,EAAE,CAAC;QAC/C,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,SAAS,GAAG,CAAC,CAAC;QAE1C,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACvC,CAAC;CACF;AAnBD,wDAmBC"}
|
|
@@ -15,7 +15,7 @@ export declare class ViralScene {
|
|
|
15
15
|
addObject(object: Object3D): void;
|
|
16
16
|
addModel(object: Object3D): void;
|
|
17
17
|
addEdge(object: Object3D): void;
|
|
18
|
-
getObjectByName(name: string): Object3D<import("three").
|
|
18
|
+
getObjectByName(name: string): Object3D<import("three").Object3DEventMap> | undefined;
|
|
19
19
|
addLights(): void;
|
|
20
20
|
addPivotPoint(): void;
|
|
21
21
|
addTransformControls(): void;
|
|
@@ -58,6 +58,7 @@ class ViralScene {
|
|
|
58
58
|
sunlight.shadow.camera.far = 20000;
|
|
59
59
|
sunlight.shadow.mapSize.x = 1024;
|
|
60
60
|
sunlight.shadow.mapSize.y = 1024;
|
|
61
|
+
sunlight.shadow.bias = -0.005;
|
|
61
62
|
sunlight.visible = false;
|
|
62
63
|
const sunlightHelper = new three_1.CameraHelper(sunlight.shadow.camera);
|
|
63
64
|
sunlightHelper.visible = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"viral-scene.js","sourceRoot":"","sources":["../../../src/components/scene/viral-scene.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"viral-scene.js","sourceRoot":"","sources":["../../../src/components/scene/viral-scene.ts"],"names":[],"mappings":"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"}
|
|
@@ -13536,8 +13536,10 @@ function workerFunction() {
|
|
|
13536
13536
|
instancingColor: IS_INSTANCEDMESH && object.instanceColor !== null,
|
|
13537
13537
|
supportsVertexTextures: SUPPORTS_VERTEX_TEXTURES,
|
|
13538
13538
|
outputColorSpace: currentRenderTarget === null ?
|
|
13539
|
-
renderer.outputColorSpace :
|
|
13540
|
-
currentRenderTarget.
|
|
13539
|
+
renderer.outputColorSpace :
|
|
13540
|
+
currentRenderTarget.isXRRenderTarget === true ?
|
|
13541
|
+
currentRenderTarget.texture.colorSpace :
|
|
13542
|
+
LinearSRGBColorSpace,
|
|
13541
13543
|
map: HAS_MAP,
|
|
13542
13544
|
matcap: HAS_MATCAP,
|
|
13543
13545
|
envMap: HAS_ENVMAP,
|
|
@@ -14645,7 +14647,9 @@ function workerFunction() {
|
|
|
14645
14647
|
}
|
|
14646
14648
|
}
|
|
14647
14649
|
if (shadow.map === null || toVSM === true || fromVSM === true) {
|
|
14648
|
-
const pars = this.type !== VSMShadowMap ?
|
|
14650
|
+
const pars = this.type !== VSMShadowMap ?
|
|
14651
|
+
{ minFilter: NearestFilter, magFilter: NearestFilter } :
|
|
14652
|
+
{};
|
|
14649
14653
|
if (shadow.map !== null) {
|
|
14650
14654
|
shadow.map.dispose();
|
|
14651
14655
|
}
|
|
@@ -16513,7 +16517,8 @@ function workerFunction() {
|
|
|
16513
16517
|
}
|
|
16514
16518
|
else {
|
|
16515
16519
|
const textures = renderTarget.isWebGLMultipleRenderTargets === true ?
|
|
16516
|
-
renderTarget.texture :
|
|
16520
|
+
renderTarget.texture :
|
|
16521
|
+
[renderTarget.texture];
|
|
16517
16522
|
for (let i = 0; i < textures.length; i++) {
|
|
16518
16523
|
const texture = textures[i];
|
|
16519
16524
|
const glFormat = utils.convert(texture.format, texture.colorSpace);
|
|
@@ -16736,7 +16741,8 @@ function workerFunction() {
|
|
|
16736
16741
|
function updateRenderTargetMipmap(renderTarget) {
|
|
16737
16742
|
const supportsMips = isPowerOfTwo$1(renderTarget) || isWebGL2;
|
|
16738
16743
|
const textures = renderTarget.isWebGLMultipleRenderTargets === true ?
|
|
16739
|
-
renderTarget.texture :
|
|
16744
|
+
renderTarget.texture :
|
|
16745
|
+
[renderTarget.texture];
|
|
16740
16746
|
for (let i = 0, il = textures.length; i < il; i++) {
|
|
16741
16747
|
const texture = textures[i];
|
|
16742
16748
|
if (textureNeedsGenerateMipmaps(texture, supportsMips)) {
|
|
@@ -16755,7 +16761,8 @@ function workerFunction() {
|
|
|
16755
16761
|
renderTarget.samples > 0 &&
|
|
16756
16762
|
useMultisampledRTT(renderTarget) === false) {
|
|
16757
16763
|
const textures = renderTarget.isWebGLMultipleRenderTargets ?
|
|
16758
|
-
renderTarget.texture :
|
|
16764
|
+
renderTarget.texture :
|
|
16765
|
+
[renderTarget.texture];
|
|
16759
16766
|
const width = renderTarget.width;
|
|
16760
16767
|
const height = renderTarget.height;
|
|
16761
16768
|
let mask = _gl.COLOR_BUFFER_BIT;
|
|
@@ -17564,7 +17571,8 @@ function workerFunction() {
|
|
|
17564
17571
|
renderer.capabilities.isWebGL2 === false) {
|
|
17565
17572
|
const layerInit = {
|
|
17566
17573
|
antialias: session.renderState.layers === undefined ?
|
|
17567
|
-
attributes.antialias :
|
|
17574
|
+
attributes.antialias :
|
|
17575
|
+
true,
|
|
17568
17576
|
alpha: true,
|
|
17569
17577
|
depth: attributes.depth,
|
|
17570
17578
|
stencil: attributes.stencil,
|
|
@@ -18295,7 +18303,8 @@ function workerFunction() {
|
|
|
18295
18303
|
if (hasUniformChanged(uniform, i, cache) === true) {
|
|
18296
18304
|
const offset = uniform.__offset;
|
|
18297
18305
|
const values = Array.isArray(uniform.value) ?
|
|
18298
|
-
uniform.value :
|
|
18306
|
+
uniform.value :
|
|
18307
|
+
[uniform.value];
|
|
18299
18308
|
let arrayOffset = 0;
|
|
18300
18309
|
for (let i = 0; i < values.length; i++) {
|
|
18301
18310
|
const value = values[i];
|
|
@@ -18356,7 +18365,8 @@ function workerFunction() {
|
|
|
18356
18365
|
}
|
|
18357
18366
|
else {
|
|
18358
18367
|
const cachedObjects = Array.isArray(cache[index]) ?
|
|
18359
|
-
cache[index] :
|
|
18368
|
+
cache[index] :
|
|
18369
|
+
[cache[index]];
|
|
18360
18370
|
const values = Array.isArray(value) ? value : [value];
|
|
18361
18371
|
for (let i = 0; i < cachedObjects.length; i++) {
|
|
18362
18372
|
const cachedObject = cachedObjects[i];
|
|
@@ -18383,7 +18393,8 @@ function workerFunction() {
|
|
|
18383
18393
|
storage: 0, // bytes
|
|
18384
18394
|
};
|
|
18385
18395
|
const values = Array.isArray(uniform.value) ?
|
|
18386
|
-
uniform.value :
|
|
18396
|
+
uniform.value :
|
|
18397
|
+
[uniform.value];
|
|
18387
18398
|
for (let j = 0, jl = values.length; j < jl; j++) {
|
|
18388
18399
|
const value = values[j];
|
|
18389
18400
|
const info = getUniformSize(value);
|
|
@@ -19219,7 +19230,8 @@ function workerFunction() {
|
|
|
19219
19230
|
_transmissionRenderTarget = new WebGLRenderTarget(1024, 1024, {
|
|
19220
19231
|
generateMipmaps: true,
|
|
19221
19232
|
type: extensions.has("EXT_color_buffer_half_float") ?
|
|
19222
|
-
HalfFloatType :
|
|
19233
|
+
HalfFloatType :
|
|
19234
|
+
UnsignedByteType,
|
|
19223
19235
|
minFilter: LinearMipmapLinearFilter,
|
|
19224
19236
|
samples: isWebGL2 && antialias === true ? 4 : 0,
|
|
19225
19237
|
});
|
|
@@ -34085,12 +34097,14 @@ which can be placed in CurveUtils.
|
|
|
34085
34097
|
// let group = new Mesh();
|
|
34086
34098
|
//foreach solid create new InstancedMesh
|
|
34087
34099
|
let mergedGeometry = new BufferGeometry();
|
|
34088
|
-
let geometries = solids.map(x => x.geometry);
|
|
34100
|
+
let geometries = solids.map((x) => x.geometry);
|
|
34089
34101
|
mergedGeometry = mergeGeometries(geometries, true);
|
|
34090
34102
|
mergedGeometry.computeVertexNormals();
|
|
34091
34103
|
const instancedMesh = new InstancedMesh(mergedGeometry, [], data.Instances.length);
|
|
34092
34104
|
instancedMesh.userData.Instances = [];
|
|
34093
34105
|
instancedMesh.userData.MaterialIds = [];
|
|
34106
|
+
instancedMesh.receiveShadow = true;
|
|
34107
|
+
instancedMesh.castShadow = true;
|
|
34094
34108
|
for (let index = 0; index < solids.length; index++) {
|
|
34095
34109
|
const solid = solids[index];
|
|
34096
34110
|
// const startVertexCount =
|
|
@@ -34138,11 +34152,13 @@ which can be placed in CurveUtils.
|
|
|
34138
34152
|
}
|
|
34139
34153
|
else {
|
|
34140
34154
|
let mergedGeometry = new BufferGeometry();
|
|
34141
|
-
let geometries = solids.map(x => x.geometry);
|
|
34155
|
+
let geometries = solids.map((x) => x.geometry);
|
|
34142
34156
|
mergedGeometry = mergeGeometries(geometries, true);
|
|
34143
34157
|
mergedGeometry.computeVertexNormals();
|
|
34144
34158
|
//recreate element by combine solids
|
|
34145
34159
|
const mesh = new Mesh(mergedGeometry);
|
|
34160
|
+
mesh.receiveShadow = true;
|
|
34161
|
+
mesh.castShadow = true;
|
|
34146
34162
|
mesh.userData.MaterialIds = [];
|
|
34147
34163
|
for (let index = 0; index < solids.length; index++) {
|
|
34148
34164
|
const solid = solids[index];
|