Skip to content

Commit

Permalink
Swift import validity, all imports.
Browse files Browse the repository at this point in the history
* MaterialX done.
* OpenVDB done.
* OpenSubdiv done.
* Ptex done.
* OpenTimelineIO done.
* Imath done.
* OpenEXR done.
* OpenImageIO done.
* OpenColorIO done.
* ImGui done.
* OneTBB done.
* Python done.
  • Loading branch information
furby-tm committed Feb 14, 2024
1 parent b9192fa commit 81d5b51
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 12 deletions.
3 changes: 3 additions & 0 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -631,6 +631,9 @@ let package = Package(
.target(name: "OpenImageIO"),
.target(name: "OpenTimelineIO"),
.target(name: "MaterialX"),
.target(name: "OpenVDB"),
.target(name: "OpenSubdiv"),
.target(name: "Ptex"),
Arch.OS.python(),
],
swiftSettings: [
Expand Down
3 changes: 3 additions & 0 deletions Sources/MetaversalDemo/Creator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ import OpenEXR
import OpenImageIO
import OpenTime
import OpenTimelineIO
import OpenVDB
import OpenSubdiv
import Ptex
#if canImport(Python)
import PyBundle
import Python
Expand Down
27 changes: 15 additions & 12 deletions Sources/OpenSubdiv/include/OpenSubdiv/OpenSubdiv.h
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@
#include <OpenSubdiv/OSDBaseVertexTag.h>

/* hierarchical boundary representation. */
#include <OpenSubdiv/OSDBoundHierarchicalEdit.h>
#include <OpenSubdiv/OSDBoundMesh.h>
#include <OpenSubdiv/OSDBoundVertex.h>
#include <OpenSubdiv/OSDBoundVertexEdit.h>
#include <OpenSubdiv/OSDBoundAllocator.h>
#include <OpenSubdiv/OSDBoundBilinear.h>
#include <OpenSubdiv/OSDBoundCatmark.h>
Expand All @@ -95,25 +99,19 @@
#include <OpenSubdiv/OSDBoundFvarData.h>
#include <OpenSubdiv/OSDBoundFvarEdit.h>
#include <OpenSubdiv/OSDBoundHalfedge.h>
#include <OpenSubdiv/OSDBoundHierarchicalEdit.h>

#include <OpenSubdiv/OSDBoundHoleEdit.h>
#include <OpenSubdiv/OSDBoundLoop.h>
#include <OpenSubdiv/OSDBoundMesh.h>
#include <OpenSubdiv/OSDBoundSubdivision.h>
#include <OpenSubdiv/OSDBoundVertex.h>
#include <OpenSubdiv/OSDBoundVertexEdit.h>

/* device dependent surfaces. */
#include <OpenSubdiv/OSDSurfaceBufferDescriptor.h>
#include <OpenSubdiv/OSDSurfaceCpuD3D11VertexBuffer.h>
#include <OpenSubdiv/OSDSurfaceCpuEvaluator.h>
#include <OpenSubdiv/OSDSurfaceCpuGLVertexBuffer.h>
#include <OpenSubdiv/OSDSurfaceCpuKernel.h>
#include <OpenSubdiv/OSDSurfaceCpuPatchTable.h>
#include <OpenSubdiv/OSDSurfaceCpuVertexBuffer.h>
#include <OpenSubdiv/OSDSurfaceCudaD3D11VertexBuffer.h>
#include <OpenSubdiv/OSDSurfaceCudaEvaluator.h>
#include <OpenSubdiv/OSDSurfaceOpenCLD3D11VertexBuffer.h>
#include <OpenSubdiv/OSDSurfaceOpenCLEvaluator.h>
#include <OpenSubdiv/OSDSurfaceOpenCLGLVertexBuffer.h>
#include <OpenSubdiv/OSDSurfaceOpenCLPatchTable.h>
Expand Down Expand Up @@ -149,11 +147,16 @@
#include <OpenSubdiv/OSDSurfaceTBBEvaluator.h>
#include <OpenSubdiv/OSDSurfaceTBBKernel.h>
#include <OpenSubdiv/OSDSurfaceTypes.h>
#include <OpenSubdiv/OSDSurfaced3D11ComputeEvaluator.h>
#include <OpenSubdiv/OSDSurfaced3D11LegacyGregoryPatchTable.h>
#include <OpenSubdiv/OSDSurfaced3D11Mesh.h>
#include <OpenSubdiv/OSDSurfaced3D11PatchTable.h>
#include <OpenSubdiv/OSDSurfaced3D11VertexBuffer.h>
#if !defined(__APPLE__)
# include <OpenSubdiv/OSDSurfaceCpuD3D11VertexBuffer.h>
# include <OpenSubdiv/OSDSurfaceCudaD3D11VertexBuffer.h>
# include <OpenSubdiv/OSDSurfaceOpenCLD3D11VertexBuffer.h>
# include <OpenSubdiv/OSDSurfaced3D11ComputeEvaluator.h>
# include <OpenSubdiv/OSDSurfaced3D11LegacyGregoryPatchTable.h>
# include <OpenSubdiv/OSDSurfaced3D11Mesh.h>
# include <OpenSubdiv/OSDSurfaced3D11PatchTable.h>
# include <OpenSubdiv/OSDSurfaced3D11VertexBuffer.h>
#endif /* !defined(__APPLE__) */

/* vectorized topology refinement. */
#include <OpenSubdiv/OSDVectorArray.h>
Expand Down
23 changes: 23 additions & 0 deletions Sources/Ptex/include/Ptex.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#ifndef __PTEX_H__
#define __PTEX_H__

#include <PtexCache.h>
#include <PtexExports.h>
#include <PtexHalf.h>
#include <PtexHalfTables.h>
#include <PtexHashMap.h>
#include <PtexIO.h>
#include <PtexInt.h>
#include <PtexMutex.h>
#include <PtexPlatform.h>
#include <PtexReader.h>
#include <PtexSeparableFilter.h>
#include <PtexSeparableKernel.h>
#include <PtexTriangleFilter.h>
#include <PtexTriangleKernel.h>
#include <PtexUtils.h>
#include <PtexVersion.h>
#include <PtexWriter.h>
#include <Ptexture.h>

#endif /* __PTEX_H__ */
1 change: 1 addition & 0 deletions Sources/Ptex/include/PtexReader.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
#include <string>
#include <map>
#include <errno.h>
#include <iostream>
#include "Ptexture.h"
#include "PtexIO.h"
#include "PtexUtils.h"
Expand Down

0 comments on commit 81d5b51

Please sign in to comment.