Merge pull request #16 from Live2D/develop

Update to Cubism 5 SDK for Java R5 beta1_1

Author: itoh-at-live2d-com

CHANGELOG.md

@@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 
+## [5-r.5-beta.1.1] - 2026-02-19
+
+### Fixed
+
+* Fix clipping mask pre-processing by consolidating functions.
+* Fix a bug where offscreen rendering results were not as expected when premultiplied alpha was disabled.
+* Fix a bug where rendering results were not as expected when using Blend mode on semi-transparent objects.
+
+
 ## [5-r.5-beta.1] - 2026-01-29
 
 ### Added
@@ -292,6 +301,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 * New released!
 
 
+[5-r.5-beta.1.1]: https://github.com/Live2D/CubismJavaFramework/compare/5-r.5-beta.1...5-r.5-beta.1.1
 [5-r.5-beta.1]: https://github.com/Live2D/CubismJavaFramework/compare/5-r.4.1...5-r.5-beta.1
 [5-r.4.1]: https://github.com/Live2D/CubismJavaFramework/compare/5-r.4...5-r.4.1
 [5-r.4]: https://github.com/Live2D/CubismJavaFramework/compare/5-r.3...5-r.4

framework/src/main/assets/com/live2d/sdk/cubism/framework/shaders/standardES/FragShaderSrcMaskBlend.frag

@@ -32,7 +32,7 @@ void main()
     vec4 col_formask = texColor * u_baseColor;
     vec4 clipMask = (1.0 - texture2D(s_texture1, v_clipPos.xy / v_clipPos.w)) * u_channelFlag;
     float maskVal = clipMask.r + clipMask.g + clipMask.b + clipMask.a;
-    vec4 colorSource = col_formask * maskVal;
+    vec4 colorSource = vec4(col_formask.rgb, col_formask.a * maskVal);
     vec4 colorDestination = ConvertPremultipliedToStraight(texture2D(s_blendTexture, v_blendCoord));
     gl_FragColor = AlphaBlend(ColorBlend(colorSource.rgb, colorDestination.rgb), colorSource, colorDestination);
 }

framework/src/main/assets/com/live2d/sdk/cubism/framework/shaders/standardES/FragShaderSrcMaskBlendTegra.frag

@@ -33,7 +33,7 @@ void main()
     vec4 col_formask = texColor * u_baseColor;
     vec4 clipMask = (1.0 - texture2D(s_texture1, v_clipPos.xy / v_clipPos.w)) * u_channelFlag;
     float maskVal = clipMask.r + clipMask.g + clipMask.b + clipMask.a;
-    vec4 colorSource = col_formask * maskVal;
+    vec4 colorSource = vec4(col_formask.rgb, col_formask.a * maskVal);
     vec4 colorDestination = ConvertPremultipliedToStraight(texture2D(s_blendTexture, v_blendCoord));
     gl_FragColor = AlphaBlend(ColorBlend(colorSource.rgb, colorDestination.rgb), colorSource, colorDestination);
 }

framework/src/main/assets/com/live2d/sdk/cubism/framework/shaders/standardES/FragShaderSrcMaskInvertedBlend.frag

@@ -32,7 +32,7 @@ void main()
     vec4 col_formask = texColor * u_baseColor;
     vec4 clipMask = (1.0 - texture2D(s_texture1, v_clipPos.xy / v_clipPos.w)) * u_channelFlag;
     float maskVal = clipMask.r + clipMask.g + clipMask.b + clipMask.a;
-    vec4 colorSource = col_formask * (1.0 - maskVal);
+    vec4 colorSource = vec4(col_formask.rgb, col_formask.a * (1.0 - maskVal));
     vec4 colorDestination = ConvertPremultipliedToStraight(texture2D(s_blendTexture, v_blendCoord));
     gl_FragColor = AlphaBlend(ColorBlend(colorSource.rgb, colorDestination.rgb), colorSource, colorDestination);
 }

framework/src/main/assets/com/live2d/sdk/cubism/framework/shaders/standardES/FragShaderSrcMaskInvertedBlendTegra.frag

@@ -33,7 +33,7 @@ void main()
     vec4 col_formask = texColor * u_baseColor;
     vec4 clipMask = (1.0 - texture2D(s_texture1, v_clipPos.xy / v_clipPos.w)) * u_channelFlag;
     float maskVal = clipMask.r + clipMask.g + clipMask.b + clipMask.a;
-    vec4 colorSource = col_formask * (1.0 - maskVal);
+    vec4 colorSource = vec4(col_formask.rgb, col_formask.a * (1.0 - maskVal));
     vec4 colorDestination = ConvertPremultipliedToStraight(texture2D(s_blendTexture, v_blendCoord));
     gl_FragColor = AlphaBlend(ColorBlend(colorSource.rgb, colorDestination.rgb), colorSource, colorDestination);
 }

framework/src/main/assets/com/live2d/sdk/cubism/framework/shaders/standardES/FragShaderSrcMaskInvertedPremultipliedAlphaBlend.frag

@@ -32,7 +32,7 @@ void main()
     vec4 col_formask = ConvertPremultipliedToStraight(texColor * u_baseColor);
     vec4 clipMask = (1.0 - texture2D(s_texture1, v_clipPos.xy / v_clipPos.w)) * u_channelFlag;
     float maskVal = clipMask.r + clipMask.g + clipMask.b + clipMask.a;
-    vec4 colorSource = col_formask * (1.0 - maskVal);
+    vec4 colorSource = vec4(col_formask.rgb, col_formask.a * (1.0 - maskVal));
     vec4 colorDestination = ConvertPremultipliedToStraight(texture2D(s_blendTexture, v_blendCoord));
     gl_FragColor = AlphaBlend(ColorBlend(colorSource.rgb, colorDestination.rgb), colorSource, colorDestination);
 }

framework/src/main/assets/com/live2d/sdk/cubism/framework/shaders/standardES/FragShaderSrcMaskInvertedPremultipliedAlphaBlendTegra.frag

@@ -33,7 +33,7 @@ void main()
     vec4 col_formask = ConvertPremultipliedToStraight(texColor * u_baseColor);
     vec4 clipMask = (1.0 - texture2D(s_texture1, v_clipPos.xy / v_clipPos.w)) * u_channelFlag;
     float maskVal = clipMask.r + clipMask.g + clipMask.b + clipMask.a;
-    vec4 colorSource = col_formask * (1.0 - maskVal);
+    vec4 colorSource = vec4(col_formask.rgb, col_formask.a * (1.0 - maskVal));
     vec4 colorDestination = ConvertPremultipliedToStraight(texture2D(s_blendTexture, v_blendCoord));
     gl_FragColor = AlphaBlend(ColorBlend(colorSource.rgb, colorDestination.rgb), colorSource, colorDestination);
 }

framework/src/main/assets/com/live2d/sdk/cubism/framework/shaders/standardES/FragShaderSrcMaskPremultipliedAlphaBlend.frag

@@ -32,7 +32,7 @@ void main()
     vec4 col_formask = ConvertPremultipliedToStraight(texColor * u_baseColor);
     vec4 clipMask = (1.0 - texture2D(s_texture1, v_clipPos.xy / v_clipPos.w)) * u_channelFlag;
     float maskVal = clipMask.r + clipMask.g + clipMask.b + clipMask.a;
-    vec4 colorSource = col_formask * maskVal;
+    vec4 colorSource = vec4(col_formask.rgb, col_formask.a * maskVal);
     vec4 colorDestination = ConvertPremultipliedToStraight(texture2D(s_blendTexture, v_blendCoord));
     gl_FragColor = AlphaBlend(ColorBlend(colorSource.rgb, colorDestination.rgb), colorSource, colorDestination);
 }

framework/src/main/assets/com/live2d/sdk/cubism/framework/shaders/standardES/FragShaderSrcMaskPremultipliedAlphaBlendTegra.frag

@@ -33,7 +33,7 @@ void main()
     vec4 col_formask = ConvertPremultipliedToStraight(texColor * u_baseColor);
     vec4 clipMask = (1.0 - texture2D(s_texture1, v_clipPos.xy / v_clipPos.w)) * u_channelFlag;
     float maskVal = clipMask.r + clipMask.g + clipMask.b + clipMask.a;
-    vec4 colorSource = col_formask * maskVal;
+    vec4 colorSource = vec4(col_formask.rgb, col_formask.a * maskVal);
     vec4 colorDestination = ConvertPremultipliedToStraight(texture2D(s_blendTexture, v_blendCoord));
     gl_FragColor = AlphaBlend(ColorBlend(colorSource.rgb, colorDestination.rgb), colorSource, colorDestination);
 }