Fix/shaderlab

docs/en/graphics/material/examples/shaderlab-05-advance.mdx

@@ -190,7 +190,6 @@ gl_FragColor = vec4(lighting, 1.0);
 
 The engine provides a rich set of built-in variables that can be used directly, such as transformation matrix variables:
 ```glsl
-mat4 renderer_LocalMat;    // Local transformation matrix
 mat4 renderer_ModelMat;    // Model matrix
 mat4 renderer_MVMat;       // Model-view matrix
 mat4 renderer_MVPMat;      // MVP matrix

docs/en/graphics/material/shaderAPI.mdx

@@ -27,7 +27,6 @@ vec4 fog(vec4 color, vec3 positionVS);
 Provides system variables for model space, view space, world space, and camera coordinates:
 
 ```glsl
-mat4 renderer_LocalMat;
 mat4 renderer_ModelMat;
 mat4 camera_ViewMat;
 mat4 camera_ProjMat;

docs/en/graphics/material/variables.mdx

@@ -25,7 +25,6 @@ Below are the engine's built-in variables for reference when writing Shaders:
 
 | Name              | Type | Description                  |
 | :---------------- | :--- | :--------------------------- |
-| renderer_LocalMat | mat4 | Model local coordinate matrix |
 | renderer_ModelMat | mat4 | Model world coordinate matrix |
 | renderer_MVMat    | mat4 | Model view matrix            |
 | renderer_MVPMat   | mat4 | Model view projection matrix |

docs/en/script/edit.mdx

@@ -24,14 +24,14 @@ For more information about the code editor, please check [Code Editor](/en/docs/
 
 After creating a script asset in the scene editor, double-click the script to open the code editor. Scripts in Galacean need to be written in [Typescript](https://www.typescriptlang.org/), and new scripts are created based on built-in templates by default. Additionally, the Galacean code editor is based on Monaco, with shortcuts similar to VSCode. After modifying the script, press `Ctrl/⌘ + S` to save, and the real-time preview area on the right will show the latest scene effects.
 
-> Tip: The Galacean code editor currently supports `.ts`, `.gs`, and `.glsl` file editing.
+> Tip: The Galacean code editor currently supports `.ts`, `.shader`, and `.glsl` file editing.
 
 ## File Preview
 
 <Image src="https://mdn.alipayobjects.com/huamei_fvsq9p/afts/img/A*o51FQa9Uh0MAAAAAAAAAAAAADqiTAQ/original" />
 
 1. **File Search** Quickly search for files in the project
-2. **Code Filter** Whether to display only code files ( `.ts`, `.gs`, `.glsl` ) in the file tree
+2. **Code Filter** Whether to display only code files ( `.ts`, `.shader`, `.glsl` ) in the file tree
 3. **Built-in Files** Used to display which files are non-editable internal files
 4. **Expand/Hide** Toggle the expansion or hiding of folders
 5. **Code Files** Editable code files will display corresponding file type thumbnails

docs/zh/graphics/material/examples/shaderlab-05-advance.mdx

@@ -193,7 +193,6 @@ void frag() {
 
 引擎提供了丰富的内置变量，直接声明使用即可，比如变换矩阵相关变量：
 ```glsl
-mat4 renderer_LocalMat;    // 本地变换矩阵
 mat4 renderer_ModelMat;    // 模型矩阵
 mat4 renderer_MVMat;       // 模型视图矩阵
 mat4 renderer_MVPMat;      // MVP矩阵

docs/zh/graphics/material/shaderAPI.mdx

@@ -29,7 +29,6 @@ vec4 fog(vec4 color, vec3 positionVS);
 提供了模型空间、视图空间、世界空间、相机坐标等[系统变量](/docs/graphics/material/variables/):
 
 ```glsl
-mat4 renderer_LocalMat;
 mat4 renderer_ModelMat;
 mat4 camera_ViewMat;
 mat4 camera_ProjMat;

docs/zh/graphics/material/variables.mdx

@@ -25,7 +25,6 @@ Shader 代码中会经常用到内置变量，一种是**逐顶点**的 `attribu
 
 | 名字               | 类型 | 解释               |
 | :----------------- | :--- | ------------------ |
-| renderer_LocalMat  | mat4 | 模型本地坐标系矩阵 |
 | renderer_ModelMat  | mat4 | 模型世界坐标系矩阵 |
 | renderer_MVMat     | mat4 | 模型视口矩阵       |
 | renderer_MVPMat    | mat4 | 模型视口投影矩阵   |

docs/zh/script/edit.mdx

@@ -24,14 +24,14 @@ Galacean Editor 提供了一个功能强大的代码编辑器，提供了代码
 
 在场景编辑器中创建脚本资产后，双击该脚本即可打开代码编辑器。Galacean 中的脚本需使用 [Typescript](https://www.typescriptlang.org/) 语言编写，同时新脚本默认基于内置模板创建。另外，Galacean 的代码编辑器基于 Monaco，快捷键与 VSCode 类似。修改脚本后，按 `Ctrl/⌘ + S` 保存，右侧实时预览区展现最新场景效果。
 
-> 提示：Galacean 代码编辑器目前支持 `.ts` `.gs` 和 `.glsl` 的文件编辑
+> 提示：Galacean 代码编辑器目前支持 `.ts` `.shader` 和 `.glsl` 的文件编辑
 
 ## 文件预览
 
 <Image src="https://mdn.alipayobjects.com/huamei_fvsq9p/afts/img/A*o51FQa9Uh0MAAAAAAAAAAAAADqiTAQ/original" />
 
 1. **文件搜索** 可快速搜索项目中的文件
-2. **代码筛选** 文件树是否仅显示代码文件 ( `.ts` `.gs` `.glsl` )
+2. **代码筛选** 文件树是否仅显示代码文件 ( `.ts` `.shader` `.glsl` )
 3. **内置文件** 用来显示哪些文件是不可编辑的内部文件
 4. **展开/隐藏** 可切换文件夹的展开或隐藏
 5. **代码文件** 可编辑的代码文件会显示对应的文件类型的缩略图标

e2e/.dev/vite.config.js

@@ -42,6 +42,7 @@ demoList.forEach(({ file }) => {
 fs.outputJSONSync(path.join(__dirname, OUT_PATH, ".demoList.json"), demoSorted);
 
 module.exports = {
+  publicDir: path.resolve(__dirname, "public"),
   server: {
     open: true,
     host: "0.0.0.0",

e2e/case/animator-blendShape.ts

@@ -38,7 +38,7 @@ WebGLEngine.create({ canvas: "canvas" }).then((engine) => {
       const { defaultSceneRoot } = asset;
       rootEntity.addChild(defaultSceneRoot);
       const animator = defaultSceneRoot.getComponent(Animator);
-      const skinMeshRenderer = defaultSceneRoot.getComponent(SkinnedMeshRenderer);
+      const skinMeshRenderer = defaultSceneRoot.getComponentsIncludeChildren(SkinnedMeshRenderer, [])[0];
       skinMeshRenderer.blendShapeWeights[0] = 1.0;
       animator.play("TheWave");
 

e2e/case/animator-multiSubMeshBlendShape.ts

@@ -45,8 +45,8 @@ WebGLEngine.create({ canvas: "canvas" }).then((engine) => {
     .then((asset) => {
       const { defaultSceneRoot } = asset;
       rootEntity.addChild(defaultSceneRoot);
-      const entity = defaultSceneRoot;
-      defaultSceneRoot.transform.rotation = new Vector3(-90, -0, 0);
+      const entity = defaultSceneRoot.children[0];
+      entity.transform.rotation = new Vector3(-90, -0, 0);
       const animator = entity.addComponent(Animator);
 
       animator.animatorController = new AnimatorController(engine);

e2e/case/gpu-instancing-auto-batch.ts

@@ -0,0 +1,68 @@
+/**
+ * @title GPU Instancing Auto Batch
+ * @category Mesh
+ */
+import {
+  AmbientLight,
+  AssetType,
+  Camera,
+  Color,
+  DirectLight,
+  GLTFResource,
+  Logger,
+  Vector3,
+  WebGLEngine
+} from "@galacean/engine";
+import { initScreenshot, updateForE2E } from "./.mockForE2E";
+
+Logger.enable();
+WebGLEngine.create({ canvas: "canvas" }).then(async (engine) => {
+  engine.canvas.resizeByClientSize(2);
+
+  const scene = engine.sceneManager.activeScene;
+  const rootEntity = scene.createRootEntity("Root");
+
+  // Camera
+  const cameraEntity = rootEntity.createChild("Camera");
+  cameraEntity.transform.setPosition(0, 10, 80);
+  cameraEntity.transform.lookAt(new Vector3(0, 0, 0));
+  const camera = cameraEntity.addComponent(Camera);
+  camera.farClipPlane = 300;
+
+  // Light
+  const lightEntity = rootEntity.createChild("Light");
+  lightEntity.transform.setRotation(-45, -45, 0);
+  lightEntity.addComponent(DirectLight).color = new Color(1, 1, 1, 1);
+
+  // Load Duck model and ambient light
+  const [glTF, ambientLight] = await Promise.all([
+    engine.resourceManager.load<GLTFResource>({
+      url: "https://gw.alipayobjects.com/os/bmw-prod/6cb8f543-285c-491a-8cfd-57a1160dc9ab.glb",
+      type: AssetType.GLTF
+    }),
+    engine.resourceManager.load<AmbientLight>({
+      url: "https://mdn.alipayobjects.com/oasis_be/afts/file/A*eRJ8QKzf5zAAAAAAgBAAAAgAekp5AQ/ambient.ambLight",
+      type: AssetType.AmbientLight
+    })
+  ]);
+  scene.ambientLight = ambientLight;
+
+  // Clone ducks with fixed seed positions for deterministic output
+  const count = 500;
+  const spread = 50;
+  for (let i = 0; i < count; i++) {
+    const duck = glTF.instantiateSceneRoot();
+    // Use deterministic positions based on index
+    const t = i / count;
+    duck.transform.setPosition(
+      Math.sin(t * 137.5) * spread * 0.5,
+      Math.cos(t * 97.3) * spread * 0.5,
+      Math.sin(t * 59.1) * spread * 0.5
+    );
+    duck.transform.setRotation(t * 360, t * 720, t * 1080);
+    rootEntity.addChild(duck);
+  }
+
+  updateForE2E(engine);
+  initScreenshot(engine, camera);
+});

e2e/case/gpu-instancing-custom-data.ts

@@ -0,0 +1,100 @@
+/**
+ * @title GPU Instancing Custom Data
+ * @category Mesh
+ */
+import {
+  Camera,
+  Color,
+  DirectLight,
+  Logger,
+  Material,
+  MeshRenderer,
+  PrimitiveMesh,
+  Shader,
+  ShaderProperty,
+  Vector3,
+  Vector4,
+  WebGLEngine
+} from "@galacean/engine";
+import { initScreenshot, updateForE2E } from "./.mockForE2E";
+
+Logger.enable();
+
+// Custom shader: uses renderer_CustomColor (per-instance) for fragment output
+Shader.create(
+  "CustomInstanceShader",
+  `
+  #include <transform_declare>
+  attribute vec3 POSITION;
+  attribute vec3 NORMAL;
+
+  varying vec3 v_normal;
+
+  void main() {
+    gl_Position = renderer_MVPMat * vec4(POSITION, 1.0);
+    v_normal = normalize((renderer_NormalMat * vec4(NORMAL, 0.0)).xyz);
+  }
+  `,
+  `
+  uniform vec4 renderer_CustomColor;
+
+  varying vec3 v_normal;
+
+  void main() {
+    vec3 lightDir = normalize(vec3(1.0, 1.0, 1.0));
+    float NdotL = max(dot(v_normal, lightDir), 0.2);
+    gl_FragColor = vec4(renderer_CustomColor.rgb * NdotL, 1.0);
+  }
+  `
+);
+
+WebGLEngine.create({ canvas: "canvas" }).then((engine) => {
+  engine.canvas.resizeByClientSize(2);
+
+  const scene = engine.sceneManager.activeScene;
+  const rootEntity = scene.createRootEntity("Root");
+
+  // Camera
+  const cameraEntity = rootEntity.createChild("Camera");
+  cameraEntity.transform.setPosition(0, 10, 80);
+  cameraEntity.transform.lookAt(new Vector3(0, 0, 0));
+  const camera = cameraEntity.addComponent(Camera);
+  camera.farClipPlane = 300;
+
+  // Light
+  const lightEntity = rootEntity.createChild("Light");
+  lightEntity.transform.setRotation(-45, -45, 0);
+  lightEntity.addComponent(DirectLight).color = new Color(1, 1, 1, 1);
+
+  // Shared mesh and material
+  const mesh = PrimitiveMesh.createCuboid(engine, 1, 1, 1);
+  const material = new Material(engine, Shader.find("CustomInstanceShader"));
+  const customColorProperty = ShaderProperty.getByName("renderer_CustomColor");
+
+  // Create cubes with deterministic positions and colors
+  const count = 500;
+  const spread = 50;
+  for (let i = 0; i < count; i++) {
+    const entity = rootEntity.createChild("Cube" + i);
+    const t = i / count;
+    entity.transform.setPosition(
+      Math.sin(t * 137.5) * spread * 0.5,
+      Math.cos(t * 97.3) * spread * 0.5,
+      Math.sin(t * 59.1) * spread * 0.5
+    );
+    entity.transform.setRotation(t * 360, t * 720, t * 1080);
+
+    const renderer = entity.addComponent(MeshRenderer);
+    renderer.mesh = mesh;
+    renderer.setMaterial(material);
+
+    // Deterministic colors based on index
+    renderer.shaderData.setVector4(
+      customColorProperty,
+      new Vector4(Math.sin(t * 6.28) * 0.5 + 0.5, Math.cos(t * 4.71) * 0.5 + 0.5, Math.sin(t * 3.14) * 0.5 + 0.5, 1.0)
+    );
+  }
+
+  updateForE2E(engine);
+  initScreenshot(engine, camera);
+});

e2e/case/particleRenderer-dream.ts

@@ -68,8 +68,8 @@ WebGLEngine.create({
 
       cameraEntity.addChild(fireEntity);
 
-      updateForE2E(engine, 500);
-      initScreenshot(engine, camera);
+      // updateForE2E(engine, 500);
+      // initScreenshot(engine, camera);
     });
 });
 

e2e/case/shaderLab-mrt.ts

@@ -9,7 +9,7 @@ import { initScreenshot, updateForE2E } from "./.mockForE2E";
 
 const shaderLab = new ShaderLab();
 
-const shaderSource = `Shader "/custom.gs" {
+const shaderSource = `Shader "/custom.shader" {
           SubShader "Default" {
             UsePass "pbr/Default/ShadowCaster"