Cleanup

CesiumGS · Jul 31, 2023 · 02a557e · 02a557e
1 parent 95f9b74
commit 02a557e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/exts/cesium.omniverse/mdl/cesium.mdl b/exts/cesium.omniverse/mdl/cesium.mdl
@@ -75,8 +75,7 @@ export float3 lookup_world_texture_float3(uniform texture_2d texture = texture_2
 //         coord: world_coordinate_2d(min_world_xy, max_world_xy));
 // }
 
-export material cesium_material(*) [[ anno::hidden() ]] = gltf_material();
-
+// For internal use only. See note in FabricMaterial.cpp
 export gltf_texture_lookup_value cesium_texture_lookup(*) [[ anno::hidden() ]] = gltf_texture_lookup();
 
 export color cesium_base_color_texture(gltf_texture_lookup_value base_color_texture)

diff --git a/src/core/include/cesium/omniverse/Tokens.h b/src/core/include/cesium/omniverse/Tokens.h
@@ -7,7 +7,6 @@
 
 namespace cesium::omniverse::FabricTokens {
 extern const omni::fabric::TokenC baseColorTex;
-extern const omni::fabric::TokenC cesium_material;
 extern const omni::fabric::TokenC cesium_texture_lookup;
 extern const omni::fabric::TokenC constant;
 extern const omni::fabric::TokenC doubleSided;
@@ -75,7 +74,6 @@ extern const omni::fabric::TokenC _worldVisibility;
 
 namespace cesium::omniverse::UsdTokens {
 extern const pxr::TfToken& baseColorTex;
-extern const pxr::TfToken& cesium_material;
 extern const pxr::TfToken& cesium_texture_lookup;
 extern const pxr::TfToken& constant;
 extern const pxr::TfToken& doubleSided;

diff --git a/src/core/src/Tokens.cpp b/src/core/src/Tokens.cpp
@@ -17,7 +17,6 @@ TF_DEFINE_PRIVATE_TOKENS(
     UsdTokens,
     (baseColorTex)
     (cesium_base_color_texture)
-    (cesium_material)
     (cesium_texture_lookup)
     (constant)
     (doubleSided)
@@ -91,7 +90,6 @@ __pragma(warning(pop))
 namespace cesium::omniverse::FabricTokens {
 const omni::fabric::TokenC baseColorTex = omni::fabric::asInt(pxr::UsdTokens->baseColorTex);
 const omni::fabric::TokenC cesium_base_color_texture = omni::fabric::asInt(pxr::UsdTokens->cesium_base_color_texture);
-const omni::fabric::TokenC cesium_material = omni::fabric::asInt(pxr::UsdTokens->cesium_material);
 const omni::fabric::TokenC cesium_texture_lookup = omni::fabric::asInt(pxr::UsdTokens->cesium_texture_lookup);
 const omni::fabric::TokenC constant = omni::fabric::asInt(pxr::UsdTokens->constant);
 const omni::fabric::TokenC doubleSided = omni::fabric::asInt(pxr::UsdTokens->doubleSided);
@@ -159,7 +157,6 @@ const omni::fabric::TokenC _worldVisibility = omni::fabric::asInt(pxr::UsdTokens
 namespace cesium::omniverse::UsdTokens {
 const pxr::TfToken& baseColorTex = pxr::UsdTokens->baseColorTex;
 const pxr::TfToken& cesium_base_color_texture = pxr::UsdTokens->cesium_base_color_texture;
-const pxr::TfToken& cesium_material = pxr::UsdTokens->cesium_material;
 const pxr::TfToken& cesium_texture_lookup = pxr::UsdTokens->cesium_texture_lookup;
 const pxr::TfToken& constant = pxr::UsdTokens->constant;
 const pxr::TfToken& doubleSided = pxr::UsdTokens->doubleSided;