diff --git a/packages/core/src/Transform.ts b/packages/core/src/Transform.ts index 2da281da2b..2cdc8691b3 100644 --- a/packages/core/src/Transform.ts +++ b/packages/core/src/Transform.ts @@ -19,41 +19,41 @@ export class Transform extends Component { private static _tempMat42: Matrix = new Matrix(); @deepClone - protected _position: Vector3 = new Vector3(); + private _position: Vector3 = new Vector3(); @deepClone - protected _rotation: Vector3 = new Vector3(); + private _rotation: Vector3 = new Vector3(); @deepClone - protected _rotationQuaternion: Quaternion = new Quaternion(); + private _rotationQuaternion: Quaternion = new Quaternion(); @deepClone - protected _scale: Vector3 = new Vector3(1, 1, 1); + private _scale: Vector3 = new Vector3(1, 1, 1); @assignmentClone - protected _localUniformScaling: boolean = true; + private _localUniformScaling: boolean = true; @deepClone - protected _worldPosition: Vector3 = new Vector3(); + private _worldPosition: Vector3 = new Vector3(); @deepClone - protected _worldRotation: Vector3 = new Vector3(); + private _worldRotation: Vector3 = new Vector3(); @deepClone - protected _worldRotationQuaternion: Quaternion = new Quaternion(); + private _worldRotationQuaternion: Quaternion = new Quaternion(); @assignmentClone - protected _worldUniformScaling: boolean = true; + private _worldUniformScaling: boolean = true; @deepClone - protected _lossyWorldScale: Vector3 = new Vector3(1, 1, 1); + private _lossyWorldScale: Vector3 = new Vector3(1, 1, 1); @deepClone - protected _localMatrix: Matrix = new Matrix(); + private _localMatrix: Matrix = new Matrix(); @deepClone - protected _worldMatrix: Matrix = new Matrix(); + private _worldMatrix: Matrix = new Matrix(); @ignoreClone - protected _worldForward: Vector3 = null; + private _worldForward: Vector3 = null; @ignoreClone - protected _worldRight: Vector3 = null; + private _worldRight: Vector3 = null; @ignoreClone - protected _worldUp: Vector3 = null; + private _worldUp: Vector3 = null; @ignoreClone - protected _isParentDirty: boolean = true; + private _isParentDirty: boolean = true; @ignoreClone - protected _parentTransformCache: Transform = null; - protected _dirtyFlag: number = TransformModifyFlags.WmWpWeWqWs; + private _parentTransformCache: Transform = null; + private _dirtyFlag: number = TransformModifyFlags.WmWpWeWqWs; /** * Local position. diff --git a/packages/ui/src/component/UICanvas.ts b/packages/ui/src/component/UICanvas.ts index 723f285829..6e9ac3f850 100644 --- a/packages/ui/src/component/UICanvas.ts +++ b/packages/ui/src/component/UICanvas.ts @@ -90,10 +90,10 @@ export class UICanvas extends Component implements IElement { return this._referenceResolution; } - set referenceResolution(val: Vector2) { + set referenceResolution(value: Vector2) { const referenceResolution = this._referenceResolution; - if (referenceResolution === val) return; - (referenceResolution.x !== val.x || referenceResolution.y !== val.y) && referenceResolution.copyFrom(val); + if (referenceResolution === value) return; + (referenceResolution.x !== value.x || referenceResolution.y !== value.y) && referenceResolution.copyFrom(value); } /** @@ -120,10 +120,10 @@ export class UICanvas extends Component implements IElement { return this._renderCamera; } - set renderCamera(val: Camera) { + set renderCamera(value: Camera) { const preCamera = this._renderCamera; - if (preCamera !== val) { - this._renderCamera = val; + if (preCamera !== value) { + this._renderCamera = value; this._updateCameraObserver(); this._setRealRenderMode(this._getRealRenderMode()); } @@ -136,9 +136,9 @@ export class UICanvas extends Component implements IElement { return this._resolutionAdaptationStrategy; } - set resolutionAdaptationStrategy(val: ResolutionAdaptationStrategy) { - if (this._resolutionAdaptationStrategy !== val) { - this._resolutionAdaptationStrategy = val; + set resolutionAdaptationStrategy(value: ResolutionAdaptationStrategy) { + if (this._resolutionAdaptationStrategy !== value) { + this._resolutionAdaptationStrategy = value; const realRenderMode = this._realRenderMode; if ( realRenderMode === CanvasRenderMode.ScreenSpaceCamera || @@ -156,9 +156,9 @@ export class UICanvas extends Component implements IElement { return this._sortOrder; } - set sortOrder(val: number) { - if (this._sortOrder !== val) { - this._sortOrder = val; + set sortOrder(value: number) { + if (this._sortOrder !== value) { + this._sortOrder = value; this._realRenderMode === CanvasRenderMode.ScreenSpaceOverlay && // @ts-ignore (this.scene._componentsManager._overlayCanvasesSortingFlag = true); @@ -172,9 +172,9 @@ export class UICanvas extends Component implements IElement { return this._distance; } - set distance(val: number) { - if (this._distance !== val) { - this._distance = val; + set distance(value: number) { + if (this._distance !== value) { + this._distance = value; if (this._realRenderMode === CanvasRenderMode.ScreenSpaceCamera) { this._adapterPoseInScreenSpace(); this._adapterSizeInScreenSpace(); diff --git a/packages/ui/src/component/UIGroup.ts b/packages/ui/src/component/UIGroup.ts index 54bc8998fd..7729f2f2ac 100644 --- a/packages/ui/src/component/UIGroup.ts +++ b/packages/ui/src/component/UIGroup.ts @@ -53,9 +53,9 @@ export class UIGroup extends Component implements IGroupAble { return this._ignoreParentGroup; } - set ignoreParentGroup(val: boolean) { - if (this._ignoreParentGroup !== val) { - this._ignoreParentGroup = val; + set ignoreParentGroup(value: boolean) { + if (this._ignoreParentGroup !== value) { + this._ignoreParentGroup = value; this._onGroupModify(GroupModifyFlags.All); } } @@ -64,9 +64,9 @@ export class UIGroup extends Component implements IGroupAble { return this._interactive; } - set interactive(val: boolean) { - if (this._interactive !== val) { - this._interactive = val; + set interactive(value: boolean) { + if (this._interactive !== value) { + this._interactive = value; this._onGroupModify(GroupModifyFlags.GlobalInteractive); } } @@ -75,10 +75,10 @@ export class UIGroup extends Component implements IGroupAble { return this._alpha; } - set alpha(val: number) { - val = Math.max(0, Math.min(val, 1)); - if (this._alpha !== val) { - this._alpha = val; + set alpha(value: number) { + value = Math.max(0, Math.min(value, 1)); + if (this._alpha !== value) { + this._alpha = value; this._onGroupModify(GroupModifyFlags.GlobalAlpha); } } diff --git a/packages/ui/src/component/UIRenderer.ts b/packages/ui/src/component/UIRenderer.ts index c8c08ddfeb..e63b0ae243 100644 --- a/packages/ui/src/component/UIRenderer.ts +++ b/packages/ui/src/component/UIRenderer.ts @@ -98,8 +98,8 @@ export class UIRenderer extends Renderer implements IGraphics { return this._raycastEnable; } - set raycastEnable(val: boolean) { - this._raycastEnable = val; + set raycastEnable(value: boolean) { + this._raycastEnable = value; } /** diff --git a/packages/ui/src/component/UITransform.ts b/packages/ui/src/component/UITransform.ts index 4194d4e646..2d6099acc1 100644 --- a/packages/ui/src/component/UITransform.ts +++ b/packages/ui/src/component/UITransform.ts @@ -16,10 +16,10 @@ export class UITransform extends Transform { return this._size; } - set size(val: Vector2) { + set size(value: Vector2) { const { _size: size } = this; - if (size === val) return; - (size.x !== val.x || size.y !== val.y) && size.copyFrom(val); + if (size === value) return; + (size.x !== value.x || size.y !== value.y) && size.copyFrom(value); } /** @@ -29,10 +29,10 @@ export class UITransform extends Transform { return this._pivot; } - set pivot(val: Vector2) { + set pivot(value: Vector2) { const { _pivot: pivot } = this; - if (pivot === val) return; - (pivot.x !== val.x || pivot.y !== val.y) && pivot.copyFrom(val); + if (pivot === value) return; + (pivot.x !== value.x || pivot.y !== value.y) && pivot.copyFrom(value); } /**