@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
|
@@ -10,8 +10,8 @@ class HTMLElementAnchorLoader {
|
|
|
10
10
|
this._renderingEngine = _renderingEngine;
|
|
11
11
|
// #region Properties (2)
|
|
12
12
|
this._htmlElements = {};
|
|
13
|
-
this._parentDiv = document.createElement(
|
|
14
|
-
this._parentDiv.classList.add(
|
|
13
|
+
this._parentDiv = document.createElement("div");
|
|
14
|
+
this._parentDiv.classList.add("sdv-anchor-container");
|
|
15
15
|
}
|
|
16
16
|
// #endregion Constructors (1)
|
|
17
17
|
// #region Public Getters And Setters (1)
|
|
@@ -35,7 +35,16 @@ class HTMLElementAnchorLoader {
|
|
|
35
35
|
}
|
|
36
36
|
if (this._renderingEngine.show === false)
|
|
37
37
|
visible = false;
|
|
38
|
-
anchor.update({
|
|
38
|
+
anchor.update({
|
|
39
|
+
anchor,
|
|
40
|
+
htmlElement,
|
|
41
|
+
page,
|
|
42
|
+
container,
|
|
43
|
+
client,
|
|
44
|
+
scale: gl_matrix_1.vec2.fromValues(scaleWidth, scaleHeight),
|
|
45
|
+
hidden,
|
|
46
|
+
visible,
|
|
47
|
+
});
|
|
39
48
|
}
|
|
40
49
|
}
|
|
41
50
|
init() {
|
|
@@ -47,36 +56,39 @@ class HTMLElementAnchorLoader {
|
|
|
47
56
|
if (!htmlElement)
|
|
48
57
|
return;
|
|
49
58
|
// set the display property to "none" if the viewport is not shown or the node is not visible
|
|
50
|
-
if (this._renderingEngine.show === false ||
|
|
51
|
-
|
|
59
|
+
if (this._renderingEngine.show === false ||
|
|
60
|
+
isVisibleInHierarchy === false)
|
|
61
|
+
htmlElement.style.display = "none";
|
|
52
62
|
// if the node is not visible return
|
|
53
63
|
if (isVisibleInHierarchy === false)
|
|
54
64
|
return;
|
|
55
65
|
this._parentDiv.appendChild(htmlElement);
|
|
56
|
-
this._htmlElements[anchor.id +
|
|
66
|
+
this._htmlElements[anchor.id + "_" + anchor.version] = {
|
|
57
67
|
node,
|
|
58
|
-
anchor
|
|
68
|
+
anchor,
|
|
59
69
|
};
|
|
60
70
|
}
|
|
61
71
|
removeData(id, version) {
|
|
62
72
|
// since the data object might be there, but no data is loaded for this viewport
|
|
63
73
|
// this check is needed
|
|
64
|
-
if (!this._htmlElements[id +
|
|
74
|
+
if (!this._htmlElements[id + "_" + version])
|
|
65
75
|
return;
|
|
66
|
-
const anchor = this._htmlElements[id +
|
|
76
|
+
const anchor = this._htmlElements[id + "_" + version].anchor;
|
|
67
77
|
if (anchor && anchor.getViewerHtmlElement(this._renderingEngine.id)) {
|
|
68
78
|
this._parentDiv.removeChild(anchor.getViewerHtmlElement(this._renderingEngine.id));
|
|
69
|
-
delete this._htmlElements[id +
|
|
79
|
+
delete this._htmlElements[id + "_" + version];
|
|
70
80
|
}
|
|
71
81
|
}
|
|
72
82
|
toggleBusyMode(toggle) {
|
|
73
|
-
if (toggle &&
|
|
74
|
-
|
|
83
|
+
if (toggle &&
|
|
84
|
+
this._renderingEngine.busyModeDisplay === viewer_shared_types_1.BUSY_MODE_DISPLAY.BLUR) {
|
|
85
|
+
if (navigator.userAgent.toLowerCase().indexOf("firefox") > -1 &&
|
|
86
|
+
navigator.userAgent.toLowerCase().indexOf("android") > -1)
|
|
75
87
|
return;
|
|
76
|
-
this._parentDiv.style.filter =
|
|
88
|
+
this._parentDiv.style.filter = "blur(3px)";
|
|
77
89
|
}
|
|
78
90
|
else {
|
|
79
|
-
this._parentDiv.style.filter =
|
|
91
|
+
this._parentDiv.style.filter = "";
|
|
80
92
|
}
|
|
81
93
|
}
|
|
82
94
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HTMLElementAnchorLoader.js","sourceRoot":"","sources":["../../src/loaders/HTMLElementAnchorLoader.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"HTMLElementAnchorLoader.js","sourceRoot":"","sources":["../../src/loaders/HTMLElementAnchorLoader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import { SDData } from
|
|
5
|
-
import {
|
|
1
|
+
import { AbstractLight } from "@shapediver/viewer.rendering-engine.light-engine";
|
|
2
|
+
import { IBox } from "@shapediver/viewer.shared.math";
|
|
3
|
+
import { ILoader } from "../interfaces/ILoader";
|
|
4
|
+
import { SDData } from "../objects/SDData";
|
|
5
|
+
import { RenderingEngine } from "../RenderingEngine";
|
|
6
6
|
export declare class LightLoader implements ILoader {
|
|
7
7
|
private readonly _renderingEngine;
|
|
8
8
|
private _forceDisabledShadows;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LightLoader.d.ts","sourceRoot":"","sources":["../../src/loaders/LightLoader.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"LightLoader.d.ts","sourceRoot":"","sources":["../../src/loaders/LightLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,aAAa,EAMb,MAAM,kDAAkD,CAAC;AAC1D,OAAO,EAAC,IAAI,EAAU,MAAM,gCAAgC,CAAC;AAE7D,OAAO,EAAC,OAAO,EAAC,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAC,eAAe,EAAC,MAAM,oBAAoB,CAAC;AAEnD,qBAAa,WAAY,YAAW,OAAO;IAU9B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAP7C,OAAO,CAAC,qBAAqB,CAAkB;IAC/C,OAAO,CAAC,eAAe,CAAK;gBAMC,gBAAgB,EAAE,eAAe;IAM9D,IAAW,oBAAoB,IAAI,OAAO,CAEzC;IAED,IAAW,oBAAoB,CAAC,KAAK,EAAE,OAAO,EAE7C;IAED,IAAW,cAAc,IAAI,MAAM,CAElC;IAED,IAAW,cAAc,CAAC,KAAK,EAAE,MAAM,EAEtC;IAMM,mBAAmB,CACzB,KAAK,EAAE,aAAa,EACpB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,IAAI;IA2CX,IAAI,IAAI,IAAI;IAEZ,IAAI,CAAC,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM;CA+InD"}
|
|
@@ -24,8 +24,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
24
24
|
};
|
|
25
25
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
26
|
exports.LightLoader = void 0;
|
|
27
|
-
const THREE = __importStar(require("three"));
|
|
28
27
|
const viewer_rendering_engine_light_engine_1 = require("@shapediver/viewer.rendering-engine.light-engine");
|
|
28
|
+
const THREE = __importStar(require("three"));
|
|
29
29
|
class LightLoader {
|
|
30
30
|
// #endregion Properties (3)
|
|
31
31
|
// #region Constructors (1)
|
|
@@ -58,7 +58,8 @@ class LightLoader {
|
|
|
58
58
|
const bs = boundingBox.boundingSphere;
|
|
59
59
|
threeDirectionalLight.position.set(bs.center[0] + light.direction[0] * bs.radius * 2.35, bs.center[1] + light.direction[1] * bs.radius * 2.35, bs.center[2] + light.direction[2] * bs.radius * 2.35);
|
|
60
60
|
threeDirectionalLight.target.position.set(bs.center[0], bs.center[1], bs.center[2]);
|
|
61
|
-
if (light.castShadow === true &&
|
|
61
|
+
if (light.castShadow === true &&
|
|
62
|
+
this.forceDisabledShadows === false) {
|
|
62
63
|
threeDirectionalLight.castShadow = true;
|
|
63
64
|
threeDirectionalLight.shadow.camera.up.set(0, 0, 1);
|
|
64
65
|
threeDirectionalLight.shadow.camera.far = 8 * bs.radius;
|
|
@@ -66,8 +67,10 @@ class LightLoader {
|
|
|
66
67
|
threeDirectionalLight.shadow.camera.left = -1.5 * bs.radius;
|
|
67
68
|
threeDirectionalLight.shadow.camera.top = 1.5 * bs.radius;
|
|
68
69
|
threeDirectionalLight.shadow.camera.bottom = -1.5 * bs.radius;
|
|
69
|
-
threeDirectionalLight.shadow.mapSize.width =
|
|
70
|
-
|
|
70
|
+
threeDirectionalLight.shadow.mapSize.width =
|
|
71
|
+
light.shadowMapResolution;
|
|
72
|
+
threeDirectionalLight.shadow.mapSize.height =
|
|
73
|
+
light.shadowMapResolution;
|
|
71
74
|
threeDirectionalLight.shadow.bias = light.shadowMapBias;
|
|
72
75
|
threeDirectionalLight.shadow.camera.updateProjectionMatrix();
|
|
73
76
|
this._shadowMapCount++;
|
|
@@ -79,7 +82,9 @@ class LightLoader {
|
|
|
79
82
|
}
|
|
80
83
|
init() { }
|
|
81
84
|
load(light, dataChild) {
|
|
82
|
-
let threeLight = dataChild.children[0] instanceof THREE.Light
|
|
85
|
+
let threeLight = dataChild.children[0] instanceof THREE.Light
|
|
86
|
+
? dataChild.children[0]
|
|
87
|
+
: null;
|
|
83
88
|
if (light instanceof viewer_rendering_engine_light_engine_1.AmbientLight) {
|
|
84
89
|
if (!threeLight) {
|
|
85
90
|
threeLight = new THREE.AmbientLight();
|
|
@@ -88,7 +93,10 @@ class LightLoader {
|
|
|
88
93
|
}
|
|
89
94
|
const threeAmbientLight = threeLight;
|
|
90
95
|
threeAmbientLight.color = this._renderingEngine.createThreeJsColor(light.color);
|
|
91
|
-
threeAmbientLight.intensity = this._renderingEngine
|
|
96
|
+
threeAmbientLight.intensity = this._renderingEngine
|
|
97
|
+
.physicallyCorrectLights
|
|
98
|
+
? light.intensity
|
|
99
|
+
: light.intensity * Math.PI;
|
|
92
100
|
}
|
|
93
101
|
if (light instanceof viewer_rendering_engine_light_engine_1.DirectionalLight) {
|
|
94
102
|
if (!threeLight) {
|
|
@@ -98,8 +106,12 @@ class LightLoader {
|
|
|
98
106
|
light.convertedObject[this._renderingEngine.id] = threeLight;
|
|
99
107
|
}
|
|
100
108
|
const threeDirectionalLight = threeLight;
|
|
101
|
-
threeDirectionalLight.color =
|
|
102
|
-
|
|
109
|
+
threeDirectionalLight.color =
|
|
110
|
+
this._renderingEngine.createThreeJsColor(light.color);
|
|
111
|
+
threeDirectionalLight.intensity = this._renderingEngine
|
|
112
|
+
.physicallyCorrectLights
|
|
113
|
+
? light.intensity
|
|
114
|
+
: light.intensity * Math.PI;
|
|
103
115
|
if (light.useNodeData) {
|
|
104
116
|
threeDirectionalLight.position.set(0, 0, 0);
|
|
105
117
|
threeDirectionalLight.target.position.set(0, 0, -1);
|
|
@@ -112,9 +124,14 @@ class LightLoader {
|
|
|
112
124
|
light.convertedObject[this._renderingEngine.id] = threeLight;
|
|
113
125
|
}
|
|
114
126
|
const threeHemisphereLight = threeLight;
|
|
115
|
-
threeHemisphereLight.color =
|
|
116
|
-
|
|
117
|
-
threeHemisphereLight.
|
|
127
|
+
threeHemisphereLight.color =
|
|
128
|
+
this._renderingEngine.createThreeJsColor(light.color);
|
|
129
|
+
threeHemisphereLight.intensity = this._renderingEngine
|
|
130
|
+
.physicallyCorrectLights
|
|
131
|
+
? light.intensity
|
|
132
|
+
: light.intensity * Math.PI;
|
|
133
|
+
threeHemisphereLight.groundColor =
|
|
134
|
+
this._renderingEngine.createThreeJsColor(light.groundColor);
|
|
118
135
|
}
|
|
119
136
|
if (light instanceof viewer_rendering_engine_light_engine_1.PointLight) {
|
|
120
137
|
if (!threeLight) {
|
|
@@ -124,9 +141,15 @@ class LightLoader {
|
|
|
124
141
|
}
|
|
125
142
|
const threePointLight = threeLight;
|
|
126
143
|
threePointLight.color = this._renderingEngine.createThreeJsColor(light.color);
|
|
127
|
-
threePointLight.intensity = this._renderingEngine
|
|
144
|
+
threePointLight.intensity = this._renderingEngine
|
|
145
|
+
.physicallyCorrectLights
|
|
146
|
+
? light.intensity
|
|
147
|
+
: light.intensity * Math.PI;
|
|
128
148
|
threePointLight.distance = light.distance;
|
|
129
|
-
threePointLight.decay = this._renderingEngine
|
|
149
|
+
threePointLight.decay = this._renderingEngine
|
|
150
|
+
.physicallyCorrectLights
|
|
151
|
+
? light.decay
|
|
152
|
+
: 0;
|
|
130
153
|
threePointLight.position.set(light.position[0], light.position[1], light.position[2]);
|
|
131
154
|
}
|
|
132
155
|
if (light instanceof viewer_rendering_engine_light_engine_1.SpotLight) {
|
|
@@ -138,11 +161,16 @@ class LightLoader {
|
|
|
138
161
|
}
|
|
139
162
|
const threeSpotLight = threeLight;
|
|
140
163
|
threeSpotLight.color = this._renderingEngine.createThreeJsColor(light.color);
|
|
141
|
-
threeSpotLight.intensity = this._renderingEngine
|
|
164
|
+
threeSpotLight.intensity = this._renderingEngine
|
|
165
|
+
.physicallyCorrectLights
|
|
166
|
+
? light.intensity
|
|
167
|
+
: light.intensity * Math.PI;
|
|
142
168
|
threeSpotLight.distance = light.distance;
|
|
143
169
|
threeSpotLight.angle = light.angle;
|
|
144
170
|
threeSpotLight.penumbra = light.penumbra;
|
|
145
|
-
threeSpotLight.decay = this._renderingEngine.physicallyCorrectLights
|
|
171
|
+
threeSpotLight.decay = this._renderingEngine.physicallyCorrectLights
|
|
172
|
+
? light.decay
|
|
173
|
+
: 0;
|
|
146
174
|
threeSpotLight.position.set(light.position[0], light.position[1], light.position[2]);
|
|
147
175
|
threeSpotLight.target.position.set(light.target[0], light.target[1], light.target[2]);
|
|
148
176
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LightLoader.js","sourceRoot":"","sources":["../../src/loaders/LightLoader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA+B;AAK/B,
|
|
1
|
+
{"version":3,"file":"LightLoader.js","sourceRoot":"","sources":["../../src/loaders/LightLoader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2GAO0D;AAE1D,6CAA+B;AAK/B,MAAa,WAAW;IAMvB,4BAA4B;IAE5B,2BAA2B;IAE3B,YAA6B,gBAAiC;QAAjC,qBAAgB,GAAhB,gBAAgB,CAAiB;QAT9D,yBAAyB;QAEjB,0BAAqB,GAAY,KAAK,CAAC;QACvC,oBAAe,GAAG,CAAC,CAAC;IAMqC,CAAC;IAElE,8BAA8B;IAE9B,yCAAyC;IAEzC,IAAW,oBAAoB;QAC9B,OAAO,IAAI,CAAC,qBAAqB,CAAC;IACnC,CAAC;IAED,IAAW,oBAAoB,CAAC,KAAc;QAC7C,IAAI,CAAC,qBAAqB,GAAG,KAAK,CAAC;IACpC,CAAC;IAED,IAAW,cAAc;QACxB,OAAO,IAAI,CAAC,eAAe,CAAC;IAC7B,CAAC;IAED,IAAW,cAAc,CAAC,KAAa;QACtC,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC;IAC9B,CAAC;IAED,4CAA4C;IAE5C,6BAA6B;IAEtB,mBAAmB,CACzB,KAAoB,EACpB,SAAiB,EACjB,WAAiB;QAEjB,MAAM,UAAU,GAA6B,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAEnE,IAAI,KAAK,YAAY,uDAAgB,EAAE;YACtC,MAAM,qBAAqB,GAA2B,UAAU,CAAC;YAEjE,MAAM,EAAE,GAAY,WAAW,CAAC,cAAc,CAAC;YAC/C,qBAAqB,CAAC,QAAQ,CAAC,GAAG,CACjC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,MAAM,GAAG,IAAI,EACpD,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,MAAM,GAAG,IAAI,EACpD,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,MAAM,GAAG,IAAI,CACpD,CAAC;YACF,qBAAqB,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CACxC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EACZ,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EACZ,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CACZ,CAAC;YAEF,IACC,KAAK,CAAC,UAAU,KAAK,IAAI;gBACzB,IAAI,CAAC,oBAAoB,KAAK,KAAK,EAClC;gBACD,qBAAqB,CAAC,UAAU,GAAG,IAAI,CAAC;gBACxC,qBAAqB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;gBACpD,qBAAqB,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC;gBACxD,qBAAqB,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,GAAG,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC;gBAC5D,qBAAqB,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC;gBAC5D,qBAAqB,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,GAAG,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC;gBAC1D,qBAAqB,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC;gBAC9D,qBAAqB,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK;oBACzC,KAAK,CAAC,mBAAmB,CAAC;gBAC3B,qBAAqB,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM;oBAC1C,KAAK,CAAC,mBAAmB,CAAC;gBAC3B,qBAAqB,CAAC,MAAM,CAAC,IAAI,GAAG,KAAK,CAAC,aAAa,CAAC;gBACxD,qBAAqB,CAAC,MAAM,CAAC,MAAM,CAAC,sBAAsB,EAAE,CAAC;gBAC7D,IAAI,CAAC,eAAe,EAAE,CAAC;aACvB;iBAAM;gBACN,qBAAqB,CAAC,UAAU,GAAG,KAAK,CAAC;aACzC;SACD;IACF,CAAC;IAEM,IAAI,KAAU,CAAC;IAEf,IAAI,CAAC,KAAoB,EAAE,SAAiB;QAClD,IAAI,UAAU,GACb,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY,KAAK,CAAC,KAAK;YAC3C,CAAC,CAAc,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;YACpC,CAAC,CAAC,IAAI,CAAC;QACT,IAAI,KAAK,YAAY,mDAAY,EAAE;YAClC,IAAI,CAAC,UAAU,EAAE;gBAChB,UAAU,GAAG,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;gBACtC,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,GAE9C,UAAU,CAAC;gBACZ,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;aAC1B;YACD,MAAM,iBAAiB,GAAuB,UAAU,CAAC;YAEzD,iBAAiB,CAAC,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CACjE,KAAK,CAAC,KAAK,CACX,CAAC;YACF,iBAAiB,CAAC,SAAS,GAAG,IAAI,CAAC,gBAAgB;iBACjD,uBAAuB;gBACxB,CAAC,CAAC,KAAK,CAAC,SAAS;gBACjB,CAAC,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,EAAE,CAAC;SAC7B;QAED,IAAI,KAAK,YAAY,uDAAgB,EAAE;YACtC,IAAI,CAAC,UAAU,EAAE;gBAChB,UAAU,GAAG,IAAI,KAAK,CAAC,gBAAgB,EAAE,CAAC;gBAC1C,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBAC1B,SAAS,CAAC,GAAG,CAA0B,UAAW,CAAC,MAAM,CAAC,CAAC;gBAC3D,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,GAE9C,UAAU,CAAC;aACZ;YACD,MAAM,qBAAqB,GAA2B,UAAU,CAAC;YAEjE,qBAAqB,CAAC,KAAK;gBAC1B,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACvD,qBAAqB,CAAC,SAAS,GAAG,IAAI,CAAC,gBAAgB;iBACrD,uBAAuB;gBACxB,CAAC,CAAC,KAAK,CAAC,SAAS;gBACjB,CAAC,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,EAAE,CAAC;YAE7B,IAAI,KAAK,CAAC,WAAW,EAAE;gBACtB,qBAAqB,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC5C,qBAAqB,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;aACpD;SACD;QAED,IAAI,KAAK,YAAY,sDAAe,EAAE;YACrC,IAAI,CAAC,UAAU,EAAE;gBAChB,UAAU,GAAG,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;gBACzC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBAC1B,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,GAE9C,UAAU,CAAC;aACZ;YACD,MAAM,oBAAoB,GAA0B,UAAU,CAAC;YAE/D,oBAAoB,CAAC,KAAK;gBACzB,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACvD,oBAAoB,CAAC,SAAS,GAAG,IAAI,CAAC,gBAAgB;iBACpD,uBAAuB;gBACxB,CAAC,CAAC,KAAK,CAAC,SAAS;gBACjB,CAAC,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,EAAE,CAAC;YAC7B,oBAAoB,CAAC,WAAW;gBAC/B,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;SAC7D;QAED,IAAI,KAAK,YAAY,iDAAU,EAAE;YAChC,IAAI,CAAC,UAAU,EAAE;gBAChB,UAAU,GAAG,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;gBACpC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBAC1B,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,GAE9C,UAAU,CAAC;aACZ;YACD,MAAM,eAAe,GAAqB,UAAU,CAAC;YAErD,eAAe,CAAC,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAC/D,KAAK,CAAC,KAAK,CACX,CAAC;YACF,eAAe,CAAC,SAAS,GAAG,IAAI,CAAC,gBAAgB;iBAC/C,uBAAuB;gBACxB,CAAC,CAAC,KAAK,CAAC,SAAS;gBACjB,CAAC,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,EAAE,CAAC;YAC7B,eAAe,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;YAC1C,eAAe,CAAC,KAAK,GAAG,IAAI,CAAC,gBAAgB;iBAC3C,uBAAuB;gBACxB,CAAC,CAAC,KAAK,CAAC,KAAK;gBACb,CAAC,CAAC,CAAC,CAAC;YACL,eAAe,CAAC,QAAQ,CAAC,GAAG,CAC3B,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,EACjB,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,EACjB,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CACjB,CAAC;SACF;QAED,IAAI,KAAK,YAAY,gDAAS,EAAE;YAC/B,IAAI,CAAC,UAAU,EAAE;gBAChB,UAAU,GAAG,IAAI,KAAK,CAAC,SAAS,CAC/B,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,KAAK,CAAC,KAAK,CAAC,EACrD,KAAK,CAAC,SAAS,EACf,KAAK,CAAC,QAAQ,EACd,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,QAAQ,EACd,KAAK,CAAC,KAAK,CACX,CAAC;gBACF,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBAC1B,SAAS,CAAC,GAAG,CAAmB,UAAW,CAAC,MAAM,CAAC,CAAC;gBACpD,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,GAE9C,UAAU,CAAC;aACZ;YACD,MAAM,cAAc,GAAoB,UAAU,CAAC;YAEnD,cAAc,CAAC,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAC9D,KAAK,CAAC,KAAK,CACX,CAAC;YACF,cAAc,CAAC,SAAS,GAAG,IAAI,CAAC,gBAAgB;iBAC9C,uBAAuB;gBACxB,CAAC,CAAC,KAAK,CAAC,SAAS;gBACjB,CAAC,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,EAAE,CAAC;YAC7B,cAAc,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;YACzC,cAAc,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;YACnC,cAAc,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;YACzC,cAAc,CAAC,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,uBAAuB;gBACnE,CAAC,CAAC,KAAK,CAAC,KAAK;gBACb,CAAC,CAAC,CAAC,CAAC;YAEL,cAAc,CAAC,QAAQ,CAAC,GAAG,CAC1B,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,EACjB,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,EACjB,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CACjB,CAAC;YACF,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CACjC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EACf,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EACf,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CACf,CAAC;SACF;IACF,CAAC;CAGD;AAnOD,kCAmOC"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import
|
|
2
|
-
import {
|
|
3
|
-
import
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
9
|
-
import { RenderingEngine } from
|
|
10
|
-
import {
|
|
1
|
+
import { GeometryData, IMaterialAbstractData, MaterialBasicLineData, MaterialPointData, MaterialStandardData, MATERIAL_TYPE, PRIMITIVE_MODE } from "@shapediver/viewer.shared.types";
|
|
2
|
+
import { quat } from "gl-matrix";
|
|
3
|
+
import * as THREE from "three";
|
|
4
|
+
import { ILoader } from "../interfaces/ILoader";
|
|
5
|
+
import { GemMaterialParameters } from "../materials/GemMaterial";
|
|
6
|
+
import { MeshUnlitMaterialParameters } from "../materials/MeshUnlitMaterialParameters";
|
|
7
|
+
import { MultiPointsMaterial, MultiPointsMaterialParameters } from "../materials/MultiPointsMaterial";
|
|
8
|
+
import { SpecularGlossinessMaterialParameters } from "../materials/SpecularGlossinessMaterial";
|
|
9
|
+
import { RenderingEngine } from "../RenderingEngine";
|
|
10
|
+
import { ENVIRONMENT_MAP_TYPE } from "./EnvironmentMapLoader";
|
|
11
11
|
export declare type MaterialSettings = {
|
|
12
12
|
mode: PRIMITIVE_MODE;
|
|
13
13
|
useVertexTangents: boolean;
|
|
@@ -16,7 +16,7 @@ export declare type MaterialSettings = {
|
|
|
16
16
|
useMorphTargets: boolean;
|
|
17
17
|
useMorphNormals: boolean;
|
|
18
18
|
};
|
|
19
|
-
declare type ThreeJsMaterialParameterTypes = THREE.PointsMaterialParameters | MultiPointsMaterialParameters | THREE.LineBasicMaterialParameters | MeshUnlitMaterialParameters | THREE.MeshPhysicalMaterialParameters | SpecularGlossinessMaterialParameters | GemMaterialParameters | THREE.ShadowMaterialParameters;
|
|
19
|
+
declare type ThreeJsMaterialParameterTypes = THREE.PointsMaterialParameters | MultiPointsMaterialParameters | THREE.LineBasicMaterialParameters | MeshUnlitMaterialParameters | THREE.MeshPhysicalMaterialParameters | SpecularGlossinessMaterialParameters | GemMaterialParameters | THREE.ShadowMaterialParameters | THREE.MeshLambertMaterialParameters | THREE.MeshPhongMaterialParameters;
|
|
20
20
|
declare type ThreeJsTextureCacheObject = {
|
|
21
21
|
texture: THREE.Texture;
|
|
22
22
|
usage: number;
|
|
@@ -71,7 +71,7 @@ export declare class MaterialLoader implements ILoader {
|
|
|
71
71
|
assignEnvironmentMapRotation(value: quat): void;
|
|
72
72
|
assignPointSize(p: number): void;
|
|
73
73
|
cacheSize(): number;
|
|
74
|
-
createMaterial(type: GEOMETRY_MATERIAL_TYPE, incomingData: IMaterialAbstractData | GeometryData, materialData: IMaterialAbstractData | null, materialSettings?: MaterialSettings): THREE.Material |
|
|
74
|
+
createMaterial(type: GEOMETRY_MATERIAL_TYPE, incomingData: IMaterialAbstractData | GeometryData, materialData: IMaterialAbstractData | null, materialSettings?: MaterialSettings): THREE.Material | THREE.MeshBasicMaterial | THREE.PointsMaterial | MultiPointsMaterial | THREE.LineBasicMaterial;
|
|
75
75
|
emptyMaterialCache(): void;
|
|
76
76
|
getMaterialProperties(materialData: IMaterialAbstractData | null, type: GEOMETRY_MATERIAL_TYPE, materialSettings?: MaterialSettings): {
|
|
77
77
|
properties: ThreeJsMaterialParameterTypes;
|
|
@@ -79,11 +79,11 @@ export declare class MaterialLoader implements ILoader {
|
|
|
79
79
|
};
|
|
80
80
|
init(): void;
|
|
81
81
|
/**
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
82
|
+
* Create a material object with the provided material data.
|
|
83
|
+
*
|
|
84
|
+
* @param material the material data
|
|
85
|
+
* @returns the material object
|
|
86
|
+
*/
|
|
87
87
|
load(incomingData: IMaterialAbstractData | GeometryData, materialSettings?: MaterialSettings): THREE.Material;
|
|
88
88
|
removeFromMaterialCache(id: string): void;
|
|
89
89
|
updateMaterials(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MaterialLoader.d.ts","sourceRoot":"","sources":["../../src/loaders/MaterialLoader.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"MaterialLoader.d.ts","sourceRoot":"","sources":["../../src/loaders/MaterialLoader.ts"],"names":[],"mappings":"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"}
|