Back hasAuthoredValue with a ShaderPortFlag

Author: chellmuth

source/MaterialXGenOslNetwork/OslNetworkShaderGenerator.cpp

@@ -65,12 +65,12 @@ ShaderPtr OslNetworkShaderGenerator::generate(const string& name, ElementPtr ele
 
             const ShaderOutput* connection = input->getConnection();
             if (!connection || connection->getNode() == &graph) {
-                if (!input->isAuthoredValue())
+                if (!input->hasAuthoredValue())
                     continue;
 
                 if (input->getName() == "backsurfaceshader"
                     || input->getName() == "displacementshader")
-                    continue; // FIXME: these aren't getting pruned by isAuthoredValue
+                    continue; // FIXME: these aren't getting pruned by hasAuthoredValue
 
                 string value = _syntax->getValue(input);
                 if (value == "null_closure()")

source/MaterialXGenShader/ShaderNode.h

@@ -112,9 +112,10 @@ using ShaderMetadataRegistryPtr = shared_ptr<ShaderMetadataRegistry>;
 class MX_GENSHADER_API ShaderPortFlag
 {
   public:
-    static const uint32_t UNIFORM    = 1u << 0;
-    static const uint32_t EMITTED    = 1u << 1;
-    static const uint32_t BIND_INPUT = 1u << 2;
+    static const uint32_t UNIFORM        = 1u << 0;
+    static const uint32_t EMITTED        = 1u << 1;
+    static const uint32_t BIND_INPUT     = 1u << 2;
+    static const uint32_t AUTHORED_VALUE = 1u << 3;
 };
 
 /// @class ShaderPort
@@ -165,18 +166,15 @@ class MX_GENSHADER_API ShaderPort : public std::enable_shared_from_this<ShaderPo
     const string& getSemantic() const { return _semantic; }
 
     /// Set a value on this port.
-    void setValue(ValuePtr value, bool isAuthoredValue = true)
+    void setValue(ValuePtr value, bool authoredValue = true)
     {
         _value = value;
-        _isAuthoredValue = isAuthoredValue;
+        setFlag(ShaderPortFlag::AUTHORED_VALUE, authoredValue);
     }
 
     /// Return the value set on this port.
     ValuePtr getValue() const { return _value; }
 
-    // Has the value been overridden.
-    bool isAuthoredValue() const { return _isAuthoredValue; }
-
     /// Return the value set on this port as a string, or an empty string if there is no value.
     string getValueString() const;
 
@@ -241,6 +239,9 @@ class MX_GENSHADER_API ShaderPort : public std::enable_shared_from_this<ShaderPo
     /// Return the emitted state of this port.
     bool isBindInput() const { return (_flags & ShaderPortFlag::BIND_INPUT) != 0; }
 
+    // Has the value been overridden.
+    bool hasAuthoredValue() const { return (_flags & ShaderPortFlag::AUTHORED_VALUE) != 0; }
+
     /// Set the metadata vector.
     void setMetadata(ShaderMetadataVecPtr metadata) { _metadata = metadata; }
 
@@ -263,7 +264,6 @@ class MX_GENSHADER_API ShaderPort : public std::enable_shared_from_this<ShaderPo
     string _geomprop;
     ShaderMetadataVecPtr _metadata;
     uint32_t _flags;
-    bool _isAuthoredValue{false};
 };
 
 /// @class ShaderInput