From 8107258a1e70104df9cf3e008a79fcc07641118f Mon Sep 17 00:00:00 2001 From: Nick Fisher Date: Fri, 16 Feb 2024 20:37:07 +0800 Subject: [PATCH] update image material --- ios/include/material/image.S | 2 +- ios/include/material/image.apple.S | 2 +- ios/include/material/image.bin | Bin 36070 -> 130 bytes ios/include/material/image.c | 3841 +++++++++++++++++----------- materials/image.mat | 10 +- 5 files changed, 2306 insertions(+), 1549 deletions(-) diff --git a/ios/include/material/image.S b/ios/include/material/image.S index 7b56aec6..a7ed274d 100644 --- a/ios/include/material/image.S +++ b/ios/include/material/image.S @@ -8,5 +8,5 @@ IMAGE_PACKAGE: IMAGE_IMAGE_OFFSET: .int 0 IMAGE_IMAGE_SIZE: - .int 36070 + .int 51248 diff --git a/ios/include/material/image.apple.S b/ios/include/material/image.apple.S index d2010a57..cc85f1e5 100644 --- a/ios/include/material/image.apple.S +++ b/ios/include/material/image.apple.S @@ -8,5 +8,5 @@ _IMAGE_PACKAGE: _IMAGE_IMAGE_OFFSET: .int 0 _IMAGE_IMAGE_SIZE: - .int 36070 + .int 51248 diff --git a/ios/include/material/image.bin b/ios/include/material/image.bin index ae04dc11c696343d625b7cccf9d769f5ded17498..077683f0dbc6a60e9890776de64b65f84161fb37 100644 GIT binary patch literal 130 zcmWN?K@!3s3;@7;U%>|~1V||TO-O?T!vk!$6g10`3;As~aWdeR8ac?m25G9-lJ N<23qL4T6u$^aJI6CiVaT literal 36070 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 1.0 || uv.s < 0.0 || uv.t < 0.0 || uv.t > 1.0) { - material.baseColor = bg; + material.baseColor = materialParams.backgroundColor; } else { uv.t = 1.0 - uv.t; vec4 color = max(texture(materialParams_image, uv.st), 0.0); color.rgb *= color.a; // Manual, pre-multiplied srcOver with opaque destination optimization - material.baseColor.rgb = color.rgb + bg.rgb * (1.0 - color.a); + material.baseColor.rgb = color.rgb + materialParams.backgroundColor.rgb * (1.0 - color.a); } } }