@needle-tools/engine 3.7.7-beta → 3.9.0-alpha
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/CHANGELOG.md +16 -0
- package/dist/needle-engine.js +473 -87019
- package/dist/needle-engine.light.js +473 -84478
- package/dist/needle-engine.light.min.js +1 -5805
- package/dist/needle-engine.light.umd.cjs +1 -5805
- package/dist/needle-engine.min.js +1 -5818
- package/dist/needle-engine.umd.cjs +1 -5818
- package/lib/engine/codegen/register_types.js +2 -0
- package/lib/engine/codegen/register_types.js.map +1 -1
- package/lib/engine/debug/debug.d.ts +1 -1
- package/lib/engine/engine_context.d.ts +3 -1
- package/lib/engine/engine_context.js +18 -13
- package/lib/engine/engine_context.js.map +1 -1
- package/lib/engine/engine_element.js +15 -8
- package/lib/engine/engine_element.js.map +1 -1
- package/lib/engine/engine_element_overlay.d.ts +2 -1
- package/lib/engine/engine_element_overlay.js +38 -55
- package/lib/engine/engine_element_overlay.js.map +1 -1
- package/lib/engine/engine_lightdata.js +6 -7
- package/lib/engine/engine_lightdata.js.map +1 -1
- package/lib/engine/engine_networking_utils.d.ts +1 -1
- package/lib/engine/engine_networking_utils.js.map +1 -1
- package/lib/engine/engine_scenelighting.js +5 -5
- package/lib/engine/engine_scenelighting.js.map +1 -1
- package/lib/engine/extensions/NEEDLE_lightmaps.js +3 -3
- package/lib/engine/extensions/NEEDLE_lightmaps.js.map +1 -1
- package/lib/engine/extensions/NEEDLE_render_objects.js +1 -1
- package/lib/engine/extensions/NEEDLE_render_objects.js.map +1 -1
- package/lib/engine/extensions/NEEDLE_techniques_webgl.js +4 -1
- package/lib/engine/extensions/NEEDLE_techniques_webgl.js.map +1 -1
- package/lib/engine/extensions/extensions.d.ts +1 -1
- package/lib/engine/extensions/extensions.js +17 -3
- package/lib/engine/extensions/extensions.js.map +1 -1
- package/lib/engine-components/Camera.js +3 -3
- package/lib/engine-components/Camera.js.map +1 -1
- package/lib/engine-components/GroundProjection.js +1 -1
- package/lib/engine-components/GroundProjection.js.map +1 -1
- package/lib/engine-components/Light.js +58 -50
- package/lib/engine-components/Light.js.map +1 -1
- package/lib/engine-components/Networking.d.ts +1 -1
- package/lib/engine-components/OrbitControls.js +4 -3
- package/lib/engine-components/OrbitControls.js.map +1 -1
- package/lib/engine-components/ParticleSystem.d.ts +2 -1
- package/lib/engine-components/ParticleSystem.js +11 -1
- package/lib/engine-components/ParticleSystem.js.map +1 -1
- package/lib/engine-components/ReflectionProbe.js +3 -3
- package/lib/engine-components/ReflectionProbe.js.map +1 -1
- package/lib/engine-components/Renderer.d.ts +1 -1
- package/lib/engine-components/Renderer.js +16 -13
- package/lib/engine-components/Renderer.js.map +1 -1
- package/lib/engine-components/RendererLightmap.d.ts +5 -8
- package/lib/engine-components/RendererLightmap.js +50 -39
- package/lib/engine-components/RendererLightmap.js.map +1 -1
- package/lib/engine-components/codegen/components.d.ts +1 -0
- package/lib/engine-components/codegen/components.js +1 -0
- package/lib/engine-components/codegen/components.js.map +1 -1
- package/lib/engine-components/export/usdz/ThreeUSDZExporter.d.ts +1 -1
- package/lib/engine-components/export/usdz/ThreeUSDZExporter.js +34 -30
- package/lib/engine-components/export/usdz/ThreeUSDZExporter.js.map +1 -1
- package/lib/engine-components/export/usdz/USDZExporter.js +2 -0
- package/lib/engine-components/export/usdz/USDZExporter.js.map +1 -1
- package/lib/engine-components/export/usdz/extensions/USDZText.d.ts +2 -1
- package/lib/engine-components/export/usdz/extensions/USDZText.js +40 -3
- package/lib/engine-components/export/usdz/extensions/USDZText.js.map +1 -1
- package/lib/engine-components/export/usdz/extensions/USDZUI.d.ts +8 -0
- package/lib/engine-components/export/usdz/extensions/USDZUI.js +101 -0
- package/lib/engine-components/export/usdz/extensions/USDZUI.js.map +1 -0
- package/lib/engine-components/ui/BaseUIComponent.js +4 -0
- package/lib/engine-components/ui/BaseUIComponent.js.map +1 -1
- package/lib/engine-components/ui/Button.d.ts +1 -1
- package/lib/engine-components/ui/Button.js +4 -1
- package/lib/engine-components/ui/Button.js.map +1 -1
- package/lib/engine-components/ui/Canvas.js +9 -1
- package/lib/engine-components/ui/Canvas.js.map +1 -1
- package/lib/engine-components/ui/EventSystem.js +2 -0
- package/lib/engine-components/ui/EventSystem.js.map +1 -1
- package/lib/engine-components/ui/Graphic.js +3 -3
- package/lib/engine-components/ui/Graphic.js.map +1 -1
- package/lib/engine-components/webxr/WebARCameraBackground.d.ts +1 -1
- package/lib/engine-components/webxr/WebARCameraBackground.js +2 -2
- package/lib/engine-components/webxr/WebARCameraBackground.js.map +1 -1
- package/lib/engine-components/webxr/WebXR.js +7 -6
- package/lib/engine-components/webxr/WebXR.js.map +1 -1
- package/lib/engine-components/webxr/WebXRPlaneTracking.d.ts +1 -1
- package/package.json +5 -5
- package/src/engine/codegen/register_types.js +2 -0
- package/src/engine/engine_context.ts +21 -14
- package/src/engine/engine_element.ts +15 -8
- package/src/engine/engine_element_overlay.ts +41 -52
- package/src/engine/engine_lightdata.ts +6 -8
- package/src/engine/engine_networking_utils.ts +1 -1
- package/src/engine/engine_scenelighting.ts +5 -5
- package/src/engine/extensions/NEEDLE_lightmaps.ts +3 -3
- package/src/engine/extensions/NEEDLE_render_objects.ts +10 -8
- package/src/engine/extensions/NEEDLE_techniques_webgl.ts +5 -1
- package/src/engine/extensions/extensions.ts +19 -4
- package/src/engine-components/Camera.ts +3 -3
- package/src/engine-components/GroundProjection.ts +1 -1
- package/src/engine-components/Light.ts +62 -57
- package/src/engine-components/OrbitControls.ts +4 -3
- package/src/engine-components/ParticleSystem.ts +14 -0
- package/src/engine-components/ReflectionProbe.ts +3 -3
- package/src/engine-components/Renderer.ts +21 -17
- package/src/engine-components/RendererLightmap.ts +55 -49
- package/src/engine-components/codegen/components.ts +1 -0
- package/src/engine-components/export/usdz/ThreeUSDZExporter.ts +43 -37
- package/src/engine-components/export/usdz/USDZExporter.ts +2 -0
- package/src/engine-components/export/usdz/extensions/USDZText.ts +41 -1
- package/src/engine-components/export/usdz/extensions/USDZUI.ts +120 -0
- package/src/engine-components/ui/BaseUIComponent.ts +5 -0
- package/src/engine-components/ui/Button.ts +3 -1
- package/src/engine-components/ui/Canvas.ts +7 -1
- package/src/engine-components/ui/EventSystem.ts +3 -1
- package/src/engine-components/ui/Graphic.ts +3 -3
- package/src/engine-components/webxr/WebARCameraBackground.ts +3 -3
- package/src/engine-components/webxr/WebXR.ts +7 -7
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { getParam, isMozillaXR } from "./engine_utils";
|
|
1
|
+
import { getParam, isMobileDevice, isMozillaXR } from "./engine_utils";
|
|
2
2
|
const debug = getParam("debugaroverlay");
|
|
3
3
|
export const arContainerClassName = "ar";
|
|
4
4
|
export const quitARClassName = "quit-ar";
|
|
@@ -14,21 +14,25 @@ export class AROverlayHandler {
|
|
|
14
14
|
registeredCloseEventElements = [];
|
|
15
15
|
_createdAROnlyElements = [];
|
|
16
16
|
_reparentedObjects = [];
|
|
17
|
+
contentElement = null;
|
|
17
18
|
requestEndAR() {
|
|
18
19
|
this.onRequestedEndAR();
|
|
19
20
|
}
|
|
20
21
|
onBegin(context, overlayContainer, session) {
|
|
21
22
|
this.currentSession = session;
|
|
22
23
|
this.arContainer = overlayContainer;
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
24
|
+
if (isMozillaXR()) {
|
|
25
|
+
const arElements = context.domElement.children;
|
|
26
|
+
for (let i = 0; i < arElements?.length; i++) {
|
|
27
|
+
const el = arElements[i];
|
|
28
|
+
if (!el)
|
|
29
|
+
return;
|
|
30
|
+
if (el === this.arContainer)
|
|
31
|
+
return;
|
|
32
|
+
this._reparentedObjects.push({ el: el, previousParent: el.parentElement });
|
|
33
|
+
this.arContainer?.appendChild(el);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
32
36
|
const quit_Elements = overlayContainer.getElementsByClassName(quitARClassName);
|
|
33
37
|
if (!quit_Elements || quit_Elements.length <= 0) {
|
|
34
38
|
console.warn(`Missing quit AR elements, creating fallback X button. Use class name '${quitARClassName}' to override.`);
|
|
@@ -78,50 +82,19 @@ export class AROverlayHandler {
|
|
|
78
82
|
}, 10);
|
|
79
83
|
}
|
|
80
84
|
}
|
|
81
|
-
|
|
82
|
-
if (
|
|
83
|
-
|
|
84
|
-
// search in the needle-engine element
|
|
85
|
-
if (element.classList.contains(arContainerClassName)) {
|
|
86
|
-
if (debug)
|
|
87
|
-
console.log("Found overlay container in needle-engine element");
|
|
88
|
-
return element;
|
|
89
|
-
}
|
|
90
|
-
if (element.shadowRoot) {
|
|
91
|
-
const el = element.shadowRoot.querySelector(`.${arContainerClassName}`);
|
|
92
|
-
if (el) {
|
|
93
|
-
if (debug)
|
|
94
|
-
console.log("Found overlay container in needle-engine element");
|
|
95
|
-
return el;
|
|
96
|
-
}
|
|
97
|
-
;
|
|
98
|
-
}
|
|
99
|
-
// search in document as well; "ar" element could live outside needle-engine element
|
|
100
|
-
const arElements = document.getElementsByClassName(arContainerClassName);
|
|
101
|
-
if (arElements && arElements.length > 0) {
|
|
102
|
-
if (debug)
|
|
103
|
-
console.log("Found overlay container in document");
|
|
104
|
-
return arElements[0];
|
|
105
|
-
}
|
|
106
|
-
if (debug)
|
|
107
|
-
console.log("No overlay container found in document - generating new ony");
|
|
108
|
-
const el = document.createElement("div");
|
|
109
|
-
el.classList.add(arContainerClassName);
|
|
110
|
-
el.style.cssText = `
|
|
111
|
-
position: fixed;
|
|
112
|
-
top: 0;
|
|
113
|
-
left: 0;
|
|
114
|
-
width: 100%;
|
|
115
|
-
height: 100%;
|
|
116
|
-
display: flex;
|
|
117
|
-
visibility: visible;
|
|
118
|
-
z-index: 9999;
|
|
119
|
-
pointer-events: none;
|
|
120
|
-
// background: rgba(0,0,0,1);
|
|
121
|
-
`;
|
|
85
|
+
createOverlayContainer(needleEngineElement) {
|
|
86
|
+
if (this.contentElement)
|
|
87
|
+
return this.contentElement;
|
|
122
88
|
if (debug)
|
|
123
|
-
|
|
124
|
-
|
|
89
|
+
console.log("Setup overlay container");
|
|
90
|
+
const contentElement = needleEngineElement.shadowRoot.querySelector(".content");
|
|
91
|
+
this.contentElement = contentElement;
|
|
92
|
+
const overlaySlot = needleEngineElement.shadowRoot.querySelector(".overlay-content");
|
|
93
|
+
if (overlaySlot)
|
|
94
|
+
contentElement.appendChild(overlaySlot);
|
|
95
|
+
if (debug && !isMobileDevice())
|
|
96
|
+
this.createFallbackCloseARButton(contentElement);
|
|
97
|
+
return contentElement;
|
|
125
98
|
}
|
|
126
99
|
onRequestedEndAR() {
|
|
127
100
|
if (!this.currentSession)
|
|
@@ -144,14 +117,24 @@ export class AROverlayHandler {
|
|
|
144
117
|
// for mozilla XR reparenting we have to make sure the close button is clickable so we set it on the element directly
|
|
145
118
|
// it's in general perhaps more safe to set it on the element to ensure it's clickable
|
|
146
119
|
quitARSlot.style.pointerEvents = "auto";
|
|
120
|
+
// we need another container to make sure the button is always on top
|
|
121
|
+
const fixedButtonContainer = document.createElement("div");
|
|
122
|
+
fixedButtonContainer.style.cssText = `
|
|
123
|
+
position: fixed;
|
|
124
|
+
top: 0;
|
|
125
|
+
right: 0;
|
|
126
|
+
z-index: 600;
|
|
127
|
+
pointer-events: all;
|
|
128
|
+
`;
|
|
129
|
+
this.appendElement(fixedButtonContainer, quitARSlot);
|
|
147
130
|
var svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
|
|
148
131
|
svg.classList.add("quit-ar-button");
|
|
149
132
|
svg.setAttribute('width', "38px");
|
|
150
133
|
svg.setAttribute('height', "38px");
|
|
151
|
-
|
|
134
|
+
fixedButtonContainer.appendChild(svg);
|
|
152
135
|
var path = document.createElementNS('http://www.w3.org/2000/svg', 'path');
|
|
153
136
|
path.setAttribute('d', 'M 12,12 L 28,28 M 28,12 12,28');
|
|
154
|
-
path.setAttribute('stroke', '#
|
|
137
|
+
path.setAttribute('stroke', '#aaa');
|
|
155
138
|
path.setAttribute('stroke-width', "3px");
|
|
156
139
|
svg.appendChild(path);
|
|
157
140
|
if (debug)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"engine_element_overlay.js","sourceRoot":"","sources":["../../src/engine/engine_element_overlay.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"engine_element_overlay.js","sourceRoot":"","sources":["../../src/engine/engine_element_overlay.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { LightmapType } from "./extensions/NEEDLE_lightmaps";
|
|
2
|
-
import
|
|
2
|
+
import { ShaderChunk, UniformsLib, Vector4 } from "three";
|
|
3
3
|
import { getParam } from "./engine_utils";
|
|
4
4
|
const debugLightmap = getParam("debuglightmaps") ? true : false;
|
|
5
5
|
// how do we know which lightmap should be used for which object
|
|
@@ -53,16 +53,15 @@ export class LightDataRegistry {
|
|
|
53
53
|
// all the chunks we can patch
|
|
54
54
|
// console.log(THREE.ShaderChunk);
|
|
55
55
|
// Unity: ambientOrLightmapUV.xy = v.uv1.xy * unity_LightmapST.xy + unity_LightmapST.zw; ambientOrLightmapUV.zw = 0;
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
vec2 lUv = vUv2.xy * lightmapScaleOffset.xy + vec2(lightmapScaleOffset.z, (1. - (lightmapScaleOffset.y + lightmapScaleOffset.w)));
|
|
56
|
+
ShaderChunk.lights_fragment_maps = ShaderChunk.lights_fragment_maps.replace("vec4 lightMapTexel = texture2D( lightMap, vLightMapUv );", `
|
|
57
|
+
vec2 lUv = vLightMapUv.xy * lightmapScaleOffset.xy + vec2(lightmapScaleOffset.z, (1. - (lightmapScaleOffset.y + lightmapScaleOffset.w)));
|
|
59
58
|
vec4 lightMapTexel = texture2D( lightMap, lUv);
|
|
60
59
|
// The range of RGBM lightmaps goes from 0 to 34.49 (5^2.2) in linear space, and from 0 to 5 in gamma space.
|
|
61
60
|
lightMapTexel.rgb *= lightMapTexel.a * 8.; // no idea where that "8" comes from... heuristically derived
|
|
62
61
|
lightMapTexel.a = 1.;
|
|
63
62
|
lightMapTexel = conv_sRGBToLinear(lightMapTexel);
|
|
64
63
|
`);
|
|
65
|
-
|
|
64
|
+
ShaderChunk.lightmap_pars_fragment = `
|
|
66
65
|
#ifdef USE_LIGHTMAP
|
|
67
66
|
uniform sampler2D lightMap;
|
|
68
67
|
uniform float lightMapIntensity;
|
|
@@ -78,11 +77,11 @@ THREE.ShaderChunk.lightmap_pars_fragment = `
|
|
|
78
77
|
// so they shouldn't receive light probe lighting.
|
|
79
78
|
// TODO: this gets difficult if there are additional real-time lightprobes added; we would need to exclude
|
|
80
79
|
// exactly those that were active when lighting was baked... that's complicated!
|
|
81
|
-
|
|
80
|
+
ShaderChunk.lights_fragment_begin = ShaderChunk.lights_fragment_begin.replace("irradiance += getLightProbeIrradiance( lightProbe, geometry.normal );", `
|
|
82
81
|
#if defined(USE_LIGHTMAP)
|
|
83
82
|
irradiance += 0.;
|
|
84
83
|
#else
|
|
85
84
|
irradiance += getLightProbeIrradiance( lightProbe, geometry.normal );
|
|
86
85
|
#endif`);
|
|
87
|
-
|
|
86
|
+
UniformsLib.lightmap["lightmapScaleOffset"] = { value: new Vector4(1, 1, 0, 0) };
|
|
88
87
|
//# sourceMappingURL=engine_lightdata.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"engine_lightdata.js","sourceRoot":"","sources":["../../src/engine/engine_lightdata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"engine_lightdata.js","sourceRoot":"","sources":["../../src/engine/engine_lightdata.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare function isLocalNetwork(hostname?: string): boolean
|
|
1
|
+
export declare function isLocalNetwork(hostname?: string): boolean;
|
|
2
2
|
export declare function isHostedOnGlitch(): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"engine_networking_utils.js","sourceRoot":"","sources":["../../src/engine/engine_networking_utils.ts"],"names":[],"mappings":"AAEA,0FAA0F;AAC1F,4BAA4B;AAC5B,+DAA+D;AAE/D,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAmB,CAAC;AAEvD,MAAM,UAAU,cAAc,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ;IAC9D,IAAG,mBAAmB,CAAC,GAAG,CAAC,QAAQ,CAAC;QAAE,OAAO,mBAAmB,CAAC,GAAG,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"engine_networking_utils.js","sourceRoot":"","sources":["../../src/engine/engine_networking_utils.ts"],"names":[],"mappings":"AAEA,0FAA0F;AAC1F,4BAA4B;AAC5B,+DAA+D;AAE/D,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAmB,CAAC;AAEvD,MAAM,UAAU,cAAc,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ;IAC9D,IAAG,mBAAmB,CAAC,GAAG,CAAC,QAAQ,CAAC;QAAE,OAAO,mBAAmB,CAAC,GAAG,CAAC,QAAQ,CAAE,CAAC;IAChF,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC,0DAA0D,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACnH,mBAAmB,CAAC,GAAG,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;IAClD,IAAI,cAAc,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IACzC,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC5B,OAAO,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;AAC1D,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Vector4, EquirectangularReflectionMapping,
|
|
1
|
+
import { Vector4, EquirectangularReflectionMapping, WebGLCubeRenderTarget, SRGBColorSpace } from "three";
|
|
2
2
|
import { LightProbeGenerator } from "three/examples/jsm/lights/LightProbeGenerator.js";
|
|
3
3
|
import { createFlatTexture, createTrilightTexture } from "./engine_shaders";
|
|
4
4
|
import { getParam } from "./engine_utils";
|
|
@@ -144,7 +144,7 @@ export class RendererData {
|
|
|
144
144
|
console.log("Setting environment reflection", existing);
|
|
145
145
|
const scene = this.context.scene;
|
|
146
146
|
const tex = existing.Source;
|
|
147
|
-
tex.
|
|
147
|
+
tex.colorSpace = SRGBColorSpace;
|
|
148
148
|
tex.mapping = EquirectangularReflectionMapping;
|
|
149
149
|
scene.environment = tex;
|
|
150
150
|
return;
|
|
@@ -159,7 +159,7 @@ export class RendererData {
|
|
|
159
159
|
if (settings.ambientTrilight) {
|
|
160
160
|
const colors = settings.ambientTrilight;
|
|
161
161
|
const tex = createTrilightTexture(colors[0], colors[1], colors[2], 64, 64);
|
|
162
|
-
tex.
|
|
162
|
+
tex.colorSpace = SRGBColorSpace;
|
|
163
163
|
tex.mapping = EquirectangularReflectionMapping;
|
|
164
164
|
this.context.scene.environment = tex;
|
|
165
165
|
}
|
|
@@ -169,7 +169,7 @@ export class RendererData {
|
|
|
169
169
|
case AmbientMode.Flat:
|
|
170
170
|
if (settings.ambientLight) {
|
|
171
171
|
const tex = createFlatTexture(settings.ambientLight, 64);
|
|
172
|
-
tex.
|
|
172
|
+
tex.colorSpace = SRGBColorSpace;
|
|
173
173
|
tex.mapping = EquirectangularReflectionMapping;
|
|
174
174
|
this.context.scene.environment = tex;
|
|
175
175
|
}
|
|
@@ -234,7 +234,7 @@ export class LightData {
|
|
|
234
234
|
this._source = tex;
|
|
235
235
|
this._ambientScale = ambientScale;
|
|
236
236
|
tex.mapping = EquirectangularReflectionMapping;
|
|
237
|
-
tex.
|
|
237
|
+
tex.colorSpace = SRGBColorSpace;
|
|
238
238
|
}
|
|
239
239
|
getSphericalHarmonicsArray(intensityFactor = 1) {
|
|
240
240
|
if (this._sphericalHarmonicsArray?.length && this._source) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"engine_scenelighting.js","sourceRoot":"","sources":["../../src/engine/engine_scenelighting.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,gCAAgC,
|
|
1
|
+
{"version":3,"file":"engine_scenelighting.js","sourceRoot":"","sources":["../../src/engine/engine_scenelighting.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { LinearSRGBColorSpace, SRGBColorSpace } from "three";
|
|
2
2
|
import { resolveReferences } from "./extension_utils";
|
|
3
3
|
import { getParam } from "../engine_utils";
|
|
4
4
|
// the lightmap extension is aimed to also export export skyboxes and custom reflection maps
|
|
@@ -47,9 +47,9 @@ export class NEEDLE_lightmaps {
|
|
|
47
47
|
else {
|
|
48
48
|
// TODO this is most likely wrong for floating point textures
|
|
49
49
|
if (entry.type !== LightmapType.Lightmap)
|
|
50
|
-
tex.
|
|
50
|
+
tex.colorSpace = SRGBColorSpace;
|
|
51
51
|
else
|
|
52
|
-
tex.
|
|
52
|
+
tex.colorSpace = LinearSRGBColorSpace;
|
|
53
53
|
// Dont flip skybox textures anymore - previously we exported them flipped when baking in Unity but now we allow to pass through export without re-baking exisitng skybox textures if they use default values. So we expect textures to be NOT flipped anymore
|
|
54
54
|
// if (entry.type === LightmapType.Skybox) {
|
|
55
55
|
// if (tex.type == FloatType || tex.type == HalfFloatType)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NEEDLE_lightmaps.js","sourceRoot":"","sources":["../../../src/engine/extensions/NEEDLE_lightmaps.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"NEEDLE_lightmaps.js","sourceRoot":"","sources":["../../../src/engine/extensions/NEEDLE_lightmaps.ts"],"names":[],"mappings":"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"}
|
|
@@ -153,7 +153,7 @@ function ToThreeCompareFunction(func) {
|
|
|
153
153
|
case CompareFunction.Always:
|
|
154
154
|
return AlwaysStencilFunc;
|
|
155
155
|
}
|
|
156
|
-
return
|
|
156
|
+
return NeverStencilFunc;
|
|
157
157
|
}
|
|
158
158
|
export const EXTENSION_NAME = "NEEDLE_render_objects";
|
|
159
159
|
//# sourceMappingURL=NEEDLE_render_objects.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NEEDLE_render_objects.js","sourceRoot":"","sources":["../../../src/engine/extensions/NEEDLE_render_objects.ts"],"names":[],"mappings":"AAKA,OAAO;AACH,gBAAgB;AAChB,gBAAgB,EAChB,eAAe,EACf,gBAAgB,EAChB,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACnB,uBAAuB,EACvB,iBAAiB;AACjB,cAAc;AACd,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,kBAAkB,EAClB,kBAAkB,EAClB,sBAAsB,EACtB,sBAAsB,EACtB,eAAe,
|
|
1
|
+
{"version":3,"file":"NEEDLE_render_objects.js","sourceRoot":"","sources":["../../../src/engine/extensions/NEEDLE_render_objects.ts"],"names":[],"mappings":"AAKA,OAAO;AACH,gBAAgB;AAChB,gBAAgB,EAChB,eAAe,EACf,gBAAgB,EAChB,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACnB,uBAAuB,EACvB,iBAAiB;AACjB,cAAc;AACd,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,kBAAkB,EAClB,kBAAkB,EAClB,sBAAsB,EACtB,sBAAsB,EACtB,eAAe,GAGlB,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,QAAQ,EAAe,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,MAAM,KAAK,GAAG,QAAQ,CAAC,cAAc,CAAC,CAAC;AAEvC,SAAS,YAAY,CAAC,YAAoB,EAAE,IAAe;IACvD,OAAO,CAAC,YAAY,GAAG,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AACjD,CAAC;AAgBD,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;AAErC,MAAM,OAAO,qBAAqB;IAEtB,MAAM,CAAC,QAAQ,GAA8C,EAAE,CAAC;IAExE,MAAM,CAAC,YAAY,CAAC,GAAsB;QACtC,IAAI,CAAC,GAAG;YAAE,OAAO;QACjB,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,CAAC;QAC5B,IAAI,KAAK;YAAE,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,QAAQ,CAAC,CAAC;QAC/D,IAAI,CAAC,MAAM;YAAE,OAAO;QACpB,MAAM,QAAQ,GAAG,qBAAqB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACxD,IAAI,CAAC,QAAQ;YAAE,OAAO;QACtB,KAAK,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;YAC3C,MAAM,OAAO,GAAyB,QAAQ,CAAC,CAAC,CAAC,CAAC;YAClD,IAAI,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE;gBAClC,IAAI,KAAK;oBAAE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAChC,UAAU,CAAC,GAAG,EAAE;oBACZ,IAAI,cAAc,EAAE,IAAI,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;wBACvD,kBAAkB,CAAC,4CAA4C,CAAC,CAAC;wBACjE,OAAO,CAAC,IAAI,CAAC,4CAA4C,EAAE,GAAG,CAAC,CAAC;qBACnE;gBACL,CAAC,EAAE,GAAG,CAAC,CAAA;gBACP,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBACjD,IAAI,GAAG,GAAG,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;oBACjC,IAAI,GAAG,EAAE;wBACL,wBAAwB;wBACxB,GAAG,GAAG,GAAG,CAAC,KAAK,EAAE,CAAC;wBAClB,GAAG,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;wBACtB,GAAG,CAAC,YAAY,GAAG,IAAI,CAAC;wBACxB,GAAG,CAAC,gBAAgB,GAAG,GAAG,CAAC;wBAC3B,GAAG,CAAC,eAAe,GAAG,GAAG,CAAC;wBAC1B,GAAG,CAAC,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC;wBAC/B,GAAG,CAAC,WAAW,GAAG,OAAO,CAAC,WAA0B,CAAC;wBACrD,GAAG,CAAC,YAAY,GAAG,OAAO,CAAC,MAAwB,CAAC;wBACpD,GAAG,CAAC,WAAW,GAAG,OAAO,CAAC,MAAwB,CAAC;wBACnD,GAAG,CAAC,YAAY,GAAG,OAAO,CAAC,OAAyB,CAAC;wBACrD,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;qBAChC;iBACJ;gBACD,gEAAgE;gBAChE,GAAG,CAAC,UAAU,CAAC,WAAW,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,OAAO,CAAC,KAAK,GAAG,EAAE,CAAC;gBACvE,MAAM;aACT;SACJ;IACL,CAAC;IAGO,MAAM,CAAa;IACnB,MAAM,CAAmB;IAEjC,YAAY,MAAkB,EAAE,MAAwB;QACpD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAED,SAAS,CAAC,OAAa;QAEnB,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;QAC/C,IAAI,UAAU,EAAE;YACZ,MAAM,GAAG,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC;YACvC,IAAI,GAAG,EAAE;gBACL,IAAI,KAAK;oBACL,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACrB,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC;gBAC7B,IAAI,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;oBACrC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;wBAC5B,MAAM,GAAG,GAAyB,EAAE,GAAG,OAAO,EAAE,CAAC;wBACjD,GAAG,CAAC,WAAW,GAAG,sBAAsB,CAAC,GAAG,CAAC,WAAqB,CAAC,CAAC;wBACpE,GAAG,CAAC,MAAM,GAAG,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;wBAC1C,GAAG,CAAC,MAAM,GAAG,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;wBAC1C,GAAG,CAAC,OAAO,GAAG,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;wBAE5C,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;4BAC5C,qBAAqB,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;wBACrD,qBAAqB,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;qBACzD;iBACJ;aACJ;SACJ;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;;AAQL,IAAK,SASJ;AATD,WAAK,SAAS;IACV,yCAAQ,CAAA;IACR,yCAAQ,CAAA;IACR,+CAAW,CAAA;IACX,mEAAqB,CAAA;IACrB,mEAAqB,CAAA;IACrB,6CAAU,CAAA;IACV,2DAAiB,CAAA;IACjB,2DAAiB,CAAA;AACrB,CAAC,EATI,SAAS,KAAT,SAAS,QASb;AAED,IAAK,eAUJ;AAVD,WAAK,eAAe;IAChB,6DAAQ,CAAA;IACR,uDAAK,CAAA;IACL,qDAAI,CAAA;IACJ,uDAAK,CAAA;IACL,+DAAS,CAAA;IACT,2DAAO,CAAA;IACP,6DAAQ,CAAA;IACR,qEAAY,CAAA;IACZ,yDAAM,CAAA;AACV,CAAC,EAVI,eAAe,KAAf,eAAe,QAUnB;AAED,SAAS,gBAAgB,CAAC,EAAa;IACnC,QAAQ,EAAE,EAAE;QACR,KAAK,SAAS,CAAC,IAAI;YACf,OAAO,aAAa,CAAC;QACzB,KAAK,SAAS,CAAC,IAAI;YACf,OAAO,aAAa,CAAC;QACzB,KAAK,SAAS,CAAC,OAAO;YAClB,OAAO,gBAAgB,CAAC;QAC5B,KAAK,SAAS,CAAC,iBAAiB;YAC5B,OAAO,kBAAkB,CAAC;QAC9B,KAAK,SAAS,CAAC,iBAAiB;YAC5B,OAAO,kBAAkB,CAAC;QAC9B,KAAK,SAAS,CAAC,aAAa;YACxB,OAAO,sBAAsB,CAAC;QAClC,KAAK,SAAS,CAAC,aAAa;YACxB,OAAO,sBAAsB,CAAC;QAClC,KAAK,SAAS,CAAC,MAAM;YACjB,OAAO,eAAe,CAAC;KAC9B;IACD,OAAO,CAAC,CAAC;AACb,CAAC;AAED,SAAS,sBAAsB,CAAC,IAAqB;IACjD,QAAQ,IAAI,EAAE;QACV,KAAK,eAAe,CAAC,KAAK;YACtB,OAAO,gBAAgB,CAAC;QAC5B,KAAK,eAAe,CAAC,IAAI;YACrB,OAAO,eAAe,CAAC;QAC3B,KAAK,eAAe,CAAC,KAAK;YACtB,OAAO,gBAAgB,CAAC;QAC5B,KAAK,eAAe,CAAC,SAAS;YAC1B,OAAO,oBAAoB,CAAC;QAChC,KAAK,eAAe,CAAC,OAAO;YACxB,OAAO,kBAAkB,CAAC;QAC9B,KAAK,eAAe,CAAC,QAAQ;YACzB,OAAO,mBAAmB,CAAC;QAC/B,KAAK,eAAe,CAAC,YAAY;YAC7B,OAAO,uBAAuB,CAAC;QACnC,KAAK,eAAe,CAAC,MAAM;YACvB,OAAO,iBAAiB,CAAC;KAChC;IACD,OAAO,gBAAgB,CAAC;AAC5B,CAAC;AAGD,MAAM,CAAC,MAAM,cAAc,GAAG,uBAAuB,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { FindShaderTechniques, whiteDefaultTexture, ToUnityMatrixArray, SetUnitySphericalHarmonics } from '../engine_shaders';
|
|
2
|
-
import { AlwaysDepth, BackSide, DoubleSide, EqualDepth, FrontSide, GreaterDepth, GreaterEqualDepth, LessDepth, LessEqualDepth, LinearEncoding, Matrix4, NotEqualDepth, RawShaderMaterial, Vector3, Vector4 } from 'three';
|
|
2
|
+
import { AlwaysDepth, BackSide, DoubleSide, EqualDepth, FrontSide, GLSL3, GreaterDepth, GreaterEqualDepth, LessDepth, LessEqualDepth, LinearEncoding, Matrix4, NotEqualDepth, RawShaderMaterial, Vector3, Vector4 } from 'three';
|
|
3
3
|
import { Context } from '../engine_setup';
|
|
4
4
|
import { getParam } from "../engine_utils";
|
|
5
5
|
import * as SHADERDATA from "../shaders/shaderData";
|
|
@@ -394,6 +394,9 @@ export class NEEDLE_techniques_webgl {
|
|
|
394
394
|
// "USE_SHADOWMAP" : true
|
|
395
395
|
// },
|
|
396
396
|
});
|
|
397
|
+
material.glslVersion = GLSL3;
|
|
398
|
+
material.vertexShader = material.vertexShader.replace("#version 300 es", "");
|
|
399
|
+
material.fragmentShader = material.fragmentShader.replace("#version 300 es", "");
|
|
397
400
|
const culling = uniforms["_Cull"]?.value;
|
|
398
401
|
switch (culling) {
|
|
399
402
|
case CullMode.Off:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NEEDLE_techniques_webgl.js","sourceRoot":"","sources":["../../../src/engine/extensions/NEEDLE_techniques_webgl.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"NEEDLE_techniques_webgl.js","sourceRoot":"","sources":["../../../src/engine/extensions/NEEDLE_techniques_webgl.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader";
|
|
|
2
2
|
import { NEEDLE_components } from "./NEEDLE_components";
|
|
3
3
|
import { ConstructorConcrete, SourceIdentifier } from "../engine_types";
|
|
4
4
|
import { Context } from "../engine_setup";
|
|
5
|
-
import { GLTFLoaderPlugin } from "three/examples/jsm/loaders/GLTFLoader";
|
|
5
|
+
import { GLTFLoaderPlugin } from "three/examples/jsm/loaders/GLTFLoader.js";
|
|
6
6
|
export declare function addCustomExtension(ext: ConstructorConcrete<GLTFLoaderPlugin>): void;
|
|
7
7
|
export declare function removeCustomExtension(ext: ConstructorConcrete<GLTFLoaderPlugin>): void;
|
|
8
8
|
export declare function registerComponentExtension(loader: GLTFLoader): NEEDLE_components;
|
|
@@ -12,6 +12,15 @@ import { NEEDLE_render_objects } from "./NEEDLE_render_objects";
|
|
|
12
12
|
import { NEEDLE_progressive } from "./NEEDLE_progressive";
|
|
13
13
|
import { InternalUsageTrackerPlugin } from "./usage_tracker";
|
|
14
14
|
import { isUsageTrackingEnabled } from "../engine_assetdatabase";
|
|
15
|
+
// import { GLTFAnimationPointerExtension } from "three/examples/jsm/loaders/GLTFLoaderAnimationPointer";
|
|
16
|
+
// lazily import the GLTFAnimationPointerExtension in case it doesnt exist (e.g. using vanilla three)
|
|
17
|
+
let GLTFAnimationPointerExtension;
|
|
18
|
+
import("three/examples/jsm/loaders/GLTFLoaderAnimationPointer").then(mod => {
|
|
19
|
+
GLTFAnimationPointerExtension = mod.GLTFAnimationPointerExtension;
|
|
20
|
+
return GLTFAnimationPointerExtension;
|
|
21
|
+
}).catch(e => {
|
|
22
|
+
console.warn("Failed to import GLTFLoaderAnimationPointer. Please use @needle-tools/three for full KHR_animation support", e);
|
|
23
|
+
});
|
|
15
24
|
const _addedCustomExtension = new Array();
|
|
16
25
|
export function addCustomExtension(ext) {
|
|
17
26
|
if (!_addedCustomExtension.includes(ext))
|
|
@@ -56,8 +65,13 @@ export function registerExtensions(loader, context, sourceId) {
|
|
|
56
65
|
loader.register(p => new InternalUsageTrackerPlugin(p));
|
|
57
66
|
for (const ext of _addedCustomExtension)
|
|
58
67
|
loader.register(p => new ext(p));
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
68
|
+
loader.register(p => {
|
|
69
|
+
if (GLTFAnimationPointerExtension) {
|
|
70
|
+
const ext = new GLTFAnimationPointerExtension(p);
|
|
71
|
+
const setPointerResolverFunction = ext.setAnimationPointerResolver;
|
|
72
|
+
setPointerResolverFunction.bind(ext)(new PointerResolver());
|
|
73
|
+
return ext;
|
|
74
|
+
}
|
|
75
|
+
});
|
|
62
76
|
}
|
|
63
77
|
//# sourceMappingURL=extensions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extensions.js","sourceRoot":"","sources":["../../../src/engine/extensions/extensions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,uDAAuD;AACvD,6EAA6E;AAC7E,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,mEAAmE;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAGlE,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"extensions.js","sourceRoot":"","sources":["../../../src/engine/extensions/extensions.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ import { XRSessionMode } from "../engine/engine_setup";
|
|
|
12
12
|
import { showBalloonMessage } from "../engine/debug/debug";
|
|
13
13
|
import { getWorldPosition } from "../engine/engine_three_utils";
|
|
14
14
|
import { Gizmos } from "../engine/engine_gizmos";
|
|
15
|
-
import { EquirectangularReflectionMapping, OrthographicCamera, PerspectiveCamera, Ray,
|
|
15
|
+
import { EquirectangularReflectionMapping, OrthographicCamera, PerspectiveCamera, Ray, SRGBColorSpace, Vector3 } from "three";
|
|
16
16
|
import { OrbitControls } from "./OrbitControls";
|
|
17
17
|
import { RenderTexture } from "../engine/engine_texture";
|
|
18
18
|
export var ClearFlags;
|
|
@@ -240,7 +240,7 @@ export class Camera extends Behaviour {
|
|
|
240
240
|
else
|
|
241
241
|
cam = this.gameObject.children[0];
|
|
242
242
|
if (cam && cam.isCamera) {
|
|
243
|
-
if (cam
|
|
243
|
+
if (cam instanceof PerspectiveCamera) {
|
|
244
244
|
if (this._fov)
|
|
245
245
|
cam.fov = this._fov;
|
|
246
246
|
cam.near = this._nearClipPlane;
|
|
@@ -392,7 +392,7 @@ class CameraSkybox {
|
|
|
392
392
|
else if (this.context.scene.background !== this._skybox) {
|
|
393
393
|
if (debug)
|
|
394
394
|
console.log("Set skybox", this._camera, this._skybox);
|
|
395
|
-
this._skybox.
|
|
395
|
+
this._skybox.colorSpace = SRGBColorSpace;
|
|
396
396
|
this._skybox.mapping = EquirectangularReflectionMapping;
|
|
397
397
|
this.context.scene.background = this._skybox;
|
|
398
398
|
}
|