USD 20.08: Update Swig and third_party headers

Author: jcowles

src/Swig/Swig.csproj

@@ -122,6 +122,7 @@
     <Content Include="pxr\usd\kind\kindTokens.i" />
     <Content Include="pxr\usd\ndr\ndr.i" />
     <Content Include="pxr\usd\sdf\sdfLayerTree.i" />
+    <Content Include="pxr\usd\sdf\sdfTimeCode.i" />
     <Content Include="pxr\usd\sdf\sdfPropertySpec.i" />
     <Content Include="pxr\usd\sdf\sdfAttributeSpec.i" />
     <Content Include="pxr\usd\sdf\sdfRelationshipSpec.i" />

src/Swig/pxr/base/vt/vtArray_Types.i

@@ -18,6 +18,11 @@ WRAP_EQUAL(SdfAssetPathArray)
 %template (SdfAssetPathArray) VtArray<SdfAssetPath>;
 typedef VtArray<SdfAssetPath> SdfAssetPathArray;
 
+CSHARP_ARRAYS(SdfTimeCode, SdfTimeCode);
+WRAP_EQUAL(SdfTimeCodeArray)
+%template (SdfTimeCodeArray) VtArray<SdfTimeCode>;
+typedef VtArray<SdfTimeCode> SdfTimeCodeArray;
+
 CSHARP_ARRAYS(bool, bool);
 WRAP_EQUAL(VtBoolArray)
 %template (VtBoolArray) VtArray<bool>;
@@ -80,8 +85,8 @@ typedef VtArray<GfQuath> VtQuathArray;
 
 CSHARP_ARRAYS(std::string, string);
 WRAP_EQUAL(VtStringArray)
-%template (VtStringArray) VtArray<std::string >;
-typedef VtArray<std::string > VtStringArray;
+%template (VtStringArray) VtArray<std::string>;
+typedef VtArray<std::string> VtStringArray;
 
 CSHARP_ARRAYS(TfToken, TfToken);
 WRAP_EQUAL(VtTokenArray)

src/Swig/pxr/base/vt/vtValue_Accessors.i

@@ -54,6 +54,10 @@
 %csattributes VtValueToSdfAssetPath "[Preserve]" 
 %typemap(csattributes) VtArray<SdfAssetPath> "[Preserve]"
 %csattributes VtValueToSdfAssetPathArray "[Preserve]" 
+%typemap(csattributes) SdfTimeCode "[Preserve]"
+%csattributes VtValueToSdfTimeCode "[Preserve]" 
+%typemap(csattributes) VtArray<SdfTimeCode> "[Preserve]"
+%csattributes VtValueToSdfTimeCodeArray "[Preserve]" 
 %typemap(csattributes) TfToken "[Preserve]"
 %csattributes VtValueToTfToken "[Preserve]" 
 %typemap(csattributes) VtArray<bool> "[Preserve]"
@@ -80,7 +84,7 @@
 %csattributes VtValueToVtQuatfArray "[Preserve]" 
 %typemap(csattributes) VtArray<GfQuath> "[Preserve]"
 %csattributes VtValueToVtQuathArray "[Preserve]" 
-%typemap(csattributes) VtArray<std::string > "[Preserve]"
+%typemap(csattributes) VtArray<std::string> "[Preserve]"
 %csattributes VtValueToVtStringArray "[Preserve]" 
 %typemap(csattributes) VtArray<TfToken> "[Preserve]"
 %csattributes VtValueToVtTokenArray "[Preserve]" 
@@ -389,6 +393,30 @@ extern void VtValueToSdfAssetPathArray(VtValue const& value, SdfAssetPathArray*
   }
 }
 
+extern SdfTimeCode VtValueToSdfTimeCode(VtValue const& value) {
+  if (value.IsHolding<SdfTimeCode>()) {
+    return value.UncheckedGet<SdfTimeCode>();
+  }
+  return SdfTimeCode();
+}
+extern void VtValueToSdfTimeCode(VtValue const& value, SdfTimeCode* output) {
+  if (value.IsHolding<SdfTimeCode>()) {
+    *output = value.UncheckedGet<SdfTimeCode>();
+  }
+}
+
+extern SdfTimeCodeArray VtValueToSdfTimeCodeArray(VtValue const& value) {
+  if (value.IsHolding<SdfTimeCodeArray>()) {
+    return value.UncheckedGet<SdfTimeCodeArray>();
+  }
+  return SdfTimeCodeArray();
+}
+extern void VtValueToSdfTimeCodeArray(VtValue const& value, SdfTimeCodeArray* output) {
+  if (value.IsHolding<SdfTimeCodeArray>()) {
+    *output = value.UncheckedGet<SdfTimeCodeArray>();
+  }
+}
+
 extern TfToken VtValueToTfToken(VtValue const& value) {
   if (value.IsHolding<TfToken>()) {
     return value.UncheckedGet<TfToken>();

src/Swig/pxr/base/vt/vtValue_Casts.i

@@ -98,6 +98,14 @@
         return UsdCs.VtValueToSdfAssetPathArray(value);
     }
 
+    public static implicit operator SdfTimeCode (VtValue value) {
+        return UsdCs.VtValueToSdfTimeCode(value);
+    }
+
+    public static implicit operator SdfTimeCodeArray (VtValue value) {
+        return UsdCs.VtValueToSdfTimeCodeArray(value);
+    }
+
     public static implicit operator TfToken (VtValue value) {
         return UsdCs.VtValueToTfToken(value);
     }
@@ -338,6 +346,14 @@
         return new VtValue(value);
     }
 
+    public static implicit operator VtValue (SdfTimeCode value) {
+        return new VtValue(value);
+    }
+
+    public static implicit operator VtValue (SdfTimeCodeArray value) {
+        return new VtValue(value);
+    }
+
     public static implicit operator VtValue (TfToken value) {
         return new VtValue(value);
     }

src/Swig/pxr/base/vt/vtValue_Types.i

@@ -33,6 +33,8 @@
 %template(VtValue) VtValue::VtValue<GfVec4i>;
 %template(VtValue) VtValue::VtValue<SdfAssetPath>;
 %template(VtValue) VtValue::VtValue<SdfAssetPathArray>;
+%template(VtValue) VtValue::VtValue<SdfTimeCode>;
+%template(VtValue) VtValue::VtValue<SdfTimeCodeArray>;
 %template(VtValue) VtValue::VtValue<TfToken>;
 %template(VtValue) VtValue::VtValue<VtBoolArray>;
 %template(VtValue) VtValue::VtValue<VtDoubleArray>;

src/Swig/pxr/usd/pcp/layerStack.i

@@ -39,6 +39,8 @@ typedef std::vector< PcpLayerStackPtr > PcpLayerStackPtrVector;
     SdfRelocatesMap *incrementalRelocatesTargetToSource,
     SdfPathVector *relocatesPrimPaths);
 
+%ignore Pcp_NeedToRecomputeLayerStackTimeCodesPerSecond;
+
 %ignore Pcp_NeedToRecomputeDueToAssetPathChange(const PcpLayerStackPtr& layerStack);
 %include "pxr/usd/pcp/layerStack.h"
 

src/Swig/pxr/usd/sdf/sdf.i

@@ -45,4 +45,4 @@
 
 %include "sdfLayer.i"
 %include "sdfLayerTree.i"
-
+%include "sdfTimeCode.i"

src/Swig/pxr/usd/sdf/sdfPath.i

@@ -71,4 +71,4 @@ typedef std::vector<SdfPath> SdfPathVector;
   }
 }
 
-%include "pxr/usd/sdf/path.h"
+%include "third_party/include/pxr/usd/sdf/path.h"

src/Swig/pxr/usd/sdf/sdfTimeCode.i

@@ -0,0 +1,25 @@
+// Copyright 2019 Unity 3D. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+%module sdfTimeCode
+
+%{
+#include "pxr/usd/sdf/timeCode.h"
+%}
+
+%template(SdfTimeCodeVector) std::vector<SdfTimeCode>;
+typedef std::vector<SdfTimeCode> SdfTimeCodeVector;
+
+
+%include "pxr/usd/sdf/timeCode.h"