Optimization shader part of the code

packages/core/src/2d/sprite/SpriteMask.ts

@@ -5,7 +5,6 @@ import { Entity } from "../../Entity";
 import { Renderer, RendererUpdateFlags } from "../../Renderer";
 import { RenderContext } from "../../RenderPipeline/RenderContext";
 import { RenderElement } from "../../RenderPipeline/RenderElement";
-import { Shader } from "../../shader/Shader";
 import { ShaderProperty } from "../../shader/ShaderProperty";
 import { SimpleSpriteAssembler } from "../assembler/SimpleSpriteAssembler";
 import { VertexData2D } from "../data/VertexData2D";

packages/core/src/2d/sprite/SpriteRenderer.ts

@@ -5,7 +5,6 @@ import { Entity } from "../../Entity";
 import { Renderer, RendererUpdateFlags } from "../../Renderer";
 import { RenderContext } from "../../RenderPipeline/RenderContext";
 import { CompareFunction } from "../../shader/enums/CompareFunction";
-import { Shader } from "../../shader/Shader";
 import { ShaderProperty } from "../../shader/ShaderProperty";
 import { IAssembler } from "../assembler/IAssembler";
 import { SimpleSpriteAssembler } from "../assembler/SimpleSpriteAssembler";

packages/core/src/ComponentsDependencies.ts

@@ -62,11 +62,9 @@ export class ComponentsDependencies {
   ): void {
     let components = map.get(targetInfo);
     if (!components) {
-      components = [];
-      map.set(targetInfo, components);
-    }
-    if (components.indexOf(dependentComponent) === -1) {
-      components.push(dependentComponent);
+      map.set(targetInfo, [dependentComponent]);
+    } else {
+      components.includes(dependentComponent) || components.push(dependentComponent);
     }
   }
 
@@ -77,11 +75,9 @@ export class ComponentsDependencies {
     const map = this._invDependenciesMap;
     let components = map.get(currentComponent);
     if (!components) {
-      components = [];
-      map.set(currentComponent, components);
-    }
-    if (components.indexOf(dependentComponent) === -1) {
-      components.push(dependentComponent);
+      map.set(currentComponent, [dependentComponent]);
+    } else {
+      components.includes(dependentComponent) || components.push(dependentComponent);
     }
   }
 
@@ -95,8 +91,7 @@ export class ComponentsDependencies {
  */
 export function dependentComponents(dependentMode: DependentMode, ...components: ComponentConstructor[]) {
   return function <T extends ComponentConstructor>(target: T): void {
-    const dependentInfo = { mode: dependentMode, components };
-    ComponentsDependencies._dependenciesMap.set(target, dependentInfo);
+    ComponentsDependencies._dependenciesMap.set(target, { mode: dependentMode, components });
     components.forEach((component) => ComponentsDependencies._addInvDependency(component, target));
   };
 }

packages/core/src/mesh/BlendShapeManager.ts

@@ -7,7 +7,6 @@ import { BufferUsage } from "../graphic/enums/BufferUsage";
 import { VertexElementFormat } from "../graphic/enums/VertexElementFormat";
 import { VertexBufferBinding } from "../graphic/VertexBufferBinding";
 import { VertexElement } from "../graphic/VertexElement";
-import { Shader } from "../shader/Shader";
 import { ShaderData } from "../shader/ShaderData";
 import { ShaderMacro } from "../shader/ShaderMacro";
 import { ShaderProperty } from "../shader/ShaderProperty";

packages/core/src/shader/Shader.ts

@@ -63,7 +63,7 @@ export class Shader {
         if (vertexSourceOrShaderPassesOrSubShaders[0].constructor === ShaderPass) {
           shader = new Shader(name, [new SubShader("Default", <ShaderPass[]>vertexSourceOrShaderPassesOrSubShaders)]);
         } else {
-          shader = new Shader(name, <SubShader[]>vertexSourceOrShaderPassesOrSubShaders);
+          shader = new Shader(name, <SubShader[]>vertexSourceOrShaderPassesOrSubShaders.slice());
         }
       } else {
         throw "SubShader or ShaderPass count must large than 0.";
@@ -92,12 +92,7 @@ export class Shader {
 
   private constructor(public readonly name: string, subShaders: SubShader[]) {
     this.name = name;
-
-    const passCount = subShaders.length;
-    if (passCount < 1) {
-      throw "SubShader count must large than 0.";
-    }
-    this._subShaders = subShaders.slice();
+    this._subShaders = subShaders;
   }
 
   /**

packages/core/src/shader/ShaderData.ts

@@ -5,7 +5,6 @@ import { CloneManager } from "../clone/CloneManager";
 import { Texture } from "../texture/Texture";
 import { ShaderDataGroup } from "./enums/ShaderDataGroup";
 import { ShaderPropertyType } from "./enums/ShaderPropertyType";
-import { Shader } from "./Shader";
 import { ShaderMacro } from "./ShaderMacro";
 import { ShaderMacroCollection } from "./ShaderMacroCollection";
 import { ShaderProperty } from "./ShaderProperty";

packages/core/src/shader/ShaderPart.ts

@@ -1,3 +1,4 @@
+import { Logger } from "../base";
 import { ShaderTagKey } from "./ShaderTagKey";
 
 /**
@@ -24,8 +25,8 @@ export abstract class ShaderPart {
     const key = typeof keyOrKeyName === "string" ? ShaderTagKey.getByName(keyOrKeyName) : keyOrKeyName;
     const tags = this._tagsMap;
 
-    if (tags[key._uniqueId]) {
-      throw `Tag named "${key.name}" already exists.`;
+    if (tags[key._uniqueId] !== undefined) {
+      Logger.warn(`The value of tag named "${key.name}" is being replaced.`);
     }
     tags[key._uniqueId] = value;
   }

packages/core/src/shader/ShaderPass.ts

@@ -29,7 +29,7 @@ export class ShaderPass extends ShaderPart {
   constructor(
     vertexSource: string,
     fragmentSource: string,
-    tags: Record<string, string> = { pipelineStage: PipelineStage.Forward }
+    tags: Record<string, number | string | boolean> = { pipelineStage: PipelineStage.Forward }
   ) {
     super();
     this._shaderPassId = ShaderPass._shaderPassCounter++;
@@ -75,21 +75,18 @@ export class ShaderPass extends ShaderPart {
       precisionStr += "#define HAS_DERIVATIVES\n";
     }
 
-    let vertexSource = ShaderFactory.parseIncludes(
+    let vertexSource =
       ` ${versionStr}
         ${graphicAPI}
         ${macroNameStr}
-      ` + this._vertexSource
-    );
-
-    let fragmentSource = ShaderFactory.parseIncludes(
+      ` + ShaderFactory.parseIncludes(this._vertexSource);
+    let fragmentSource =
       ` ${versionStr}
         ${graphicAPI}
         ${isWebGL2 ? "" : ShaderFactory.parseExtension(Shader._shaderExtension)}
         ${precisionStr}
         ${macroNameStr}
-      ` + this._fragmentSource
-    );
+      ` + ShaderFactory.parseIncludes(this._fragmentSource);
 
     if (isWebGL2) {
       vertexSource = ShaderFactory.convertTo300(vertexSource);

packages/core/src/shader/ShaderProgram.ts

@@ -8,7 +8,6 @@ import { IHardwareRenderer } from "../renderingHardwareInterface/IHardwareRender
 import { Scene } from "../Scene";
 import { Texture } from "../texture";
 import { ShaderDataGroup } from "./enums/ShaderDataGroup";
-import { Shader } from "./Shader";
 import { ShaderData } from "./ShaderData";
 import { ShaderProperty } from "./ShaderProperty";
 import { ShaderUniform } from "./ShaderUniform";

packages/core/src/shader/SubShader.ts

@@ -19,7 +19,7 @@ export class SubShader extends ShaderPart {
    * @param name - Name of the sub shader
    * @param passes - Sub shader passes
    */
-  constructor(public readonly name: string, passes: ShaderPass[], tags?: Record<string, string>) {
+  constructor(public readonly name: string, passes: ShaderPass[], tags?: Record<string, number | string | boolean>) {
     super();
     const passCount = passes.length;
     if (passCount < 1) {