diff --git a/MaterialX b/MaterialX index 6d6c5aa..9273433 160000 --- a/MaterialX +++ b/MaterialX @@ -1 +1 @@ -Subproject commit 6d6c5aa72670c38de95726190a51ccf9bd935485 +Subproject commit 92734332d595278298ad08e6543409bbabf344f0 diff --git a/source/MaterialXglTF/GltfMaterialHandler.cpp b/source/MaterialXglTF/GltfMaterialHandler.cpp index f5b903a..2ea96f1 100644 --- a/source/MaterialXglTF/GltfMaterialHandler.cpp +++ b/source/MaterialXglTF/GltfMaterialHandler.cpp @@ -1,3 +1,20 @@ +/* + +Copyright 2022 - 2023 Bernard Kwok + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http ://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +*/ #include #include diff --git a/source/MaterialXglTF/GltfMaterialHandler.h b/source/MaterialXglTF/GltfMaterialHandler.h index 8dbbbe7..3c1a44b 100644 --- a/source/MaterialXglTF/GltfMaterialHandler.h +++ b/source/MaterialXglTF/GltfMaterialHandler.h @@ -1,3 +1,20 @@ +/* + +Copyright 2022 - 2023 Bernard Kwok + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http ://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +*/ #ifndef MATERIALX_CGLTF_MaterialHandler_H #define MATERIALX_CGLTF_MaterialHandler_H @@ -49,7 +66,12 @@ class MX_GLTF_API MaterialHandler /// to perform actions such as shader translation and baking. /// /// Document to modify - virtual void translateShaders(DocumentPtr /*doc*/, StringVec& /*log*/) {}; + /// Error log + virtual void translateShaders(DocumentPtr doc, StringVec& log) + { + std::ignore = doc; + std::ignore = log; + }; /// /// Set document containing MaterialX definitions. This includes core library @@ -153,6 +175,7 @@ class MX_GLTF_API GltfMaterialHandler : public MaterialHandler /// Convert MaterialX document to glTF and save to file path /// /// File path + /// Error log /// True on success bool load(const FilePath& filePath, StringVec& log) override; @@ -160,6 +183,7 @@ class MX_GLTF_API GltfMaterialHandler : public MaterialHandler /// Convert glTF to MaterialX document and save to file path /// /// File path + /// Error log /// True on success bool save(const FilePath& filePath, StringVec& log) override; @@ -169,6 +193,7 @@ class MX_GLTF_API GltfMaterialHandler : public MaterialHandler /// to perform actions such as shader translation and baking. /// /// Document to modify + /// Error log void translateShaders(DocumentPtr doc, StringVec& log) override; private: diff --git a/source/MaterialXglTF/GltfMaterialUtil.cpp b/source/MaterialXglTF/GltfMaterialUtil.cpp index 1ae4022..416af01 100644 --- a/source/MaterialXglTF/GltfMaterialUtil.cpp +++ b/source/MaterialXglTF/GltfMaterialUtil.cpp @@ -1,3 +1,20 @@ +/* + +Copyright 2022 - 2023 Bernard Kwok + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http ://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +*/ #include diff --git a/source/MaterialXglTF/GltfMaterialUtill.h b/source/MaterialXglTF/GltfMaterialUtill.h index 98a18ea..20155e2 100644 --- a/source/MaterialXglTF/GltfMaterialUtill.h +++ b/source/MaterialXglTF/GltfMaterialUtill.h @@ -1,3 +1,20 @@ +/* + +Copyright 2022 - 2023 Bernard Kwok + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http ://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +*/ #ifndef MATERIALX_GLTF_UTIL_H #define MATERIALX_GLTF_UTIL_H diff --git a/source/MaterialXglTF/LICENSE b/source/MaterialXglTF/LICENSE new file mode 100644 index 0000000..3871345 --- /dev/null +++ b/source/MaterialXglTF/LICENSE @@ -0,0 +1,13 @@ +Copyright 2022 - 2023 Bernard Kwok + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http ://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/source/glTF2Mtx/LICENSE b/source/glTF2Mtx/LICENSE new file mode 100644 index 0000000..fe619bb --- /dev/null +++ b/source/glTF2Mtx/LICENSE @@ -0,0 +1,7 @@ +Copyright (c) 2022-2023 Bernard Kwok + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/source/glTF2Mtx/glTF2Mtlx.cpp b/source/glTF2Mtx/glTF2Mtlx.cpp index 3fa5441..55ebfc7 100644 --- a/source/glTF2Mtx/glTF2Mtlx.cpp +++ b/source/glTF2Mtx/glTF2Mtlx.cpp @@ -1,3 +1,20 @@ +/* + +Copyright 2022 - 2023 Bernard Kwok + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http ://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +*/ #include #include #include diff --git a/source/glTFMtlxTest/LICENSE b/source/glTFMtlxTest/LICENSE new file mode 100644 index 0000000..fe619bb --- /dev/null +++ b/source/glTFMtlxTest/LICENSE @@ -0,0 +1,7 @@ +Copyright (c) 2022-2023 Bernard Kwok + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/source/glTFMtlxTest/MaterialXglTF/MaterialXglTF.cpp b/source/glTFMtlxTest/MaterialXglTF/MaterialXglTF.cpp index 5209a4b..9bdcf3c 100644 --- a/source/glTFMtlxTest/MaterialXglTF/MaterialXglTF.cpp +++ b/source/glTFMtlxTest/MaterialXglTF/MaterialXglTF.cpp @@ -1,3 +1,20 @@ +/* + +Copyright 2022 - 2023 Bernard Kwok + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http ://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +*/ #include