Merge pull request AcademySoftwareFoundation#104 from jstone-lucasfilm/master

Update development version to v1.36.0

Author: jstone-lucasfilm

CMakeLists.txt

@@ -1,7 +1,7 @@
 project(MaterialX)
 set(MATERIALX_MAJOR_VERSION 1)
-set(MATERIALX_MINOR_VERSION 35)
-set(MATERIALX_BUILD_VERSION 5)
+set(MATERIALX_MINOR_VERSION 36)
+set(MATERIALX_BUILD_VERSION 0)
 set(MATERIALX_LIBRARY_VERSION ${MATERIALX_MAJOR_VERSION}.${MATERIALX_MINOR_VERSION}.${MATERIALX_BUILD_VERSION})
 
 cmake_minimum_required(VERSION 3.1)

source/MaterialXTest/Element.cpp

@@ -45,7 +45,7 @@ TEST_CASE("Element", "[element]")
     elem2->setName("elem2");
     REQUIRE(elem1->getName() == "elem1");
     REQUIRE(elem2->getName() == "elem2");
-    REQUIRE_THROWS_AS(elem2->setName("elem1"), mx::Exception);
+    REQUIRE_THROWS_AS(elem2->setName("elem1"), mx::Exception&);
 
     // Modify element order.
     mx::DocumentPtr doc2 = doc->copy();
@@ -54,7 +54,7 @@ TEST_CASE("Element", "[element]")
     REQUIRE(*doc2 != *doc);
     doc2->setChildIndex("elem1", doc2->getChildIndex("elem2"));
     REQUIRE(*doc2 == *doc);
-    REQUIRE_THROWS_AS(doc2->setChildIndex("elem1", 100), mx::Exception);
+    REQUIRE_THROWS_AS(doc2->setChildIndex("elem1", 100), mx::Exception&);
     REQUIRE(*doc2 == *doc);
 
     // Create and test an orphaned element.
@@ -64,5 +64,5 @@ TEST_CASE("Element", "[element]")
         orphan = doc3->getChild("elem1");
         REQUIRE(orphan);
     }
-    REQUIRE_THROWS_AS(orphan->getDocument(), mx::ExceptionOrphanedElement);    
+    REQUIRE_THROWS_AS(orphan->getDocument(), mx::ExceptionOrphanedElement&);    
 }

source/MaterialXTest/Geom.cpp

@@ -20,12 +20,12 @@ TEST_CASE("Geom", "[geom]")
     geominfo2->setGeomAttrValue("id", std::string("01"));
     mx::GeomInfoPtr geominfo3 = doc->addGeomInfo("geominfo3", "/robot2");
     geominfo3->setGeomAttrValue("id", std::string("02"));
-    REQUIRE_THROWS_AS(doc->addGeomInfo("geominfo1"), mx::Exception);
+    REQUIRE_THROWS_AS(doc->addGeomInfo("geominfo1"), mx::Exception&);
 
     // Create a node graph with a single image node.
     mx::NodeGraphPtr nodeGraph = doc->addNodeGraph();
     nodeGraph->setFilePrefix("folder/");
-    REQUIRE_THROWS_AS(doc->addNodeGraph(nodeGraph->getName()), mx::Exception);
+    REQUIRE_THROWS_AS(doc->addNodeGraph(nodeGraph->getName()), mx::Exception&);
     mx::NodePtr image = nodeGraph->addNode("image");
     image->setParameterValue("file", std::string("%asset%id_diffuse_%UDIM.tif"), mx::FILENAME_TYPE_STRING);
 

source/MaterialXTest/Node.cpp

@@ -37,7 +37,7 @@ TEST_CASE("Node", "[node]")
 
     // Create a node graph with two source nodes.
     mx::NodeGraphPtr nodeGraph = doc->addNodeGraph();
-    REQUIRE_THROWS_AS(doc->addNodeGraph(nodeGraph->getName()), mx::Exception);
+    REQUIRE_THROWS_AS(doc->addNodeGraph(nodeGraph->getName()), mx::Exception&);
     mx::NodePtr constant = nodeGraph->addNode("constant");
     mx::NodePtr image = nodeGraph->addNode("image");
     REQUIRE(nodeGraph->getNodes().size() == 2);

source/MaterialXTest/Types.cpp

@@ -8,6 +8,8 @@
 #include <MaterialXCore/Types.h>
 #include <MaterialXCore/Value.h>
 
+#include <cmath>
+
 namespace mx = MaterialX;
 
 const float EPSILON = 1e-4f;

source/MaterialXTest/Value.cpp

@@ -59,10 +59,10 @@ TEST_CASE("Value strings", "[value]")
     REQUIRE(mx::fromValueString<std::string>("text") == "text");
 
     // Verify that invalid conversions throw exceptions.
-    REQUIRE_THROWS_AS(mx::fromValueString<int>("text"), mx::ExceptionTypeError);
-    REQUIRE_THROWS_AS(mx::fromValueString<float>("text"), mx::ExceptionTypeError);
-    REQUIRE_THROWS_AS(mx::fromValueString<bool>("1"), mx::ExceptionTypeError);
-    REQUIRE_THROWS_AS(mx::fromValueString<mx::Color3>("1"), mx::ExceptionTypeError);
+    REQUIRE_THROWS_AS(mx::fromValueString<int>("text"), mx::ExceptionTypeError&);
+    REQUIRE_THROWS_AS(mx::fromValueString<float>("text"), mx::ExceptionTypeError&);
+    REQUIRE_THROWS_AS(mx::fromValueString<bool>("1"), mx::ExceptionTypeError&);
+    REQUIRE_THROWS_AS(mx::fromValueString<mx::Color3>("1"), mx::ExceptionTypeError&);
 }
 
 TEST_CASE("Typed values", "[value]")

source/MaterialXTest/XmlIo.cpp

@@ -203,5 +203,5 @@ TEST_CASE("Load content", "[xmlio]")
 
     // Read a non-existent document.
     mx::DocumentPtr doc2 = mx::createDocument();
-    REQUIRE_THROWS_AS(mx::readFromXmlFile(doc2, "NonExistent.mtlx"), mx::ExceptionFileMissing);
+    REQUIRE_THROWS_AS(mx::readFromXmlFile(doc2, "NonExistent.mtlx"), mx::ExceptionFileMissing&);
 }