Remove tileId

CesiumGS · Jul 10, 2023 · 34e6e3f · 34e6e3f
1 parent 52b0760
commit 34e6e3f
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 39 deletions.
diff --git a/src/core/include/cesium/omniverse/Context.h b/src/core/include/cesium/omniverse/Context.h
@@ -82,7 +82,6 @@ class Context {
 
     int64_t getContextId() const;
     int64_t getNextTilesetId() const;
-    int64_t getNextTileId() const;
 
     const CesiumGeospatial::Cartographic getGeoreferenceOrigin() const;
     void setGeoreferenceOrigin(const CesiumGeospatial::Cartographic& origin);
@@ -160,7 +159,6 @@ class Context {
     int64_t _contextId;
 
     mutable std::atomic<int64_t> _tilesetId{};
-    mutable std::atomic<int64_t> _tileId{};
 
     std::filesystem::path _cesiumExtensionLocation;
     std::filesystem::path _certificatePath;

diff --git a/src/core/include/cesium/omniverse/FabricGeometry.h b/src/core/include/cesium/omniverse/FabricGeometry.h
@@ -25,7 +25,6 @@ class FabricGeometry {
 
     void setGeometry(
         int64_t tilesetId,
-        int64_t tileId,
         const glm::dmat4& ecefToUsdTransform,
         const glm::dmat4& gltfToEcefTransform,
         const glm::dmat4& nodeTransform,

diff --git a/src/core/include/cesium/omniverse/FabricMaterial.h b/src/core/include/cesium/omniverse/FabricMaterial.h
@@ -29,7 +29,7 @@ class FabricMaterial {
         pxr::SdfAssetPath defaultTextureAssetPath);
     ~FabricMaterial();
 
-    void setMaterial(int64_t tilesetId, int64_t tileId, const MaterialInfo& materialInfo);
+    void setMaterial(int64_t tilesetId, const MaterialInfo& materialInfo);
 
     void setBaseColorTexture(const std::shared_ptr<FabricTexture>& texture, const TextureInfo& textureInfo);
 
@@ -43,7 +43,7 @@ class FabricMaterial {
   private:
     void initialize(pxr::SdfPath path, const FabricMaterialDefinition& materialDefinition);
     void reset();
-    void setTilesetIdAndTileId(int64_t tilesetId, int64_t tileId);
+    void setTilesetId(int64_t tilesetId);
     void setMaterialValues(const MaterialInfo& materialInfo);
     void setBaseColorTextureValues(const pxr::SdfAssetPath& textureAssetPath, const TextureInfo& textureInfo);
 

diff --git a/src/core/include/cesium/omniverse/FabricUtil.h b/src/core/include/cesium/omniverse/FabricUtil.h
@@ -28,6 +28,6 @@ std::string printFabricStage();
 FabricStatistics getStatistics();
 void destroyPrim(const omni::fabric::Path& path);
 void setTilesetTransform(int64_t tilesetId, const glm::dmat4& ecefToUsdTransform);
-void setTilesetIdAndTileId(const omni::fabric::Path& pathFabric, int64_t tilesetId, int64_t tileId);
+void setTilesetId(const omni::fabric::Path& pathFabric, int64_t tilesetId);
 
 } // namespace cesium::omniverse::FabricUtil
diff --git a/src/core/include/cesium/omniverse/Tokens.h b/src/core/include/cesium/omniverse/Tokens.h
@@ -58,7 +58,6 @@ extern const omni::fabric::TokenC vertex;
 extern const omni::fabric::TokenC vertexColor;
 extern const omni::fabric::TokenC _auto;
 extern const omni::fabric::TokenC _cesium_localToEcefTransform;
-extern const omni::fabric::TokenC _cesium_tileId;
 extern const omni::fabric::TokenC _cesium_tilesetId;
 extern const omni::fabric::TokenC _deletedPrims;
 extern const omni::fabric::TokenC _paramColorSpace;
@@ -123,7 +122,6 @@ extern const pxr::TfToken& vertex;
 extern const pxr::TfToken& vertexColor;
 extern const pxr::TfToken& _auto;
 extern const pxr::TfToken& _cesium_localToEcefTransform;
-extern const pxr::TfToken& _cesium_tileId;
 extern const pxr::TfToken& _cesium_tilesetId;
 extern const pxr::TfToken& _deletedPrims;
 extern const pxr::TfToken& _paramColorSpace;
@@ -174,7 +172,6 @@ const omni::fabric::Type primvars_vertexColor(omni::fabric::BaseDataType::eFloat
 const omni::fabric::Type Shader(omni::fabric::BaseDataType::eTag, 1, 0, omni::fabric::AttributeRole::ePrimTypeName);
 const omni::fabric::Type subdivisionScheme(omni::fabric::BaseDataType::eToken, 1, 0, omni::fabric::AttributeRole::eNone);
 const omni::fabric::Type _cesium_localToEcefTransform(omni::fabric::BaseDataType::eDouble, 16, 0, omni::fabric::AttributeRole::eMatrix);
-const omni::fabric::Type _cesium_tileId(omni::fabric::BaseDataType::eInt64, 1, 0, omni::fabric::AttributeRole::eNone);
 const omni::fabric::Type _cesium_tilesetId(omni::fabric::BaseDataType::eInt64, 1, 0, omni::fabric::AttributeRole::eNone);
 const omni::fabric::Type _paramColorSpace(omni::fabric::BaseDataType::eToken, 1, 1, omni::fabric::AttributeRole::eNone);
 const omni::fabric::Type _sdrMetadata(omni::fabric::BaseDataType::eToken, 1, 1, omni::fabric::AttributeRole::eNone);

diff --git a/src/core/src/Context.cpp b/src/core/src/Context.cpp
@@ -461,10 +461,6 @@ int64_t Context::getNextTilesetId() const {
     return _tilesetId++;
 }
 
-int64_t Context::getNextTileId() const {
-    return _tileId++;
-}
-
 const CesiumGeospatial::Cartographic Context::getGeoreferenceOrigin() const {
     const auto georeference = UsdUtil::getOrCreateCesiumGeoreference();
 

diff --git a/src/core/src/FabricGeometry.cpp b/src/core/src/FabricGeometry.cpp
@@ -97,7 +97,6 @@ void FabricGeometry::initialize() {
     attributes.addAttribute(FabricTypes::primvars_displayOpacity, FabricTokens::primvars_displayOpacity);
     attributes.addAttribute(FabricTypes::Mesh, FabricTokens::Mesh);
     attributes.addAttribute(FabricTypes::_cesium_tilesetId, FabricTokens::_cesium_tilesetId);
-    attributes.addAttribute(FabricTypes::_cesium_tileId, FabricTokens::_cesium_tileId);
     attributes.addAttribute(FabricTypes::_cesium_localToEcefTransform, FabricTokens::_cesium_localToEcefTransform);
     attributes.addAttribute(FabricTypes::_worldPosition, FabricTokens::_worldPosition);
     attributes.addAttribute(FabricTypes::_worldOrientation, FabricTokens::_worldOrientation);
@@ -214,7 +213,7 @@ void FabricGeometry::reset() {
     displayColorFabric[0] = DEFAULT_VERTEX_COLOR;
     displayOpacityFabric[0] = DEFAULT_VERTEX_OPACITY;
 
-    FabricUtil::setTilesetIdAndTileId(_pathFabric, -1, -1);
+    FabricUtil::setTilesetId(_pathFabric, -1);
 
     srw.setArrayAttributeSize(_pathFabric, FabricTokens::materialBinding, 0);
     srw.setArrayAttributeSize(_pathFabric, FabricTokens::faceVertexCounts, 0);
@@ -236,7 +235,6 @@ void FabricGeometry::reset() {
 
 void FabricGeometry::setGeometry(
     int64_t tilesetId,
-    int64_t tileId,
     const glm::dmat4& ecefToUsdTransform,
     const glm::dmat4& gltfToEcefTransform,
     const glm::dmat4& nodeTransform,
@@ -299,7 +297,7 @@ void FabricGeometry::setGeometry(
     *worldOrientationFabric = worldOrientation;
     *worldScaleFabric = worldScale;
 
-    FabricUtil::setTilesetIdAndTileId(_pathFabric, tilesetId, tileId);
+    FabricUtil::setTilesetId(_pathFabric, tilesetId);
 
     if (_debugRandomColors) {
         const auto r = glm::linearRand(0.0f, 1.0f);

diff --git a/src/core/src/FabricMaterial.cpp b/src/core/src/FabricMaterial.cpp
@@ -79,7 +79,6 @@ void FabricMaterial::initialize(pxr::SdfPath path, const FabricMaterialDefinitio
 
         attributes.addAttribute(FabricTypes::Material, FabricTokens::Material);
         attributes.addAttribute(FabricTypes::_cesium_tilesetId, FabricTokens::_cesium_tilesetId);
-        attributes.addAttribute(FabricTypes::_cesium_tileId, FabricTokens::_cesium_tileId);
 
         attributes.createAttributes(materialPathFabric);
     }
@@ -106,7 +105,6 @@ void FabricMaterial::initialize(pxr::SdfPath path, const FabricMaterialDefinitio
         attributes.addAttribute(FabricTypes::_sdrMetadata, FabricTokens::_sdrMetadata);
         attributes.addAttribute(FabricTypes::Shader, FabricTokens::Shader);
         attributes.addAttribute(FabricTypes::_cesium_tilesetId, FabricTokens::_cesium_tilesetId);
-        attributes.addAttribute(FabricTypes::_cesium_tileId, FabricTokens::_cesium_tileId);
         // clang-format on
 
         if (hasVertexColors) {
@@ -176,7 +174,6 @@ void FabricMaterial::initialize(pxr::SdfPath path, const FabricMaterialDefinitio
             attributes.addAttribute(FabricTypes::_sdrMetadata, FabricTokens::_sdrMetadata);
             attributes.addAttribute(FabricTypes::Shader, FabricTokens::Shader);
             attributes.addAttribute(FabricTypes::_cesium_tilesetId, FabricTokens::_cesium_tilesetId);
-            attributes.addAttribute(FabricTypes::_cesium_tileId, FabricTokens::_cesium_tileId);
             // clang-format on
 
             attributes.createAttributes(baseColorTexPathFabric);
@@ -220,18 +217,18 @@ void FabricMaterial::reset() {
     auto srw = UsdUtil::getFabricStageReaderWriter();
 
     setMaterialValues(GltfUtil::getDefaultMaterialInfo());
-    setTilesetIdAndTileId(-1, -1);
+    setTilesetId(-1);
 
     if (_materialDefinition.hasBaseColorTexture()) {
         clearBaseColorTexture();
     }
 }
 
-void FabricMaterial::setMaterial(int64_t tilesetId, int64_t tileId, const MaterialInfo& materialInfo) {
+void FabricMaterial::setMaterial(int64_t tilesetId, const MaterialInfo& materialInfo) {
     auto srw = UsdUtil::getFabricStageReaderWriter();
 
     setMaterialValues(materialInfo);
-    setTilesetIdAndTileId(tilesetId, tileId);
+    setTilesetId(tilesetId);
 }
 
 void FabricMaterial::setBaseColorTexture(
@@ -257,12 +254,12 @@ void FabricMaterial::clearBaseColorTexture() {
     setBaseColorTextureValues(_defaultTextureAssetPath, GltfUtil::getDefaultTextureInfo());
 }
 
-void FabricMaterial::setTilesetIdAndTileId(int64_t tilesetId, int64_t tileId) {
-    FabricUtil::setTilesetIdAndTileId(_materialPathFabric, tilesetId, tileId);
-    FabricUtil::setTilesetIdAndTileId(_shaderPathFabric, tilesetId, tileId);
+void FabricMaterial::setTilesetId(int64_t tilesetId) {
+    FabricUtil::setTilesetId(_materialPathFabric, tilesetId);
+    FabricUtil::setTilesetId(_shaderPathFabric, tilesetId);
 
     if (_materialDefinition.hasBaseColorTexture()) {
-        FabricUtil::setTilesetIdAndTileId(_baseColorTexPathFabric, tilesetId, tileId);
+        FabricUtil::setTilesetId(_baseColorTexPathFabric, tilesetId);
     }
 }
 

diff --git a/src/core/src/FabricPrepareRenderResources.cpp b/src/core/src/FabricPrepareRenderResources.cpp
@@ -44,7 +44,6 @@ struct TileLoadThreadResult {
 
 struct MeshInfo {
     const int64_t tilesetId;
-    const int64_t tileId;
     const glm::dmat4 ecefToUsdTransform;
     const glm::dmat4 gltfToEcefTransform;
     const glm::dmat4 nodeTransform;
@@ -57,7 +56,6 @@ std::vector<MeshInfo>
 gatherMeshes(const OmniTileset& tileset, const glm::dmat4& tileTransform, const CesiumGltf::Model& model) {
     CESIUM_TRACE("FabricPrepareRenderResources::gatherMeshes");
     const auto tilesetId = tileset.getTilesetId();
-    const auto tileId = Context::instance().getNextTileId();
 
     const auto smoothNormals = tileset.getSmoothNormals();
 
@@ -71,7 +69,7 @@ gatherMeshes(const OmniTileset& tileset, const glm::dmat4& tileTransform, const
 
     model.forEachPrimitiveInScene(
         -1,
-        [tilesetId, tileId, &ecefToUsdTransform, &gltfToEcefTransform, smoothNormals, &meshes](
+        [tilesetId, &ecefToUsdTransform, &gltfToEcefTransform, smoothNormals, &meshes](
             const CesiumGltf::Model& gltf,
             [[maybe_unused]] const CesiumGltf::Node& node,
             const CesiumGltf::Mesh& mesh,
@@ -81,7 +79,6 @@ gatherMeshes(const OmniTileset& tileset, const glm::dmat4& tileTransform, const
             const auto primitiveId = getIndexFromRef(mesh.primitives, primitive);
             meshes.emplace_back(MeshInfo{
                 tilesetId,
-                tileId,
                 ecefToUsdTransform,
                 gltfToEcefTransform,
                 transform,
@@ -147,7 +144,6 @@ void setFabricMeshes(
 
         geometry->setGeometry(
             meshInfo.tilesetId,
-            meshInfo.tileId,
             meshInfo.ecefToUsdTransform,
             meshInfo.gltfToEcefTransform,
             meshInfo.nodeTransform,
@@ -157,7 +153,7 @@ void setFabricMeshes(
             hasImagery);
 
         if (material != nullptr) {
-            material->setMaterial(meshInfo.tilesetId, meshInfo.tileId, materialInfo);
+            material->setMaterial(meshInfo.tilesetId, materialInfo);
             geometry->setMaterial(material);
 
             if (baseColorTexture != nullptr && materialInfo.baseColorTexture.has_value()) {

diff --git a/src/core/src/FabricUtil.cpp b/src/core/src/FabricUtil.cpp
@@ -630,14 +630,12 @@ void setTilesetTransform(int64_t tilesetId, const glm::dmat4& ecefToUsdTransform
     }
 }
 
-void setTilesetIdAndTileId(const omni::fabric::Path& pathFabric, int64_t tilesetId, int64_t tileId) {
+void setTilesetId(const omni::fabric::Path& pathFabric, int64_t tilesetId) {
     auto srw = UsdUtil::getFabricStageReaderWriter();
 
     auto tilesetIdFabric = srw.getAttributeWr<int64_t>(pathFabric, FabricTokens::_cesium_tilesetId);
-    auto tileIdFabric = srw.getAttributeWr<int64_t>(pathFabric, FabricTokens::_cesium_tileId);
 
     *tilesetIdFabric = tilesetId;
-    *tileIdFabric = tileId;
 }
 
 } // namespace cesium::omniverse::FabricUtil
diff --git a/src/core/src/Tokens.cpp b/src/core/src/Tokens.cpp
@@ -37,7 +37,6 @@ TF_DEFINE_PRIVATE_TOKENS(
     (vertex)
     (vertexColor)
     (_cesium_localToEcefTransform)
-    (_cesium_tileId)
     (_cesium_tilesetId)
     (_deletedPrims)
     (_paramColorSpace)
@@ -138,7 +137,6 @@ const omni::fabric::TokenC vertex = omni::fabric::asInt(pxr::UsdTokens->vertex);
 const omni::fabric::TokenC vertexColor = omni::fabric::asInt(pxr::UsdTokens->vertexColor);
 const omni::fabric::TokenC _auto = omni::fabric::asInt(pxr::UsdTokens->_auto);
 const omni::fabric::TokenC _cesium_localToEcefTransform = omni::fabric::asInt(pxr::UsdTokens->_cesium_localToEcefTransform);
-const omni::fabric::TokenC _cesium_tileId = omni::fabric::asInt(pxr::UsdTokens->_cesium_tileId);
 const omni::fabric::TokenC _cesium_tilesetId = omni::fabric::asInt(pxr::UsdTokens->_cesium_tilesetId);
 const omni::fabric::TokenC _deletedPrims = omni::fabric::asInt(pxr::UsdTokens->_deletedPrims);
 const omni::fabric::TokenC _paramColorSpace = omni::fabric::asInt(pxr::UsdTokens->_paramColorSpace);
@@ -203,7 +201,6 @@ const pxr::TfToken& vertex = pxr::UsdTokens->vertex;
 const pxr::TfToken& vertexColor = pxr::UsdTokens->vertexColor;
 const pxr::TfToken& _auto = pxr::UsdTokens->_auto;
 const pxr::TfToken& _cesium_localToEcefTransform = pxr::UsdTokens->_cesium_localToEcefTransform;
-const pxr::TfToken& _cesium_tileId = pxr::UsdTokens->_cesium_tileId;
 const pxr::TfToken& _cesium_tilesetId = pxr::UsdTokens->_cesium_tilesetId;
 const pxr::TfToken& _deletedPrims = pxr::UsdTokens->_deletedPrims;
 const pxr::TfToken& _paramColorSpace = pxr::UsdTokens->_paramColorSpace;