Skip to content

Commit

Permalink
Fix compile.
Browse files Browse the repository at this point in the history
  • Loading branch information
syoyo committed May 17, 2024
1 parent 729d116 commit 90a1c04
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions src/usdMtlx.hh
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
// asset inputs:file = @input.mtlx@
// ...
// }
//
//
//
//
// Corresponding USD Shader C++ class is defined in usdShade.hh.
//
//
// This module implements .mtlx load and access to its content.
//
// Based on MaterialX spec v1.38
Expand All @@ -31,9 +31,13 @@
#include "asset-resolution.hh"
#include "usdShade.hh"


namespace tinyusdz {

constexpr auto kMtlxUsdPreviewSurface = "MtlxUsdPreviewSurface";
constexpr auto kMtlxAutodeskStandardSurface = "MtlxAutodeskStandaradSurface";

namespace mtlx {

// TODO: use tinyusdz::value?
enum class MtlxType {
Invalid, // invalid
Expand Down Expand Up @@ -206,11 +210,6 @@ class UsdMtlx
std::string version{"1.38"};
};

constexpr auto kMtlxUsdPreviewSurface = "MtlxUsdPreviewSurface";
constexpr auto kMtlxAutodeskStandardSurface = "MtlxAutodeskStandaradSurface";


namespace mtlx {

enum class ColorSpace {
Lin_rec709, // lin_rec709
Expand Down Expand Up @@ -242,7 +241,7 @@ struct MtlxModel {

// Content of shader.
// MtlxUsdPreviewSurface or MtlxAutodeskStandaradSurface
value::Value shader;
value::Value shader;

std::map<std::string, MtlxMaterial> surface_materials;
std::map<std::string, value::Value> shaders; // MtlxUsdPreviewSurface or MtlxAutodeskStandaradSurface
Expand Down

0 comments on commit 90a1c04

Please sign in to comment.