diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-08-04 00:15:36 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-08-04 00:15:36 +0300 |
| commit | ea26ee5e92aa93ed966581ab17da5fc38d43a884 (patch) | |
| tree | 9362314316f9cfddb84761745ebf9ba5fc0261cb /indra/llmath/llvolume.h | |
| parent | eba7ae24dc00725909aea0ede7c8b3d3f4394017 (diff) | |
| parent | 9dba9f80f4d40ec12a735ddbb66a9d103a959ece (diff) | |
Merge branch 'master' into DRTVWR-548-maint-N
# Conflicts:
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llvovolume.cpp
Diffstat (limited to 'indra/llmath/llvolume.h')
| -rw-r--r-- | indra/llmath/llvolume.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h index a984aa127e..3ccaed47f1 100644 --- a/indra/llmath/llvolume.h +++ b/indra/llmath/llvolume.h @@ -903,6 +903,10 @@ public: typedef std::map<LLVector3, std::vector<VertexMapData>, VertexMapData::ComparePosition > PointMap; }; + // Eliminates non unique triangles, takes positions, + // normals and texture coordinates into account. + void remap(); + void optimize(F32 angle_cutoff = 2.f); bool cacheOptimize(); |
