Skip to content

Commit

Permalink
feat: update code
Browse files Browse the repository at this point in the history
  • Loading branch information
cptbtptpbcptdtptp committed Dec 19, 2024
1 parent 1caa84d commit 8527942
Show file tree
Hide file tree
Showing 21 changed files with 56 additions and 49 deletions.
2 changes: 1 addition & 1 deletion packages/core/src/2d/assembler/ISpriteAssembler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Matrix, Vector2, Vector3 } from "@galacean/engine-math";
import { ISpriteRenderer } from "./ISpriteRenderer";

/**
* @internal
* Interface for sprite assembler.
*/
export interface ISpriteAssembler {
resetData(renderer: ISpriteRenderer, vertexCount?: number): void;
Expand Down
3 changes: 3 additions & 0 deletions packages/core/src/2d/assembler/ISpriteRenderer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ import { SubPrimitiveChunk } from "../../RenderPipeline/SubPrimitiveChunk";
import { SpriteTileMode } from "../enums/SpriteTileMode";
import { Sprite } from "../sprite";

/**
* Interface for sprite renderer.
*/
export interface ISpriteRenderer {
sprite: Sprite;
color?: Color;
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/2d/assembler/SimpleSpriteAssembler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { ISpriteAssembler } from "./ISpriteAssembler";
import { ISpriteRenderer } from "./ISpriteRenderer";

/**
* @internal
* Assemble vertex data for the sprite renderer in simple mode.
*/
@StaticInterfaceImplement<ISpriteAssembler>()
export class SimpleSpriteAssembler {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/2d/assembler/SlicedSpriteAssembler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { ISpriteAssembler } from "./ISpriteAssembler";
import { ISpriteRenderer } from "./ISpriteRenderer";

/**
* @internal
* Assemble vertex data for the sprite renderer in sliced mode.
*/
@StaticInterfaceImplement<ISpriteAssembler>()
export class SlicedSpriteAssembler {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/2d/assembler/TiledSpriteAssembler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { ISpriteRenderer } from "./ISpriteRenderer";
import { SimpleSpriteAssembler } from "./SimpleSpriteAssembler";

/**
* @internal
* Assemble vertex data for the sprite renderer in tiled mode.
*/
@StaticInterfaceImplement<ISpriteAssembler>()
export class TiledSpriteAssembler {
Expand Down
9 changes: 9 additions & 0 deletions packages/core/src/2d/enums/SpriteModifyFlags.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,22 @@
* Sprite Property Dirty Flag.
*/
export enum SpriteModifyFlags {
/** The texture of sprite changes. */
texture = 0x1,
/** The size of sprite changes. */
size = 0x2,
/** The rotation of sprite changes. */
atlasRotate = 0x4,
/** The atlasRegion of sprite changes. */
atlasRegion = 0x8,
/** The atlasRegionOffset of sprite changes. */
atlasRegionOffset = 0x10,
/** The region of sprite changes. */
region = 0x20,
/** The pivot of sprite changes. */
pivot = 0x40,
/** The border of sprite changes. */
border = 0x80,
/** The sprite destroyed. */
destroy = 0x100
}
4 changes: 2 additions & 2 deletions packages/core/src/Camera.ts
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ export class Camera extends Component {
} else {
this.shaderData.disableMacro("CAMERA_ORTHOGRAPHIC");
}
this._dispatchModify(CameraModifyFlags.CameraType);
this._dispatchModify(CameraModifyFlags.ProjectionType);
}
}

Expand Down Expand Up @@ -654,7 +654,7 @@ export class Camera extends Component {
Logger.error("mipLevel only take effect in WebGL2.0");
}
let ignoreClearFlags: CameraClearFlags;
if (this._cameraType === CameraType.XRCamera && !this._renderTarget && !this.independentCanvasEnabled) {
if (this._cameraType !== CameraType.Normal && !this._renderTarget && !this.independentCanvasEnabled) {
ignoreClearFlags = engine.xrManager._getCameraIgnoreClearFlags(this._cameraType);
}
this._renderPipeline.render(context, cubeFace, mipLevel, ignoreClearFlags);
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/ComponentsManager.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { IUICanvas } from "@galacean/engine-design";
import { Camera } from "./Camera";
import { Component } from "./Component";
import { Renderer } from "./Renderer";
import { Script } from "./Script";
import { Animator } from "./animation";
import { IUICanvas } from "./ui/IUICanvas";
import { DisorderedArray } from "./utils/DisorderedArray";

/**
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/Renderer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { DependentMode, dependentComponents } from "./ComponentsDependencies";
import { Entity } from "./Entity";
import { RenderContext } from "./RenderPipeline/RenderContext";
import { SubRenderElement } from "./RenderPipeline/SubRenderElement";
import { Transform } from "./Transform";
import { Transform, TransformModifyFlags } from "./Transform";
import { assignmentClone, deepClone, ignoreClone } from "./clone/CloneManager";
import { IComponentCustomClone } from "./clone/ComponentCloner";
import { SpriteMaskLayer } from "./enums/SpriteMaskLayer";
Expand Down Expand Up @@ -550,7 +550,7 @@ export class Renderer extends Component implements IComponentCustomClone {
}

@ignoreClone
protected _onTransformChanged(type: number): void {
protected _onTransformChanged(type: TransformModifyFlags): void {
this._dirtyUpdateFlag |= RendererUpdateFlags.WorldPositionAndBounds;
}
}
Expand Down
11 changes: 10 additions & 1 deletion packages/core/src/enums/CameraModifyFlags.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
/**
* The camera modify flags.
*/
export enum CameraModifyFlags {
CameraType = 0x1,
/** The types of camera projections changes. */
ProjectionType = 0x1,
/** The aspect ratio of the camera changes. */
AspectRatio = 0x2,
/** The field of view of the camera changes. */
FieldOfView = 0x4,
/** The orthographic size of the camera changes. */
OrthographicSize = 0x8,
/** The camera becomes active in the scene. */
EnableInScene = 0x10,
/** The camera becomes inactive in the scene. */
DisableInScene = 0x20
}
3 changes: 1 addition & 2 deletions packages/core/src/enums/CameraType.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,5 @@ export enum CameraType {
Normal = 0x0,
XRCenterCamera = 0x1,
XRLeftCamera = 0x2,
XRRightCamera = 0x4,
XRCamera = CameraType.XRCenterCamera | CameraType.XRLeftCamera | CameraType.XRRightCamera
XRRightCamera = 0x4
}
23 changes: 0 additions & 23 deletions packages/core/src/enums/ComponentType.ts

This file was deleted.

5 changes: 5 additions & 0 deletions packages/core/src/enums/EntityModifyFlags.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
/**
* The entity modify flags.
*/
export enum EntityModifyFlags {
/** The parent changes. */
Parent = 0x1,
/** The sibling index changes. */
SiblingIndex = 0x2
}
4 changes: 2 additions & 2 deletions packages/core/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export { Entity } from "./Entity";
export { Component } from "./Component";
export { Script } from "./Script";
export { Renderer, RendererUpdateFlags } from "./Renderer";
export { DependentMode, dependentComponents } from "./ComponentsDependencies";
export { dependentComponents, DependentMode } from "./ComponentsDependencies";
export { Camera } from "./Camera";
export { Transform } from "./Transform";
export { BoolUpdateFlag } from "./BoolUpdateFlag";
Expand All @@ -34,7 +34,6 @@ export * from "./base";

export { Background } from "./Background";
export { BackgroundMode } from "./enums/BackgroundMode";
export { BackgroundTextureFillMode } from "./enums/BackgroundTextureFillMode";
export { DepthTextureMode } from "./enums/DepthTextureMode";
export { FogMode } from "./enums/FogMode";
export { CameraClearFlags } from "./enums/CameraClearFlags";
Expand All @@ -45,6 +44,7 @@ export { MSAASamples } from "./enums/MSAASamples";
export { ReplacementFailureStrategy } from "./enums/ReplacementFailureStrategy";
export { Downsampling } from "./enums/Downsampling";
export { ColorSpace } from "./enums/ColorSpace";
export { BackgroundTextureFillMode } from "./enums/BackgroundTextureFillMode";
export { SpriteMaskLayer } from "./enums/SpriteMaskLayer";
export { XRManager } from "./xr/XRManager";
export * from "./utils/index";
Expand Down
14 changes: 14 additions & 0 deletions packages/core/src/ui/IUICanvas.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { Entity } from "../Entity";
import { RenderContext } from "../RenderPipeline/RenderContext";
import { RenderElement } from "../RenderPipeline/RenderElement";

/**
* @internal
*/
export interface IUICanvas {
entity: Entity;
sortOrder: number;
_canvasIndex: number;
_renderElement: RenderElement;
_prepareRender(renderContext: RenderContext): void;
}
2 changes: 1 addition & 1 deletion packages/core/src/ui/UIUtils.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { IUICanvas } from "@galacean/engine-design";
import { Matrix, Vector4 } from "@galacean/engine-math";
import { Engine } from "../Engine";
import { RenderQueue } from "../RenderPipeline";
import { ContextRendererUpdateFlag } from "../RenderPipeline/RenderContext";
import { VirtualCamera } from "../VirtualCamera";
import { RenderQueueType } from "../shader";
import { DisorderedArray } from "../utils/DisorderedArray";
import { IUICanvas } from "./IUICanvas";

export class UIUtils {
private static _renderQueue: RenderQueue;
Expand Down
1 change: 0 additions & 1 deletion packages/design/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ export * from "./input/index";
export * from "./physics/index";
export * from "./renderingHardwareInterface/index";
export * from "./shader-lab/index";
export * from "./ui/index";
export * from "./xr/index";
7 changes: 0 additions & 7 deletions packages/design/src/ui/IUICanvas.ts

This file was deleted.

1 change: 0 additions & 1 deletion packages/design/src/ui/index.ts

This file was deleted.

2 changes: 1 addition & 1 deletion packages/ui/src/component/UICanvas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ export class UICanvas extends Component implements IElement {
private _onCameraModifyListener(flag: CameraModifyFlags): void {
if (this._realRenderMode === CanvasRenderMode.ScreenSpaceCamera) {
switch (flag) {
case CameraModifyFlags.CameraType:
case CameraModifyFlags.ProjectionType:
case CameraModifyFlags.AspectRatio:
this._adapterSizeInScreenSpace();
break;
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/src/interface/IGroupAble.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ export interface IGroupAble extends IElement {

_getGroup(): UIGroup;
_onGroupModify(flag: GroupModifyFlags, isPass?: boolean): void;
_groupListener: (flag: number) => void;
_groupListener(flag: number): void;
}

0 comments on commit 8527942

Please sign in to comment.