galacean · GuoLei1990 · Jul 17, 2024 · Apr 9, 2024 · Apr 24, 2024 · Apr 24, 2024
diff --git a/package.json b/package.json
@@ -71,7 +71,7 @@
   },
   "pnpm": {
     "overrides": {
-      "@galacean/engine": "^1.2.0-alpha.5"
+      "@galacean/engine": "^1.2.0-beta.1"
     }
   }
 }
diff --git a/packages/auxiliary-lines/package.json b/packages/auxiliary-lines/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-toolkit-auxiliary-lines",
-  "version": "1.2.0-beta.3",
+  "version": "0.0.0-experimental-shaderlab-pbr.5",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"

diff --git a/packages/controls/package.json b/packages/controls/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-toolkit-controls",
-  "version": "1.2.0-beta.3",
+  "version": "0.0.0-experimental-shaderlab-pbr.5",
   "license": "MIT",
   "publishConfig": {
     "access": "public",

diff --git a/packages/custom-gltf-parser/package.json b/packages/custom-gltf-parser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-toolkit-custom-gltf-parser",
-  "version": "1.2.0-beta.3",
+  "version": "0.0.0-experimental-shaderlab-pbr.5",
   "license": "MIT",
   "scripts": {
     "b:types": "tsc"

diff --git a/packages/custom-material/package.json b/packages/custom-material/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-toolkit-custom-material",
-  "version": "1.2.0-beta.3",
+  "version": "0.0.0-experimental-shaderlab-pbr.5",
   "license": "MIT",
   "scripts": {
     "b:types": "tsc",

diff --git a/packages/draco/package.json b/packages/draco/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-toolkit-draco",
-  "version": "1.2.0-beta.3",
+  "version": "0.0.0-experimental-shaderlab-pbr.5",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"

diff --git a/packages/dynamic-bone/package.json b/packages/dynamic-bone/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-toolkit-dynamic-bone",
-  "version": "1.2.0-beta.3",
+  "version": "0.0.0-experimental-shaderlab-pbr.5",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"

diff --git a/packages/framebuffer-picker/package.json b/packages/framebuffer-picker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-toolkit-framebuffer-picker",
-  "version": "1.2.0-beta.3",
+  "version": "0.0.0-experimental-shaderlab-pbr.5",
   "license": "MIT",
   "module": "dist/es/index.js",
   "main": "dist/commonjs/browser.js",

diff --git a/packages/galacean-engine-toolkit/package.json b/packages/galacean-engine-toolkit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-toolkit",
-  "version": "1.2.0-beta.3",
+  "version": "0.0.0-experimental-shaderlab-pbr.5",
   "license": "MIT",
   "scripts": {
     "b:types": "tsc"

diff --git a/packages/geometry-sketch/package.json b/packages/geometry-sketch/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-toolkit-geometry-sketch",
-  "version": "1.2.0-beta.3",
+  "version": "0.0.0-experimental-shaderlab-pbr.5",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"

diff --git a/packages/gizmo/package.json b/packages/gizmo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-toolkit-gizmo",
-  "version": "1.2.0-beta.3",
+  "version": "0.0.0-experimental-shaderlab-pbr.5",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"

diff --git a/packages/input-logger/package.json b/packages/input-logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-toolkit-input-logger",
-  "version": "1.2.0-beta.3",
+  "version": "0.0.0-experimental-shaderlab-pbr.5",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"

diff --git a/packages/lines/package.json b/packages/lines/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-toolkit-lines",
-  "version": "1.2.0-beta.3",
+  "version": "0.0.0-experimental-shaderlab-pbr.5",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"

diff --git a/packages/navigation-gizmo/package.json b/packages/navigation-gizmo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-toolkit-navigation-gizmo",
-  "version": "1.2.0-beta.3",
+  "version": "0.0.0-experimental-shaderlab-pbr.5",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"

diff --git a/packages/outline/package.json b/packages/outline/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-toolkit-outline",
-  "version": "1.2.0-beta.3",
+  "version": "0.0.0-experimental-shaderlab-pbr.5",
   "license": "MIT",
   "module": "dist/es/index.js",
   "main": "dist/commonjs/browser.js",

diff --git a/packages/shaderlab/package.json b/packages/shaderlab/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@galacean/engine-toolkit-shader-lab",
-  "version": "1.2.0-beta.3",
+  "version": "0.0.0-experimental-shaderlab-pbr.5",
   "license": "MIT",
   "scripts": {
     "b:types": "tsc"

diff --git a/packages/shaderlab/src/GSLPBRMaterial.ts b/packages/shaderlab/src/GSLPBRMaterial.ts
diff --git a/packages/shaderlab/src/index.ts b/packages/shaderlab/src/index.ts
@@ -1 +1,23 @@
-export { GSLPBRMaterial } from "./GSLPBRMaterial";
+import { Shader, ShaderFactory } from "@galacean/engine";
+import { PBRSource, fragmentList } from "./shaders";
+
+let includeRegistered = false;
+let shaderRegistered = false;
+
+export function registerIncludes() {
+  if (includeRegistered) return;
+
+  for (const sourceFragment of fragmentList) {
+    ShaderFactory.registerInclude(sourceFragment.includeKey, sourceFragment.source);
+  }
+
+  includeRegistered = true;
+}
+
+export function registerShader() {
+  if (shaderRegistered) return;
+
+  Shader.create(PBRSource);
+
+  shaderRegistered = true;
+}
diff --git a/packages/shaderlab/src/shaders/BlendShape.glsl b/packages/shaderlab/src/shaders/BlendShape.glsl
@@ -0,0 +1,105 @@
+#ifndef BLENDSHAPE_INCLUDED
+#define BLENDSHAPE_INCLUDED
+
+#ifdef RENDERER_HAS_BLENDSHAPE
+	#ifdef RENDERER_BLENDSHAPE_USE_TEXTURE
+		mediump sampler2DArray renderer_BlendShapeTexture;
+		ivec3 renderer_BlendShapeTextureInfo;
+		float renderer_BlendShapeWeights[RENDERER_BLENDSHAPE_COUNT];
+
+		vec3 getBlendShapeVertexElement(int blendShapeIndex, int vertexElementIndex){			
+			int y = vertexElementIndex / renderer_BlendShapeTextureInfo.y;
+			int x = vertexElementIndex - y * renderer_BlendShapeTextureInfo.y;
+			ivec3 uv = ivec3(x, y , blendShapeIndex);
+			return (texelFetch(renderer_BlendShapeTexture, uv, 0)).xyz;
+		}
+	#else
+		#if defined( RENDERER_BLENDSHAPE_HAS_NORMAL ) && defined( RENDERER_BLENDSHAPE_HAS_TANGENT )
+			float renderer_BlendShapeWeights[2];
+		#else
+			#if defined( RENDERER_BLENDSHAPE_HAS_NORMAL ) || defined( RENDERER_BLENDSHAPE_HAS_TANGENT )
+				float renderer_BlendShapeWeights[4];
+			#else
+				float renderer_BlendShapeWeights[8];
+			#endif
+		#endif
+	#endif
+
+	void calculateBlendShape(Attributes attributes, inout vec4 position
+        #ifdef RENDERER_HAS_NORMAL
+            ,inout vec3 normal
+			 #ifdef RENDERER_HAS_TANGENT
+            	,inout vec4 tangent
+        	#endif
+        #endif
+
+	){
+		#ifdef RENDERER_BLENDSHAPE_USE_TEXTURE	
+    		int vertexOffset = gl_VertexID * renderer_BlendShapeTextureInfo.x;
+    		for(int i = 0; i < RENDERER_BLENDSHAPE_COUNT; i++){
+    			int vertexElementOffset = vertexOffset;
+    			float weight = renderer_BlendShapeWeights[i];
+    			// Warnning: Multiplying by 0 creates weird precision issues, causing rendering anomalies in Ace2 Android13
+    			if(weight != 0.0){
+    				position.xyz += getBlendShapeVertexElement(i, vertexElementOffset) * weight;
+
+    				#if defined( RENDERER_HAS_NORMAL ) && defined( RENDERER_BLENDSHAPE_HAS_NORMAL )
+    					vertexElementOffset += 1;
+    					normal += getBlendShapeVertexElement(i, vertexElementOffset) * weight;
+    				#endif
+
+    				#if defined( RENDERER_HAS_TANGENT ) && defined(RENDERER_BLENDSHAPE_HAS_TANGENT)
+    					vertexElementOffset += 1;
+    					tangent.xyz += getBlendShapeVertexElement(i, vertexElementOffset) * weight;
+    				#endif
+    			}
+
+    		}
+    	#else
+    		position.xyz += attributes.POSITION_BS0 * renderer_BlendShapeWeights[0];
+    		position.xyz += attributes.POSITION_BS1 * renderer_BlendShapeWeights[1];
+
+    		#if defined( RENDERER_BLENDSHAPE_HAS_NORMAL ) && defined( RENDERER_BLENDSHAPE_HAS_TANGENT )
+    			#ifdef RENDERER_HAS_NORMAL
+    				normal += attributes.NORMAL_BS0 * renderer_BlendShapeWeights[0];
+    				normal += attributes.NORMAL_BS1 * renderer_BlendShapeWeights[1];
+    			#endif
+
+    			#ifdef RENDERER_HAS_TANGENT
+    				tangent.xyz += attributes.TANGENT_BS0 * renderer_BlendShapeWeights[0];
+    				tangent.xyz += attributes.TANGENT_BS1 * renderer_BlendShapeWeights[1];
+    			#endif				
+    		#else
+    			#if defined( RENDERER_BLENDSHAPE_HAS_NORMAL ) || defined( RENDERER_BLENDSHAPE_HAS_TANGENT )
+    				position.xyz += attributes.POSITION_BS2 * renderer_BlendShapeWeights[2];
+    				position.xyz += attributes.POSITION_BS3 * renderer_BlendShapeWeights[3];
+
+    				#if defined( RENDERER_BLENDSHAPE_HAS_NORMAL ) && defined( RENDERER_HAS_NORMAL )
+    					normal += attributes.NORMAL_BS0 * renderer_BlendShapeWeights[0];
+    					normal += attributes.NORMAL_BS1 * renderer_BlendShapeWeights[1];
+    					normal += attributes.NORMAL_BS2 * renderer_BlendShapeWeights[2];
+    					normal += attributes.NORMAL_BS3 * renderer_BlendShapeWeights[3];
+    				#endif
+
+    				#if defined(RENDERER_BLENDSHAPE_HAS_TANGENT) && defined( RENDERER_HAS_TANGENT )
+    					tangent.xyz += attributes.TANGENT_BS0 * renderer_BlendShapeWeights[0];
+    					tangent.xyz += attributes.TANGENT_BS1 * renderer_BlendShapeWeights[1];
+    					tangent.xyz += attributes.TANGENT_BS2 * renderer_BlendShapeWeights[2];
+    					tangent.xyz += attributes.TANGENT_BS3 * renderer_BlendShapeWeights[3];
+    				#endif
+    			#else
+    				position.xyz += attributes.POSITION_BS2 * renderer_BlendShapeWeights[2];
+    				position.xyz += attributes.POSITION_BS3 * renderer_BlendShapeWeights[3];
+    				position.xyz += attributes.POSITION_BS4 * renderer_BlendShapeWeights[4];
+    				position.xyz += attributes.POSITION_BS5 * renderer_BlendShapeWeights[5];
+    				position.xyz += attributes.POSITION_BS6 * renderer_BlendShapeWeights[6];
+    				position.xyz += attributes.POSITION_BS7 * renderer_BlendShapeWeights[7];
+    			#endif
+    		#endif
+    	#endif
+	}
+
+#endif
+
+
+#endif
diff --git a/packages/shaderlab/src/shaders/common.glsl → packages/shaderlab/src/shaders/Common.glsl b/packages/shaderlab/src/shaders/common.glsl → packages/shaderlab/src/shaders/Common.glsl
@@ -1,3 +1,6 @@
+#ifndef COMMON_INCLUDED
+#define COMMON_INCLUDED
+
 #define PI 3.14159265359
 #define RECIPROCAL_PI 0.31830988618
 #define EPSILON 1e-6
@@ -92,3 +95,6 @@ float remapDepthBufferLinear01(float z){
 
 	#define INVERSE_MAT(mat) inverseMat(mat)
 #endif
+
+
+#endif
diff --git a/packages/shaderlab/src/shaders/Fog.glsl b/packages/shaderlab/src/shaders/Fog.glsl
@@ -0,0 +1,30 @@
+#ifndef FOG_INCLUDED
+#define FOG_INCLUDED
+
+#if SCENE_FOG_MODE != 0
+    vec4 scene_FogColor;
+    vec4 scene_FogParams; // (-1/(end-start), end/(end-start), density/ln(2),density/sprt(ln(2)));
+
+    vec4 fog(vec4 color, vec3 positionVS){
+        float fogDepth = length(positionVS);
+
+        #if SCENE_FOG_MODE == 1
+            // (end-z) / (end-start) = z * (-1/(end-start)) + (end/(end-start))
+            float fogIntensity = clamp(fogDepth * scene_FogParams.x + scene_FogParams.y, 0.0, 1.0);
+        #elif SCENE_FOG_MODE == 2
+            // exp(-z * density) = exp2((-z * density)/ln(2)) = exp2(-z * density/ln(2))
+            float fogIntensity = clamp(exp2(-fogDepth * scene_FogParams.z), 0.0, 1.0);
+        #elif SCENE_FOG_MODE == 3
+            // exp(-(z * density)^2) = exp2(-(z * density)^2/ln(2)) = exp2(-(z * density/sprt(ln(2)))^2)
+            float factor = fogDepth * scene_FogParams.w;
+            float fogIntensity = clamp(exp2(-factor * factor), 0.0, 1.0);
+        #endif
+
+        color.rgb = mix(scene_FogColor.rgb, color.rgb, fogIntensity);
+
+        return color;
+    }
+#endif
+
+
+#endif
diff --git a/packages/shaderlab/src/shaders/FogFragment.glsl b/packages/shaderlab/src/shaders/FogFragment.glsl
diff --git a/packages/shaderlab/src/shaders/FogFragmentDeclaration.glsl b/packages/shaderlab/src/shaders/FogFragmentDeclaration.glsl
diff --git a/packages/shaderlab/src/shaders/FogVertex.glsl b/packages/shaderlab/src/shaders/FogVertex.glsl