diff options
| author | Thaddeus Crews <repiteo@outlook.com> | 2024-11-27 10:47:03 -0600 |
|---|---|---|
| committer | Thaddeus Crews <repiteo@outlook.com> | 2024-11-27 10:47:03 -0600 |
| commit | 21542298aab762750c66855629fc22bd44729ef1 (patch) | |
| tree | e010dfbb92d3af91df7230b482ee99ca318478f4 /scene/resources | |
| parent | 1c78b09815659f06144856ad731c505a96a257f8 (diff) | |
| parent | 9e34e454805f0dc6aad459170e7a2bbdaf2d4575 (diff) | |
| download | redot-engine-21542298aab762750c66855629fc22bd44729ef1.tar.gz | |
Merge pull request #99743 from clayjohn/material-texture-mask
Use Vector4 for texture mask in BaseMaterial to avoid converting to and from Plane
Diffstat (limited to 'scene/resources')
| -rw-r--r-- | scene/resources/material.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp index ecc1982aa5..96719a9e76 100644 --- a/scene/resources/material.cpp +++ b/scene/resources/material.cpp @@ -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]; |