fix: lint

galacean · Sep 26, 2024 · ca9450d · ca9450d
1 parent ee29a4f
commit ca9450d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 6 deletions.
diff --git a/packages/core/src/2d/sprite/SpriteMask.ts b/packages/core/src/2d/sprite/SpriteMask.ts
@@ -16,6 +16,7 @@ import { SpriteModifyFlags } from "../enums/SpriteModifyFlags";
 import { Sprite } from "./Sprite";
 import { Material } from "../../material";
 import { ColorWriteMask, CullMode, RenderQueueType, Shader } from "../../shader";
+import { Engine } from "../../Engine";
 
 /**
  * A component for masking Sprites.
@@ -26,7 +27,7 @@ export class SpriteMask extends Renderer {
   /** @internal */
   static _alphaCutoffProperty: ShaderProperty = ShaderProperty.getByName("renderer_MaskAlphaCutoff");
 
-  static _createSpriteMaskMaterial(engine): Material {
+  static _createSpriteMaskMaterial(engine: Engine): Material {
     const material = new Material(engine, Shader.find("SpriteMask"));
     const renderState = material.renderState;
     renderState.blendState.targetBlendState.colorWriteMask = ColorWriteMask.None;

diff --git a/packages/core/src/2d/sprite/SpriteRenderer.ts b/packages/core/src/2d/sprite/SpriteRenderer.ts
@@ -20,6 +20,7 @@ import { SpriteTileMode } from "../enums/SpriteTileMode";
 import { Sprite } from "./Sprite";
 import { Material } from "../../material";
 import { BlendFactor, BlendOperation, CullMode, RenderQueueType, Shader } from "../../shader";
+import { Engine } from "../../Engine";
 
 /**
  * Renders a Sprite for 2D graphics.
@@ -28,7 +29,7 @@ export class SpriteRenderer extends Renderer {
   /** @internal */
   static _textureProperty: ShaderProperty = ShaderProperty.getByName("renderer_SpriteTexture");
 
-  static _createSpriteMaterial(engine, maskInteraction: SpriteMaskInteraction): Material {
+  static _createSpriteMaterial(engine: Engine, maskInteraction: SpriteMaskInteraction): Material {
     const material = new Material(engine, Shader.find("Sprite"));
     const renderState = material.renderState;
     const target = renderState.blendState.targetBlendState;

diff --git a/packages/core/src/2d/text/TextRenderer.ts b/packages/core/src/2d/text/TextRenderer.ts
@@ -33,7 +33,7 @@ export class TextRenderer extends Renderer {
   private static _worldPositions = [new Vector3(), new Vector3(), new Vector3(), new Vector3()];
   private static _charRenderInfos: CharRenderInfo[] = [];
 
-  static _createTextMaterial(engine): Material {
+  static _createTextMaterial(engine: Engine): Material {
     const material = new Material(engine, Shader.find("Text"));
     const renderState = material.renderState;
     const target = renderState.blendState.targetBlendState;

diff --git a/packages/core/src/Engine.ts b/packages/core/src/Engine.ts
@@ -234,9 +234,22 @@ export class Engine extends EventDispatcher {
     this._canvas = canvas;
 
     const { _spriteDefaultMaterials: spriteDefaultMaterials } = this;
-    this._spriteDefaultMaterial = spriteDefaultMaterials[SpriteMaskInteraction.None] = SpriteRenderer._createSpriteMaterial(this, SpriteMaskInteraction.None);
-    spriteDefaultMaterials[SpriteMaskInteraction.VisibleInsideMask] = SpriteRenderer._createSpriteMaterial(this, SpriteMaskInteraction.VisibleInsideMask);
-    spriteDefaultMaterials[SpriteMaskInteraction.VisibleOutsideMask] = SpriteRenderer._createSpriteMaterial(this, SpriteMaskInteraction.VisibleOutsideMask);
+
+    this._spriteDefaultMaterial = spriteDefaultMaterials[SpriteMaskInteraction.None] = SpriteRenderer._createSpriteMaterial(
+      this,
+      SpriteMaskInteraction.None
+    );
+
+    spriteDefaultMaterials[SpriteMaskInteraction.VisibleInsideMask] = SpriteRenderer._createSpriteMaterial(
+      this,
+      SpriteMaskInteraction.VisibleInsideMask
+    );
+
+    spriteDefaultMaterials[SpriteMaskInteraction.VisibleOutsideMask] = SpriteRenderer._createSpriteMaterial(
+      this,
+      SpriteMaskInteraction.VisibleOutsideMask
+    );
+
     this._textDefaultMaterial = TextRenderer._createTextMaterial(this);
     this._spriteMaskDefaultMaterial = SpriteMask._createSpriteMaskMaterial(this);
     this._textDefaultFont = Font.createFromOS(this, "Arial");