@galacean/engine-loader 1.1.0-beta.15 → 1.1.0-beta.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/main.js +28 -23
- package/dist/main.js.map +1 -1
- package/dist/miniprogram.js +28 -23
- package/dist/module.js +28 -23
- package/dist/module.js.map +1 -1
- package/package.json +5 -5
package/dist/miniprogram.js
CHANGED
|
@@ -5545,29 +5545,34 @@ var SceneLoader = /*#__PURE__*/ function(Loader1) {
|
|
|
5545
5545
|
var promises = [];
|
|
5546
5546
|
// parse ambient light
|
|
5547
5547
|
var ambient = data.scene.ambient;
|
|
5548
|
-
|
|
5549
|
-
|
|
5550
|
-
|
|
5551
|
-
|
|
5552
|
-
|
|
5553
|
-
|
|
5554
|
-
|
|
5555
|
-
|
|
5556
|
-
|
|
5557
|
-
|
|
5558
|
-
|
|
5559
|
-
|
|
5560
|
-
|
|
5561
|
-
|
|
5562
|
-
|
|
5563
|
-
|
|
5564
|
-
|
|
5565
|
-
|
|
5566
|
-
|
|
5567
|
-
|
|
5568
|
-
|
|
5569
|
-
|
|
5570
|
-
|
|
5548
|
+
if (ambient) {
|
|
5549
|
+
var useCustomAmbient = ambient.specularMode === "Custom";
|
|
5550
|
+
var useSH = ambient.diffuseMode === miniprogram.DiffuseMode.SphericalHarmonics;
|
|
5551
|
+
scene.ambientLight.diffuseIntensity = ambient.diffuseIntensity;
|
|
5552
|
+
scene.ambientLight.specularIntensity = ambient.specularIntensity;
|
|
5553
|
+
scene.ambientLight.diffuseMode = ambient.diffuseMode;
|
|
5554
|
+
scene.ambientLight.diffuseSolidColor.copyFrom(ambient.diffuseSolidColor);
|
|
5555
|
+
scene.ambientLight.specularTextureDecodeRGBM = true;
|
|
5556
|
+
if (useCustomAmbient && ambient.customAmbientLight) {
|
|
5557
|
+
promises.push(// @ts-ignore
|
|
5558
|
+
resourceManager.getResourceByRef(ambient.customAmbientLight).then(function(ambientLight) {
|
|
5559
|
+
var _ambientLight;
|
|
5560
|
+
scene.ambientLight.specularTexture = (_ambientLight = ambientLight) == null ? void 0 : _ambientLight.specularTexture;
|
|
5561
|
+
}));
|
|
5562
|
+
}
|
|
5563
|
+
if (ambient.ambientLight && (!useCustomAmbient || useSH)) {
|
|
5564
|
+
promises.push(// @ts-ignore
|
|
5565
|
+
resourceManager.getResourceByRef(ambient.ambientLight).then(function(ambientLight) {
|
|
5566
|
+
if (!useCustomAmbient) {
|
|
5567
|
+
var _ambientLight;
|
|
5568
|
+
scene.ambientLight.specularTexture = (_ambientLight = ambientLight) == null ? void 0 : _ambientLight.specularTexture;
|
|
5569
|
+
}
|
|
5570
|
+
if (useSH) {
|
|
5571
|
+
var _ambientLight1;
|
|
5572
|
+
scene.ambientLight.diffuseSphericalHarmonics = (_ambientLight1 = ambientLight) == null ? void 0 : _ambientLight1.diffuseSphericalHarmonics;
|
|
5573
|
+
}
|
|
5574
|
+
}));
|
|
5575
|
+
}
|
|
5571
5576
|
}
|
|
5572
5577
|
var background = data.scene.background;
|
|
5573
5578
|
scene.background.mode = background.mode;
|
package/dist/module.js
CHANGED
|
@@ -5540,29 +5540,34 @@ var SceneLoader = /*#__PURE__*/ function(Loader1) {
|
|
|
5540
5540
|
var promises = [];
|
|
5541
5541
|
// parse ambient light
|
|
5542
5542
|
var ambient = data.scene.ambient;
|
|
5543
|
-
|
|
5544
|
-
|
|
5545
|
-
|
|
5546
|
-
|
|
5547
|
-
|
|
5548
|
-
|
|
5549
|
-
|
|
5550
|
-
|
|
5551
|
-
|
|
5552
|
-
|
|
5553
|
-
|
|
5554
|
-
|
|
5555
|
-
|
|
5556
|
-
|
|
5557
|
-
|
|
5558
|
-
|
|
5559
|
-
|
|
5560
|
-
|
|
5561
|
-
|
|
5562
|
-
|
|
5563
|
-
|
|
5564
|
-
|
|
5565
|
-
|
|
5543
|
+
if (ambient) {
|
|
5544
|
+
var useCustomAmbient = ambient.specularMode === "Custom";
|
|
5545
|
+
var useSH = ambient.diffuseMode === DiffuseMode.SphericalHarmonics;
|
|
5546
|
+
scene.ambientLight.diffuseIntensity = ambient.diffuseIntensity;
|
|
5547
|
+
scene.ambientLight.specularIntensity = ambient.specularIntensity;
|
|
5548
|
+
scene.ambientLight.diffuseMode = ambient.diffuseMode;
|
|
5549
|
+
scene.ambientLight.diffuseSolidColor.copyFrom(ambient.diffuseSolidColor);
|
|
5550
|
+
scene.ambientLight.specularTextureDecodeRGBM = true;
|
|
5551
|
+
if (useCustomAmbient && ambient.customAmbientLight) {
|
|
5552
|
+
promises.push(// @ts-ignore
|
|
5553
|
+
resourceManager.getResourceByRef(ambient.customAmbientLight).then(function(ambientLight) {
|
|
5554
|
+
var _ambientLight;
|
|
5555
|
+
scene.ambientLight.specularTexture = (_ambientLight = ambientLight) == null ? void 0 : _ambientLight.specularTexture;
|
|
5556
|
+
}));
|
|
5557
|
+
}
|
|
5558
|
+
if (ambient.ambientLight && (!useCustomAmbient || useSH)) {
|
|
5559
|
+
promises.push(// @ts-ignore
|
|
5560
|
+
resourceManager.getResourceByRef(ambient.ambientLight).then(function(ambientLight) {
|
|
5561
|
+
if (!useCustomAmbient) {
|
|
5562
|
+
var _ambientLight;
|
|
5563
|
+
scene.ambientLight.specularTexture = (_ambientLight = ambientLight) == null ? void 0 : _ambientLight.specularTexture;
|
|
5564
|
+
}
|
|
5565
|
+
if (useSH) {
|
|
5566
|
+
var _ambientLight1;
|
|
5567
|
+
scene.ambientLight.diffuseSphericalHarmonics = (_ambientLight1 = ambientLight) == null ? void 0 : _ambientLight1.diffuseSphericalHarmonics;
|
|
5568
|
+
}
|
|
5569
|
+
}));
|
|
5570
|
+
}
|
|
5566
5571
|
}
|
|
5567
5572
|
var background = data.scene.background;
|
|
5568
5573
|
scene.background.mode = background.mode;
|