Fix initialize function override mip levels(groundalbedo.w) (#9633)

* Fix initialize function override mip levels(groundalbedo.w)

* Code style
This commit is contained in:
jk20012001
2021-11-05 17:51:00 +08:00
committed by GitHub
parent 7ad092a260
commit f488ea0bb1
2 changed files with 28 additions and 28 deletions
+6 -2
View File
@@ -153,11 +153,15 @@ export class Ambient {
public initialize (ambientInfo: AmbientInfo) {
// Init HDR/LDR from serialized data on load
this._skyColorHDR = ambientInfo.skyColorHDR;
this._groundAlbedoHDR = ambientInfo.groundAlbedoHDR;
this._groundAlbedoHDR.x = ambientInfo.groundAlbedoHDR.x;
this._groundAlbedoHDR.y = ambientInfo.groundAlbedoHDR.y;
this._groundAlbedoHDR.z = ambientInfo.groundAlbedoHDR.z;
this._skyIllumHDR = ambientInfo.skyIllumHDR;
this._skyColorLDR = ambientInfo.skyColorLDR;
this._groundAlbedoLDR = ambientInfo.groundAlbedoLDR;
this._groundAlbedoLDR.x = ambientInfo.groundAlbedoLDR.x;
this._groundAlbedoLDR.y = ambientInfo.groundAlbedoLDR.y;
this._groundAlbedoLDR.z = ambientInfo.groundAlbedoLDR.z;
this._skyIllumLDR = ambientInfo.skyIllumLDR;
if (JSB) {
+22 -26
View File
@@ -39,6 +39,8 @@ import { Root } from '../root';
const _up = new Vec3(0, 1, 0);
const _v3 = new Vec3();
const _v4 = new Vec4();
const _col = new Color();
const _qt = new Quat();
// Normalize HDR color
@@ -114,31 +116,28 @@ export class AmbientInfo {
})
@editable
set skyLightingColor (val: Color) {
let result;
const color = new Vec4(val.x, val.y, val.z, val.w);
_v4.set(val.x, val.y, val.z, val.w);
if ((legacyCC.director.root as Root).pipeline.pipelineSceneData.isHDR) {
this._skyColorHDR = color;
(result as Vec4) = this._skyColorHDR;
this._skyColorHDR.set(_v4);
} else {
this._skyColorLDR = color;
(result as Vec4) = this._skyColorLDR;
this._skyColorLDR.set(_v4);
}
if (this._resource) { this._resource.skyColor = _v3.set(color.x, color.y, color.z); }
if (this._resource) { this._resource.skyColor.set(_v4); }
}
get skyLightingColor () {
const isHDR = (legacyCC.director.root as Root).pipeline.pipelineSceneData.isHDR;
const color = isHDR ? this._skyColorHDR.clone() : this._skyColorLDR.clone();
normalizeHDRColor(color);
return new Color(color.x * 255, color.y * 255, color.z * 255, 255);
_v4.set(isHDR ? this._skyColorHDR : this._skyColorLDR);
normalizeHDRColor(_v4);
return _col.set(_v4.x * 255, _v4.y * 255, _v4.z * 255, 255);
}
set skyColor (val: Vec4) {
if ((legacyCC.director.root as Root).pipeline.pipelineSceneData.isHDR) {
this._skyColorHDR = val;
this._skyColorHDR.set(val);
} else {
this._skyColorLDR = val;
this._skyColorLDR.set(val);
}
if (this._resource) { this._resource.skyColor = val; }
if (this._resource) { this._resource.skyColor.set(val); }
}
/**
@@ -179,31 +178,28 @@ export class AmbientInfo {
})
@editable
set groundLightingColor (val: Color) {
let result;
const color = new Vec4(val.x, val.y, val.z, val.w);
_v4.set(val.x, val.y, val.z, val.w);
if ((legacyCC.director.root as Root).pipeline.pipelineSceneData.isHDR) {
this._groundAlbedoHDR = color;
(result as Vec4) = this._groundAlbedoHDR;
this._groundAlbedoHDR.set(_v4);
} else {
this._groundAlbedoLDR = color;
(result as Vec4) = this._groundAlbedoLDR;
this._groundAlbedoLDR.set(_v4);
}
if (this._resource) { this._resource.groundAlbedo = _v3.set(color.x, color.y, color.z); }
if (this._resource) { this._resource.groundAlbedo.set(_v4); }
}
get groundLightingColor () {
const isHDR = (legacyCC.director.root as Root).pipeline.pipelineSceneData.isHDR;
const color = isHDR ? this._groundAlbedoHDR : this._groundAlbedoLDR;
normalizeHDRColor(color);
return new Color(color.x * 255, color.y * 255, color.z * 255, 255);
_v4.set(isHDR ? this._groundAlbedoHDR : this._groundAlbedoLDR);
normalizeHDRColor(_v4);
return _col.set(_v4.x * 255, _v4.y * 255, _v4.z * 255, 255);
}
set groundAlbedo (val: Vec4) {
if ((legacyCC.director.root as Root).pipeline.pipelineSceneData.isHDR) {
this._groundAlbedoHDR = val;
this._groundAlbedoHDR.set(val);
} else {
this._groundAlbedoLDR = val;
this._groundAlbedoLDR.set(val);
}
if (this._resource) { this._resource.groundAlbedo = val; }
if (this._resource) { this._resource.groundAlbedo.set(val); }
}
public activate (resource: Ambient) {