diff --git a/UnitySDK/Assets/TiltBrush/Scripts/BrushDescriptor.cs b/UnitySDK/Assets/TiltBrush/Scripts/BrushDescriptor.cs index 1822e5d1..f44bf5d3 100644 --- a/UnitySDK/Assets/TiltBrush/Scripts/BrushDescriptor.cs +++ b/UnitySDK/Assets/TiltBrush/Scripts/BrushDescriptor.cs @@ -28,7 +28,6 @@ public enum Semantic { XyIsUvZIsDistance, UnitlessVector, XyIsUv, - Timestamp, } public Material Material { get { return m_Material; } } diff --git a/UnitySDK/Assets/TiltBrush/Scripts/Gltf/ImportGltf.cs b/UnitySDK/Assets/TiltBrush/Scripts/Gltf/ImportGltf.cs index 07e45a09..b6c65155 100644 --- a/UnitySDK/Assets/TiltBrush/Scripts/Gltf/ImportGltf.cs +++ b/UnitySDK/Assets/TiltBrush/Scripts/Gltf/ImportGltf.cs @@ -912,6 +912,10 @@ private static void StoreDataInMesh( // The data is not fully hooked-up in the gltf, and it doesn't make its way to THREE. // So: ignore it. break; + case "_TB_TIMESTAMP": + // Tilt Brush .glb files don't ever have txc2, so this is a safe place to stuff timestamps + mesh.uvSets[2] = data; + break; default: Debug.LogWarningFormat("Unhandled attribute {0}", semantic); break; @@ -1025,9 +1029,6 @@ static Semantic GetTexcoordSemantic(ImportState state, GltfMaterialBase material return desc.m_uv0Semantic; } else if (uvChannel == 1) { return desc.m_uv1Semantic; - } else if (uvChannel == 2) { - // All brushes use texcoord2 as (optional) timestamp data - return Semantic.Timestamp; } else { Debug.LogWarningFormat("Unexpected TB texcoord: {0}", uvChannel); return Semantic.Unspecified;