Open shader core API by ShaderLab #274
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -71,7 +71,7 @@ | |
| }, | ||
| "pnpm": { | ||
| "overrides": { | ||
| "@galacean/engine": "^1.2.0-beta.1" | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,23 @@ | ||
| 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; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| #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 attr, inout vec4 position | ||
| #ifdef RENDERER_HAS_NORMAL | ||
| ,inout vec3 normal | ||
| #endif | ||
| #ifdef RENDERER_HAS_TANGENT | ||
| ,inout vec4 tangent | ||
| #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 += attr.POSITION_BS0 * renderer_BlendShapeWeights[0]; | ||
| position.xyz += attr.POSITION_BS1 * renderer_BlendShapeWeights[1]; | ||
|
|
||
| #if defined( RENDERER_BLENDSHAPE_HAS_NORMAL ) && defined( RENDERER_BLENDSHAPE_HAS_TANGENT ) | ||
| #ifdef RENDERER_HAS_NORMAL | ||
| normal += attr.NORMAL_BS0 * renderer_BlendShapeWeights[0]; | ||
| normal += attr.NORMAL_BS1 * renderer_BlendShapeWeights[1]; | ||
| #endif | ||
|
|
||
| #ifdef RENDERER_HAS_TANGENT | ||
| tangent.xyz += attr.TANGENT_BS0 * renderer_BlendShapeWeights[0]; | ||
| tangent.xyz += attr.TANGENT_BS1 * renderer_BlendShapeWeights[1]; | ||
| #endif | ||
| #else | ||
| #if defined( RENDERER_BLENDSHAPE_HAS_NORMAL ) || defined( RENDERER_BLENDSHAPE_HAS_TANGENT ) | ||
| position.xyz += attr.POSITION_BS2 * renderer_BlendShapeWeights[2]; | ||
| position.xyz += attr.POSITION_BS3 * renderer_BlendShapeWeights[3]; | ||
|
|
||
| #if defined( RENDERER_BLENDSHAPE_HAS_NORMAL ) && defined( RENDERER_HAS_NORMAL ) | ||
| normal += attr.NORMAL_BS0 * renderer_BlendShapeWeights[0]; | ||
| normal += attr.NORMAL_BS1 * renderer_BlendShapeWeights[1]; | ||
| normal += attr.NORMAL_BS2 * renderer_BlendShapeWeights[2]; | ||
| normal += attr.NORMAL_BS3 * renderer_BlendShapeWeights[3]; | ||
| #endif | ||
|
|
||
| #if defined(RENDERER_BLENDSHAPE_HAS_TANGENT) && defined( RENDERER_HAS_TANGENT ) | ||
| tangent.xyz += attr.TANGENT_BS0 * renderer_BlendShapeWeights[0]; | ||
| tangent.xyz += attr.TANGENT_BS1 * renderer_BlendShapeWeights[1]; | ||
| tangent.xyz += attr.TANGENT_BS2 * renderer_BlendShapeWeights[2]; | ||
| tangent.xyz += attr.TANGENT_BS3 * renderer_BlendShapeWeights[3]; | ||
| #endif | ||
| #else | ||
| position.xyz += attr.POSITION_BS2 * renderer_BlendShapeWeights[2]; | ||
| position.xyz += attr.POSITION_BS3 * renderer_BlendShapeWeights[3]; | ||
| position.xyz += attr.POSITION_BS4 * renderer_BlendShapeWeights[4]; | ||
| position.xyz += attr.POSITION_BS5 * renderer_BlendShapeWeights[5]; | ||
| position.xyz += attr.POSITION_BS6 * renderer_BlendShapeWeights[6]; | ||
| position.xyz += attr.POSITION_BS7 * renderer_BlendShapeWeights[7]; | ||
| #endif | ||
| #endif | ||
| #endif | ||
| } | ||
|
|
||
| #endif | ||
|
|
||
|
|
||
| #endif | ||
|
There was a problem hiding this comment. Thorough Analysis of BlendShape.glsl The file effectively handles various configurations for blend shapes, allowing for a flexible shader setup that can adapt based on the renderer's capabilities. The use of conditional compilation is appropriate and well-implemented. However, consider adding comments explaining the blend shape calculations and their expected effects, especially for complex conditional paths, to enhance maintainability and readability. Would you like me to help document these complex sections for better clarity? |
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Attributes attribute