diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-02-02 21:05:02 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-02-02 21:05:02 +0100 |
| commit | d1589a94926865dce3fca87b02bb1d6a9428a265 (patch) | |
| tree | 5ec779a3c7847f338a302ad1980d936c3b8edfaa | |
| parent | fc7429d5fed7e36d7344c96250e661d222e0defe (diff) | |
| parent | dc065754756a67ebe2b01821e86ab620178ccb7c (diff) | |
Merge pull request #72601 from Calinou/primitivemesh-uv2-padding-add-property-hint
Add a property hint for PrimitiveMesh's `uv2_padding`
| -rw-r--r-- | doc/classes/PrimitiveMesh.xml | 3 | ||||
| -rw-r--r-- | scene/resources/primitive_meshes.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/classes/PrimitiveMesh.xml b/doc/classes/PrimitiveMesh.xml index b1c8907d8e..b98590d10c 100644 --- a/doc/classes/PrimitiveMesh.xml +++ b/doc/classes/PrimitiveMesh.xml @@ -48,7 +48,8 @@ The current [Material] of the primitive mesh. </member> <member name="uv2_padding" type="float" setter="set_uv2_padding" getter="get_uv2_padding" default="2.0"> - If [member add_uv2] is set, specifies the padding in pixels applied along seams of the mesh. If at generation the size of the lightmap texture can't be determined, the UVs are calculated assuming a texture size of 1024x1024. + If [member add_uv2] is set, specifies the padding in pixels applied along seams of the mesh. Lower padding values allow making better use of the lightmap texture (resulting in higher texel density), but may introduce visible lightmap bleeding along edges. + If the size of the lightmap texture can't be determined when generating the mesh, UV2 is calculated assuming a texture size of 1024x1024. </member> </members> </class> diff --git a/scene/resources/primitive_meshes.cpp b/scene/resources/primitive_meshes.cpp index 86ed0001dd..ef1f6459e9 100644 --- a/scene/resources/primitive_meshes.cpp +++ b/scene/resources/primitive_meshes.cpp @@ -257,7 +257,7 @@ void PrimitiveMesh::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::AABB, "custom_aabb", PROPERTY_HINT_NONE, "suffix:m"), "set_custom_aabb", "get_custom_aabb"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "flip_faces"), "set_flip_faces", "get_flip_faces"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "add_uv2"), "set_add_uv2", "get_add_uv2"); - ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "uv2_padding"), "set_uv2_padding", "get_uv2_padding"); + ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "uv2_padding", PROPERTY_HINT_RANGE, "0,10,0.01,or_greater"), "set_uv2_padding", "get_uv2_padding"); GDVIRTUAL_BIND(_create_mesh_array); } |