@shapediver/viewer.rendering-engine.rendering-engine-threejs 3.9.0 → 3.9.1
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/README.md +1 -1
- package/dist/RenderingEngine.d.ts +23 -23
- package/dist/RenderingEngine.d.ts.map +1 -1
- package/dist/RenderingEngine.js +245 -128
- package/dist/RenderingEngine.js.map +1 -1
- package/dist/index.d.ts +11 -11
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +12 -11
- package/dist/index.js.map +1 -1
- package/dist/injectors/TextureUnifierInjector.d.ts.map +1 -1
- package/dist/injectors/TextureUnifierInjector.js +22 -13
- package/dist/injectors/TextureUnifierInjector.js.map +1 -1
- package/dist/interfaces/ILoader.d.ts.map +1 -1
- package/dist/interfaces/IPostProcessingEffectDefinitions.d.ts.map +1 -1
- package/dist/interfaces/IPostProcessingEffectDefinitions.js.map +1 -1
- package/dist/interfaces/IRenderingEngine.d.ts +6 -6
- package/dist/interfaces/IRenderingEngine.d.ts.map +1 -1
- package/dist/loaders/EnvironmentMapLoader.d.ts +3 -3
- package/dist/loaders/EnvironmentMapLoader.d.ts.map +1 -1
- package/dist/loaders/EnvironmentMapLoader.js +150 -52
- package/dist/loaders/EnvironmentMapLoader.js.map +1 -1
- package/dist/loaders/GeometryLoader.d.ts +6 -6
- package/dist/loaders/GeometryLoader.d.ts.map +1 -1
- package/dist/loaders/GeometryLoader.js +140 -93
- package/dist/loaders/GeometryLoader.js.map +1 -1
- package/dist/loaders/HTMLElementAnchorLoader.d.ts +4 -4
- package/dist/loaders/HTMLElementAnchorLoader.d.ts.map +1 -1
- package/dist/loaders/HTMLElementAnchorLoader.js +26 -14
- package/dist/loaders/HTMLElementAnchorLoader.js.map +1 -1
- package/dist/loaders/LightLoader.d.ts +5 -5
- package/dist/loaders/LightLoader.d.ts.map +1 -1
- package/dist/loaders/LightLoader.js +43 -15
- package/dist/loaders/LightLoader.js.map +1 -1
- package/dist/loaders/MaterialLoader.d.ts +17 -17
- package/dist/loaders/MaterialLoader.d.ts.map +1 -1
- package/dist/loaders/MaterialLoader.js +563 -198
- package/dist/loaders/MaterialLoader.js.map +1 -1
- package/dist/managers/CameraManager.d.ts +6 -6
- package/dist/managers/CameraManager.d.ts.map +1 -1
- package/dist/managers/CameraManager.js +47 -27
- package/dist/managers/CameraManager.js.map +1 -1
- package/dist/managers/EnvironmentGeometryManager.d.ts +7 -7
- package/dist/managers/EnvironmentGeometryManager.d.ts.map +1 -1
- package/dist/managers/EnvironmentGeometryManager.js +20 -8
- package/dist/managers/EnvironmentGeometryManager.js.map +1 -1
- package/dist/managers/PostProcessingManager.d.ts +9 -9
- package/dist/managers/PostProcessingManager.d.ts.map +1 -1
- package/dist/managers/PostProcessingManager.js +358 -173
- package/dist/managers/PostProcessingManager.js.map +1 -1
- package/dist/managers/RenderingManager.d.ts +4 -4
- package/dist/managers/RenderingManager.d.ts.map +1 -1
- package/dist/managers/RenderingManager.js +164 -79
- package/dist/managers/RenderingManager.js.map +1 -1
- package/dist/managers/SceneTracingManager.d.ts +3 -3
- package/dist/managers/SceneTracingManager.d.ts.map +1 -1
- package/dist/managers/SceneTracingManager.js +12 -9
- package/dist/managers/SceneTracingManager.js.map +1 -1
- package/dist/managers/SceneTreeManager.d.ts +7 -7
- package/dist/managers/SceneTreeManager.d.ts.map +1 -1
- package/dist/managers/SceneTreeManager.js +100 -52
- package/dist/managers/SceneTreeManager.js.map +1 -1
- package/dist/managers/environmentGeometry/ContactShadow.d.ts +4 -4
- package/dist/managers/environmentGeometry/ContactShadow.d.ts.map +1 -1
- package/dist/managers/environmentGeometry/ContactShadow.js +14 -9
- package/dist/managers/environmentGeometry/ContactShadow.js.map +1 -1
- package/dist/managers/environmentGeometry/Grid.d.ts +5 -5
- package/dist/managers/environmentGeometry/Grid.d.ts.map +1 -1
- package/dist/managers/environmentGeometry/Grid.js +28 -13
- package/dist/managers/environmentGeometry/Grid.js.map +1 -1
- package/dist/managers/environmentGeometry/GroundPlane.d.ts +5 -5
- package/dist/managers/environmentGeometry/GroundPlane.d.ts.map +1 -1
- package/dist/managers/environmentGeometry/GroundPlane.js +17 -10
- package/dist/managers/environmentGeometry/GroundPlane.js.map +1 -1
- package/dist/managers/environmentGeometry/GroundPlaneShadow.d.ts +5 -5
- package/dist/managers/environmentGeometry/GroundPlaneShadow.d.ts.map +1 -1
- package/dist/managers/environmentGeometry/GroundPlaneShadow.js +11 -8
- package/dist/managers/environmentGeometry/GroundPlaneShadow.js.map +1 -1
- package/dist/managers/environmentGeometry/IEnvironmentGeometry.d.ts +2 -2
- package/dist/managers/environmentGeometry/IEnvironmentGeometry.d.ts.map +1 -1
- package/dist/managers/postprocessing/GodRaysManager.d.ts +3 -3
- package/dist/managers/postprocessing/GodRaysManager.d.ts.map +1 -1
- package/dist/managers/postprocessing/GodRaysManager.js +5 -5
- package/dist/managers/postprocessing/GodRaysManager.js.map +1 -1
- package/dist/managers/postprocessing/OutlineManager.d.ts +3 -3
- package/dist/managers/postprocessing/OutlineManager.d.ts.map +1 -1
- package/dist/managers/postprocessing/OutlineManager.js +1 -1
- package/dist/managers/postprocessing/OutlineManager.js.map +1 -1
- package/dist/managers/postprocessing/SSAARenderPass.d.ts +12 -12
- package/dist/managers/postprocessing/SSAARenderPass.d.ts.map +1 -1
- package/dist/managers/postprocessing/SSAARenderPass.js +83 -35
- package/dist/managers/postprocessing/SSAARenderPass.js.map +1 -1
- package/dist/managers/postprocessing/SelectiveBloomManager.d.ts +3 -3
- package/dist/managers/postprocessing/SelectiveBloomManager.d.ts.map +1 -1
- package/dist/managers/postprocessing/SelectiveBloomManager.js +1 -1
- package/dist/managers/postprocessing/SelectiveBloomManager.js.map +1 -1
- package/dist/managers/postprocessing/ao/ao/AOEffect.d.ts +5 -5
- package/dist/managers/postprocessing/ao/ao/AOEffect.d.ts.map +1 -1
- package/dist/managers/postprocessing/ao/ao/AOEffect.js +43 -34
- package/dist/managers/postprocessing/ao/ao/AOEffect.js.map +1 -1
- package/dist/managers/postprocessing/ao/ao/AOPass.d.ts +2 -2
- package/dist/managers/postprocessing/ao/ao/AOPass.d.ts.map +1 -1
- package/dist/managers/postprocessing/ao/ao/AOPass.js +26 -14
- package/dist/managers/postprocessing/ao/ao/AOPass.js.map +1 -1
- package/dist/managers/postprocessing/ao/hbao/HBAOEffect.d.ts +3 -3
- package/dist/managers/postprocessing/ao/hbao/HBAOEffect.d.ts.map +1 -1
- package/dist/managers/postprocessing/ao/hbao/HBAOEffect.js +2 -2
- package/dist/managers/postprocessing/ao/hbao/HBAOEffect.js.map +1 -1
- package/dist/managers/postprocessing/ao/poissionDenoise/PoissionDenoisePass.d.ts +2 -2
- package/dist/managers/postprocessing/ao/poissionDenoise/PoissionDenoisePass.d.ts.map +1 -1
- package/dist/managers/postprocessing/ao/poissionDenoise/PoissionDenoisePass.js +51 -36
- package/dist/managers/postprocessing/ao/poissionDenoise/PoissionDenoisePass.js.map +1 -1
- package/dist/managers/postprocessing/ao/ssao/SSAOEffect.d.ts +3 -3
- package/dist/managers/postprocessing/ao/ssao/SSAOEffect.d.ts.map +1 -1
- package/dist/managers/postprocessing/ao/ssao/SSAOEffect.js +15 -10
- package/dist/managers/postprocessing/ao/ssao/SSAOEffect.js.map +1 -1
- package/dist/managers/postprocessing/ao/utils/shader/basic.d.ts.map +1 -1
- package/dist/managers/postprocessing/ao/utils/shader/basic.js.map +1 -1
- package/dist/managers/postprocessing/ao/utils/shader/sampleBlueNoise.d.ts.map +1 -1
- package/dist/managers/postprocessing/ao/utils/shader/sampleBlueNoise.js.map +1 -1
- package/dist/managers/postprocessing/effects/tone-mapping/ToneMappingEffect.d.ts +2 -2
- package/dist/managers/postprocessing/effects/tone-mapping/ToneMappingEffect.d.ts.map +1 -1
- package/dist/managers/postprocessing/effects/tone-mapping/ToneMappingEffect.js +43 -35
- package/dist/managers/postprocessing/effects/tone-mapping/ToneMappingEffect.js.map +1 -1
- package/dist/managers/postprocessing/utils/CopyMaterial.d.ts.map +1 -1
- package/dist/managers/postprocessing/utils/CopyMaterial.js +2 -2
- package/dist/managers/postprocessing/utils/CopyMaterial.js.map +1 -1
- package/dist/managers/postprocessing/utils/CopyShader.d.ts.map +1 -1
- package/dist/managers/postprocessing/utils/CopyShader.js +4 -4
- package/dist/managers/postprocessing/utils/CopyShader.js.map +1 -1
- package/dist/managers/postprocessing/utils/FullScreenQuad.d.ts +1 -1
- package/dist/managers/postprocessing/utils/FullScreenQuad.d.ts.map +1 -1
- package/dist/managers/postprocessing/utils/FullScreenQuad.js +2 -2
- package/dist/managers/postprocessing/utils/FullScreenQuad.js.map +1 -1
- package/dist/managers/postprocessing/utils/NormalPass.d.ts +2 -2
- package/dist/managers/postprocessing/utils/NormalPass.d.ts.map +1 -1
- package/dist/managers/postprocessing/utils/NormalPass.js +3 -3
- package/dist/managers/postprocessing/utils/NormalPass.js.map +1 -1
- package/dist/managers/postprocessing/utils/RenderPass.d.ts +2 -2
- package/dist/managers/postprocessing/utils/RenderPass.d.ts.map +1 -1
- package/dist/managers/postprocessing/utils/RenderPass.js +14 -5
- package/dist/managers/postprocessing/utils/RenderPass.js.map +1 -1
- package/dist/materials/GemMaterial.d.ts +2 -2
- package/dist/materials/GemMaterial.d.ts.map +1 -1
- package/dist/materials/GemMaterial.js +20 -20
- package/dist/materials/GemMaterial.js.map +1 -1
- package/dist/materials/MeshUnlitMaterialParameters.d.ts +1 -1
- package/dist/materials/MeshUnlitMaterialParameters.d.ts.map +1 -1
- package/dist/materials/MultiPointsMaterial.d.ts +1 -1
- package/dist/materials/MultiPointsMaterial.d.ts.map +1 -1
- package/dist/materials/MultiPointsMaterial.js +46 -45
- package/dist/materials/MultiPointsMaterial.js.map +1 -1
- package/dist/materials/SpecularGlossinessMaterial.d.ts +2 -2
- package/dist/materials/SpecularGlossinessMaterial.d.ts.map +1 -1
- package/dist/materials/SpecularGlossinessMaterial.js +47 -47
- package/dist/materials/SpecularGlossinessMaterial.js.map +1 -1
- package/dist/objects/SDBone.d.ts +3 -3
- package/dist/objects/SDBone.d.ts.map +1 -1
- package/dist/objects/SDBone.js.map +1 -1
- package/dist/objects/SDColor.d.ts +2 -2
- package/dist/objects/SDColor.d.ts.map +1 -1
- package/dist/objects/SDColor.js +15 -11
- package/dist/objects/SDColor.js.map +1 -1
- package/dist/objects/SDData.d.ts +1 -1
- package/dist/objects/SDData.d.ts.map +1 -1
- package/dist/objects/SDData.js.map +1 -1
- package/dist/objects/SDObject.d.ts +3 -3
- package/dist/objects/SDObject.d.ts.map +1 -1
- package/dist/objects/SDObject.js.map +1 -1
- package/dist/shaders/PCSS.d.ts.map +1 -1
- package/dist/shaders/PCSS.js.map +1 -1
- package/dist/shaders/gem.d.ts.map +1 -1
- package/dist/shaders/gem.js.map +1 -1
- package/dist/three/CSS2DRenderer.d.ts +1 -1
- package/dist/three/CSS2DRenderer.d.ts.map +1 -1
- package/dist/three/CSS2DRenderer.js +33 -17
- package/dist/three/CSS2DRenderer.js.map +1 -1
- package/dist/three/geometries/TextGeometry.d.ts +1 -1
- package/dist/three/geometries/TextGeometry.d.ts.map +1 -1
- package/dist/three/geometries/TextGeometry.js +3 -2
- package/dist/three/geometries/TextGeometry.js.map +1 -1
- package/dist/three/loaders/RGBELoader.d.ts +1 -1
- package/dist/three/loaders/RGBELoader.d.ts.map +1 -1
- package/dist/three/loaders/RGBELoader.js +59 -46
- package/dist/three/loaders/RGBELoader.js.map +1 -1
- package/dist/types/IThreejsData.d.ts +2 -2
- package/dist/types/IThreejsData.d.ts.map +1 -1
- package/dist/types/ThreejsData.d.ts +3 -3
- package/dist/types/ThreejsData.d.ts.map +1 -1
- package/dist/types/ThreejsData.js.map +1 -1
- package/package.json +63 -63
|
@@ -24,10 +24,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
exports.ContactShadow = void 0;
|
|
27
|
-
const SDData_1 = require("../../objects/SDData");
|
|
28
27
|
const THREE = __importStar(require("three"));
|
|
29
28
|
const HorizontalBlurShader_js_1 = require("three/examples/jsm/shaders/HorizontalBlurShader.js");
|
|
30
29
|
const VerticalBlurShader_js_1 = require("three/examples/jsm/shaders/VerticalBlurShader.js");
|
|
30
|
+
const SDData_1 = require("../../objects/SDData");
|
|
31
31
|
class ContactShadow {
|
|
32
32
|
// #endregion Properties (17)
|
|
33
33
|
// #region Constructors (1)
|
|
@@ -36,12 +36,12 @@ class ContactShadow {
|
|
|
36
36
|
this._parent = _parent;
|
|
37
37
|
// #region Properties (17)
|
|
38
38
|
this._blur = 1.5;
|
|
39
|
-
this._color =
|
|
39
|
+
this._color = "#ffffff";
|
|
40
40
|
this._darkness = 2.5;
|
|
41
41
|
this._height = 0.25;
|
|
42
42
|
this._opacity = 1;
|
|
43
43
|
this._currentGridExtents = 1;
|
|
44
|
-
this._contactShadowObject = new SDData_1.SDData(
|
|
44
|
+
this._contactShadowObject = new SDData_1.SDData("contactShadow", "");
|
|
45
45
|
this._contactShadowObject.visible = false;
|
|
46
46
|
this._contactShadowObject.userData.ambientOcclusion = false;
|
|
47
47
|
this._parent.add(this._contactShadowObject);
|
|
@@ -122,7 +122,10 @@ class ContactShadow {
|
|
|
122
122
|
const excludedObjects = [];
|
|
123
123
|
this._renderingEngine.scene.traverse(function (object) {
|
|
124
124
|
if (object.visible === true) {
|
|
125
|
-
if (object instanceof THREE.Line ||
|
|
125
|
+
if (object instanceof THREE.Line ||
|
|
126
|
+
object instanceof THREE.LineLoop ||
|
|
127
|
+
object instanceof THREE.LineSegments ||
|
|
128
|
+
object instanceof THREE.Points) {
|
|
126
129
|
excludedObjects.push(object);
|
|
127
130
|
object.visible = false;
|
|
128
131
|
}
|
|
@@ -153,8 +156,10 @@ class ContactShadow {
|
|
|
153
156
|
object.visible = true;
|
|
154
157
|
this._plane.visible = true;
|
|
155
158
|
this._renderingEngine.gridVisibility = initialGridVisibility;
|
|
156
|
-
this._renderingEngine.groundPlaneVisibility =
|
|
157
|
-
|
|
159
|
+
this._renderingEngine.groundPlaneVisibility =
|
|
160
|
+
initialGroundPlaneVisibility;
|
|
161
|
+
this._renderingEngine.groundPlaneShadowVisibility =
|
|
162
|
+
initialGroundPlaneShadowVisibility;
|
|
158
163
|
}
|
|
159
164
|
updatePosition(position) {
|
|
160
165
|
this._contactShadowObject.position.set(position[0], position[1], position[2]);
|
|
@@ -166,13 +171,13 @@ class ContactShadow {
|
|
|
166
171
|
// blur horizontally and draw in the renderTargetBlur
|
|
167
172
|
this._blurPlane.material = this._horizontalBlurMaterial;
|
|
168
173
|
this._blurPlane.material.uniforms.tDiffuse.value = this._renderTarget.texture;
|
|
169
|
-
this._horizontalBlurMaterial.uniforms.h.value = amount * 1 / 256;
|
|
174
|
+
this._horizontalBlurMaterial.uniforms.h.value = (amount * 1) / 256;
|
|
170
175
|
this._renderingEngine.renderer.setRenderTarget(this._renderTargetBlur);
|
|
171
176
|
this._renderingEngine.renderer.render(this._blurPlane, this._shadowCamera);
|
|
172
177
|
// blur vertically and draw in the main renderTarget
|
|
173
178
|
this._blurPlane.material = this._verticalBlurMaterial;
|
|
174
179
|
this._blurPlane.material.uniforms.tDiffuse.value = this._renderTargetBlur.texture;
|
|
175
|
-
this._verticalBlurMaterial.uniforms.v.value = amount * 1 / 256;
|
|
180
|
+
this._verticalBlurMaterial.uniforms.v.value = (amount * 1) / 256;
|
|
176
181
|
this._renderingEngine.renderer.setRenderTarget(this._renderTarget);
|
|
177
182
|
this._renderingEngine.renderer.render(this._blurPlane, this._shadowCamera);
|
|
178
183
|
this._blurPlane.visible = false;
|
|
@@ -229,7 +234,7 @@ class ContactShadow {
|
|
|
229
234
|
shader.uniforms.darkness = this._depthMaterial.userData.darkness;
|
|
230
235
|
shader.fragmentShader = /* glsl */ `
|
|
231
236
|
uniform float darkness;
|
|
232
|
-
${shader.fragmentShader.replace(
|
|
237
|
+
${shader.fragmentShader.replace("gl_FragColor = vec4( vec3( 1.0 - fragCoordZ ), opacity );", "gl_FragColor = vec4( vec3( 0.0 ), ( 1.0 - fragCoordZ ) * darkness );")}
|
|
233
238
|
`;
|
|
234
239
|
};
|
|
235
240
|
this._depthMaterial.depthTest = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ContactShadow.js","sourceRoot":"","sources":["../../../src/managers/environmentGeometry/ContactShadow.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"ContactShadow.js","sourceRoot":"","sources":["../../../src/managers/environmentGeometry/ContactShadow.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { Color } from
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import { SDObject } from
|
|
5
|
-
import { IEnvironmentGeometry } from
|
|
1
|
+
import { Color } from "@shapediver/viewer.shared.types";
|
|
2
|
+
import { vec3 } from "gl-matrix";
|
|
3
|
+
import { RenderingEngine } from "../..";
|
|
4
|
+
import { SDObject } from "../../objects/SDObject";
|
|
5
|
+
import { IEnvironmentGeometry } from "./IEnvironmentGeometry";
|
|
6
6
|
export declare class Grid implements IEnvironmentGeometry {
|
|
7
7
|
private readonly _renderingEngine;
|
|
8
8
|
private readonly _parent;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Grid.d.ts","sourceRoot":"","sources":["../../../src/managers/environmentGeometry/Grid.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Grid.d.ts","sourceRoot":"","sources":["../../../src/managers/environmentGeometry/Grid.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,KAAK,EAAC,MAAM,iCAAiC,CAAC;AACtD,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AAE/B,OAAO,EAAC,eAAe,EAAC,MAAM,OAAO,CAAC;AAEtC,OAAO,EAAC,QAAQ,EAAC,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAE5D,qBAAa,IAAK,YAAW,oBAAoB;IAc/C,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAZzB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiC;IAE5D,OAAO,CAAC,KAAK,CAAoB;IACjC,OAAO,CAAC,MAAM,CAAsB;IACpC,OAAO,CAAC,WAAW,CAAU;gBAOX,gBAAgB,EAAE,eAAe,EACjC,OAAO,EAAE,QAAQ;IAsBnC,IAAW,KAAK,IAAI,KAAK,CAExB;IAED,IAAW,KAAK,CAAC,KAAK,EAAE,KAAK,EAW5B;IAED,IAAW,OAAO,IAAI,OAAO,CAE5B;IAED,IAAW,OAAO,CAAC,KAAK,EAAE,OAAO,EAEhC;IAMM,kBAAkB,CACxB,QAAQ,EAAE,IAAI,EACd,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GACjB,IAAI;IAkBA,cAAc,CAAC,QAAQ,EAAE,IAAI,GAAG,IAAI;CAM3C"}
|
|
@@ -24,9 +24,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
exports.Grid = void 0;
|
|
27
|
-
const SDData_1 = require("../../objects/SDData");
|
|
28
|
-
const THREE = __importStar(require("three"));
|
|
29
27
|
const viewer_shared_services_1 = require("@shapediver/viewer.shared.services");
|
|
28
|
+
const THREE = __importStar(require("three"));
|
|
29
|
+
const SDData_1 = require("../../objects/SDData");
|
|
30
30
|
class Grid {
|
|
31
31
|
// #endregion Properties (5)
|
|
32
32
|
// #region Constructors (1)
|
|
@@ -35,12 +35,17 @@ class Grid {
|
|
|
35
35
|
this._parent = _parent;
|
|
36
36
|
// #region Properties (5)
|
|
37
37
|
this._converter = viewer_shared_services_1.Converter.instance;
|
|
38
|
-
this._color =
|
|
39
|
-
this._gridObject = new SDData_1.SDData(
|
|
38
|
+
this._color = "#44444426";
|
|
39
|
+
this._gridObject = new SDData_1.SDData("grid", "");
|
|
40
40
|
this._grid = new THREE.GridHelper();
|
|
41
|
-
this._grid.material.opacity =
|
|
42
|
-
|
|
43
|
-
|
|
41
|
+
this._grid.material.opacity =
|
|
42
|
+
typeof this._color == "string" && this._color.length <= 8
|
|
43
|
+
? 0.15
|
|
44
|
+
: this._converter.toAlpha(this._color);
|
|
45
|
+
this._grid.material.transparent =
|
|
46
|
+
this._grid.material.opacity !== 1;
|
|
47
|
+
this._grid.material.color =
|
|
48
|
+
this._renderingEngine.createThreeJsColor(this._color);
|
|
44
49
|
this._grid.rotateX(Math.PI / 2);
|
|
45
50
|
this._grid.visible = false;
|
|
46
51
|
this._gridObject.add(this._grid);
|
|
@@ -53,9 +58,14 @@ class Grid {
|
|
|
53
58
|
}
|
|
54
59
|
set color(value) {
|
|
55
60
|
this._color = value;
|
|
56
|
-
this._grid.material.opacity =
|
|
57
|
-
|
|
58
|
-
|
|
61
|
+
this._grid.material.opacity =
|
|
62
|
+
typeof this._color == "string" && this._color.length <= 8
|
|
63
|
+
? 0.15
|
|
64
|
+
: this._converter.toAlpha(this._color);
|
|
65
|
+
this._grid.material.transparent =
|
|
66
|
+
this._grid.material.opacity !== 1;
|
|
67
|
+
this._grid.material.color =
|
|
68
|
+
this._renderingEngine.createThreeJsColor(this._color);
|
|
59
69
|
this._grid.material.needsUpdate = true;
|
|
60
70
|
}
|
|
61
71
|
get visible() {
|
|
@@ -69,9 +79,14 @@ class Grid {
|
|
|
69
79
|
changeSceneExtents(position, divisions, gridExtents) {
|
|
70
80
|
this._gridObject.remove(this._grid);
|
|
71
81
|
this._grid = new THREE.GridHelper(2 * gridExtents, divisions);
|
|
72
|
-
this._grid.material.opacity =
|
|
73
|
-
|
|
74
|
-
|
|
82
|
+
this._grid.material.opacity =
|
|
83
|
+
typeof this._color == "string" && this._color.length <= 8
|
|
84
|
+
? 0.15
|
|
85
|
+
: this._converter.toAlpha(this._color);
|
|
86
|
+
this._grid.material.transparent =
|
|
87
|
+
this._grid.material.opacity !== 1;
|
|
88
|
+
this._grid.material.color =
|
|
89
|
+
this._renderingEngine.createThreeJsColor(this._color);
|
|
75
90
|
this._grid.rotateX(Math.PI / 2);
|
|
76
91
|
this._grid.visible = this._renderingEngine.gridVisibility;
|
|
77
92
|
this._gridObject.add(this._grid);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Grid.js","sourceRoot":"","sources":["../../../src/managers/environmentGeometry/Grid.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA
|
|
1
|
+
{"version":3,"file":"Grid.js","sourceRoot":"","sources":["../../../src/managers/environmentGeometry/Grid.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { Color } from
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import { SDObject } from
|
|
5
|
-
import { IEnvironmentGeometry } from
|
|
1
|
+
import { Color } from "@shapediver/viewer.shared.types";
|
|
2
|
+
import { vec3 } from "gl-matrix";
|
|
3
|
+
import { RenderingEngine } from "../..";
|
|
4
|
+
import { SDObject } from "../../objects/SDObject";
|
|
5
|
+
import { IEnvironmentGeometry } from "./IEnvironmentGeometry";
|
|
6
6
|
export declare class GroundPlane implements IEnvironmentGeometry {
|
|
7
7
|
private readonly _renderingEngine;
|
|
8
8
|
private readonly _parent;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GroundPlane.d.ts","sourceRoot":"","sources":["../../../src/managers/environmentGeometry/GroundPlane.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"GroundPlane.d.ts","sourceRoot":"","sources":["../../../src/managers/environmentGeometry/GroundPlane.ts"],"names":[],"mappings":"AACA,OAAO,EACN,KAAK,EAGL,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AAE/B,OAAO,EAAC,eAAe,EAAC,MAAM,OAAO,CAAC;AAEtC,OAAO,EAAC,QAAQ,EAAC,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAE5D,qBAAa,WAAY,YAAW,oBAAoB;IActD,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAZzB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiC;IAE5D,OAAO,CAAC,MAAM,CAAsB;IACpC,OAAO,CAAC,YAAY,CAAc;IAClC,OAAO,CAAC,kBAAkB,CAAU;gBAOlB,gBAAgB,EAAE,eAAe,EACjC,OAAO,EAAE,QAAQ;IAuBnC,IAAW,KAAK,IAAI,KAAK,CAExB;IAED,IAAW,KAAK,CAAC,KAAK,EAAE,KAAK,EAG5B;IAED,IAAW,OAAO,IAAI,OAAO,CAE5B;IAED,IAAW,OAAO,CAAC,KAAK,EAAE,OAAO,EAEhC;IAMM,kBAAkB,CACxB,QAAQ,EAAE,IAAI,EACd,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GACjB,IAAI;IAUA,cAAc,CAAC,QAAQ,EAAE,IAAI,GAAG,IAAI;IAQ3C,OAAO,CAAC,sBAAsB;CAgB9B"}
|
|
@@ -24,10 +24,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
exports.GroundPlane = void 0;
|
|
27
|
-
const SDData_1 = require("../../objects/SDData");
|
|
28
|
-
const THREE = __importStar(require("three"));
|
|
29
|
-
const viewer_shared_types_1 = require("@shapediver/viewer.shared.types");
|
|
30
27
|
const viewer_shared_services_1 = require("@shapediver/viewer.shared.services");
|
|
28
|
+
const viewer_shared_types_1 = require("@shapediver/viewer.shared.types");
|
|
29
|
+
const THREE = __importStar(require("three"));
|
|
30
|
+
const SDData_1 = require("../../objects/SDData");
|
|
31
31
|
class GroundPlane {
|
|
32
32
|
// #endregion Properties (4)
|
|
33
33
|
// #region Constructors (1)
|
|
@@ -36,8 +36,8 @@ class GroundPlane {
|
|
|
36
36
|
this._parent = _parent;
|
|
37
37
|
// #region Properties (4)
|
|
38
38
|
this._converter = viewer_shared_services_1.Converter.instance;
|
|
39
|
-
this._color =
|
|
40
|
-
this._groundPlaneObject = new SDData_1.SDData(
|
|
39
|
+
this._color = "#d3d3d3ff";
|
|
40
|
+
this._groundPlaneObject = new SDData_1.SDData("groundPlane", "");
|
|
41
41
|
const mat = new viewer_shared_types_1.MaterialStandardData();
|
|
42
42
|
mat.color = this._color;
|
|
43
43
|
mat.side = viewer_shared_types_1.MATERIAL_SIDE.FRONT;
|
|
@@ -77,11 +77,18 @@ class GroundPlane {
|
|
|
77
77
|
// #endregion Public Methods (2)
|
|
78
78
|
// #region Private Methods (1)
|
|
79
79
|
assignGroundPlaneColor(color) {
|
|
80
|
-
this._groundPlane.material.opacity =
|
|
81
|
-
|
|
82
|
-
this._groundPlane.material.
|
|
83
|
-
|
|
84
|
-
|
|
80
|
+
this._groundPlane.material.opacity =
|
|
81
|
+
this._converter.toAlpha(color);
|
|
82
|
+
this._groundPlane.material.transparent =
|
|
83
|
+
this._groundPlane.material.opacity !==
|
|
84
|
+
1;
|
|
85
|
+
this._groundPlane.material.depthWrite =
|
|
86
|
+
!this._groundPlane.material
|
|
87
|
+
.transparent;
|
|
88
|
+
this._groundPlane.material.color =
|
|
89
|
+
this._renderingEngine.createThreeJsColor(color);
|
|
90
|
+
this._groundPlane.material.needsUpdate =
|
|
91
|
+
true;
|
|
85
92
|
}
|
|
86
93
|
}
|
|
87
94
|
exports.GroundPlane = GroundPlane;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GroundPlane.js","sourceRoot":"","sources":["../../../src/managers/environmentGeometry/GroundPlane.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"GroundPlane.js","sourceRoot":"","sources":["../../../src/managers/environmentGeometry/GroundPlane.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { Color } from
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import { SDObject } from
|
|
5
|
-
import { IEnvironmentGeometry } from
|
|
1
|
+
import { Color } from "@shapediver/viewer.shared.types";
|
|
2
|
+
import { vec3 } from "gl-matrix";
|
|
3
|
+
import { RenderingEngine } from "../..";
|
|
4
|
+
import { SDObject } from "../../objects/SDObject";
|
|
5
|
+
import { IEnvironmentGeometry } from "./IEnvironmentGeometry";
|
|
6
6
|
export declare class GroundPlaneShadow implements IEnvironmentGeometry {
|
|
7
7
|
private readonly _renderingEngine;
|
|
8
8
|
private readonly _parent;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GroundPlaneShadow.d.ts","sourceRoot":"","sources":["../../../src/managers/environmentGeometry/GroundPlaneShadow.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"GroundPlaneShadow.d.ts","sourceRoot":"","sources":["../../../src/managers/environmentGeometry/GroundPlaneShadow.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,KAAK,EAAqB,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AAE/B,OAAO,EAAC,eAAe,EAAC,MAAM,OAAO,CAAC;AAEtC,OAAO,EAAC,QAAQ,EAAC,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAE5D,qBAAa,iBAAkB,YAAW,oBAAoB;IAc5D,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAZzB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiC;IAE5D,OAAO,CAAC,MAAM,CAAsB;IACpC,OAAO,CAAC,kBAAkB,CAAc;IACxC,OAAO,CAAC,wBAAwB,CAAU;gBAOxB,gBAAgB,EAAE,eAAe,EACjC,OAAO,EAAE,QAAQ;IAqBnC,IAAW,KAAK,IAAI,KAAK,CAExB;IAED,IAAW,KAAK,CAAC,KAAK,EAAE,KAAK,EAG5B;IAED,IAAW,OAAO,IAAI,OAAO,CAE5B;IAED,IAAW,OAAO,CAAC,KAAK,EAAE,OAAO,EAEhC;IAMM,kBAAkB,CACxB,QAAQ,EAAE,IAAI,EACd,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GACjB,IAAI;IAcA,cAAc,CAAC,QAAQ,EAAE,IAAI,GAAG,IAAI;IAY3C,OAAO,CAAC,4BAA4B;CAUpC"}
|
|
@@ -24,10 +24,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
exports.GroundPlaneShadow = void 0;
|
|
27
|
-
const SDData_1 = require("../../objects/SDData");
|
|
28
|
-
const THREE = __importStar(require("three"));
|
|
29
|
-
const viewer_shared_types_1 = require("@shapediver/viewer.shared.types");
|
|
30
27
|
const viewer_shared_services_1 = require("@shapediver/viewer.shared.services");
|
|
28
|
+
const viewer_shared_types_1 = require("@shapediver/viewer.shared.types");
|
|
29
|
+
const THREE = __importStar(require("three"));
|
|
30
|
+
const SDData_1 = require("../../objects/SDData");
|
|
31
31
|
class GroundPlaneShadow {
|
|
32
32
|
// #endregion Properties (4)
|
|
33
33
|
// #region Constructors (1)
|
|
@@ -36,8 +36,8 @@ class GroundPlaneShadow {
|
|
|
36
36
|
this._parent = _parent;
|
|
37
37
|
// #region Properties (4)
|
|
38
38
|
this._converter = viewer_shared_services_1.Converter.instance;
|
|
39
|
-
this._color =
|
|
40
|
-
this._groundPlaneShadowObject = new SDData_1.SDData(
|
|
39
|
+
this._color = "#d3d3d3ff";
|
|
40
|
+
this._groundPlaneShadowObject = new SDData_1.SDData("groundPlaneShadow", "");
|
|
41
41
|
const matShadow = new viewer_shared_types_1.MaterialShadowData();
|
|
42
42
|
matShadow.color = this._color;
|
|
43
43
|
matShadow.opacity = this._converter.toAlpha(this._color);
|
|
@@ -75,9 +75,12 @@ class GroundPlaneShadow {
|
|
|
75
75
|
// #endregion Public Methods (2)
|
|
76
76
|
// #region Private Methods (1)
|
|
77
77
|
assignGroundPlaneShadowColor(color) {
|
|
78
|
-
this._groundPlaneShadow.material.opacity =
|
|
79
|
-
|
|
80
|
-
this._groundPlaneShadow.material.
|
|
78
|
+
this._groundPlaneShadow.material.opacity =
|
|
79
|
+
this._converter.toAlpha(color);
|
|
80
|
+
this._groundPlaneShadow.material.color =
|
|
81
|
+
this._renderingEngine.createThreeJsColor(color);
|
|
82
|
+
this._groundPlaneShadow.material.needsUpdate =
|
|
83
|
+
true;
|
|
81
84
|
}
|
|
82
85
|
}
|
|
83
86
|
exports.GroundPlaneShadow = GroundPlaneShadow;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GroundPlaneShadow.js","sourceRoot":"","sources":["../../../src/managers/environmentGeometry/GroundPlaneShadow.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"GroundPlaneShadow.js","sourceRoot":"","sources":["../../../src/managers/environmentGeometry/GroundPlaneShadow.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IEnvironmentGeometry.d.ts","sourceRoot":"","sources":["../../../src/managers/environmentGeometry/IEnvironmentGeometry.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"IEnvironmentGeometry.d.ts","sourceRoot":"","sources":["../../../src/managers/environmentGeometry/IEnvironmentGeometry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAC,MAAM,iCAAiC,CAAC;AACtD,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AAE/B,MAAM,WAAW,oBAAoB;IAGpC,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IAMjB,kBAAkB,CACjB,QAAQ,EAAE,IAAI,EACd,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GACjB,IAAI,CAAC;IACR,cAAc,CAAC,QAAQ,EAAE,IAAI,GAAG,IAAI,CAAC;CAGrC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import { RenderingEngine } from
|
|
1
|
+
import { ITreeNode } from "@shapediver/viewer.shared.node-tree";
|
|
2
|
+
import { GodRaysEffect } from "postprocessing";
|
|
3
|
+
import { RenderingEngine } from "../../RenderingEngine";
|
|
4
4
|
export declare class GodRaysManager {
|
|
5
5
|
private readonly _renderingEngine;
|
|
6
6
|
private _godRaysEffect;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GodRaysManager.d.ts","sourceRoot":"","sources":["../../../src/managers/postprocessing/GodRaysManager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"GodRaysManager.d.ts","sourceRoot":"","sources":["../../../src/managers/postprocessing/GodRaysManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,qCAAqC,CAAC;AAC9D,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAAC,eAAe,EAAC,MAAM,uBAAuB,CAAC;AAEtD,qBAAa,cAAc;IAUd,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAP7C,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,YAAY,CAA0C;gBAMjC,gBAAgB,EAAE,eAAe;IAMvD,iBAAiB,IAAI,IAAI;IAIzB,SAAS,CAAC,aAAa,EAAE,aAAa;IAKtC,cAAc,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;CAmC5C"}
|
|
@@ -43,18 +43,18 @@ class GodRaysManager {
|
|
|
43
43
|
}
|
|
44
44
|
setLightSource(node) {
|
|
45
45
|
this._lightSource = null;
|
|
46
|
-
node.convertedObject[this._renderingEngine.id].traverse(o => {
|
|
46
|
+
node.convertedObject[this._renderingEngine.id].traverse((o) => {
|
|
47
47
|
if (o instanceof THREE.Mesh || o instanceof THREE.Points)
|
|
48
48
|
this._lightSource = o;
|
|
49
49
|
});
|
|
50
50
|
if (this._lightSource) {
|
|
51
51
|
if (Array.isArray(this._lightSource.material)) {
|
|
52
|
-
this._lightSource.material.forEach(m => m.transparent = true);
|
|
53
|
-
this._lightSource.material.forEach(m => m.depthWrite = false);
|
|
52
|
+
(this._lightSource.material).forEach((m) => (m.transparent = true));
|
|
53
|
+
(this._lightSource.material).forEach((m) => (m.depthWrite = false));
|
|
54
54
|
}
|
|
55
55
|
else {
|
|
56
|
-
this._lightSource.material.transparent = true;
|
|
57
|
-
this._lightSource.material.depthWrite = false;
|
|
56
|
+
(this._lightSource.material).transparent = true;
|
|
57
|
+
(this._lightSource.material).depthWrite = false;
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
60
|
this._godRaysEffect.lightSource = this._lightSource;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GodRaysManager.js","sourceRoot":"","sources":["../../../src/managers/postprocessing/GodRaysManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"GodRaysManager.js","sourceRoot":"","sources":["../../../src/managers/postprocessing/GodRaysManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,6CAA+B;AAG/B,MAAa,cAAc;IAM1B,4BAA4B;IAE5B,2BAA2B;IAE3B,YAA6B,gBAAiC;QAAjC,qBAAgB,GAAhB,gBAAgB,CAAiB;QANtD,iBAAY,GAAqC,IAAI,CAAC;IAMG,CAAC;IAElE,8BAA8B;IAE9B,6BAA6B;IAEtB,iBAAiB;QACvB,IAAI,CAAC,cAAc,CAAC,WAAW,GAAG,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;IACpD,CAAC;IAEM,SAAS,CAAC,aAA4B;QAC5C,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;QACpC,IAAI,CAAC,cAAc,CAAC,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC;IACrD,CAAC;IAEM,cAAc,CAAC,IAAe;QACpC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QAExB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAC7C,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE;YAChB,IAAI,CAAC,YAAY,KAAK,CAAC,IAAI,IAAI,CAAC,YAAY,KAAK,CAAC,MAAM;gBACvD,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,YAAY,EAAE;YACtB,IACC,KAAK,CAAC,OAAO,CACgB,IAAI,CAAC,YAAa,CAAC,QAAQ,CACvD,EACA;gBACkB,CACU,IAAI,CAAC,YAAa,CAAC,QAAQ,CACtD,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC;gBACvB,CACU,IAAI,CAAC,YAAa,CAAC,QAAQ,CACtD,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC;aAC1C;iBAAM;gBACW,CACY,IAAI,CAAC,YAAa,CAAC,QAAQ,CACtD,CAAC,WAAW,GAAG,IAAI,CAAC;gBACL,CACY,IAAI,CAAC,YAAa,CAAC,QAAQ,CACtD,CAAC,UAAU,GAAG,KAAK,CAAC;aACtB;SACD;QAED,IAAI,CAAC,cAAc,CAAC,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC;IACrD,CAAC;CAGD;AA5DD,wCA4DC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { ITreeNode } from
|
|
2
|
-
import { OutlineEffect } from
|
|
3
|
-
import { RenderingEngine } from
|
|
1
|
+
import { ITreeNode } from "@shapediver/viewer.shared.node-tree";
|
|
2
|
+
import { OutlineEffect } from "postprocessing";
|
|
3
|
+
import { RenderingEngine } from "../../RenderingEngine";
|
|
4
4
|
export declare class OutlineManager {
|
|
5
5
|
private readonly _renderingEngine;
|
|
6
6
|
private _outlineEffect;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OutlineManager.d.ts","sourceRoot":"","sources":["../../../src/managers/postprocessing/OutlineManager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"OutlineManager.d.ts","sourceRoot":"","sources":["../../../src/managers/postprocessing/OutlineManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,qCAAqC,CAAC;AAC9D,OAAO,EAAC,aAAa,EAAC,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAAC,eAAe,EAAC,MAAM,uBAAuB,CAAC;AAEtD,qBAAa,cAAc;IAUd,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAP7C,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,aAAa,CAAmB;gBAMX,gBAAgB,EAAE,eAAe;IAMvD,YAAY,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;IAKnC,cAAc,IAAI,IAAI;IAKtB,eAAe,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO;IAQzC,SAAS,CAAC,aAAa,EAAE,aAAa;IAKtC,0BAA0B;CAgBjC"}
|
|
@@ -56,7 +56,7 @@ class OutlineManager {
|
|
|
56
56
|
updateOutlineEffectObjects() {
|
|
57
57
|
this._outlineEffect.selection.clear();
|
|
58
58
|
for (let i = 0; i < this._outlineNodes.length; i++) {
|
|
59
|
-
this._outlineNodes[i].convertedObject[this._renderingEngine.id].traverse(o => {
|
|
59
|
+
this._outlineNodes[i].convertedObject[this._renderingEngine.id].traverse((o) => {
|
|
60
60
|
if (o instanceof THREE.Mesh)
|
|
61
61
|
this._outlineEffect.selection.add(o);
|
|
62
62
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OutlineManager.js","sourceRoot":"","sources":["../../../src/managers/postprocessing/OutlineManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"OutlineManager.js","sourceRoot":"","sources":["../../../src/managers/postprocessing/OutlineManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,6CAA+B;AAG/B,MAAa,cAAc;IAM1B,4BAA4B;IAE5B,2BAA2B;IAE3B,YAA6B,gBAAiC;QAAjC,qBAAgB,GAAhB,gBAAgB,CAAiB;QANtD,kBAAa,GAAgB,EAAE,CAAC;IAMyB,CAAC;IAElE,8BAA8B;IAE9B,6BAA6B;IAEtB,YAAY,CAAC,IAAe;QAClC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACnC,CAAC;IAEM,cAAc;QACpB,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACnC,CAAC;IAEM,eAAe,CAAC,IAAe;QACrC,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,KAAK,KAAK,CAAC,CAAC;YAAE,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAEtD,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAClC,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC;IACrB,CAAC;IAEM,SAAS,CAAC,aAA4B;QAC5C,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;QACpC,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACnC,CAAC;IAEM,0BAA0B;QAChC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QAEtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAElD,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,eAAe,CACpC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAEzB,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE;gBAChB,IAAI,CAAC,YAAY,KAAK,CAAC,IAAI;oBAC1B,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACvC,CAAC,CAAC,CAAC;SACH;IACF,CAAC;CAGD;AAvDD,wCAuDC"}
|
|
@@ -1,16 +1,16 @@
|
|
|
1
|
-
import { Pass } from
|
|
2
|
-
import { Camera, Scene, WebGLRenderer, WebGLRenderTarget } from
|
|
1
|
+
import { Pass } from "postprocessing";
|
|
2
|
+
import { Camera, Scene, WebGLRenderer, WebGLRenderTarget } from "three";
|
|
3
3
|
/**
|
|
4
|
-
*
|
|
5
|
-
* Supersample Anti-Aliasing Render Pass
|
|
6
|
-
*
|
|
7
|
-
* This manual approach to SSAA re-renders the scene once for each sample with camera jitter and accumulates the results.
|
|
8
|
-
*
|
|
9
|
-
* References: https://en.wikipedia.org/wiki/Supersampling
|
|
10
|
-
*
|
|
11
|
-
* original implementation from three.js@0.152.2 was modified to work with the postprocessing library
|
|
12
|
-
*
|
|
13
|
-
*/
|
|
4
|
+
*
|
|
5
|
+
* Supersample Anti-Aliasing Render Pass
|
|
6
|
+
*
|
|
7
|
+
* This manual approach to SSAA re-renders the scene once for each sample with camera jitter and accumulates the results.
|
|
8
|
+
*
|
|
9
|
+
* References: https://en.wikipedia.org/wiki/Supersampling
|
|
10
|
+
*
|
|
11
|
+
* original implementation from three.js@0.152.2 was modified to work with the postprocessing library
|
|
12
|
+
*
|
|
13
|
+
*/
|
|
14
14
|
export declare class SSAARenderPass extends Pass {
|
|
15
15
|
private readonly _clearPass;
|
|
16
16
|
private readonly _copyUniforms;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SSAARenderPass.d.ts","sourceRoot":"","sources":["../../../src/managers/postprocessing/SSAARenderPass.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"SSAARenderPass.d.ts","sourceRoot":"","sources":["../../../src/managers/postprocessing/SSAARenderPass.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,IAAI,EAAC,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAIN,MAAM,EAQN,KAAK,EAKL,aAAa,EACb,iBAAiB,EACjB,MAAM,OAAO,CAAC;AA6Bf;;;;;;;;;;GAUG;AACH,qBAAa,cAAe,SAAQ,IAAI;IAGvC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;IACvC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAM;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiB;IACzC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAO;IACnC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAoB;IACxD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAiB;IAEnD,OAAO,CAAC,WAAW,CAAqB;IACxC,OAAO,CAAC,WAAW,CAAsB;IACzC,OAAO,CAAC,cAAc,CAAsB;IAC5C,OAAO,CAAC,YAAY,CAAa;IACjC,OAAO,CAAC,SAAS,CAAiB;IAClC,OAAO,CAAC,aAAa,CAAe;gBAMxB,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM;IAiDxC,IAAW,UAAU,CAAC,KAAK,EAAE,MAAM,EAElC;IAED,IAAW,SAAS,CAAC,KAAK,EAAE,KAAK,EAEhC;IAED,IAAW,cAAc,YAExB;IAED,IAAW,cAAc,CAAC,KAAK,SAAA,EAE9B;IAED,IAAW,WAAW,IAOQ,MAAM,CALnC;IAED;;OAEG;IACH,IAAW,WAAW,CAAC,KAAK,EAAE,MAAM,EAEnC;IAED;;OAEG;IACH,IAAW,QAAQ,CAAC,KAAK,EAAE,OAAO,EAEjC;IAMM,OAAO;IAMd;;;;;;;;OAQG;IACI,MAAM,CACZ,QAAQ,EAAE,aAAa,EACvB,WAAW,EAAE,iBAAiB,EAC9B,YAAY,EAAE,iBAAiB,EAC/B,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,SAAS;IAoIhB,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;CAK5C"}
|