Skip to content

Commit

Permalink
Successful Swift MaterialX import.
Browse files Browse the repository at this point in the history
  • Loading branch information
furby-tm committed Feb 14, 2024
1 parent a8a06c4 commit b9192fa
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 6 deletions.
1 change: 1 addition & 0 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -630,6 +630,7 @@ let package = Package(
.target(name: "OpenColorIO"),
.target(name: "OpenImageIO"),
.target(name: "OpenTimelineIO"),
.target(name: "MaterialX"),
Arch.OS.python(),
],
swiftSettings: [
Expand Down
17 changes: 11 additions & 6 deletions Sources/MaterialX/include/MaterialX/MaterialX.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,7 @@
#include <MaterialX/MXRenderMslMaterial.h>
#include <MaterialX/MXRenderMslMetalFramebuffer.h>
#include <MaterialX/MXRenderMslMetalState.h>
#include <MaterialX/MXRenderMslMetalTextureHandler.h>
#include <MaterialX/MXRenderMslPipelineStateObject.h>
#include <MaterialX/MXRenderMslRenderer.h>
#include <MaterialX/MXRenderMslTextureBaker.h>
#include <MaterialX/MXRenderOiioImageLoader.h>
#include <MaterialX/MXRenderShaderMaterial.h>
#include <MaterialX/MXRenderShaderRenderer.h>
Expand Down Expand Up @@ -187,12 +184,20 @@
#include <MaterialX/MXRenderGlslGLCocoaWrappers.h>
#include <MaterialX/MXRenderGlslGLContext.h>
#include <MaterialX/MXRenderGlslGLFramebuffer.h>
#include <MaterialX/MXRenderGlslGLTextureHandler.h>
#include <MaterialX/MXRenderGlslGLUtil.h>
#include <MaterialX/MXRenderGlslGlslMaterial.h>
#include <MaterialX/MXRenderGlslGlslProgram.h>
#include <MaterialX/MXRenderGlslGlslRenderer.h>
#include <MaterialX/MXRenderGlslTextureBaker.h>

#if defined(__APPLE__)
# include <MaterialX/MXRenderMslMetalTextureHandler.h>
# include <MaterialX/MXRenderMslRenderer.h>
# include <MaterialX/MXRenderMslTextureBaker.h>
#else /* defined(__APPLE__) */
# include <MaterialX/MXRenderGlslGLTextureHandler.h>
# include <MaterialX/MXRenderGlslGlslRenderer.h>
# include <MaterialX/MXRenderGlslTextureBaker.h>
#endif /* !defined(__APPLE__) */

#include <MaterialX/MXRenderOslExport.h>
#include <MaterialX/MXRenderOslRenderer.h>

Expand Down
1 change: 1 addition & 0 deletions Sources/MetaversalDemo/Creator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@

import Imath
import ImGui
import MaterialX
import OCIOBundle
import OpenColorIO
import OpenEXR
Expand Down

0 comments on commit b9192fa

Please sign in to comment.