Merge pull request #228 from Autodesk/chenh/MAYA-101845/usd-geom-curves

VP2RenderDelegate support for USD curves
Autodesk · Feb 11, 2020 · 4a8f0a7 · 4a8f0a7
2 parents a792378 + f13a3e1
commit 4a8f0a7
Show file tree

Hide file tree

Showing 26 changed files with 3,781 additions and 147 deletions.
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -1,6 +1,6 @@
 #
 # =======================================================================
-# Copyright 2019 Autodesk
+# Copyright 2020 Autodesk
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -145,6 +145,7 @@ list(APPEND mayaUsd_src
     render/pxrUsdMayaGL/usdProxyShapeAdapter.cpp
     render/pxrUsdMayaGL/userData.cpp
     #
+    render/vp2RenderDelegate/basisCurves.cpp
     render/vp2RenderDelegate/bboxGeom.cpp
     render/vp2RenderDelegate/debugCodes.cpp
     render/vp2RenderDelegate/draw_item.cpp
@@ -183,14 +184,27 @@ list(APPEND mayaUsdShaderFragments_xmls
     render/vp2ShaderFragments/usdPreviewSurfaceCombiner.xml
     render/vp2ShaderFragments/usdPreviewSurfaceLighting.xml
     # New fragments
+    render/vp2ShaderFragments/BasisCurvesLinearDomain_GLSL.xml
+    render/vp2ShaderFragments/BasisCurvesLinearDomain_HLSL.xml
+    render/vp2ShaderFragments/BasisCurvesLinearDomain_Cg.xml
+    render/vp2ShaderFragments/BasisCurvesLinearFallbackShader.xml
+    render/vp2ShaderFragments/BasisCurvesLinearHull.xml
+    render/vp2ShaderFragments/BasisCurvesCubicDomain_GLSL.xml
+    render/vp2ShaderFragments/BasisCurvesCubicDomain_HLSL.xml
+    render/vp2ShaderFragments/BasisCurvesCubicDomain_Cg.xml
+    render/vp2ShaderFragments/BasisCurvesCubicFallbackShader.xml
+    render/vp2ShaderFragments/BasisCurvesCubicHull.xml
     render/vp2ShaderFragments/FallbackCPVShader.xml
     render/vp2ShaderFragments/FallbackShader.xml
     render/vp2ShaderFragments/Float4ToFloat3.xml
     render/vp2ShaderFragments/Float4ToFloat4.xml
+    render/vp2ShaderFragments/NwFaceCameraIfNAN.xml
+    render/vp2ShaderFragments/UsdPrimvarReader_color.xml
     render/vp2ShaderFragments/UsdPrimvarReader_float.xml
     render/vp2ShaderFragments/UsdPrimvarReader_float2.xml
     render/vp2ShaderFragments/UsdPrimvarReader_float3.xml
     render/vp2ShaderFragments/UsdPrimvarReader_float4.xml
+    render/vp2ShaderFragments/UsdPrimvarReader_vector.xml
     render/vp2ShaderFragments/UsdUVTexture.xml
     # USD plug info
     render/vp2ShaderFragments/plugInfo.json