Refactor (Face/CndSurfaceVerts): rename field 'texIdx' to 'uvIdx''

Author: smlu

libraries/libim/content/asset/primitives/face.h

@@ -28,7 +28,7 @@ namespace libim::content::asset {
         struct VertexIdx
         {
             std::size_t vertIdx;
-            std::optional<std::size_t> texIdx;
+            std::optional<std::size_t> uvIdx;  // index in UV list
         };
 
         Flags<Flag> flags;
@@ -43,7 +43,7 @@ namespace libim::content::asset {
 
 
     inline bool operator == (const Face::VertexIdx& lhs, const Face::VertexIdx& rhs) {
-        return lhs.vertIdx == rhs.vertIdx && lhs.texIdx == rhs.texIdx;
+        return lhs.vertIdx == rhs.vertIdx && lhs.uvIdx == rhs.uvIdx;
     }
 
     inline bool operator != (const Face::VertexIdx& lhs, const Face::VertexIdx& rhs) {

libraries/libim/content/asset/world/impl/serialization/cnd/georesource/cnd_section_georesource.cpp

@@ -119,8 +119,8 @@ Georesource CND::parseSection_Georesource(const InputStream& istream, const CndH
             s.vecIntensities.reserve(h.numVerts);
             for (auto& v : s.verts)
             {
-                v.vertIdx   = safe_cast<decltype(v.vertIdx)>(itVerts->vertIdx);
-                v.texIdx    = makeOptionalIdx(itVerts->texIdx);
+                v.vertIdx = safe_cast<decltype(v.vertIdx)>(itVerts->vertIdx);
+                v.uvIdx   = makeOptionalIdx(itVerts->uvIdx);
                 s.vecIntensities.push_back(std::move(itVerts->color));
                 ++itVerts;
             }
@@ -192,7 +192,7 @@ void CND::writeSection_Georesource(OutputStream& ostream, const Georesource& geo
             {
                 vecSurfVerts.push_back({
                     safe_cast<decltype(CndSurfaceVerts::vertIdx)>(v.vertIdx),
-                    fromOptionalIdx(v.texIdx),
+                    fromOptionalIdx(v.uvIdx),
                     s.vecIntensities.at(idx)
                 });
             }

libraries/libim/content/asset/world/impl/serialization/cnd/georesource/cnd_surface.h

@@ -27,7 +27,7 @@ namespace libim::content::asset {
     struct CndSurfaceVerts
     {
         uint32_t vertIdx;
-        int32_t texIdx;
+        int32_t uvIdx;
         LinearColor color;       // vertex color
     };
     static_assert(sizeof(CndSurfaceVerts) == 24);