oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Mostly deal with problems caused by polygon offset (#15867)

Browse source
This commit is contained in:
sfan5 2025-03-16 17:56:32 +01:00 • committed by GitHub
parent c07499ccfc
commit 42ac5b2f40
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/client/tile.cpp
View file

@ -21,11 +21,16 @@ void TileLayer::applyMaterialOptions(video::SMaterial &material, int layer) cons
/* /*
* The second layer is for overlays, but uses the same vertex positions * The second layer is for overlays, but uses the same vertex positions
* as the first, which easily leads to Z-fighting. * as the first, which easily leads to Z-fighting.
* To fix this we can offset the polygons in the direction of the camera. * To fix this we offset the polygons of the *first layer* away from the camera.
* This only affects the depth buffer and leads to no visual gaps in geometry. * This only affects the depth buffer and leads to no visual gaps in geometry.
*
* However, doing so intrudes the "Z space" of the overlay of the next node
* so that leads to inconsistent Z-sorting again. :(
* HACK: For lack of a better approach we restrict this to cases where
* an overlay is actually present.
*/ */
if (layer == 1) { if (need_polygon_offset) {
material.PolygonOffsetSlopeScale = -1; material.PolygonOffsetSlopeScale = 1;
material.PolygonOffsetDepthBias = -1; material.PolygonOffsetDepthBias = 1;
} }
} }

17
src/client/tile.h
View file

@ -73,7 +73,8 @@ struct TileLayer
material_flags == other.material_flags && material_flags == other.material_flags &&
has_color == other.has_color && has_color == other.has_color &&
color == other.color && color == other.color &&
scale == other.scale; scale == other.scale &&
need_polygon_offset == other.need_polygon_offset;
} }
/*! /*!
@ -92,6 +93,12 @@ struct TileLayer
*/ */
void applyMaterialOptions(video::SMaterial &material, int layer) const; void applyMaterialOptions(video::SMaterial &material, int layer) const;
/// @return is this layer uninitalized?
bool empty() const
{
return !shader_id && !texture_id;
}
/// @return is this layer semi-transparent? /// @return is this layer semi-transparent?
bool isTransparent() const bool isTransparent() const
{ {
@ -125,6 +132,12 @@ struct TileLayer
MATERIAL_FLAG_TILEABLE_HORIZONTAL| MATERIAL_FLAG_TILEABLE_HORIZONTAL|
MATERIAL_FLAG_TILEABLE_VERTICAL; MATERIAL_FLAG_TILEABLE_VERTICAL;
u8 scale = 1;
/// does this tile need to have a positive polygon offset set?
/// @see TileLayer::applyMaterialOptions
bool need_polygon_offset = false;
/// @note not owned by this struct /// @note not owned by this struct
std::vector<FrameSpec> *frames = nullptr; std::vector<FrameSpec> *frames = nullptr;
@ -136,8 +149,6 @@ struct TileLayer
//! If true, the tile has its own color. //! If true, the tile has its own color.
bool has_color = false; bool has_color = false;
u8 scale = 1;
}; };
enum class TileRotation: u8 { enum class TileRotation: u8 {

2
src/nodedef.cpp
View file

@ -919,6 +919,8 @@ void ContentFeatures::updateTextures(ITextureSource *tsrc, IShaderSource *shdsrc
fillTileAttribs(tsrc, &tiles[j].layers[1], tiles[j], tdef_overlay[j], fillTileAttribs(tsrc, &tiles[j].layers[1], tiles[j], tdef_overlay[j],
color, overlay_material, overlay_shader, color, overlay_material, overlay_shader,
tdef[j].backface_culling, tsettings); tdef[j].backface_culling, tsettings);
tiles[j].layers[0].need_polygon_offset = !tiles[j].layers[1].empty();
} }
MaterialType special_material = material_type; MaterialType special_material = material_type;