Add Storm Hdx/Mtlx UsdImaging/GL.

* hail hydra. Signed-off-by: furby™ <devs@wabi.foundation>
wabiverse · Sep 7, 2024 · 390237e · 390237e
1 parent c24e058
commit 390237e
Show file tree

Hide file tree

Showing 102 changed files with 10,437 additions and 87 deletions.
diff --git a/DeclarativePixarUSD.usda b/DeclarativePixarUSD.usda
@@ -1,6 +1,6 @@
 #usda 1.0
 (
-    doc = "SwiftUSD v24.08.0 | Declarative API"
+    doc = "SwiftUSD v24.08.3 | Declarative API"
 )
 
 def "DeclarativeScene"

diff --git a/HelloPixarUSD.usda b/HelloPixarUSD.usda
@@ -1,6 +1,6 @@
 #usda 1.0
 (
-    doc = "SwiftUSD v24.08.0"
+    doc = "SwiftUSD v24.08.3"
 )
 
 def Xform "Geometry"

diff --git a/Package.swift b/Package.swift
@@ -177,6 +177,26 @@ let package = Package(
       name: "Hd",
       targets: ["Hd"]
     ),
+    .library(
+      name: "HdAr",
+      targets: ["HdAr"]
+    ),
+    .library(
+      name: "HdMtlx",
+      targets: ["HdMtlx"]
+    ),
+    .library(
+      name: "HdSi",
+      targets: ["HdSi"]
+    ),
+    .library(
+      name: "HdSt",
+      targets: ["HdSt"]
+    ),
+    .library(
+      name: "Hdx",
+      targets: ["Hdx"]
+    ),
     .library(
       name: "Garch",
       targets: ["Garch"]
@@ -218,6 +238,14 @@ let package = Package(
       name: "UsdShaders",
       targets: ["UsdShaders"]
     ),
+    .library(
+      name: "UsdImaging",
+      targets: ["UsdImaging"]
+    ),
+    .library(
+      name: "UsdImagingGL",
+      targets: ["UsdImagingGL"]
+    ),
     // ----------------- Apps -----
     .executable(
       name: "UsdView",
@@ -1308,6 +1336,7 @@ let package = Package(
         .target(name: "Hio"),
       ],
       resources: [
+        .copy("shaders"),
         .process("Resources")
       ],
       cxxSettings: [
@@ -1337,6 +1366,209 @@ let package = Package(
       ]
     ),
 
+    .target(
+      name: "HdSi",
+      dependencies: [
+        .target(name: "Arch"),
+        .target(name: "Tf"),
+        .target(name: "Plug"),
+        .target(name: "Trace"),
+        .target(name: "Vt"),
+        .target(name: "Work"),
+        .target(name: "Sdf"),
+        .target(name: "CameraUtil"),
+        .target(name: "GeomUtil"),
+        .target(name: "Hf"),
+        .target(name: "Hd"),
+        .target(name: "PxOsd"),
+      ],
+      cxxSettings: [
+        .define("MFB_PACKAGE_NAME", to: "HdSi"),
+        .define("MFB_ALT_PACKAGE_NAME", to: "HdSi"),
+        .define("MFB_PACKAGE_MODULE", to: "HdSi"),
+        .define("HDSI_EXPORTS", to: "1"),
+        .define("_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH", .when(platforms: [.windows])),
+      ]
+    ),
+
+    .target(
+      name: "HdMtlx",
+      dependencies: [
+        .target(name: "Arch"),
+        .target(name: "Tf"),
+        .target(name: "Trace"),
+        .target(name: "Vt"),
+        .target(name: "Gf"),
+        .target(name: "Hd"),
+        .target(name: "Sdf"),
+        .target(name: "Sdr"),
+        .target(name: "UsdMtlx")
+      ],
+      cxxSettings: [
+        .define("MFB_PACKAGE_NAME", to: "HdMtlx"),
+        .define("MFB_ALT_PACKAGE_NAME", to: "HdMtlx"),
+        .define("MFB_PACKAGE_MODULE", to: "HdMtlx"),
+        .define("HDMTLX_EXPORTS", to: "1"),
+        .define("_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH", .when(platforms: [.windows])),
+      ]
+    ),
+
+    .target(
+      name: "HdSt",
+      dependencies: [
+        .target(name: "Hio"),
+        .target(name: "Garch"),
+        .target(name: "Glf"),
+        .target(name: "Hd"),
+        .target(name: "HdSi"),
+        .target(name: "HgiGL"),
+        .target(name: "HgiInterop"),
+        .target(name: "Sdr"),
+        .target(name: "Arch"),
+        .target(name: "Tf"),
+        .target(name: "Trace"),
+        .target(name: "HdMtlx"),
+      ],
+      resources: [
+        .copy("shaders"),
+        .copy("textures"),
+        .process("Resources")
+      ],
+      cxxSettings: [
+        .define("MFB_PACKAGE_NAME", to: "HdSt"),
+        .define("MFB_ALT_PACKAGE_NAME", to: "HdSt"),
+        .define("MFB_PACKAGE_MODULE", to: "HdSt"),
+        .define("HDST_EXPORTS", to: "1"),
+        .define("PXR_MATERIALX_SUPPORT_ENABLED", to: "1"),
+        .define("_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH", .when(platforms: [.windows])),
+      ]
+    ),
+
+    .target(
+      name: "Hdx",
+      dependencies: [
+        .target(name: "Arch"),
+        .target(name: "Tf"),
+        .target(name: "Gf"),
+        .target(name: "Vt"),
+        .target(name: "Plug"),
+        .target(name: "Work"),
+        .target(name: "Sdf"),
+        .target(name: "Garch"),
+        .target(name: "Glf"),
+        .target(name: "PxOsd"),
+        .target(name: "Hd"),
+        .target(name: "HdSt"),
+        .target(name: "Hgi"),
+        .target(name: "HgiInterop"),
+        .target(name: "CameraUtil"),
+      ],
+      resources: [
+        .copy("shaders"),
+        .copy("textures"),
+        .process("Resources")
+      ],
+      cxxSettings: [
+        .define("MFB_PACKAGE_NAME", to: "Hdx"),
+        .define("MFB_ALT_PACKAGE_NAME", to: "Hdx"),
+        .define("MFB_PACKAGE_MODULE", to: "Hdx"),
+        .define("HDX_EXPORTS", to: "1"),
+        .define("_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH", .when(platforms: [.windows])),
+      ]
+    ),
+
+    .target(
+      name: "HdAr",
+      dependencies: [
+        .target(name: "Arch"),
+        .target(name: "Tf"),
+        .target(name: "Hd"),
+        .target(name: "Ar"),
+      ],
+      cxxSettings: [
+        .define("MFB_PACKAGE_NAME", to: "HdAr"),
+        .define("MFB_ALT_PACKAGE_NAME", to: "HdAr"),
+        .define("MFB_PACKAGE_MODULE", to: "HdAr"),
+        .define("HDAR_EXPORTS", to: "1"),
+        .define("_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH", .when(platforms: [.windows])),
+      ]
+    ),
+
+    .target(
+      name: "UsdImaging",
+      dependencies: [
+        .target(name: "Arch"),
+        .target(name: "Tf"),
+        .target(name: "Gf"),
+        .target(name: "Vt"),
+        .target(name: "Plug"),
+        .target(name: "Trace"),
+        .target(name: "Work"),
+        .target(name: "GeomUtil"),
+        .target(name: "Hd"),
+        .target(name: "HdAr"),
+        .target(name: "Hio"),
+        .target(name: "PxOsd"),
+        .target(name: "Ar"),
+        .target(name: "Sdf"),
+        .target(name: "Usd"),
+        .target(name: "UsdGeom"),
+        .target(name: "UsdLux"),
+        .target(name: "UsdRender"),
+        .target(name: "UsdShade"),
+        .target(name: "UsdVol"),
+      ],
+      resources: [
+        .process("Resources")
+      ],
+      cxxSettings: [
+        .define("MFB_PACKAGE_NAME", to: "UsdImaging"),
+        .define("MFB_ALT_PACKAGE_NAME", to: "UsdImaging"),
+        .define("MFB_PACKAGE_MODULE", to: "UsdImaging"),
+        .define("USDIMAGING_EXPORTS", to: "1"),
+        .define("_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH", .when(platforms: [.windows])),
+      ]
+    ),
+
+    .target(
+      name: "UsdImagingGL",
+      dependencies: [
+        .target(name: "Arch"),
+        .target(name: "Tf"),
+        .target(name: "Gf"),
+        .target(name: "Vt"),
+        .target(name: "Plug"),
+        .target(name: "Trace"),
+        .target(name: "Work"),
+        .target(name: "Hio"),
+        .target(name: "Garch"),
+        .target(name: "Glf"),
+        .target(name: "Hd"),
+        .target(name: "HdSi"),
+        .target(name: "Hdx"),
+        .target(name: "Hgi"),
+        .target(name: "PxOsd"),
+        .target(name: "Ar"),
+        .target(name: "Sdf"),
+        .target(name: "Sdr"),
+        .target(name: "Usd"),
+        .target(name: "UsdGeom"),
+        .target(name: "UsdHydra"),
+        .target(name: "UsdShade"),
+        .target(name: "UsdImaging"),
+      ],
+      resources: [
+        .process("Resources")
+      ],
+      cxxSettings: [
+        .define("MFB_PACKAGE_NAME", to: "UsdImagingGL"),
+        .define("MFB_ALT_PACKAGE_NAME", to: "UsdImagingGL"),
+        .define("MFB_PACKAGE_MODULE", to: "UsdImagingGL"),
+        .define("USDIMAGINGGL_EXPORTS", to: "1"),
+        .define("_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH", .when(platforms: [.windows])),
+      ]
+    ),
+
     .executableTarget(
       name: "UsdView",
       dependencies: [
@@ -1491,20 +1723,27 @@ let package = Package(
         .target(name: "UsdVol"),
         // ------- imaging. ------
         .target(name: "CameraUtil"),
+        .target(name: "Garch"),
+        .target(name: "GeomUtil"),
+        .target(name: "Glf"),
         .target(name: "Hf"),
-        .target(name: "PxOsd"),
         .target(name: "Hd"),
-        .target(name: "Garch"),
+        .target(name: "HdAr"),
+        .target(name: "HdMtlx"),
+        .target(name: "HdSi"),
+        .target(name: "HdSt"),
+        .target(name: "Hdx"),
         .target(name: "Hgi"),
         .target(name: "HgiMetal", condition: .when(platforms: Arch.OS.apple.platform)),
         // .target(name: "HgiVulkan", condition: .when(platforms: Arch.OS.linux.platform)),
         .target(name: "HgiGL"),
         .target(name: "HgiInterop"),
         .target(name: "Hio"),
-        .target(name: "Glf"),
-        .target(name: "GeomUtil"),
+        .target(name: "PxOsd"),
         // --- usd imaging. ------
         .target(name: "UsdShaders"),
+        .target(name: "UsdImaging"),
+        .target(name: "UsdImagingGL"),
         // -------- macros. ------
         .target(name: "PixarMacros"),
         // -----------------------

diff --git a/Sources/Bin/.gitkeep b/Sources/Bin/.gitkeep
diff --git a/Sources/Bin/bakeMaterialX.cpp b/Sources/Bin/bakeMaterialX.cpp
@@ -22,9 +22,9 @@
 #include <MaterialX/MXCoreDocument.h>
 #include <MaterialX/MXFormatUtil.h>
 #include <MaterialX/MXFormatXmlIo.h>
-#include <MaterialXCore/Generated.h>
-#include <MaterialXCore/Node.h>
-#include <MaterialXRenderGlsl/TextureBaker.h>
+#include <MaterialX/MXCoreGenerated.h>
+#include <MaterialX/MXCoreNode.h>
+#include <MaterialX/MXRenderGlslTextureBaker.h>
 
 #include <fstream>
 

diff --git a/Sources/Bin/include/Bin/bakeMaterialX.h b/Sources/Bin/include/Bin/bakeMaterialX.h
@@ -14,7 +14,7 @@
 #include "Hd/material.h"
 #include "UsdShade/material.h"
 
-#include <MaterialXCore/Library.h>
+#include <MaterialX/MXCoreLibrary.h>
 
 #include "Tf/declarePtrs.h"
 #include <string>

diff --git a/...es/Glf/Resources/shaders/pcfShader.glslfx → Sources/Glf/shaders/pcfShader.glslfx b/...es/Glf/Resources/shaders/pcfShader.glslfx → Sources/Glf/shaders/pcfShader.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 ---Percentage-Closer Filtering (PCF)

diff --git a/...f/Resources/shaders/simpleLighting.glslfx → Sources/Glf/shaders/simpleLighting.glslfx b/...f/Resources/shaders/simpleLighting.glslfx → Sources/Glf/shaders/simpleLighting.glslfx
@@ -3,25 +3,8 @@
 //
 // Copyright 2016 Pixar
 //
-// Licensed under the Apache License, Version 2.0 (the "Apache License")
-// with the following modification; you may not use this file except in
-// compliance with the Apache License and the following modification to it:
-// Section 6. Trademarks. is deleted and replaced with:
-//
-// 6. Trademarks. This License does not grant permission to use the trade
-//    names, trademarks, service marks, or product names of the Licensor
-//    and its affiliates, except as required to comply with Section 4(c) of
-//    the License and to reproduce the content of the NOTICE file.
-//
-// You may obtain a copy of the Apache License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the Apache License with the above modification is
-// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the Apache License for the specific
-// language governing permissions and limitations under the Apache License.
+// Licensed under the terms set forth in the LICENSE.txt file available at
+// https://openusd.org/license.
 //
 
 --- This is what an import might look like.

diff --git a/Sources/Hd/include/Hd/version.h b/Sources/Hd/include/Hd/version.h
@@ -63,7 +63,7 @@
 // 56 -> 57: Changing SetOverrideWindowPolicy to std::optional on
 //           HdRenderPassState, HdxPickFromRenderBufferTaskParams,
 //           HdxTaskController and UsdImagingGLEngine.
-// 57 -> 58: Introducing hdsi/version.h
+// 57 -> 58: Introducing version.h
 // 58 -> 59: HdGeomSubsetsSchema::GetIds() renamed to
 //           HdGeomSubsetsSchema::GetGeomSubsetNames().
 // 59 -> 60: Introduced HdRenderDelegate::GetCapabilities().

diff --git a/Sources/HdAr/.gitkeep b/Sources/HdAr/.gitkeep
diff --git a/Sources/HdGp/.gitkeep b/Sources/HdGp/.gitkeep
diff --git a/Sources/HdMtlx/.gitkeep b/Sources/HdMtlx/.gitkeep