maobo/cup_edit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update image material

Browse Source
This commit is contained in:
Nick Fisher
2024-02-16 20:37:07 +08:00
parent 2ae3f8c466
commit 8107258a1e
5 changed files with 2306 additions and 1549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ios/include/material/image.S
View File

@@ -8,5 +8,5 @@ IMAGE_PACKAGE:
IMAGE_IMAGE_OFFSET: IMAGE_IMAGE_OFFSET:
.int 0 .int 0
IMAGE_IMAGE_SIZE: IMAGE_IMAGE_SIZE:
.int 36070 .int 51248

2
ios/include/material/image.apple.S
View File

@@ -8,5 +8,5 @@ _IMAGE_PACKAGE:
_IMAGE_IMAGE_OFFSET: _IMAGE_IMAGE_OFFSET:
.int 0 .int 0
_IMAGE_IMAGE_SIZE: _IMAGE_IMAGE_SIZE:
.int 36070 .int 51248

BIN
ios/include/material/image.bin
View File

Binary file not shown.

3841
ios/include/material/image.c
View File

File diff suppressed because it is too large Load Diff

10
materials/image.mat
View File

@@ -11,7 +11,7 @@ material {
precision : high precision : high
}, },
{ {
type : float3, type : float4,
name : backgroundColor name : backgroundColor
}, },
{ {
@@ -38,17 +38,15 @@ vertex {
fragment { fragment {
void material(inout MaterialInputs material) { void material(inout MaterialInputs material) {
prepareMaterial(material); prepareMaterial(material);
highp vec2 uv = (materialParams.transform * vec4(saturate(variable_imageUV.st), 1.0, 1.0)).st;
vec4 bg = vec4(materialParams.backgroundColor, 1.0);
highp vec2 uv = (materialParams.transform * vec4(saturate(variable_imageUV.st), 1.0, 1.0)).st;
if (materialParams.showImage == 0 || uv.s > 1.0 || uv.s < 0.0 || uv.t < 0.0 || uv.t > 1.0) { if (materialParams.showImage == 0 || uv.s > 1.0 || uv.s < 0.0 || uv.t < 0.0 || uv.t > 1.0) {
material.baseColor = bg; material.baseColor = materialParams.backgroundColor;
} else { } else {
uv.t = 1.0 - uv.t; uv.t = 1.0 - uv.t;
vec4 color = max(texture(materialParams_image, uv.st), 0.0); vec4 color = max(texture(materialParams_image, uv.st), 0.0);
color.rgb *= color.a; color.rgb *= color.a;
// Manual, pre-multiplied srcOver with opaque destination optimization // 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);
} }
} }
} }