Merge pull request #99743 from clayjohn/material-texture-mask

Use Vector4 for texture mask in BaseMaterial to avoid converting to and from Plane
This commit is contained in:
Thaddeus Crews 2024-11-27 10:47:03 -06:00
commit 21542298aa
No known key found for this signature in database
GPG key ID: 62181B86FE9E5D84

View file

@ -2737,13 +2737,13 @@ float BaseMaterial3D::get_grow() const {
return grow;
}
static Plane _get_texture_mask(BaseMaterial3D::TextureChannel p_channel) {
static const Plane masks[5] = {
Plane(1, 0, 0, 0),
Plane(0, 1, 0, 0),
Plane(0, 0, 1, 0),
Plane(0, 0, 0, 1),
Plane(0.3333333, 0.3333333, 0.3333333, 0),
static Vector4 _get_texture_mask(BaseMaterial3D::TextureChannel p_channel) {
static const Vector4 masks[5] = {
Vector4(1, 0, 0, 0),
Vector4(0, 1, 0, 0),
Vector4(0, 0, 1, 0),
Vector4(0, 0, 0, 1),
Vector4(0.3333333, 0.3333333, 0.3333333, 0),
};
return masks[p_channel];