diff --git a/CMakeLists.txt b/CMakeLists.txt index 445aa6cc..9589b169 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # project(OpenSubdiv) diff --git a/cmake/FindDXSDK.cmake b/cmake/FindDXSDK.cmake index 8c6e3eeb..d02e6032 100644 --- a/cmake/FindDXSDK.cmake +++ b/cmake/FindDXSDK.cmake @@ -1,59 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # # Try to find DirectX SDK. diff --git a/cmake/FindDocutils.cmake b/cmake/FindDocutils.cmake index 211d591e..48332895 100644 --- a/cmake/FindDocutils.cmake +++ b/cmake/FindDocutils.cmake @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # # - Try to find the restructured text to HTML converter diff --git a/cmake/FindGLEW.cmake b/cmake/FindGLEW.cmake index e12edf69..03a292fd 100644 --- a/cmake/FindGLEW.cmake +++ b/cmake/FindGLEW.cmake @@ -1,59 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # # Try to find GLEW library and include path. diff --git a/cmake/FindGLFW.cmake b/cmake/FindGLFW.cmake index 9f766498..24750d00 100644 --- a/cmake/FindGLFW.cmake +++ b/cmake/FindGLFW.cmake @@ -1,59 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # # Try to find GLFW library and include path. diff --git a/cmake/FindIlmBase.cmake b/cmake/FindIlmBase.cmake index 795a3061..06466697 100644 --- a/cmake/FindIlmBase.cmake +++ b/cmake/FindIlmBase.cmake @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # # - Try to find the IlmBase library diff --git a/cmake/FindMaya.cmake b/cmake/FindMaya.cmake index 529a701e..2a63487a 100644 --- a/cmake/FindMaya.cmake +++ b/cmake/FindMaya.cmake @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # # - Maya finder module diff --git a/cmake/FindOpenCL.cmake b/cmake/FindOpenCL.cmake index e8061209..fe9ca55a 100644 --- a/cmake/FindOpenCL.cmake +++ b/cmake/FindOpenCL.cmake @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # # - Try to find an OpenCL library diff --git a/cmake/FindOpenGLES.cmake b/cmake/FindOpenGLES.cmake index 60058ab4..408a88ec 100644 --- a/cmake/FindOpenGLES.cmake +++ b/cmake/FindOpenGLES.cmake @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # # - Try to find OpenGLES diff --git a/cmake/FindPTex.cmake b/cmake/FindPTex.cmake index 54585b49..99f5f04b 100644 --- a/cmake/FindPTex.cmake +++ b/cmake/FindPTex.cmake @@ -1,59 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # # Try to find PTex library and include path. diff --git a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake index a6e4c3cb..97a42fdc 100644 --- a/cmake/FindTBB.cmake +++ b/cmake/FindTBB.cmake @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # # - Try to find Intel's Threading Building Blocks diff --git a/documentation/CMakeLists.txt b/documentation/CMakeLists.txt index a4d0525d..70f094c3 100644 --- a/documentation/CMakeLists.txt +++ b/documentation/CMakeLists.txt @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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/documentation/processHtml.py b/documentation/processHtml.py index bbe13bcd..f45f4e26 100755 --- a/documentation/processHtml.py +++ b/documentation/processHtml.py @@ -1,62 +1,28 @@ #!/usr/bin/env python - # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # - import os import sys import string diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index e0646c94..0b2b5737 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # if( OPENGL_FOUND AND (GLEW_FOUND AND GLFW_FOUND) OR (APPLE AND GLFW_FOUND)) diff --git a/examples/common/clInit.h b/examples/common/clInit.h index 11e260d7..550b080d 100644 --- a/examples/common/clInit.h +++ b/examples/common/clInit.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_EXAMPLE_CL_INIT_H #define OSD_EXAMPLE_CL_INIT_H diff --git a/examples/common/cudaInit.h b/examples/common/cudaInit.h index b8f0046e..b1b8a9c1 100644 --- a/examples/common/cudaInit.h +++ b/examples/common/cudaInit.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_CUDA_INIT_H #define OSD_CUDA_INIT_H diff --git a/examples/common/d3d11_compile.h b/examples/common/d3d11_compile.h index effefac7..f86090a8 100644 --- a/examples/common/d3d11_compile.h +++ b/examples/common/d3d11_compile.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 D3D11_COMPILE_H #define D3D11_COMPILE_H diff --git a/examples/common/d3d11_hud.cpp b/examples/common/d3d11_hud.cpp index ed6c7522..7e1a9edf 100644 --- a/examples/common/d3d11_hud.cpp +++ b/examples/common/d3d11_hud.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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/examples/common/d3d11_hud.h b/examples/common/d3d11_hud.h index 847374b7..bfdf703d 100644 --- a/examples/common/d3d11_hud.h +++ b/examples/common/d3d11_hud.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 D3D11_HUD_H #define D3D11_HUD_H diff --git a/examples/common/export_obj.py b/examples/common/export_obj.py index 64dd08f1..6d30e0a9 100644 --- a/examples/common/export_obj.py +++ b/examples/common/export_obj.py @@ -1,3 +1,27 @@ +# +# Copyright 2013 Pixar +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: +# +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. +# +# 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. +# import maya.OpenMaya as OpenMaya selectionList = OpenMaya.MSelectionList() diff --git a/examples/common/font_image.cpp b/examples/common/font_image.cpp index 4bd21f78..46323125 100644 --- a/examples/common/font_image.cpp +++ b/examples/common/font_image.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // unsigned char font_image[] = { diff --git a/examples/common/font_image.h b/examples/common/font_image.h index 86bcb37b..62b269fd 100644 --- a/examples/common/font_image.h +++ b/examples/common/font_image.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 FONT_IMAGE_H diff --git a/examples/common/gl_hud.cpp b/examples/common/gl_hud.cpp index 764b85f8..2fa9e81d 100644 --- a/examples/common/gl_hud.cpp +++ b/examples/common/gl_hud.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "gl_hud.h" diff --git a/examples/common/gl_hud.h b/examples/common/gl_hud.h index 9befd330..95040220 100644 --- a/examples/common/gl_hud.h +++ b/examples/common/gl_hud.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 GL_HUD_H #define GL_HUD_H diff --git a/examples/common/hdr_reader.cpp b/examples/common/hdr_reader.cpp index d79373c8..148bb810 100644 --- a/examples/common/hdr_reader.cpp +++ b/examples/common/hdr_reader.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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/examples/common/hdr_reader.h b/examples/common/hdr_reader.h index 826c943c..02205c3b 100644 --- a/examples/common/hdr_reader.h +++ b/examples/common/hdr_reader.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // #define HDR_X_MAJOR (1 << 0) diff --git a/examples/common/hud.cpp b/examples/common/hud.cpp index 8de1c8ed..148d001b 100644 --- a/examples/common/hud.cpp +++ b/examples/common/hud.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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/examples/common/hud.h b/examples/common/hud.h index e3abe48e..8fb1bbe1 100644 --- a/examples/common/hud.h +++ b/examples/common/hud.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 HUD_H #define HUD_H diff --git a/examples/common/maya_util.h b/examples/common/maya_util.h index e8691820..fb8134fe 100644 --- a/examples/common/maya_util.h +++ b/examples/common/maya_util.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 _EXAMPLE_MAYA_UTIL_H_ #define _EXAMPLE_MAYA_UTIL_H_ diff --git a/examples/common/patchColors.cpp b/examples/common/patchColors.cpp index fc3fad7a..2dc0cf0c 100644 --- a/examples/common/patchColors.cpp +++ b/examples/common/patchColors.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "patchColors.h" diff --git a/examples/common/patchColors.h b/examples/common/patchColors.h index bdbf8aa8..ac2437a8 100644 --- a/examples/common/patchColors.h +++ b/examples/common/patchColors.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 COMMON_PATCH_COLORS_H #define COMMON_PATCH_COLORS_H diff --git a/examples/common/simple_math.h b/examples/common/simple_math.h index a8bdeab8..1d37f152 100644 --- a/examples/common/simple_math.h +++ b/examples/common/simple_math.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 SIMPLE_MATH_H #define SIMPLE_MATH_H diff --git a/examples/common/stopwatch.h b/examples/common/stopwatch.h index 8529d8ca..00e384c5 100644 --- a/examples/common/stopwatch.h +++ b/examples/common/stopwatch.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 STOPWATCH_H diff --git a/examples/dxViewer/CMakeLists.txt b/examples/dxViewer/CMakeLists.txt index 907c709a..55090854 100644 --- a/examples/dxViewer/CMakeLists.txt +++ b/examples/dxViewer/CMakeLists.txt @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # # *** dxViewer *** diff --git a/examples/dxViewer/dxviewer.cpp b/examples/dxViewer/dxviewer.cpp index 59dd00b9..c52be162 100644 --- a/examples/dxViewer/dxviewer.cpp +++ b/examples/dxViewer/dxviewer.cpp @@ -1,1527 +1,1495 @@ -// -// Copyright (C) Pixar. All rights reserved. -// -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. -// -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. -// -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. -// -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. -// -#include -#include - -#include -#include -#include -#include - -#include -#include -#include -OpenSubdiv::OsdCpuComputeController * g_cpuComputeController = NULL; - -#ifdef OPENSUBDIV_HAS_OPENMP - #include - OpenSubdiv::OsdOmpComputeController * g_ompComputeController = NULL; -#endif - -#undef OPENSUBDIV_HAS_OPENCL // XXX: dyu OpenCL D3D11 interop needs work... -#ifdef OPENSUBDIV_HAS_OPENCL - #include - #include - #include - - #include "../common/clInit.h" - - cl_context g_clContext; - cl_command_queue g_clQueue; - OpenSubdiv::OsdCLComputeController * g_clComputeController = NULL; -#endif - -#ifdef OPENSUBDIV_HAS_CUDA - #include - #include - #include - - #include - #include - - bool g_cudaInitialized = false; - OpenSubdiv::OsdCudaComputeController * g_cudaComputeController = NULL; -#endif - -#include -#include -#include -OpenSubdiv::OsdD3D11ComputeController * g_d3d11ComputeController = NULL; - -#include -OpenSubdiv::OsdD3D11MeshInterface *g_mesh; - -#include "../../regression/common/shape_utils.h" -#include "../common/stopwatch.h" -#include "../common/simple_math.h" -#include "../common/d3d11_hud.h" - -static const char *shaderSource = -#include "shader.inc" -; - -#include -#include -#include -#include - -#define SAFE_RELEASE(p) { if(p) { (p)->Release(); (p)=NULL; } } - -typedef OpenSubdiv::HbrMesh OsdHbrMesh; -typedef OpenSubdiv::HbrVertex OsdHbrVertex; -typedef OpenSubdiv::HbrFace OsdHbrFace; -typedef OpenSubdiv::HbrHalfedge OsdHbrHalfedge; - -enum KernelType { kCPU = 0, - kOPENMP = 1, - kCUDA = 2, - kCL = 3, - kDirectCompute = 4 }; - -struct SimpleShape { - std::string name; - Scheme scheme; - std::string data; - - SimpleShape() { } - SimpleShape( std::string const & idata, char const * iname, Scheme ischeme ) - : name(iname), scheme(ischeme), data(idata) { } -}; - -std::vector g_defaultShapes; - -int g_currentShape = 0; - -int g_frame = 0, - g_repeatCount = 0; - -// GUI variables -int g_freeze = 0, - g_wire = 2, - g_adaptive = 1, - g_drawCageEdges = 1, - g_drawCageVertices = 0, - g_drawPatchCVs = 0, - g_drawNormals = 0, - g_mbutton[3] = {0, 0, 0}; - -int g_displayPatchColor = 1; - -float g_rotate[2] = {0, 0}, - g_prev_x = 0, - g_prev_y = 0, - g_dolly = 5, - g_pan[2] = {0, 0}, - g_center[3] = {0, 0, 0}, - g_size = 0; - -int g_width = 1024, - g_height = 1024; - -D3D11hud *g_hud = NULL; - -// performance -float g_cpuTime = 0; -float g_gpuTime = 0; -Stopwatch g_fpsTimer; - -// geometry -std::vector g_orgPositions, - g_positions, - g_normals; - -Scheme g_scheme; - -int g_level = 2; -int g_tessLevel = 1; -int g_tessLevelMin = 1; -int g_kernel = kCPU; -float g_moveScale = 0.0f; - -std::vector g_coarseEdges; -std::vector g_coarseEdgeSharpness; -std::vector g_coarseVertexSharpness; - -ID3D11Device * g_pd3dDevice = NULL; -ID3D11DeviceContext * g_pd3dDeviceContext = NULL; -IDXGISwapChain * g_pSwapChain = NULL; -ID3D11RenderTargetView * g_pSwapChainRTV = NULL; - -ID3D11RasterizerState* g_pRasterizerState = NULL; -ID3D11InputLayout* g_pInputLayout = NULL; -ID3D11DepthStencilState* g_pDepthStencilState = NULL; -ID3D11Texture2D * g_pDepthStencilBuffer = NULL; -ID3D11Buffer* g_pcbPerFrame = NULL; -ID3D11Buffer* g_pcbTessellation = NULL; -ID3D11Buffer* g_pcbLighting = NULL; -ID3D11DepthStencilView* g_pDepthStencilView = NULL; - -bool g_bDone; - -//------------------------------------------------------------------------------ -static void -initializeShapes( ) { - -#include - g_defaultShapes.push_back(SimpleShape(catmark_cube_corner0, "catmark_cube_corner0", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_cube_corner1, "catmark_cube_corner1", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_cube_corner2, "catmark_cube_corner2", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_cube_corner3, "catmark_cube_corner3", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_cube_corner4, "catmark_cube_corner4", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_cube_creases0, "catmark_cube_creases0", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_cube_creases1, "catmark_cube_creases1", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_cube, "catmark_cube", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_dart_edgecorner, "catmark_dart_edgecorner", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_dart_edgeonly, "catmark_dart_edgeonly", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_edgecorner ,"catmark_edgecorner", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_edgeonly, "catmark_edgeonly", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_gregory_test1, "catmark_gregory_test1", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_gregory_test2, "catmark_gregory_test2", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_gregory_test3, "catmark_gregory_test3", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_gregory_test4, "catmark_gregory_test4", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_hole_test1, "catmark_hole_test1", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_hole_test2, "catmark_hole_test2", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_pyramid_creases0, "catmark_pyramid_creases0", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_pyramid_creases1, "catmark_pyramid_creases1", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_pyramid, "catmark_pyramid", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_tent_creases0, "catmark_tent_creases0", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_tent_creases1, "catmark_tent_creases1", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_tent, "catmark_tent", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_torus, "catmark_torus", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_torus_creases0, "catmark_torus_creases0", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_square_hedit0, "catmark_square_hedit0", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_square_hedit1, "catmark_square_hedit1", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_square_hedit2, "catmark_square_hedit2", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_square_hedit3, "catmark_square_hedit3", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_square_hedit4, "catmark_square_hedit4", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_bishop, "catmark_bishop", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_car, "catmark_car", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_helmet, "catmark_helmet", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_pawn, "catmark_pawn", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(catmark_rook, "catmark_rook", kCatmark)); - -#include - g_defaultShapes.push_back(SimpleShape(bilinear_cube, "bilinear_cube", kBilinear)); - - -#include - g_defaultShapes.push_back(SimpleShape(loop_cube_creases0, "loop_cube_creases0", kLoop)); - -#include - g_defaultShapes.push_back(SimpleShape(loop_cube_creases1, "loop_cube_creases1", kLoop)); - -#include - g_defaultShapes.push_back(SimpleShape(loop_cube, "loop_cube", kLoop)); - -#include - g_defaultShapes.push_back(SimpleShape(loop_icosahedron, "loop_icosahedron", kLoop)); - -#include - g_defaultShapes.push_back(SimpleShape(loop_saddle_edgecorner, "loop_saddle_edgecorner", kLoop)); - -#include - g_defaultShapes.push_back(SimpleShape(loop_saddle_edgeonly, "loop_saddle_edgeonly", kLoop)); - -#include - g_defaultShapes.push_back(SimpleShape(loop_triangle_edgecorner, "loop_triangle_edgecorner", kLoop)); - -#include - g_defaultShapes.push_back(SimpleShape(loop_triangle_edgeonly, "loop_triangle_edgeonly", kLoop)); -} - -//------------------------------------------------------------------------------ -static void -calcNormals(OsdHbrMesh * mesh, std::vector const & pos, std::vector & result ) { - - // calc normal vectors - int nverts = (int)pos.size()/3; - - int nfaces = mesh->GetNumCoarseFaces(); - for (int i = 0; i < nfaces; ++i) { - - OsdHbrFace * f = mesh->GetFace(i); - - float const * p0 = &pos[f->GetVertex(0)->GetID()*3], - * p1 = &pos[f->GetVertex(1)->GetID()*3], - * p2 = &pos[f->GetVertex(2)->GetID()*3]; - - float n[3]; - cross( n, p0, p1, p2 ); - - for (int j = 0; j < f->GetNumVertices(); j++) { - int idx = f->GetVertex(j)->GetID() * 3; - result[idx ] += n[0]; - result[idx+1] += n[1]; - result[idx+2] += n[2]; - } - } - for (int i = 0; i < nverts; ++i) - normalize( &result[i*3] ); -} - -//------------------------------------------------------------------------------ -static void -updateGeom() { - - int nverts = (int)g_orgPositions.size() / 3; - - std::vector vertex; - vertex.reserve(nverts*6); - - const float *p = &g_orgPositions[0]; - const float *n = &g_normals[0]; - - float r = sin(g_frame*0.001f) * g_moveScale; - for (int i = 0; i < nverts; ++i) { - float move = 0.05f*cosf(p[0]*20+g_frame*0.01f); - float ct = cos(p[2] * r); - float st = sin(p[2] * r); - g_positions[i*3+0] = p[0]*ct + p[1]*st; - g_positions[i*3+1] = -p[0]*st + p[1]*ct; - g_positions[i*3+2] = p[2]; - - p += 3; - } - - p = &g_positions[0]; - for (int i = 0; i < nverts; ++i) { - vertex.push_back(p[0]); - vertex.push_back(p[1]); - vertex.push_back(p[2]); - vertex.push_back(n[0]); - vertex.push_back(n[1]); - vertex.push_back(n[2]); - - p += 3; - n += 3; - } - - g_mesh->UpdateVertexBuffer(&vertex[0], 0, nverts); - - Stopwatch s; - s.Start(); - - g_mesh->Refine(); - - s.Stop(); - g_cpuTime = float(s.GetElapsed() * 1000.0f); - s.Start(); - - g_mesh->Synchronize(); - - s.Stop(); - g_gpuTime = float(s.GetElapsed() * 1000.0f); -} - -//------------------------------------------------------------------------------ -static const char * -getKernelName(int kernel) { - - if (kernel == kCPU) - return "CPU"; - else if (kernel == kOPENMP) - return "OpenMP"; - else if (kernel == kCUDA) - return "Cuda"; - else if (kernel == kCL) - return "OpenCL"; - else if (kernel == kDirectCompute) - return "DirectCompute"; - return "Unknown"; -} - -//------------------------------------------------------------------------------ -static void -createOsdMesh( const std::string &shape, int level, int kernel, Scheme scheme=kCatmark ) { - - // generate Hbr representation from "obj" description - OsdHbrMesh * hmesh = simpleHbr(shape.c_str(), scheme, g_orgPositions); - - g_normals.resize(g_orgPositions.size(),0.0f); - g_positions.resize(g_orgPositions.size(),0.0f); - calcNormals( hmesh, g_orgPositions, g_normals ); - - // save coarse topology (used for coarse mesh drawing) - g_coarseEdges.clear(); - g_coarseEdgeSharpness.clear(); - g_coarseVertexSharpness.clear(); - int nf = hmesh->GetNumFaces(); - for(int i=0; iGetFace(i); - int nv = face->GetNumVertices(); - for(int j=0; jGetVertex(j)->GetID()); - g_coarseEdges.push_back(face->GetVertex((j+1)%nv)->GetID()); - g_coarseEdgeSharpness.push_back(face->GetEdge(j)->GetSharpness()); - } - } - int nv = hmesh->GetNumVertices(); - for(int i=0; iGetVertex(i)->GetSharpness()); - } - - delete g_mesh; - g_mesh = NULL; - - g_scheme = scheme; - - // Adaptive refinement currently supported only for catmull-clark scheme - bool doAdaptive = (g_adaptive!=0 and g_scheme==kCatmark); - - OpenSubdiv::OsdMeshBitset bits; - bits.set(OpenSubdiv::MeshAdaptive, doAdaptive); - - int numVertexElements = 6; - int numVaryingElements = 0; - - if (g_kernel == kCPU) { - if (not g_cpuComputeController) { - g_cpuComputeController = new OpenSubdiv::OsdCpuComputeController(); - } - g_mesh = new OpenSubdiv::OsdMesh( - g_cpuComputeController, - hmesh, - numVertexElements, - numVaryingElements, - level, bits, g_pd3dDeviceContext); -#ifdef OPENSUBDIV_HAS_OPENMP - } else if (kernel == kOPENMP) { - if (not g_ompComputeController) { - g_ompComputeController = new OpenSubdiv::OsdOmpComputeController(); - } - g_mesh = new OpenSubdiv::OsdMesh( - g_ompComputeController, - hmesh, - numVertexElements, - numVaryingElements, - level, bits, g_pd3dDeviceContext); -#endif -#ifdef OPENSUBDIV_HAS_OPENCL - } else if(kernel == kCL) { - if (not g_clComputeController) { - g_clComputeController = new OpenSubdiv::OsdCLComputeController(g_clContext, g_clQueue); - } - g_mesh = new OpenSubdiv::OsdMesh( - g_clComputeController, - hmesh, - numVertexElements, - numVaryingElements, - level, bits, g_pd3dDeviceContext); -#endif -#ifdef OPENSUBDIV_HAS_CUDA - } else if (g_kernel == kCUDA) { - if (not g_cudaComputeController) { - g_cudaComputeController = new OpenSubdiv::OsdCudaComputeController(); - } - g_mesh = new OpenSubdiv::OsdMesh( - g_cudaComputeController, - hmesh, - numVertexElements, - numVaryingElements, - level, bits, g_pd3dDeviceContext); -#endif - } else if (g_kernel == kDirectCompute) { - if (not g_d3d11ComputeController) { - g_d3d11ComputeController = new OpenSubdiv::OsdD3D11ComputeController(g_pd3dDeviceContext); - } - g_mesh = new OpenSubdiv::OsdMesh( - g_d3d11ComputeController, - hmesh, - numVertexElements, - numVaryingElements, - level, bits, g_pd3dDeviceContext); - } else { - printf("Unsupported kernel %s\n", getKernelName(kernel)); - } - - // Hbr mesh can be deleted - delete hmesh; - - // compute model bounding - float min[3] = { FLT_MAX, FLT_MAX, FLT_MAX}; - float max[3] = {-FLT_MAX, -FLT_MAX, -FLT_MAX}; - for (size_t i=0; i EffectDesc; - -class EffectDrawRegistry : public OpenSubdiv::OsdD3D11DrawRegistry { - -protected: - virtual ConfigType * - _CreateDrawConfig(DescType const & desc, - SourceConfigType const * sconfig, - ID3D11Device * pd3dDevice, - ID3D11InputLayout ** ppInputLayout, - D3D11_INPUT_ELEMENT_DESC const * pInputElementDescs, - int numInputElements); - - virtual SourceConfigType * - _CreateDrawSourceConfig(DescType const & desc, ID3D11Device * pd3dDevice); -}; - -EffectDrawRegistry::SourceConfigType * -EffectDrawRegistry::_CreateDrawSourceConfig( - DescType const & desc, ID3D11Device * pd3dDevice) -{ - Effect effect = desc.second; - - SourceConfigType * sconfig = - BaseRegistry::_CreateDrawSourceConfig(desc.first, pd3dDevice); - - sconfig->commonShader.AddDefine("OSD_ENABLE_PATCH_CULL"); - sconfig->commonShader.AddDefine("OSD_ENABLE_SCREENSPACE_TESSELLATION"); - - bool smoothNormals = false; - if (desc.first.GetType() == OpenSubdiv::FarPatchTables::QUADS || - desc.first.GetType() == OpenSubdiv::FarPatchTables::TRIANGLES) { - sconfig->vertexShader.source = shaderSource; - sconfig->vertexShader.target = "vs_5_0"; - sconfig->vertexShader.entry = "vs_main"; - } else { - if (effect == kQuadWire) effect = kTriWire; - if (effect == kQuadFill) effect = kTriFill; - if (effect == kQuadLine) effect = kTriLine; - smoothNormals = true; - } - assert(sconfig); - - sconfig->geometryShader.source = shaderSource; - sconfig->geometryShader.target = "gs_5_0"; - - sconfig->pixelShader.source = shaderSource; - sconfig->pixelShader.target = "ps_5_0"; - - switch (effect) { - case kQuadWire: - sconfig->geometryShader.entry = "gs_quad_wire"; - sconfig->geometryShader.AddDefine("PRIM_QUAD"); - sconfig->geometryShader.AddDefine("GEOMETRY_OUT_WIRE"); - sconfig->pixelShader.entry = "ps_main"; - sconfig->pixelShader.AddDefine("PRIM_QUAD"); - sconfig->pixelShader.AddDefine("GEOMETRY_OUT_WIRE"); - break; - case kQuadFill: - sconfig->geometryShader.entry = "gs_quad"; - sconfig->geometryShader.AddDefine("PRIM_QUAD"); - sconfig->geometryShader.AddDefine("GEOMETRY_OUT_FILL"); - sconfig->pixelShader.entry = "ps_main"; - sconfig->pixelShader.AddDefine("PRIM_QUAD"); - sconfig->pixelShader.AddDefine("GEOMETRY_OUT_FILL"); - break; - case kQuadLine: - sconfig->geometryShader.entry = "gs_quad_wire"; - sconfig->geometryShader.AddDefine("PRIM_QUAD"); - sconfig->geometryShader.AddDefine("GEOMETRY_OUT_LINE"); - sconfig->pixelShader.entry = "ps_main"; - sconfig->pixelShader.AddDefine("PRIM_QUAD"); - sconfig->pixelShader.AddDefine("GEOMETRY_OUT_LINE"); - break; - case kTriWire: - sconfig->geometryShader.entry = - smoothNormals ? "gs_triangle_smooth_wire" : "gs_triangle_wire"; - sconfig->geometryShader.AddDefine("PRIM_TRI"); - sconfig->geometryShader.AddDefine("GEOMETRY_OUT_WIRE"); - sconfig->pixelShader.entry = "ps_main"; - sconfig->pixelShader.AddDefine("PRIM_TRI"); - sconfig->pixelShader.AddDefine("GEOMETRY_OUT_WIRE"); - break; - case kTriFill: - sconfig->geometryShader.entry = - smoothNormals ? "gs_triangle_smooth" : "gs_triangle"; - sconfig->geometryShader.AddDefine("PRIM_TRI"); - sconfig->geometryShader.AddDefine("GEOMETRY_OUT_FILL"); - sconfig->pixelShader.entry = "ps_main"; - sconfig->pixelShader.AddDefine("PRIM_TRI"); - sconfig->pixelShader.AddDefine("GEOMETRY_OUT_FILL"); - break; - case kTriLine: - sconfig->geometryShader.entry = - smoothNormals ? "gs_triangle_smooth_wire" : "gs_triangle_wire"; - sconfig->geometryShader.AddDefine("PRIM_TRI"); - sconfig->geometryShader.AddDefine("GEOMETRY_OUT_LINE"); - sconfig->pixelShader.entry = "ps_main"; - sconfig->pixelShader.AddDefine("PRIM_TRI"); - sconfig->pixelShader.AddDefine("GEOMETRY_OUT_LINE"); - break; - case kPoint: - sconfig->geometryShader.entry = "gs_point"; - sconfig->pixelShader.entry = "ps_main_point"; - break; - } - - return sconfig; -} - -EffectDrawRegistry::ConfigType * -EffectDrawRegistry::_CreateDrawConfig( - DescType const & desc, - SourceConfigType const * sconfig, - ID3D11Device * pd3dDevice, - ID3D11InputLayout ** ppInputLayout, - D3D11_INPUT_ELEMENT_DESC const * pInputElementDescs, - int numInputElements) -{ - ConfigType * config = BaseRegistry::_CreateDrawConfig(desc.first, sconfig, - pd3dDevice, ppInputLayout, pInputElementDescs, numInputElements); - assert(config); - - return config; -} - -EffectDrawRegistry effectRegistry; - -static Effect -GetEffect() -{ - if (g_scheme == kLoop) { - return (g_wire == 0 ? kTriWire : (g_wire == 1 ? kTriFill : kTriLine)); - } else { - return (g_wire == 0 ? kQuadWire : (g_wire == 1 ? kQuadFill : kQuadLine)); - } -} - -//------------------------------------------------------------------------------ -static void -bindProgram(Effect effect, OpenSubdiv::OsdDrawContext::PatchArray const & patch) -{ - EffectDesc effectDesc(patch.GetDescriptor(), effect); - - // input layout - const D3D11_INPUT_ELEMENT_DESC hInElementDesc[] = { - { "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 }, - { "NORMAL", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 4*3, D3D11_INPUT_PER_VERTEX_DATA, 0 } - }; - - EffectDrawRegistry::ConfigType * - config = effectRegistry.GetDrawConfig( - effectDesc, g_pd3dDevice, - &g_pInputLayout, hInElementDesc, ARRAYSIZE(hInElementDesc)); - - assert(g_pInputLayout); - - // Update transform state - { - __declspec(align(16)) - struct CB_PER_FRAME_CONSTANTS - { - float ModelViewMatrix[16]; - float ProjectionMatrix[16]; - float ModelViewProjectionMatrix[16]; - }; - - if (! g_pcbPerFrame) { - D3D11_BUFFER_DESC cbDesc; - ZeroMemory(&cbDesc, sizeof(cbDesc)); - cbDesc.Usage = D3D11_USAGE_DYNAMIC; - cbDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER; - cbDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE; - cbDesc.MiscFlags = 0; - cbDesc.ByteWidth = sizeof(CB_PER_FRAME_CONSTANTS); - g_pd3dDevice->CreateBuffer(&cbDesc, NULL, &g_pcbPerFrame); - } - assert(g_pcbPerFrame); - - D3D11_MAPPED_SUBRESOURCE MappedResource; - g_pd3dDeviceContext->Map(g_pcbPerFrame, 0, D3D11_MAP_WRITE_DISCARD, 0, &MappedResource); - CB_PER_FRAME_CONSTANTS* pData = ( CB_PER_FRAME_CONSTANTS* )MappedResource.pData; - - float aspect = (g_height > 0) ? (float)g_width / g_height : 1.0f; - identity(pData->ModelViewMatrix); - translate(pData->ModelViewMatrix, -g_pan[0], -g_pan[1], -g_dolly); - rotate(pData->ModelViewMatrix, g_rotate[1], 1, 0, 0); - rotate(pData->ModelViewMatrix, g_rotate[0], 0, 1, 0); - translate(pData->ModelViewMatrix, -g_center[0], -g_center[2], g_center[1]); // z-up model - rotate(pData->ModelViewMatrix, -90, 1, 0, 0); // z-up model - - identity(pData->ProjectionMatrix); - perspective(pData->ProjectionMatrix, 45.0, aspect, 0.01f, 500.0); - multMatrix(pData->ModelViewProjectionMatrix, pData->ModelViewMatrix, pData->ProjectionMatrix); - - g_pd3dDeviceContext->Unmap( g_pcbPerFrame, 0 ); - } - - // Update tessellation state - { - __declspec(align(16)) - struct Tessellation { - float TessLevel; - int GregoryQuadOffsetBase; - int PrimitiveIdBase; - }; - - if (! g_pcbTessellation) { - D3D11_BUFFER_DESC cbDesc; - ZeroMemory(&cbDesc, sizeof(cbDesc)); - cbDesc.Usage = D3D11_USAGE_DYNAMIC; - cbDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER; - cbDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE; - cbDesc.MiscFlags = 0; - cbDesc.ByteWidth = sizeof(Tessellation); - g_pd3dDevice->CreateBuffer(&cbDesc, NULL, &g_pcbTessellation); - } - assert(g_pcbTessellation); - - D3D11_MAPPED_SUBRESOURCE MappedResource; - g_pd3dDeviceContext->Map(g_pcbTessellation, 0, D3D11_MAP_WRITE_DISCARD, 0, &MappedResource); - Tessellation * pData = ( Tessellation* )MappedResource.pData; - - pData->TessLevel = static_cast(1 << g_tessLevel); - pData->GregoryQuadOffsetBase = patch.GetQuadOffsetIndex(); - pData->PrimitiveIdBase = patch.GetPatchIndex(); - - g_pd3dDeviceContext->Unmap( g_pcbTessellation, 0 ); - } - - g_pd3dDeviceContext->IASetInputLayout(g_pInputLayout); - - g_pd3dDeviceContext->VSSetShader(config->vertexShader, NULL, 0); - g_pd3dDeviceContext->VSSetConstantBuffers(0, 1, &g_pcbPerFrame); - g_pd3dDeviceContext->HSSetShader(config->hullShader, NULL, 0); - g_pd3dDeviceContext->HSSetConstantBuffers(0, 1, &g_pcbPerFrame); - g_pd3dDeviceContext->HSSetConstantBuffers(1, 1, &g_pcbTessellation); - g_pd3dDeviceContext->DSSetShader(config->domainShader, NULL, 0); - g_pd3dDeviceContext->DSSetConstantBuffers(0, 1, &g_pcbPerFrame); - g_pd3dDeviceContext->GSSetShader(config->geometryShader, NULL, 0); - g_pd3dDeviceContext->GSSetConstantBuffers(0, 1, &g_pcbPerFrame); - g_pd3dDeviceContext->PSSetShader(config->pixelShader, NULL, 0); - g_pd3dDeviceContext->PSSetConstantBuffers(0, 1, &g_pcbPerFrame); - g_pd3dDeviceContext->PSSetConstantBuffers(2, 1, &g_pcbLighting); - - if (g_mesh->GetDrawContext()->vertexBufferSRV) { - g_pd3dDeviceContext->VSSetShaderResources(0, 1, &g_mesh->GetDrawContext()->vertexBufferSRV); - } - if (g_mesh->GetDrawContext()->vertexValenceBufferSRV) { - g_pd3dDeviceContext->VSSetShaderResources(1, 1, &g_mesh->GetDrawContext()->vertexValenceBufferSRV); - } - if (g_mesh->GetDrawContext()->quadOffsetBufferSRV) { - g_pd3dDeviceContext->HSSetShaderResources(2, 1, &g_mesh->GetDrawContext()->quadOffsetBufferSRV); - } - if (g_mesh->GetDrawContext()->ptexCoordinateBufferSRV) { - g_pd3dDeviceContext->HSSetShaderResources(3, 1, &g_mesh->GetDrawContext()->ptexCoordinateBufferSRV); - g_pd3dDeviceContext->DSSetShaderResources(3, 1, &g_mesh->GetDrawContext()->ptexCoordinateBufferSRV); - } -} - -//------------------------------------------------------------------------------ -static void -display() -{ - float color[4] = {0.006f, 0.006f, 0.006f, 1.0f}; - g_pd3dDeviceContext->ClearRenderTargetView(g_pSwapChainRTV, color); - - // Clear the depth buffer. - g_pd3dDeviceContext->ClearDepthStencilView(g_pDepthStencilView, D3D11_CLEAR_DEPTH, 1.0f, 0); - - g_pd3dDeviceContext->OMSetDepthStencilState(g_pDepthStencilState, 1); - g_pd3dDeviceContext->RSSetState(g_pRasterizerState); - - ID3D11Buffer *buffer = g_mesh->BindVertexBuffer(); - assert(buffer); - - UINT hStrides = 6*sizeof(float); - UINT hOffsets = 0; - g_pd3dDeviceContext->IASetVertexBuffers(0, 1, &buffer, &hStrides, &hOffsets); - - OpenSubdiv::OsdDrawContext::PatchArrayVector const & patches = g_mesh->GetDrawContext()->patchArrays; - - g_pd3dDeviceContext->IASetIndexBuffer(g_mesh->GetDrawContext()->patchIndexBuffer, DXGI_FORMAT_R32_UINT, 0); - - // cv drawing -#if 0 - if (g_drawPatchCVs) { - - bindProgram(kPoint, OpenSubdiv::OsdDrawContext::PatchArray()); - - g_pd3dDeviceContext->IASetPrimitiveTopology( - D3D11_PRIMITIVE_TOPOLOGY_POINTLIST); - - for (int i=0; i<(int)patches.size(); ++i) { - OpenSubdiv::OsdDrawContext::PatchArray const & patch = patches[i]; - - g_pd3dDeviceContext->DrawIndexed(patch.GetNumIndices(), - patch.GetVertIndex(), 0); - } - } -#endif - - // patch drawing - for (int i=0; i<(int)patches.size(); ++i) { - OpenSubdiv::OsdDrawContext::PatchArray const & patch = patches[i]; - - D3D11_PRIMITIVE_TOPOLOGY topology; - - if (g_mesh->GetDrawContext()->IsAdaptive()) { - - switch (patch.GetDescriptor().GetNumControlVertices()) { - case 4: - topology = D3D11_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST; - break; - case 9: - topology = D3D11_PRIMITIVE_TOPOLOGY_9_CONTROL_POINT_PATCHLIST; - break; - case 12: - topology = D3D11_PRIMITIVE_TOPOLOGY_12_CONTROL_POINT_PATCHLIST; - break; - case 16: - topology = D3D11_PRIMITIVE_TOPOLOGY_16_CONTROL_POINT_PATCHLIST; - break; - default: - assert(false); - break; - } - - } else { - if (g_scheme == kLoop) { - topology = D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST; - } else { - topology = D3D11_PRIMITIVE_TOPOLOGY_LINELIST_ADJ; - } - } - - bindProgram(GetEffect(), patch); - - g_pd3dDeviceContext->IASetPrimitiveTopology(topology); - - g_pd3dDeviceContext->DrawIndexed( - patch.GetNumIndices(), patch.GetVertIndex(), 0); - } - - if (g_hud->IsVisible()) { - g_fpsTimer.Stop(); - double fps = 1.0/g_fpsTimer.GetElapsed(); - g_fpsTimer.Start(); - - g_hud->DrawString(10, -100, "# of Vertices = %d", g_mesh->GetNumVertices()); - g_hud->DrawString(10, -80, "SUBDIVISION = %s", - g_scheme==kBilinear ? "BILINEAR" : (g_scheme == kLoop ? "LOOP" : "CATMARK")); - g_hud->DrawString(10, -60, "GPU TIME = %.3f ms", g_gpuTime); - g_hud->DrawString(10, -40, "CPU TIME = %.3f ms", g_cpuTime); - g_hud->DrawString(10, -20, "FPS = %3.1f", fps); - } - - g_hud->Flush(); - - g_pSwapChain->Present(0, 0); -} - -//------------------------------------------------------------------------------ -static void -motion(int x, int y) { - - if (g_mbutton[0] && !g_mbutton[1] && !g_mbutton[2]) { - // orbit - g_rotate[0] += x - g_prev_x; - g_rotate[1] += y - g_prev_y; - } else if (!g_mbutton[0] && g_mbutton[1] && !g_mbutton[2]) { - // pan - g_pan[0] -= g_dolly*(x - g_prev_x)/g_width; - g_pan[1] += g_dolly*(y - g_prev_y)/g_height; - } else if ((g_mbutton[0] && g_mbutton[1] && !g_mbutton[2]) or - (!g_mbutton[0] && !g_mbutton[1] && g_mbutton[2])) { - // dolly - g_dolly -= g_dolly*0.01f*(x - g_prev_x); - if(g_dolly <= 0.01) g_dolly = 0.01f; - } - - g_prev_x = float(x); - g_prev_y = float(y); -} - -//------------------------------------------------------------------------------ -static void -mouse(int button, int state, int x, int y) { - - if (button == 0 && state == 1 && g_hud->MouseClick(x, y)) return; - - if (button < 3) { - g_prev_x = float(x); - g_prev_y = float(y); - g_mbutton[button] = state; - } -} - -//----------------------------------------------------------------------------- -static void -quit() { - - g_bDone = true; - - if (g_mesh) - delete g_mesh; - - if (g_hud) - delete g_hud; - - SAFE_RELEASE(g_pRasterizerState); - SAFE_RELEASE(g_pInputLayout); - SAFE_RELEASE(g_pDepthStencilState); - SAFE_RELEASE(g_pcbPerFrame); - SAFE_RELEASE(g_pcbTessellation); - SAFE_RELEASE(g_pcbLighting); - SAFE_RELEASE(g_pDepthStencilView); - - SAFE_RELEASE(g_pSwapChainRTV); - SAFE_RELEASE(g_pSwapChain); - SAFE_RELEASE(g_pd3dDeviceContext); - SAFE_RELEASE(g_pd3dDevice); - - delete g_cpuComputeController; - -#ifdef OPENSUBDIV_HAS_OPENMP - delete g_ompComputeController; -#endif - -#ifdef OPENSUBDIV_HAS_OPENCL - delete g_clComputeController; - uninitCL(g_clContext, g_clQueue); -#endif - -#ifdef OPENSUBDIV_HAS_CUDA - delete g_cudaComputeController; - cudaDeviceReset(); -#endif - - delete g_d3d11ComputeController; - - PostQuitMessage(0); - exit(0); -} - -//------------------------------------------------------------------------------ -static void -keyboard(char key) { - - if (g_hud->KeyDown((int)key)) return; - - switch (key) { - case 'Q': quit(); - case 'F': fitFrame(); break; - case '+': - case '=': g_tessLevel++; break; - case '-': g_tessLevel = std::max(g_tessLevelMin, g_tessLevel-1); break; - case 0x1b: g_hud->SetVisible(!g_hud->IsVisible()); break; - } -} - -//------------------------------------------------------------------------------ -static void -callbackWireframe(int b) -{ - g_wire = b; -} - -static void -callbackKernel(int k) -{ - g_kernel = k; - -#ifdef OPENSUBDIV_HAS_OPENCL - if (g_kernel == kCL and g_clContext == NULL) { - if (initCL(&g_clContext, &g_clQueue) == false) { - printf("Error in initializing OpenCL\n"); - exit(1); - } - } -#endif -#ifdef OPENSUBDIV_HAS_CUDA - if (g_kernel == kCUDA and g_cudaInitialized == false) { - g_cudaInitialized = true; - cudaD3D11SetDirect3DDevice( g_pd3dDevice ); - } -#endif - - createOsdMesh( g_defaultShapes[ g_currentShape ].data, g_level, g_kernel, g_defaultShapes[ g_currentShape ].scheme ); -} - -static void -callbackLevel(int l) -{ - g_level = l; - createOsdMesh( g_defaultShapes[g_currentShape].data, g_level, g_kernel, g_defaultShapes[ g_currentShape ].scheme ); -} - -static void -callbackModel(int m) -{ - if (m < 0) - m = 0; - - if (m >= (int)g_defaultShapes.size()) - m = (int)g_defaultShapes.size() - 1; - - g_currentShape = m; - - createOsdMesh( g_defaultShapes[m].data, g_level, g_kernel, g_defaultShapes[ g_currentShape ].scheme ); -} - -static void -callbackDisplayNormal(bool checked, int n) -{ - g_drawNormals = checked; -} - -static void -callbackAnimate(bool checked, int m) -{ - g_moveScale = checked; -} - -static void -callbackFreeze(bool checked, int f) -{ - g_freeze = checked; -} - -static void -callbackAdaptive(bool checked, int a) -{ - g_adaptive = checked; - - createOsdMesh( g_defaultShapes[g_currentShape].data, g_level, g_kernel, g_defaultShapes[ g_currentShape ].scheme ); -} - -static void -callbackDisplayCageEdges(bool checked, int d) -{ - g_drawCageEdges = checked; -} - -static void -callbackDisplayCageVertices(bool checked, int d) -{ - g_drawCageVertices = checked; -} - -static void -callbackDisplayPatchCVs(bool checked, int d) -{ - g_drawPatchCVs = checked; -} - -static void -callbackDisplayPatchColor(bool checked, int p) -{ - g_displayPatchColor = checked; -} - -static void -initHUD() -{ - g_hud = new D3D11hud(g_pd3dDeviceContext); - g_hud->Init(g_width, g_height); - - g_hud->AddRadioButton(0, "CPU (K)", true, 10, 10, callbackKernel, kCPU, 'K'); -#ifdef OPENSUBDIV_HAS_OPENMP - g_hud->AddRadioButton(0, "OPENMP", false, 10, 30, callbackKernel, kOPENMP, 'K'); -#endif -#ifdef OPENSUBDIV_HAS_CUDA - g_hud->AddRadioButton(0, "CUDA", false, 10, 50, callbackKernel, kCUDA, 'K'); -#endif -#ifdef OPENSUBDIV_HAS_OPENCL - g_hud->AddRadioButton(0, "OPENCL", false, 10, 70, callbackKernel, kCL, 'K'); -#endif - g_hud->AddRadioButton(0, "DirectCompute", false, 10, 90, callbackKernel, kDirectCompute, 'K'); - - g_hud->AddRadioButton(1, "Wire (W)", g_wire == 0, 200, 10, callbackWireframe, 0, 'W'); - g_hud->AddRadioButton(1, "Shaded", g_wire == 1, 200, 30, callbackWireframe, 1, 'W'); - g_hud->AddRadioButton(1, "Wire+Shaded", g_wire == 2, 200, 50, callbackWireframe, 2, 'W'); - -// g_hud->AddCheckBox("Cage Edges (H)", true, 350, 10, callbackDisplayCageEdges, 0, 'H'); -// g_hud->AddCheckBox("Cage Verts (J)", false, 350, 30, callbackDisplayCageVertices, 0, 'J'); - g_hud->AddCheckBox("Patch CVs (L)", false, 350, 50, callbackDisplayPatchCVs, 0, 'L'); -// g_hud->AddCheckBox("Show normal vector (E)", false, 350, 10, callbackDisplayNormal, 0, 'E'); - g_hud->AddCheckBox("Animate vertices (M)", g_moveScale != 0, 350, 70, callbackAnimate, 0, 'M'); - g_hud->AddCheckBox("Patch Color (P)", true, 350, 90, callbackDisplayPatchColor, 0, 'p'); - g_hud->AddCheckBox("Freeze (spc)", false, 350, 130, callbackFreeze, 0, ' '); - - g_hud->AddCheckBox("Adaptive (`)", true, 10, 150, callbackAdaptive, 0, '`'); - - for (int i = 1; i < 11; ++i) { - char level[16]; - sprintf(level, "Lv. %d", i); - g_hud->AddRadioButton(3, level, i==2, 10, 170+i*20, callbackLevel, i, '0'+(i%10)); - } - - for(int i = 0; i < (int)g_defaultShapes.size(); ++i){ - g_hud->AddRadioButton(4, g_defaultShapes[i].name.c_str(), i==0, -220, 10+i*16, callbackModel, i, 'N'); - } - - callbackModel(g_currentShape); -} - -//------------------------------------------------------------------------------ -static bool -initD3D11(HWND hWnd) -{ - D3D_DRIVER_TYPE driverTypes[] = { - D3D_DRIVER_TYPE_HARDWARE, - D3D_DRIVER_TYPE_WARP, - D3D_DRIVER_TYPE_REFERENCE, - }; - - UINT numDriverTypes = ARRAYSIZE(driverTypes); - - DXGI_SWAP_CHAIN_DESC hDXGISwapChainDesc; - hDXGISwapChainDesc.BufferDesc.Width = g_width; - hDXGISwapChainDesc.BufferDesc.Height = g_height; - hDXGISwapChainDesc.BufferDesc.RefreshRate.Numerator = 0; - hDXGISwapChainDesc.BufferDesc.RefreshRate.Denominator = 1; - hDXGISwapChainDesc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; - hDXGISwapChainDesc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; - hDXGISwapChainDesc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; - hDXGISwapChainDesc.SampleDesc.Count = 1; - hDXGISwapChainDesc.SampleDesc.Quality = 0; - hDXGISwapChainDesc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; - hDXGISwapChainDesc.BufferCount = 1; - hDXGISwapChainDesc.OutputWindow = hWnd; - hDXGISwapChainDesc.Windowed = TRUE; - hDXGISwapChainDesc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; - hDXGISwapChainDesc.Flags = DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH; - - // create device and swap chain - HRESULT hr; - D3D_DRIVER_TYPE hDriverType = D3D_DRIVER_TYPE_NULL; - D3D_FEATURE_LEVEL hFeatureLevel = D3D_FEATURE_LEVEL_11_0; - for(UINT driverTypeIndex=0; driverTypeIndex < numDriverTypes; driverTypeIndex++){ - hDriverType = driverTypes[driverTypeIndex]; - hr = D3D11CreateDeviceAndSwapChain(NULL, - hDriverType, NULL, 0, NULL, 0, - D3D11_SDK_VERSION, &hDXGISwapChainDesc, - &g_pSwapChain, &g_pd3dDevice, - &hFeatureLevel, &g_pd3dDeviceContext); - if(SUCCEEDED(hr)){ - break; - } - } - - if(FAILED(hr)){ - MessageBoxW(hWnd, L"D3D11CreateDeviceAndSwapChain", L"Err", MB_ICONSTOP); - return false; - } - - // create rasterizer - D3D11_RASTERIZER_DESC rasterDesc; - ZeroMemory(&rasterDesc, sizeof(rasterDesc)); - rasterDesc.AntialiasedLineEnable = false; - rasterDesc.CullMode = D3D11_CULL_NONE; // XXX - rasterDesc.DepthBias = 0; - rasterDesc.DepthBiasClamp = 0.0f; - rasterDesc.DepthClipEnable = true; - rasterDesc.FillMode = D3D11_FILL_SOLID; - rasterDesc.FrontCounterClockwise = true; - rasterDesc.MultisampleEnable = false; - rasterDesc.ScissorEnable = false; - rasterDesc.SlopeScaledDepthBias = 0.0f; - - g_pd3dDevice->CreateRasterizerState(&rasterDesc, &g_pRasterizerState); - assert(g_pRasterizerState); - - __declspec(align(16)) - struct Lighting { - struct Light { - float position[4]; - float ambient[4]; - float diffuse[4]; - float specular[4]; - } lightSource[2]; - } lightingData = { - 0.5, 0.2f, 1.0f, 0.0f, - 0.1f, 0.1f, 0.1f, 1.0f, - 0.7f, 0.7f, 0.7f, 1.0f, - 0.8f, 0.8f, 0.8f, 1.0f, - - -0.8f, 0.4f, -1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f, - 0.5f, 0.5f, 0.5f, 1.0f, - 0.8f, 0.8f, 0.8f, 1.0f, - }; - D3D11_BUFFER_DESC cbDesc; - ZeroMemory(&cbDesc, sizeof(cbDesc)); - cbDesc.Usage = D3D11_USAGE_DYNAMIC; - cbDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER; - cbDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE; - cbDesc.MiscFlags = 0; - cbDesc.ByteWidth = sizeof(lightingData); - D3D11_SUBRESOURCE_DATA initData; - initData.pSysMem = &lightingData; - g_pd3dDevice->CreateBuffer(&cbDesc, &initData, &g_pcbLighting); - assert(g_pcbLighting); - - // create depth stencil state - D3D11_DEPTH_STENCIL_DESC depthStencilDesc; - ZeroMemory(&depthStencilDesc, sizeof(depthStencilDesc)); - depthStencilDesc.DepthEnable = true; - depthStencilDesc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ALL; - depthStencilDesc.DepthFunc = D3D11_COMPARISON_LESS_EQUAL; - depthStencilDesc.StencilEnable = false; - - g_pd3dDevice->CreateDepthStencilState(&depthStencilDesc, &g_pDepthStencilState); - assert(g_pDepthStencilState); - - return true; -} - -static bool -updateRenderTarget(HWND hWnd) -{ - RECT rc; - GetClientRect(hWnd, &rc); - UINT width = rc.right - rc.left; - UINT height = rc.bottom - rc.top; - - if (g_pSwapChainRTV && (g_width == width) && (g_height == height)) { - return true; - } - g_width = width; - g_height = height; - - g_hud->Rebuild(g_width, g_height); - - SAFE_RELEASE(g_pSwapChainRTV); - - g_pSwapChain->ResizeBuffers(0, g_width, g_height, DXGI_FORMAT_UNKNOWN, 0); - - // get backbuffer of swap chain - ID3D11Texture2D* hpBackBuffer = NULL; - if(FAILED(g_pSwapChain->GetBuffer(0, __uuidof(ID3D11Texture2D), (void**)&hpBackBuffer))){ - MessageBoxW(hWnd, L"SwpChain GetBuffer", L"Err", MB_ICONSTOP); - return false; - } - - // create render target from the back buffer - if(FAILED(g_pd3dDevice->CreateRenderTargetView(hpBackBuffer, NULL, &g_pSwapChainRTV))){ - MessageBoxW(hWnd, L"CreateRenderTargetView", L"Err", MB_ICONSTOP); - return false; - } - SAFE_RELEASE(hpBackBuffer); - - // create depth buffer - D3D11_TEXTURE2D_DESC depthBufferDesc; - ZeroMemory(&depthBufferDesc, sizeof(depthBufferDesc)); - depthBufferDesc.Width = g_width; - depthBufferDesc.Height = g_height; - depthBufferDesc.MipLevels = 1; - depthBufferDesc.ArraySize = 1; - depthBufferDesc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; - depthBufferDesc.SampleDesc.Count = 1; - depthBufferDesc.SampleDesc.Quality = 0; - depthBufferDesc.Usage = D3D11_USAGE_DEFAULT; - depthBufferDesc.BindFlags = D3D11_BIND_DEPTH_STENCIL; - depthBufferDesc.CPUAccessFlags = 0; - depthBufferDesc.MiscFlags = 0; - - g_pd3dDevice->CreateTexture2D(&depthBufferDesc, NULL, &g_pDepthStencilBuffer); - assert(g_pDepthStencilBuffer); - - D3D11_DEPTH_STENCIL_VIEW_DESC depthStencilViewDesc; - ZeroMemory(&depthStencilViewDesc, sizeof(depthStencilViewDesc)); - depthStencilViewDesc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; - depthStencilViewDesc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2D; - depthStencilViewDesc.Texture2D.MipSlice = 0; - - g_pd3dDevice->CreateDepthStencilView(g_pDepthStencilBuffer, &depthStencilViewDesc, &g_pDepthStencilView); - assert(g_pDepthStencilView); - - // set device context to the render target - g_pd3dDeviceContext->OMSetRenderTargets(1, &g_pSwapChainRTV, g_pDepthStencilView); - - // init viewport - D3D11_VIEWPORT vp; - vp.TopLeftX = 0; - vp.TopLeftY = 0; - vp.Width = (float)g_width; - vp.Height = (float)g_height; - vp.MinDepth = 0.0f; - vp.MaxDepth = 1.0f; - g_pd3dDeviceContext->RSSetViewports(1, &vp); - - return true; -} - -//------------------------------------------------------------------------------ -static void -callbackError(OpenSubdiv::OsdErrorType err, const char *message) -{ - std::ostringstream s; - s << "OsdError: " << err << "\n"; - s << message; - OutputDebugString(s.str().c_str()); -} - -//------------------------------------------------------------------------------ -static LRESULT WINAPI -msgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ - switch(msg) - { - case WM_KEYDOWN: - keyboard(MapVirtualKey(UINT(wParam), MAPVK_VK_TO_CHAR)); - break; - case WM_DESTROY: - quit(); - return 0; - case WM_MOUSEMOVE: - motion(LOWORD(lParam), HIWORD(lParam)); - return 0; - case WM_LBUTTONDOWN: - mouse(0, 1, LOWORD(lParam), HIWORD(lParam)); - return 0; - case WM_LBUTTONUP: - mouse(0, 0, LOWORD(lParam), HIWORD(lParam)); - return 0; - case WM_MBUTTONDOWN: - mouse(1, 1, LOWORD(lParam), HIWORD(lParam)); - return 0; - case WM_MBUTTONUP: - mouse(1, 0, LOWORD(lParam), HIWORD(lParam)); - return 0; - case WM_RBUTTONDOWN: - mouse(2, 1, LOWORD(lParam), HIWORD(lParam)); - return 0; - case WM_RBUTTONUP: - mouse(2, 0, LOWORD(lParam), HIWORD(lParam)); - return 0; - case WM_PAINT: - ValidateRect(hWnd, NULL); - return 0; - } - return DefWindowProc(hWnd, msg, wParam, lParam); -} - -int WINAPI -WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - // register window class - TCHAR szWindowClass[] = "OPENSUBDIV_EXAMPLE"; - WNDCLASS wcex; - wcex.style = CS_HREDRAW | CS_VREDRAW; - wcex.lpfnWndProc = msgProc; - wcex.cbClsExtra = 0; - wcex.cbWndExtra = 0; - wcex.hInstance = hInstance; - wcex.hIcon = NULL; - wcex.hCursor = NULL; - wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); - wcex.lpszMenuName = NULL; - wcex.lpszClassName = szWindowClass; - RegisterClass(&wcex); - - // crete window - RECT rect = { 0, 0, g_width, g_height }; - AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE); - - HWND hWnd = CreateWindow(szWindowClass, - "OpenSubdiv DirectX Viewer", - WS_OVERLAPPEDWINDOW | WS_VISIBLE, - CW_USEDEFAULT, - CW_USEDEFAULT, - rect.right - rect.left, - rect.bottom - rect.top, - NULL, - NULL, - hInstance, - NULL); - - initializeShapes(); - - OsdSetErrorCallback(callbackError); - - initD3D11(hWnd); - - initHUD(); - - // main loop - while (g_bDone == false) { - MSG msg; - ZeroMemory(&msg, sizeof(msg)); - while (msg.message != WM_QUIT) { - while (PeekMessage(&msg, NULL, 0U, 0U, PM_REMOVE)) { - if (msg.message == WM_QUIT) goto end; - TranslateMessage(&msg); - DispatchMessage(&msg); - } - if (not g_freeze) - g_frame++; - - updateGeom(); - updateRenderTarget(hWnd); - display(); - } - } - end: - - quit(); -} - -//------------------------------------------------------------------------------ +// +// Copyright 2013 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: +// +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. +// +// 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 +#include +#include +#include + +#include +#include +#include +OpenSubdiv::OsdCpuComputeController * g_cpuComputeController = NULL; + +#ifdef OPENSUBDIV_HAS_OPENMP + #include + OpenSubdiv::OsdOmpComputeController * g_ompComputeController = NULL; +#endif + +#undef OPENSUBDIV_HAS_OPENCL // XXX: dyu OpenCL D3D11 interop needs work... +#ifdef OPENSUBDIV_HAS_OPENCL + #include + #include + #include + + #include "../common/clInit.h" + + cl_context g_clContext; + cl_command_queue g_clQueue; + OpenSubdiv::OsdCLComputeController * g_clComputeController = NULL; +#endif + +#ifdef OPENSUBDIV_HAS_CUDA + #include + #include + #include + + #include + #include + + bool g_cudaInitialized = false; + OpenSubdiv::OsdCudaComputeController * g_cudaComputeController = NULL; +#endif + +#include +#include +#include +OpenSubdiv::OsdD3D11ComputeController * g_d3d11ComputeController = NULL; + +#include +OpenSubdiv::OsdD3D11MeshInterface *g_mesh; + +#include "../../regression/common/shape_utils.h" +#include "../common/stopwatch.h" +#include "../common/simple_math.h" +#include "../common/d3d11_hud.h" + +static const char *shaderSource = +#include "shader.inc" +; + +#include +#include +#include +#include + +#define SAFE_RELEASE(p) { if(p) { (p)->Release(); (p)=NULL; } } + +typedef OpenSubdiv::HbrMesh OsdHbrMesh; +typedef OpenSubdiv::HbrVertex OsdHbrVertex; +typedef OpenSubdiv::HbrFace OsdHbrFace; +typedef OpenSubdiv::HbrHalfedge OsdHbrHalfedge; + +enum KernelType { kCPU = 0, + kOPENMP = 1, + kCUDA = 2, + kCL = 3, + kDirectCompute = 4 }; + +struct SimpleShape { + std::string name; + Scheme scheme; + std::string data; + + SimpleShape() { } + SimpleShape( std::string const & idata, char const * iname, Scheme ischeme ) + : name(iname), scheme(ischeme), data(idata) { } +}; + +std::vector g_defaultShapes; + +int g_currentShape = 0; + +int g_frame = 0, + g_repeatCount = 0; + +// GUI variables +int g_freeze = 0, + g_wire = 2, + g_adaptive = 1, + g_drawCageEdges = 1, + g_drawCageVertices = 0, + g_drawPatchCVs = 0, + g_drawNormals = 0, + g_mbutton[3] = {0, 0, 0}; + +int g_displayPatchColor = 1; + +float g_rotate[2] = {0, 0}, + g_prev_x = 0, + g_prev_y = 0, + g_dolly = 5, + g_pan[2] = {0, 0}, + g_center[3] = {0, 0, 0}, + g_size = 0; + +int g_width = 1024, + g_height = 1024; + +D3D11hud *g_hud = NULL; + +// performance +float g_cpuTime = 0; +float g_gpuTime = 0; +Stopwatch g_fpsTimer; + +// geometry +std::vector g_orgPositions, + g_positions, + g_normals; + +Scheme g_scheme; + +int g_level = 2; +int g_tessLevel = 1; +int g_tessLevelMin = 1; +int g_kernel = kCPU; +float g_moveScale = 0.0f; + +std::vector g_coarseEdges; +std::vector g_coarseEdgeSharpness; +std::vector g_coarseVertexSharpness; + +ID3D11Device * g_pd3dDevice = NULL; +ID3D11DeviceContext * g_pd3dDeviceContext = NULL; +IDXGISwapChain * g_pSwapChain = NULL; +ID3D11RenderTargetView * g_pSwapChainRTV = NULL; + +ID3D11RasterizerState* g_pRasterizerState = NULL; +ID3D11InputLayout* g_pInputLayout = NULL; +ID3D11DepthStencilState* g_pDepthStencilState = NULL; +ID3D11Texture2D * g_pDepthStencilBuffer = NULL; +ID3D11Buffer* g_pcbPerFrame = NULL; +ID3D11Buffer* g_pcbTessellation = NULL; +ID3D11Buffer* g_pcbLighting = NULL; +ID3D11DepthStencilView* g_pDepthStencilView = NULL; + +bool g_bDone; + +//------------------------------------------------------------------------------ +static void +initializeShapes( ) { + +#include + g_defaultShapes.push_back(SimpleShape(catmark_cube_corner0, "catmark_cube_corner0", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_cube_corner1, "catmark_cube_corner1", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_cube_corner2, "catmark_cube_corner2", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_cube_corner3, "catmark_cube_corner3", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_cube_corner4, "catmark_cube_corner4", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_cube_creases0, "catmark_cube_creases0", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_cube_creases1, "catmark_cube_creases1", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_cube, "catmark_cube", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_dart_edgecorner, "catmark_dart_edgecorner", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_dart_edgeonly, "catmark_dart_edgeonly", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_edgecorner ,"catmark_edgecorner", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_edgeonly, "catmark_edgeonly", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_gregory_test1, "catmark_gregory_test1", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_gregory_test2, "catmark_gregory_test2", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_gregory_test3, "catmark_gregory_test3", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_gregory_test4, "catmark_gregory_test4", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_hole_test1, "catmark_hole_test1", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_hole_test2, "catmark_hole_test2", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_pyramid_creases0, "catmark_pyramid_creases0", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_pyramid_creases1, "catmark_pyramid_creases1", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_pyramid, "catmark_pyramid", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_tent_creases0, "catmark_tent_creases0", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_tent_creases1, "catmark_tent_creases1", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_tent, "catmark_tent", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_torus, "catmark_torus", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_torus_creases0, "catmark_torus_creases0", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_square_hedit0, "catmark_square_hedit0", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_square_hedit1, "catmark_square_hedit1", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_square_hedit2, "catmark_square_hedit2", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_square_hedit3, "catmark_square_hedit3", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_square_hedit4, "catmark_square_hedit4", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_bishop, "catmark_bishop", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_car, "catmark_car", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_helmet, "catmark_helmet", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_pawn, "catmark_pawn", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(catmark_rook, "catmark_rook", kCatmark)); + +#include + g_defaultShapes.push_back(SimpleShape(bilinear_cube, "bilinear_cube", kBilinear)); + + +#include + g_defaultShapes.push_back(SimpleShape(loop_cube_creases0, "loop_cube_creases0", kLoop)); + +#include + g_defaultShapes.push_back(SimpleShape(loop_cube_creases1, "loop_cube_creases1", kLoop)); + +#include + g_defaultShapes.push_back(SimpleShape(loop_cube, "loop_cube", kLoop)); + +#include + g_defaultShapes.push_back(SimpleShape(loop_icosahedron, "loop_icosahedron", kLoop)); + +#include + g_defaultShapes.push_back(SimpleShape(loop_saddle_edgecorner, "loop_saddle_edgecorner", kLoop)); + +#include + g_defaultShapes.push_back(SimpleShape(loop_saddle_edgeonly, "loop_saddle_edgeonly", kLoop)); + +#include + g_defaultShapes.push_back(SimpleShape(loop_triangle_edgecorner, "loop_triangle_edgecorner", kLoop)); + +#include + g_defaultShapes.push_back(SimpleShape(loop_triangle_edgeonly, "loop_triangle_edgeonly", kLoop)); +} + +//------------------------------------------------------------------------------ +static void +calcNormals(OsdHbrMesh * mesh, std::vector const & pos, std::vector & result ) { + + // calc normal vectors + int nverts = (int)pos.size()/3; + + int nfaces = mesh->GetNumCoarseFaces(); + for (int i = 0; i < nfaces; ++i) { + + OsdHbrFace * f = mesh->GetFace(i); + + float const * p0 = &pos[f->GetVertex(0)->GetID()*3], + * p1 = &pos[f->GetVertex(1)->GetID()*3], + * p2 = &pos[f->GetVertex(2)->GetID()*3]; + + float n[3]; + cross( n, p0, p1, p2 ); + + for (int j = 0; j < f->GetNumVertices(); j++) { + int idx = f->GetVertex(j)->GetID() * 3; + result[idx ] += n[0]; + result[idx+1] += n[1]; + result[idx+2] += n[2]; + } + } + for (int i = 0; i < nverts; ++i) + normalize( &result[i*3] ); +} + +//------------------------------------------------------------------------------ +static void +updateGeom() { + + int nverts = (int)g_orgPositions.size() / 3; + + std::vector vertex; + vertex.reserve(nverts*6); + + const float *p = &g_orgPositions[0]; + const float *n = &g_normals[0]; + + float r = sin(g_frame*0.001f) * g_moveScale; + for (int i = 0; i < nverts; ++i) { + float move = 0.05f*cosf(p[0]*20+g_frame*0.01f); + float ct = cos(p[2] * r); + float st = sin(p[2] * r); + g_positions[i*3+0] = p[0]*ct + p[1]*st; + g_positions[i*3+1] = -p[0]*st + p[1]*ct; + g_positions[i*3+2] = p[2]; + + p += 3; + } + + p = &g_positions[0]; + for (int i = 0; i < nverts; ++i) { + vertex.push_back(p[0]); + vertex.push_back(p[1]); + vertex.push_back(p[2]); + vertex.push_back(n[0]); + vertex.push_back(n[1]); + vertex.push_back(n[2]); + + p += 3; + n += 3; + } + + g_mesh->UpdateVertexBuffer(&vertex[0], 0, nverts); + + Stopwatch s; + s.Start(); + + g_mesh->Refine(); + + s.Stop(); + g_cpuTime = float(s.GetElapsed() * 1000.0f); + s.Start(); + + g_mesh->Synchronize(); + + s.Stop(); + g_gpuTime = float(s.GetElapsed() * 1000.0f); +} + +//------------------------------------------------------------------------------ +static const char * +getKernelName(int kernel) { + + if (kernel == kCPU) + return "CPU"; + else if (kernel == kOPENMP) + return "OpenMP"; + else if (kernel == kCUDA) + return "Cuda"; + else if (kernel == kCL) + return "OpenCL"; + else if (kernel == kDirectCompute) + return "DirectCompute"; + return "Unknown"; +} + +//------------------------------------------------------------------------------ +static void +createOsdMesh( const std::string &shape, int level, int kernel, Scheme scheme=kCatmark ) { + + // generate Hbr representation from "obj" description + OsdHbrMesh * hmesh = simpleHbr(shape.c_str(), scheme, g_orgPositions); + + g_normals.resize(g_orgPositions.size(),0.0f); + g_positions.resize(g_orgPositions.size(),0.0f); + calcNormals( hmesh, g_orgPositions, g_normals ); + + // save coarse topology (used for coarse mesh drawing) + g_coarseEdges.clear(); + g_coarseEdgeSharpness.clear(); + g_coarseVertexSharpness.clear(); + int nf = hmesh->GetNumFaces(); + for(int i=0; iGetFace(i); + int nv = face->GetNumVertices(); + for(int j=0; jGetVertex(j)->GetID()); + g_coarseEdges.push_back(face->GetVertex((j+1)%nv)->GetID()); + g_coarseEdgeSharpness.push_back(face->GetEdge(j)->GetSharpness()); + } + } + int nv = hmesh->GetNumVertices(); + for(int i=0; iGetVertex(i)->GetSharpness()); + } + + delete g_mesh; + g_mesh = NULL; + + g_scheme = scheme; + + // Adaptive refinement currently supported only for catmull-clark scheme + bool doAdaptive = (g_adaptive!=0 and g_scheme==kCatmark); + + OpenSubdiv::OsdMeshBitset bits; + bits.set(OpenSubdiv::MeshAdaptive, doAdaptive); + + int numVertexElements = 6; + int numVaryingElements = 0; + + if (g_kernel == kCPU) { + if (not g_cpuComputeController) { + g_cpuComputeController = new OpenSubdiv::OsdCpuComputeController(); + } + g_mesh = new OpenSubdiv::OsdMesh( + g_cpuComputeController, + hmesh, + numVertexElements, + numVaryingElements, + level, bits, g_pd3dDeviceContext); +#ifdef OPENSUBDIV_HAS_OPENMP + } else if (kernel == kOPENMP) { + if (not g_ompComputeController) { + g_ompComputeController = new OpenSubdiv::OsdOmpComputeController(); + } + g_mesh = new OpenSubdiv::OsdMesh( + g_ompComputeController, + hmesh, + numVertexElements, + numVaryingElements, + level, bits, g_pd3dDeviceContext); +#endif +#ifdef OPENSUBDIV_HAS_OPENCL + } else if(kernel == kCL) { + if (not g_clComputeController) { + g_clComputeController = new OpenSubdiv::OsdCLComputeController(g_clContext, g_clQueue); + } + g_mesh = new OpenSubdiv::OsdMesh( + g_clComputeController, + hmesh, + numVertexElements, + numVaryingElements, + level, bits, g_pd3dDeviceContext); +#endif +#ifdef OPENSUBDIV_HAS_CUDA + } else if (g_kernel == kCUDA) { + if (not g_cudaComputeController) { + g_cudaComputeController = new OpenSubdiv::OsdCudaComputeController(); + } + g_mesh = new OpenSubdiv::OsdMesh( + g_cudaComputeController, + hmesh, + numVertexElements, + numVaryingElements, + level, bits, g_pd3dDeviceContext); +#endif + } else if (g_kernel == kDirectCompute) { + if (not g_d3d11ComputeController) { + g_d3d11ComputeController = new OpenSubdiv::OsdD3D11ComputeController(g_pd3dDeviceContext); + } + g_mesh = new OpenSubdiv::OsdMesh( + g_d3d11ComputeController, + hmesh, + numVertexElements, + numVaryingElements, + level, bits, g_pd3dDeviceContext); + } else { + printf("Unsupported kernel %s\n", getKernelName(kernel)); + } + + // Hbr mesh can be deleted + delete hmesh; + + // compute model bounding + float min[3] = { FLT_MAX, FLT_MAX, FLT_MAX}; + float max[3] = {-FLT_MAX, -FLT_MAX, -FLT_MAX}; + for (size_t i=0; i EffectDesc; + +class EffectDrawRegistry : public OpenSubdiv::OsdD3D11DrawRegistry { + +protected: + virtual ConfigType * + _CreateDrawConfig(DescType const & desc, + SourceConfigType const * sconfig, + ID3D11Device * pd3dDevice, + ID3D11InputLayout ** ppInputLayout, + D3D11_INPUT_ELEMENT_DESC const * pInputElementDescs, + int numInputElements); + + virtual SourceConfigType * + _CreateDrawSourceConfig(DescType const & desc, ID3D11Device * pd3dDevice); +}; + +EffectDrawRegistry::SourceConfigType * +EffectDrawRegistry::_CreateDrawSourceConfig( + DescType const & desc, ID3D11Device * pd3dDevice) +{ + Effect effect = desc.second; + + SourceConfigType * sconfig = + BaseRegistry::_CreateDrawSourceConfig(desc.first, pd3dDevice); + + sconfig->commonShader.AddDefine("OSD_ENABLE_PATCH_CULL"); + sconfig->commonShader.AddDefine("OSD_ENABLE_SCREENSPACE_TESSELLATION"); + + bool smoothNormals = false; + if (desc.first.GetType() == OpenSubdiv::FarPatchTables::QUADS || + desc.first.GetType() == OpenSubdiv::FarPatchTables::TRIANGLES) { + sconfig->vertexShader.source = shaderSource; + sconfig->vertexShader.target = "vs_5_0"; + sconfig->vertexShader.entry = "vs_main"; + } else { + if (effect == kQuadWire) effect = kTriWire; + if (effect == kQuadFill) effect = kTriFill; + if (effect == kQuadLine) effect = kTriLine; + smoothNormals = true; + } + assert(sconfig); + + sconfig->geometryShader.source = shaderSource; + sconfig->geometryShader.target = "gs_5_0"; + + sconfig->pixelShader.source = shaderSource; + sconfig->pixelShader.target = "ps_5_0"; + + switch (effect) { + case kQuadWire: + sconfig->geometryShader.entry = "gs_quad_wire"; + sconfig->geometryShader.AddDefine("PRIM_QUAD"); + sconfig->geometryShader.AddDefine("GEOMETRY_OUT_WIRE"); + sconfig->pixelShader.entry = "ps_main"; + sconfig->pixelShader.AddDefine("PRIM_QUAD"); + sconfig->pixelShader.AddDefine("GEOMETRY_OUT_WIRE"); + break; + case kQuadFill: + sconfig->geometryShader.entry = "gs_quad"; + sconfig->geometryShader.AddDefine("PRIM_QUAD"); + sconfig->geometryShader.AddDefine("GEOMETRY_OUT_FILL"); + sconfig->pixelShader.entry = "ps_main"; + sconfig->pixelShader.AddDefine("PRIM_QUAD"); + sconfig->pixelShader.AddDefine("GEOMETRY_OUT_FILL"); + break; + case kQuadLine: + sconfig->geometryShader.entry = "gs_quad_wire"; + sconfig->geometryShader.AddDefine("PRIM_QUAD"); + sconfig->geometryShader.AddDefine("GEOMETRY_OUT_LINE"); + sconfig->pixelShader.entry = "ps_main"; + sconfig->pixelShader.AddDefine("PRIM_QUAD"); + sconfig->pixelShader.AddDefine("GEOMETRY_OUT_LINE"); + break; + case kTriWire: + sconfig->geometryShader.entry = + smoothNormals ? "gs_triangle_smooth_wire" : "gs_triangle_wire"; + sconfig->geometryShader.AddDefine("PRIM_TRI"); + sconfig->geometryShader.AddDefine("GEOMETRY_OUT_WIRE"); + sconfig->pixelShader.entry = "ps_main"; + sconfig->pixelShader.AddDefine("PRIM_TRI"); + sconfig->pixelShader.AddDefine("GEOMETRY_OUT_WIRE"); + break; + case kTriFill: + sconfig->geometryShader.entry = + smoothNormals ? "gs_triangle_smooth" : "gs_triangle"; + sconfig->geometryShader.AddDefine("PRIM_TRI"); + sconfig->geometryShader.AddDefine("GEOMETRY_OUT_FILL"); + sconfig->pixelShader.entry = "ps_main"; + sconfig->pixelShader.AddDefine("PRIM_TRI"); + sconfig->pixelShader.AddDefine("GEOMETRY_OUT_FILL"); + break; + case kTriLine: + sconfig->geometryShader.entry = + smoothNormals ? "gs_triangle_smooth_wire" : "gs_triangle_wire"; + sconfig->geometryShader.AddDefine("PRIM_TRI"); + sconfig->geometryShader.AddDefine("GEOMETRY_OUT_LINE"); + sconfig->pixelShader.entry = "ps_main"; + sconfig->pixelShader.AddDefine("PRIM_TRI"); + sconfig->pixelShader.AddDefine("GEOMETRY_OUT_LINE"); + break; + case kPoint: + sconfig->geometryShader.entry = "gs_point"; + sconfig->pixelShader.entry = "ps_main_point"; + break; + } + + return sconfig; +} + +EffectDrawRegistry::ConfigType * +EffectDrawRegistry::_CreateDrawConfig( + DescType const & desc, + SourceConfigType const * sconfig, + ID3D11Device * pd3dDevice, + ID3D11InputLayout ** ppInputLayout, + D3D11_INPUT_ELEMENT_DESC const * pInputElementDescs, + int numInputElements) +{ + ConfigType * config = BaseRegistry::_CreateDrawConfig(desc.first, sconfig, + pd3dDevice, ppInputLayout, pInputElementDescs, numInputElements); + assert(config); + + return config; +} + +EffectDrawRegistry effectRegistry; + +static Effect +GetEffect() +{ + if (g_scheme == kLoop) { + return (g_wire == 0 ? kTriWire : (g_wire == 1 ? kTriFill : kTriLine)); + } else { + return (g_wire == 0 ? kQuadWire : (g_wire == 1 ? kQuadFill : kQuadLine)); + } +} + +//------------------------------------------------------------------------------ +static void +bindProgram(Effect effect, OpenSubdiv::OsdDrawContext::PatchArray const & patch) +{ + EffectDesc effectDesc(patch.GetDescriptor(), effect); + + // input layout + const D3D11_INPUT_ELEMENT_DESC hInElementDesc[] = { + { "POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0 }, + { "NORMAL", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 4*3, D3D11_INPUT_PER_VERTEX_DATA, 0 } + }; + + EffectDrawRegistry::ConfigType * + config = effectRegistry.GetDrawConfig( + effectDesc, g_pd3dDevice, + &g_pInputLayout, hInElementDesc, ARRAYSIZE(hInElementDesc)); + + assert(g_pInputLayout); + + // Update transform state + { + __declspec(align(16)) + struct CB_PER_FRAME_CONSTANTS + { + float ModelViewMatrix[16]; + float ProjectionMatrix[16]; + float ModelViewProjectionMatrix[16]; + }; + + if (! g_pcbPerFrame) { + D3D11_BUFFER_DESC cbDesc; + ZeroMemory(&cbDesc, sizeof(cbDesc)); + cbDesc.Usage = D3D11_USAGE_DYNAMIC; + cbDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER; + cbDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE; + cbDesc.MiscFlags = 0; + cbDesc.ByteWidth = sizeof(CB_PER_FRAME_CONSTANTS); + g_pd3dDevice->CreateBuffer(&cbDesc, NULL, &g_pcbPerFrame); + } + assert(g_pcbPerFrame); + + D3D11_MAPPED_SUBRESOURCE MappedResource; + g_pd3dDeviceContext->Map(g_pcbPerFrame, 0, D3D11_MAP_WRITE_DISCARD, 0, &MappedResource); + CB_PER_FRAME_CONSTANTS* pData = ( CB_PER_FRAME_CONSTANTS* )MappedResource.pData; + + float aspect = (g_height > 0) ? (float)g_width / g_height : 1.0f; + identity(pData->ModelViewMatrix); + translate(pData->ModelViewMatrix, -g_pan[0], -g_pan[1], -g_dolly); + rotate(pData->ModelViewMatrix, g_rotate[1], 1, 0, 0); + rotate(pData->ModelViewMatrix, g_rotate[0], 0, 1, 0); + translate(pData->ModelViewMatrix, -g_center[0], -g_center[2], g_center[1]); // z-up model + rotate(pData->ModelViewMatrix, -90, 1, 0, 0); // z-up model + + identity(pData->ProjectionMatrix); + perspective(pData->ProjectionMatrix, 45.0, aspect, 0.01f, 500.0); + multMatrix(pData->ModelViewProjectionMatrix, pData->ModelViewMatrix, pData->ProjectionMatrix); + + g_pd3dDeviceContext->Unmap( g_pcbPerFrame, 0 ); + } + + // Update tessellation state + { + __declspec(align(16)) + struct Tessellation { + float TessLevel; + int GregoryQuadOffsetBase; + int PrimitiveIdBase; + }; + + if (! g_pcbTessellation) { + D3D11_BUFFER_DESC cbDesc; + ZeroMemory(&cbDesc, sizeof(cbDesc)); + cbDesc.Usage = D3D11_USAGE_DYNAMIC; + cbDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER; + cbDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE; + cbDesc.MiscFlags = 0; + cbDesc.ByteWidth = sizeof(Tessellation); + g_pd3dDevice->CreateBuffer(&cbDesc, NULL, &g_pcbTessellation); + } + assert(g_pcbTessellation); + + D3D11_MAPPED_SUBRESOURCE MappedResource; + g_pd3dDeviceContext->Map(g_pcbTessellation, 0, D3D11_MAP_WRITE_DISCARD, 0, &MappedResource); + Tessellation * pData = ( Tessellation* )MappedResource.pData; + + pData->TessLevel = static_cast(1 << g_tessLevel); + pData->GregoryQuadOffsetBase = patch.GetQuadOffsetIndex(); + pData->PrimitiveIdBase = patch.GetPatchIndex(); + + g_pd3dDeviceContext->Unmap( g_pcbTessellation, 0 ); + } + + g_pd3dDeviceContext->IASetInputLayout(g_pInputLayout); + + g_pd3dDeviceContext->VSSetShader(config->vertexShader, NULL, 0); + g_pd3dDeviceContext->VSSetConstantBuffers(0, 1, &g_pcbPerFrame); + g_pd3dDeviceContext->HSSetShader(config->hullShader, NULL, 0); + g_pd3dDeviceContext->HSSetConstantBuffers(0, 1, &g_pcbPerFrame); + g_pd3dDeviceContext->HSSetConstantBuffers(1, 1, &g_pcbTessellation); + g_pd3dDeviceContext->DSSetShader(config->domainShader, NULL, 0); + g_pd3dDeviceContext->DSSetConstantBuffers(0, 1, &g_pcbPerFrame); + g_pd3dDeviceContext->GSSetShader(config->geometryShader, NULL, 0); + g_pd3dDeviceContext->GSSetConstantBuffers(0, 1, &g_pcbPerFrame); + g_pd3dDeviceContext->PSSetShader(config->pixelShader, NULL, 0); + g_pd3dDeviceContext->PSSetConstantBuffers(0, 1, &g_pcbPerFrame); + g_pd3dDeviceContext->PSSetConstantBuffers(2, 1, &g_pcbLighting); + + if (g_mesh->GetDrawContext()->vertexBufferSRV) { + g_pd3dDeviceContext->VSSetShaderResources(0, 1, &g_mesh->GetDrawContext()->vertexBufferSRV); + } + if (g_mesh->GetDrawContext()->vertexValenceBufferSRV) { + g_pd3dDeviceContext->VSSetShaderResources(1, 1, &g_mesh->GetDrawContext()->vertexValenceBufferSRV); + } + if (g_mesh->GetDrawContext()->quadOffsetBufferSRV) { + g_pd3dDeviceContext->HSSetShaderResources(2, 1, &g_mesh->GetDrawContext()->quadOffsetBufferSRV); + } + if (g_mesh->GetDrawContext()->ptexCoordinateBufferSRV) { + g_pd3dDeviceContext->HSSetShaderResources(3, 1, &g_mesh->GetDrawContext()->ptexCoordinateBufferSRV); + g_pd3dDeviceContext->DSSetShaderResources(3, 1, &g_mesh->GetDrawContext()->ptexCoordinateBufferSRV); + } +} + +//------------------------------------------------------------------------------ +static void +display() +{ + float color[4] = {0.006f, 0.006f, 0.006f, 1.0f}; + g_pd3dDeviceContext->ClearRenderTargetView(g_pSwapChainRTV, color); + + // Clear the depth buffer. + g_pd3dDeviceContext->ClearDepthStencilView(g_pDepthStencilView, D3D11_CLEAR_DEPTH, 1.0f, 0); + + g_pd3dDeviceContext->OMSetDepthStencilState(g_pDepthStencilState, 1); + g_pd3dDeviceContext->RSSetState(g_pRasterizerState); + + ID3D11Buffer *buffer = g_mesh->BindVertexBuffer(); + assert(buffer); + + UINT hStrides = 6*sizeof(float); + UINT hOffsets = 0; + g_pd3dDeviceContext->IASetVertexBuffers(0, 1, &buffer, &hStrides, &hOffsets); + + OpenSubdiv::OsdDrawContext::PatchArrayVector const & patches = g_mesh->GetDrawContext()->patchArrays; + + g_pd3dDeviceContext->IASetIndexBuffer(g_mesh->GetDrawContext()->patchIndexBuffer, DXGI_FORMAT_R32_UINT, 0); + + // cv drawing +#if 0 + if (g_drawPatchCVs) { + + bindProgram(kPoint, OpenSubdiv::OsdDrawContext::PatchArray()); + + g_pd3dDeviceContext->IASetPrimitiveTopology( + D3D11_PRIMITIVE_TOPOLOGY_POINTLIST); + + for (int i=0; i<(int)patches.size(); ++i) { + OpenSubdiv::OsdDrawContext::PatchArray const & patch = patches[i]; + + g_pd3dDeviceContext->DrawIndexed(patch.GetNumIndices(), + patch.GetVertIndex(), 0); + } + } +#endif + + // patch drawing + for (int i=0; i<(int)patches.size(); ++i) { + OpenSubdiv::OsdDrawContext::PatchArray const & patch = patches[i]; + + D3D11_PRIMITIVE_TOPOLOGY topology; + + if (g_mesh->GetDrawContext()->IsAdaptive()) { + + switch (patch.GetDescriptor().GetNumControlVertices()) { + case 4: + topology = D3D11_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST; + break; + case 9: + topology = D3D11_PRIMITIVE_TOPOLOGY_9_CONTROL_POINT_PATCHLIST; + break; + case 12: + topology = D3D11_PRIMITIVE_TOPOLOGY_12_CONTROL_POINT_PATCHLIST; + break; + case 16: + topology = D3D11_PRIMITIVE_TOPOLOGY_16_CONTROL_POINT_PATCHLIST; + break; + default: + assert(false); + break; + } + + } else { + if (g_scheme == kLoop) { + topology = D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST; + } else { + topology = D3D11_PRIMITIVE_TOPOLOGY_LINELIST_ADJ; + } + } + + bindProgram(GetEffect(), patch); + + g_pd3dDeviceContext->IASetPrimitiveTopology(topology); + + g_pd3dDeviceContext->DrawIndexed( + patch.GetNumIndices(), patch.GetVertIndex(), 0); + } + + if (g_hud->IsVisible()) { + g_fpsTimer.Stop(); + double fps = 1.0/g_fpsTimer.GetElapsed(); + g_fpsTimer.Start(); + + g_hud->DrawString(10, -100, "# of Vertices = %d", g_mesh->GetNumVertices()); + g_hud->DrawString(10, -80, "SUBDIVISION = %s", + g_scheme==kBilinear ? "BILINEAR" : (g_scheme == kLoop ? "LOOP" : "CATMARK")); + g_hud->DrawString(10, -60, "GPU TIME = %.3f ms", g_gpuTime); + g_hud->DrawString(10, -40, "CPU TIME = %.3f ms", g_cpuTime); + g_hud->DrawString(10, -20, "FPS = %3.1f", fps); + } + + g_hud->Flush(); + + g_pSwapChain->Present(0, 0); +} + +//------------------------------------------------------------------------------ +static void +motion(int x, int y) { + + if (g_mbutton[0] && !g_mbutton[1] && !g_mbutton[2]) { + // orbit + g_rotate[0] += x - g_prev_x; + g_rotate[1] += y - g_prev_y; + } else if (!g_mbutton[0] && g_mbutton[1] && !g_mbutton[2]) { + // pan + g_pan[0] -= g_dolly*(x - g_prev_x)/g_width; + g_pan[1] += g_dolly*(y - g_prev_y)/g_height; + } else if ((g_mbutton[0] && g_mbutton[1] && !g_mbutton[2]) or + (!g_mbutton[0] && !g_mbutton[1] && g_mbutton[2])) { + // dolly + g_dolly -= g_dolly*0.01f*(x - g_prev_x); + if(g_dolly <= 0.01) g_dolly = 0.01f; + } + + g_prev_x = float(x); + g_prev_y = float(y); +} + +//------------------------------------------------------------------------------ +static void +mouse(int button, int state, int x, int y) { + + if (button == 0 && state == 1 && g_hud->MouseClick(x, y)) return; + + if (button < 3) { + g_prev_x = float(x); + g_prev_y = float(y); + g_mbutton[button] = state; + } +} + +//----------------------------------------------------------------------------- +static void +quit() { + + g_bDone = true; + + if (g_mesh) + delete g_mesh; + + if (g_hud) + delete g_hud; + + SAFE_RELEASE(g_pRasterizerState); + SAFE_RELEASE(g_pInputLayout); + SAFE_RELEASE(g_pDepthStencilState); + SAFE_RELEASE(g_pcbPerFrame); + SAFE_RELEASE(g_pcbTessellation); + SAFE_RELEASE(g_pcbLighting); + SAFE_RELEASE(g_pDepthStencilView); + + SAFE_RELEASE(g_pSwapChainRTV); + SAFE_RELEASE(g_pSwapChain); + SAFE_RELEASE(g_pd3dDeviceContext); + SAFE_RELEASE(g_pd3dDevice); + + delete g_cpuComputeController; + +#ifdef OPENSUBDIV_HAS_OPENMP + delete g_ompComputeController; +#endif + +#ifdef OPENSUBDIV_HAS_OPENCL + delete g_clComputeController; + uninitCL(g_clContext, g_clQueue); +#endif + +#ifdef OPENSUBDIV_HAS_CUDA + delete g_cudaComputeController; + cudaDeviceReset(); +#endif + + delete g_d3d11ComputeController; + + PostQuitMessage(0); + exit(0); +} + +//------------------------------------------------------------------------------ +static void +keyboard(char key) { + + if (g_hud->KeyDown((int)key)) return; + + switch (key) { + case 'Q': quit(); + case 'F': fitFrame(); break; + case '+': + case '=': g_tessLevel++; break; + case '-': g_tessLevel = std::max(g_tessLevelMin, g_tessLevel-1); break; + case 0x1b: g_hud->SetVisible(!g_hud->IsVisible()); break; + } +} + +//------------------------------------------------------------------------------ +static void +callbackWireframe(int b) +{ + g_wire = b; +} + +static void +callbackKernel(int k) +{ + g_kernel = k; + +#ifdef OPENSUBDIV_HAS_OPENCL + if (g_kernel == kCL and g_clContext == NULL) { + if (initCL(&g_clContext, &g_clQueue) == false) { + printf("Error in initializing OpenCL\n"); + exit(1); + } + } +#endif +#ifdef OPENSUBDIV_HAS_CUDA + if (g_kernel == kCUDA and g_cudaInitialized == false) { + g_cudaInitialized = true; + cudaD3D11SetDirect3DDevice( g_pd3dDevice ); + } +#endif + + createOsdMesh( g_defaultShapes[ g_currentShape ].data, g_level, g_kernel, g_defaultShapes[ g_currentShape ].scheme ); +} + +static void +callbackLevel(int l) +{ + g_level = l; + createOsdMesh( g_defaultShapes[g_currentShape].data, g_level, g_kernel, g_defaultShapes[ g_currentShape ].scheme ); +} + +static void +callbackModel(int m) +{ + if (m < 0) + m = 0; + + if (m >= (int)g_defaultShapes.size()) + m = (int)g_defaultShapes.size() - 1; + + g_currentShape = m; + + createOsdMesh( g_defaultShapes[m].data, g_level, g_kernel, g_defaultShapes[ g_currentShape ].scheme ); +} + +static void +callbackDisplayNormal(bool checked, int n) +{ + g_drawNormals = checked; +} + +static void +callbackAnimate(bool checked, int m) +{ + g_moveScale = checked; +} + +static void +callbackFreeze(bool checked, int f) +{ + g_freeze = checked; +} + +static void +callbackAdaptive(bool checked, int a) +{ + g_adaptive = checked; + + createOsdMesh( g_defaultShapes[g_currentShape].data, g_level, g_kernel, g_defaultShapes[ g_currentShape ].scheme ); +} + +static void +callbackDisplayCageEdges(bool checked, int d) +{ + g_drawCageEdges = checked; +} + +static void +callbackDisplayCageVertices(bool checked, int d) +{ + g_drawCageVertices = checked; +} + +static void +callbackDisplayPatchCVs(bool checked, int d) +{ + g_drawPatchCVs = checked; +} + +static void +callbackDisplayPatchColor(bool checked, int p) +{ + g_displayPatchColor = checked; +} + +static void +initHUD() +{ + g_hud = new D3D11hud(g_pd3dDeviceContext); + g_hud->Init(g_width, g_height); + + g_hud->AddRadioButton(0, "CPU (K)", true, 10, 10, callbackKernel, kCPU, 'K'); +#ifdef OPENSUBDIV_HAS_OPENMP + g_hud->AddRadioButton(0, "OPENMP", false, 10, 30, callbackKernel, kOPENMP, 'K'); +#endif +#ifdef OPENSUBDIV_HAS_CUDA + g_hud->AddRadioButton(0, "CUDA", false, 10, 50, callbackKernel, kCUDA, 'K'); +#endif +#ifdef OPENSUBDIV_HAS_OPENCL + g_hud->AddRadioButton(0, "OPENCL", false, 10, 70, callbackKernel, kCL, 'K'); +#endif + g_hud->AddRadioButton(0, "DirectCompute", false, 10, 90, callbackKernel, kDirectCompute, 'K'); + + g_hud->AddRadioButton(1, "Wire (W)", g_wire == 0, 200, 10, callbackWireframe, 0, 'W'); + g_hud->AddRadioButton(1, "Shaded", g_wire == 1, 200, 30, callbackWireframe, 1, 'W'); + g_hud->AddRadioButton(1, "Wire+Shaded", g_wire == 2, 200, 50, callbackWireframe, 2, 'W'); + +// g_hud->AddCheckBox("Cage Edges (H)", true, 350, 10, callbackDisplayCageEdges, 0, 'H'); +// g_hud->AddCheckBox("Cage Verts (J)", false, 350, 30, callbackDisplayCageVertices, 0, 'J'); + g_hud->AddCheckBox("Patch CVs (L)", false, 350, 50, callbackDisplayPatchCVs, 0, 'L'); +// g_hud->AddCheckBox("Show normal vector (E)", false, 350, 10, callbackDisplayNormal, 0, 'E'); + g_hud->AddCheckBox("Animate vertices (M)", g_moveScale != 0, 350, 70, callbackAnimate, 0, 'M'); + g_hud->AddCheckBox("Patch Color (P)", true, 350, 90, callbackDisplayPatchColor, 0, 'p'); + g_hud->AddCheckBox("Freeze (spc)", false, 350, 130, callbackFreeze, 0, ' '); + + g_hud->AddCheckBox("Adaptive (`)", true, 10, 150, callbackAdaptive, 0, '`'); + + for (int i = 1; i < 11; ++i) { + char level[16]; + sprintf(level, "Lv. %d", i); + g_hud->AddRadioButton(3, level, i==2, 10, 170+i*20, callbackLevel, i, '0'+(i%10)); + } + + for(int i = 0; i < (int)g_defaultShapes.size(); ++i){ + g_hud->AddRadioButton(4, g_defaultShapes[i].name.c_str(), i==0, -220, 10+i*16, callbackModel, i, 'N'); + } + + callbackModel(g_currentShape); +} + +//------------------------------------------------------------------------------ +static bool +initD3D11(HWND hWnd) +{ + D3D_DRIVER_TYPE driverTypes[] = { + D3D_DRIVER_TYPE_HARDWARE, + D3D_DRIVER_TYPE_WARP, + D3D_DRIVER_TYPE_REFERENCE, + }; + + UINT numDriverTypes = ARRAYSIZE(driverTypes); + + DXGI_SWAP_CHAIN_DESC hDXGISwapChainDesc; + hDXGISwapChainDesc.BufferDesc.Width = g_width; + hDXGISwapChainDesc.BufferDesc.Height = g_height; + hDXGISwapChainDesc.BufferDesc.RefreshRate.Numerator = 0; + hDXGISwapChainDesc.BufferDesc.RefreshRate.Denominator = 1; + hDXGISwapChainDesc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; + hDXGISwapChainDesc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + hDXGISwapChainDesc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + hDXGISwapChainDesc.SampleDesc.Count = 1; + hDXGISwapChainDesc.SampleDesc.Quality = 0; + hDXGISwapChainDesc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + hDXGISwapChainDesc.BufferCount = 1; + hDXGISwapChainDesc.OutputWindow = hWnd; + hDXGISwapChainDesc.Windowed = TRUE; + hDXGISwapChainDesc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + hDXGISwapChainDesc.Flags = DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH; + + // create device and swap chain + HRESULT hr; + D3D_DRIVER_TYPE hDriverType = D3D_DRIVER_TYPE_NULL; + D3D_FEATURE_LEVEL hFeatureLevel = D3D_FEATURE_LEVEL_11_0; + for(UINT driverTypeIndex=0; driverTypeIndex < numDriverTypes; driverTypeIndex++){ + hDriverType = driverTypes[driverTypeIndex]; + hr = D3D11CreateDeviceAndSwapChain(NULL, + hDriverType, NULL, 0, NULL, 0, + D3D11_SDK_VERSION, &hDXGISwapChainDesc, + &g_pSwapChain, &g_pd3dDevice, + &hFeatureLevel, &g_pd3dDeviceContext); + if(SUCCEEDED(hr)){ + break; + } + } + + if(FAILED(hr)){ + MessageBoxW(hWnd, L"D3D11CreateDeviceAndSwapChain", L"Err", MB_ICONSTOP); + return false; + } + + // create rasterizer + D3D11_RASTERIZER_DESC rasterDesc; + ZeroMemory(&rasterDesc, sizeof(rasterDesc)); + rasterDesc.AntialiasedLineEnable = false; + rasterDesc.CullMode = D3D11_CULL_NONE; // XXX + rasterDesc.DepthBias = 0; + rasterDesc.DepthBiasClamp = 0.0f; + rasterDesc.DepthClipEnable = true; + rasterDesc.FillMode = D3D11_FILL_SOLID; + rasterDesc.FrontCounterClockwise = true; + rasterDesc.MultisampleEnable = false; + rasterDesc.ScissorEnable = false; + rasterDesc.SlopeScaledDepthBias = 0.0f; + + g_pd3dDevice->CreateRasterizerState(&rasterDesc, &g_pRasterizerState); + assert(g_pRasterizerState); + + __declspec(align(16)) + struct Lighting { + struct Light { + float position[4]; + float ambient[4]; + float diffuse[4]; + float specular[4]; + } lightSource[2]; + } lightingData = { + 0.5, 0.2f, 1.0f, 0.0f, + 0.1f, 0.1f, 0.1f, 1.0f, + 0.7f, 0.7f, 0.7f, 1.0f, + 0.8f, 0.8f, 0.8f, 1.0f, + + -0.8f, 0.4f, -1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + 0.5f, 0.5f, 0.5f, 1.0f, + 0.8f, 0.8f, 0.8f, 1.0f, + }; + D3D11_BUFFER_DESC cbDesc; + ZeroMemory(&cbDesc, sizeof(cbDesc)); + cbDesc.Usage = D3D11_USAGE_DYNAMIC; + cbDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER; + cbDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE; + cbDesc.MiscFlags = 0; + cbDesc.ByteWidth = sizeof(lightingData); + D3D11_SUBRESOURCE_DATA initData; + initData.pSysMem = &lightingData; + g_pd3dDevice->CreateBuffer(&cbDesc, &initData, &g_pcbLighting); + assert(g_pcbLighting); + + // create depth stencil state + D3D11_DEPTH_STENCIL_DESC depthStencilDesc; + ZeroMemory(&depthStencilDesc, sizeof(depthStencilDesc)); + depthStencilDesc.DepthEnable = true; + depthStencilDesc.DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ALL; + depthStencilDesc.DepthFunc = D3D11_COMPARISON_LESS_EQUAL; + depthStencilDesc.StencilEnable = false; + + g_pd3dDevice->CreateDepthStencilState(&depthStencilDesc, &g_pDepthStencilState); + assert(g_pDepthStencilState); + + return true; +} + +static bool +updateRenderTarget(HWND hWnd) +{ + RECT rc; + GetClientRect(hWnd, &rc); + UINT width = rc.right - rc.left; + UINT height = rc.bottom - rc.top; + + if (g_pSwapChainRTV && (g_width == width) && (g_height == height)) { + return true; + } + g_width = width; + g_height = height; + + g_hud->Rebuild(g_width, g_height); + + SAFE_RELEASE(g_pSwapChainRTV); + + g_pSwapChain->ResizeBuffers(0, g_width, g_height, DXGI_FORMAT_UNKNOWN, 0); + + // get backbuffer of swap chain + ID3D11Texture2D* hpBackBuffer = NULL; + if(FAILED(g_pSwapChain->GetBuffer(0, __uuidof(ID3D11Texture2D), (void**)&hpBackBuffer))){ + MessageBoxW(hWnd, L"SwpChain GetBuffer", L"Err", MB_ICONSTOP); + return false; + } + + // create render target from the back buffer + if(FAILED(g_pd3dDevice->CreateRenderTargetView(hpBackBuffer, NULL, &g_pSwapChainRTV))){ + MessageBoxW(hWnd, L"CreateRenderTargetView", L"Err", MB_ICONSTOP); + return false; + } + SAFE_RELEASE(hpBackBuffer); + + // create depth buffer + D3D11_TEXTURE2D_DESC depthBufferDesc; + ZeroMemory(&depthBufferDesc, sizeof(depthBufferDesc)); + depthBufferDesc.Width = g_width; + depthBufferDesc.Height = g_height; + depthBufferDesc.MipLevels = 1; + depthBufferDesc.ArraySize = 1; + depthBufferDesc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; + depthBufferDesc.SampleDesc.Count = 1; + depthBufferDesc.SampleDesc.Quality = 0; + depthBufferDesc.Usage = D3D11_USAGE_DEFAULT; + depthBufferDesc.BindFlags = D3D11_BIND_DEPTH_STENCIL; + depthBufferDesc.CPUAccessFlags = 0; + depthBufferDesc.MiscFlags = 0; + + g_pd3dDevice->CreateTexture2D(&depthBufferDesc, NULL, &g_pDepthStencilBuffer); + assert(g_pDepthStencilBuffer); + + D3D11_DEPTH_STENCIL_VIEW_DESC depthStencilViewDesc; + ZeroMemory(&depthStencilViewDesc, sizeof(depthStencilViewDesc)); + depthStencilViewDesc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; + depthStencilViewDesc.ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2D; + depthStencilViewDesc.Texture2D.MipSlice = 0; + + g_pd3dDevice->CreateDepthStencilView(g_pDepthStencilBuffer, &depthStencilViewDesc, &g_pDepthStencilView); + assert(g_pDepthStencilView); + + // set device context to the render target + g_pd3dDeviceContext->OMSetRenderTargets(1, &g_pSwapChainRTV, g_pDepthStencilView); + + // init viewport + D3D11_VIEWPORT vp; + vp.TopLeftX = 0; + vp.TopLeftY = 0; + vp.Width = (float)g_width; + vp.Height = (float)g_height; + vp.MinDepth = 0.0f; + vp.MaxDepth = 1.0f; + g_pd3dDeviceContext->RSSetViewports(1, &vp); + + return true; +} + +//------------------------------------------------------------------------------ +static void +callbackError(OpenSubdiv::OsdErrorType err, const char *message) +{ + std::ostringstream s; + s << "OsdError: " << err << "\n"; + s << message; + OutputDebugString(s.str().c_str()); +} + +//------------------------------------------------------------------------------ +static LRESULT WINAPI +msgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch(msg) + { + case WM_KEYDOWN: + keyboard(MapVirtualKey(UINT(wParam), MAPVK_VK_TO_CHAR)); + break; + case WM_DESTROY: + quit(); + return 0; + case WM_MOUSEMOVE: + motion(LOWORD(lParam), HIWORD(lParam)); + return 0; + case WM_LBUTTONDOWN: + mouse(0, 1, LOWORD(lParam), HIWORD(lParam)); + return 0; + case WM_LBUTTONUP: + mouse(0, 0, LOWORD(lParam), HIWORD(lParam)); + return 0; + case WM_MBUTTONDOWN: + mouse(1, 1, LOWORD(lParam), HIWORD(lParam)); + return 0; + case WM_MBUTTONUP: + mouse(1, 0, LOWORD(lParam), HIWORD(lParam)); + return 0; + case WM_RBUTTONDOWN: + mouse(2, 1, LOWORD(lParam), HIWORD(lParam)); + return 0; + case WM_RBUTTONUP: + mouse(2, 0, LOWORD(lParam), HIWORD(lParam)); + return 0; + case WM_PAINT: + ValidateRect(hWnd, NULL); + return 0; + } + return DefWindowProc(hWnd, msg, wParam, lParam); +} + +int WINAPI +WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) +{ + // register window class + TCHAR szWindowClass[] = "OPENSUBDIV_EXAMPLE"; + WNDCLASS wcex; + wcex.style = CS_HREDRAW | CS_VREDRAW; + wcex.lpfnWndProc = msgProc; + wcex.cbClsExtra = 0; + wcex.cbWndExtra = 0; + wcex.hInstance = hInstance; + wcex.hIcon = NULL; + wcex.hCursor = NULL; + wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); + wcex.lpszMenuName = NULL; + wcex.lpszClassName = szWindowClass; + RegisterClass(&wcex); + + // crete window + RECT rect = { 0, 0, g_width, g_height }; + AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE); + + HWND hWnd = CreateWindow(szWindowClass, + "OpenSubdiv DirectX Viewer", + WS_OVERLAPPEDWINDOW | WS_VISIBLE, + CW_USEDEFAULT, + CW_USEDEFAULT, + rect.right - rect.left, + rect.bottom - rect.top, + NULL, + NULL, + hInstance, + NULL); + + initializeShapes(); + + OsdSetErrorCallback(callbackError); + + initD3D11(hWnd); + + initHUD(); + + // main loop + while (g_bDone == false) { + MSG msg; + ZeroMemory(&msg, sizeof(msg)); + while (msg.message != WM_QUIT) { + while (PeekMessage(&msg, NULL, 0U, 0U, PM_REMOVE)) { + if (msg.message == WM_QUIT) goto end; + TranslateMessage(&msg); + DispatchMessage(&msg); + } + if (not g_freeze) + g_frame++; + + updateGeom(); + updateRenderTarget(hWnd); + display(); + } + } + end: + + quit(); +} + +//------------------------------------------------------------------------------ diff --git a/examples/dxViewer/shader.hlsl b/examples/dxViewer/shader.hlsl index df493bd5..515f4907 100644 --- a/examples/dxViewer/shader.hlsl +++ b/examples/dxViewer/shader.hlsl @@ -1,343 +1,311 @@ -// -// Copyright (C) Pixar. All rights reserved. -// -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. -// -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. -// -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. -// -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. -// - -struct OutputPointVertex { - float4 positionOut : SV_Position; -}; - -// --------------------------------------------------------------------------- -// Vertex Shader -// --------------------------------------------------------------------------- - -void vs_main( in InputVertex input, - out OutputVertex output ) -{ - output.positionOut = mul(ModelViewProjectionMatrix, input.position); - output.position = mul(ModelViewMatrix, input.position); - output.normal = mul(ModelViewMatrix,float4(input.normal, 0)).xyz; -} - -// --------------------------------------------------------------------------- -// Geometry Shader -// --------------------------------------------------------------------------- - -OutputVertex -outputVertex(OutputVertex input, float3 normal) -{ - OutputVertex v = input; - v.normal = normal; - return v; -} - -#if defined(GEOMETRY_OUT_WIRE) || defined(GEOMETRY_OUT_LINE) -#ifdef PRIM_TRI - #define EDGE_VERTS 3 -#endif -#ifdef PRIM_QUAD - #define EDGE_VERTS 4 -#endif - -static float VIEWPORT_SCALE = 1024.0; // XXXdyu - -float edgeDistance(float2 p, float2 p0, float2 p1) -{ - return VIEWPORT_SCALE * - abs((p.x - p0.x) * (p1.y - p0.y) - - (p.y - p0.y) * (p1.x - p0.x)) / length(p1.xy - p0.xy); -} - -OutputVertex -outputWireVertex(OutputVertex input, float3 normal, - int index, float2 edgeVerts[EDGE_VERTS]) -{ - OutputVertex v = input; - v.normal = normal; - - v.edgeDistance[0] = - edgeDistance(edgeVerts[index], edgeVerts[0], edgeVerts[1]); - v.edgeDistance[1] = - edgeDistance(edgeVerts[index], edgeVerts[1], edgeVerts[2]); -#ifdef PRIM_TRI - v.edgeDistance[2] = - edgeDistance(edgeVerts[index], edgeVerts[2], edgeVerts[0]); -#endif -#ifdef PRIM_QUAD - v.edgeDistance[2] = - edgeDistance(edgeVerts[index], edgeVerts[2], edgeVerts[3]); - v.edgeDistance[3] = - edgeDistance(edgeVerts[index], edgeVerts[3], edgeVerts[0]); -#endif - - return v; -} -#endif - -[maxvertexcount(6)] -void gs_quad( lineadj OutputVertex input[4], - inout TriangleStream triStream ) -{ - float3 A = (input[0].position - input[1].position).xyz; - float3 B = (input[3].position - input[1].position).xyz; - float3 C = (input[2].position - input[1].position).xyz; - - float3 n0 = normalize(cross(B, A)); - - triStream.Append(outputVertex(input[0], n0)); - triStream.Append(outputVertex(input[1], n0)); - triStream.Append(outputVertex(input[3], n0)); - triStream.RestartStrip(); - triStream.Append(outputVertex(input[3], n0)); - triStream.Append(outputVertex(input[1], n0)); - triStream.Append(outputVertex(input[2], n0)); - triStream.RestartStrip(); -} - -#if defined(GEOMETRY_OUT_WIRE) || defined(GEOMETRY_OUT_LINE) -#ifdef PRIM_QUAD -[maxvertexcount(6)] -void gs_quad_wire( lineadj OutputVertex input[4], - inout TriangleStream triStream ) -{ - float3 A = (input[0].position - input[1].position).xyz; - float3 B = (input[3].position - input[1].position).xyz; - float3 C = (input[2].position - input[1].position).xyz; - - float3 n0 = normalize(cross(B, A)); - - float2 edgeVerts[4]; - edgeVerts[0] = input[0].positionOut.xy / input[0].positionOut.w; - edgeVerts[1] = input[1].positionOut.xy / input[1].positionOut.w; - edgeVerts[2] = input[2].positionOut.xy / input[2].positionOut.w; - edgeVerts[3] = input[3].positionOut.xy / input[3].positionOut.w; - - triStream.Append(outputWireVertex(input[0], n0, 0, edgeVerts)); - triStream.Append(outputWireVertex(input[1], n0, 1, edgeVerts)); - triStream.Append(outputWireVertex(input[3], n0, 3, edgeVerts)); - triStream.RestartStrip(); - triStream.Append(outputWireVertex(input[3], n0, 3, edgeVerts)); - triStream.Append(outputWireVertex(input[1], n0, 1, edgeVerts)); - triStream.Append(outputWireVertex(input[2], n0, 2, edgeVerts)); - triStream.RestartStrip(); -} -#endif -#endif - -[maxvertexcount(3)] -void gs_triangle( triangle OutputVertex input[3], - inout TriangleStream triStream ) -{ - float3 A = (input[0].position - input[1].position).xyz; - float3 B = (input[2].position - input[1].position).xyz; - - float3 n0 = normalize(cross(B, A)); - - triStream.Append(outputVertex(input[0], n0)); - triStream.Append(outputVertex(input[1], n0)); - triStream.Append(outputVertex(input[2], n0)); -} - -[maxvertexcount(3)] -void gs_triangle_smooth( triangle OutputVertex input[3], - inout TriangleStream triStream ) -{ - triStream.Append(outputVertex(input[0], input[0].normal)); - triStream.Append(outputVertex(input[1], input[1].normal)); - triStream.Append(outputVertex(input[2], input[2].normal)); -} - -#if defined(GEOMETRY_OUT_WIRE) || defined(GEOMETRY_OUT_LINE) -#ifdef PRIM_TRI -[maxvertexcount(3)] -void gs_triangle_wire( triangle OutputVertex input[3], - inout TriangleStream triStream ) -{ - float3 A = (input[0].position - input[1].position).xyz; - float3 B = (input[2].position - input[1].position).xyz; - - float3 n0 = normalize(cross(B, A)); - - float2 edgeVerts[3]; - edgeVerts[0] = input[0].positionOut.xy / input[0].positionOut.w; - edgeVerts[1] = input[1].positionOut.xy / input[1].positionOut.w; - edgeVerts[2] = input[2].positionOut.xy / input[2].positionOut.w; - - triStream.Append(outputWireVertex(input[0], n0, 0, edgeVerts)); - triStream.Append(outputWireVertex(input[1], n0, 1, edgeVerts)); - triStream.Append(outputWireVertex(input[2], n0, 2, edgeVerts)); -} - -[maxvertexcount(3)] -void gs_triangle_smooth_wire( triangle OutputVertex input[3], - inout TriangleStream triStream ) -{ - float2 edgeVerts[3]; - edgeVerts[0] = input[0].positionOut.xy / input[0].positionOut.w; - edgeVerts[1] = input[1].positionOut.xy / input[1].positionOut.w; - edgeVerts[2] = input[2].positionOut.xy / input[2].positionOut.w; - - triStream.Append(outputWireVertex(input[0], input[0].normal, 0, edgeVerts)); - triStream.Append(outputWireVertex(input[1], input[1].normal, 1, edgeVerts)); - triStream.Append(outputWireVertex(input[2], input[2].normal, 2, edgeVerts)); -} -#endif -#endif - -[maxvertexcount(1)] -void gs_point( point OutputVertex input[1], - inout PointStream pointStream ) -{ - OutputPointVertex v0; - v0.positionOut = input[0].positionOut; - - pointStream.Append(v0); -} - -// --------------------------------------------------------------------------- -// Lighting -// --------------------------------------------------------------------------- - -#define NUM_LIGHTS 2 - -struct LightSource { - float4 position; - float4 ambient; - float4 diffuse; - float4 specular; -}; - -cbuffer Lighting : register( b2 ) { - LightSource lightSource[NUM_LIGHTS]; -}; - -float4 -lighting(float3 Peye, float3 Neye) -{ - float4 color = float4(0.0, 0.0, 0.0, 0.0); - //float4 material = float4(0.4, 0.4, 0.8, 1); - float4 material = float4(0.13, 0.13, 0.61, 1); // sRGB (gamma 2.2) - - for (int i = 0; i < NUM_LIGHTS; ++i) { - - float4 Plight = lightSource[i].position; - - float3 l = (Plight.w == 0.0) - ? normalize(Plight.xyz) : normalize(Plight.xyz - Peye); - - float3 n = normalize(Neye); - float3 h = normalize(l + float3(0,0,1)); // directional viewer - - float d = max(0.0, dot(n, l)); - float s = pow(max(0.0, dot(n, h)), 500.0f); - - color += lightSource[i].ambient * material - + d * lightSource[i].diffuse * material - + s * lightSource[i].specular; - } - - - color.a = 1.0; - return color; -} - -// --------------------------------------------------------------------------- -// Pixel Shader -// --------------------------------------------------------------------------- - -float4 -edgeColor(float4 Cfill, float4 edgeDistance) -{ -#if defined(GEOMETRY_OUT_WIRE) || defined(GEOMETRY_OUT_LINE) -#ifdef PRIM_TRI - float d = - min(edgeDistance[0], min(edgeDistance[1], edgeDistance[2])); -#endif -#ifdef PRIM_QUAD - float d = - min(min(edgeDistance[0], edgeDistance[1]), - min(edgeDistance[2], edgeDistance[3])); -#endif - float4 Cedge = float4(1.0, 1.0, 0.0, 1.0); - float p = exp2(-2 * d * d); - -#if defined(GEOMETRY_OUT_WIRE) - if (p < 0.25) discard; -#endif - - Cfill.rgb = lerp(Cfill.rgb, Cedge.rgb, p); -#endif - return Cfill; -} - -// --------------------------------------------------------------------------- -// Pixel Shader -// --------------------------------------------------------------------------- - -void -ps_main( in OutputVertex input, - bool isFrontFacing : SV_IsFrontFace, - out float4 colorOut : SV_Target ) -{ - float3 N = (isFrontFacing ? input.normal : -input.normal); - colorOut = edgeColor(lighting(input.position.xyz, N), input.edgeDistance); -} - -void -ps_main_point( in OutputPointVertex input, - out float4 colorOut : SV_Target ) -{ - colorOut = float4(1, 1, 1, 1); -} +// +// Copyright 2013 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: +// +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. +// +// 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. +// + +struct OutputPointVertex { + float4 positionOut : SV_Position; +}; + +// --------------------------------------------------------------------------- +// Vertex Shader +// --------------------------------------------------------------------------- + +void vs_main( in InputVertex input, + out OutputVertex output ) +{ + output.positionOut = mul(ModelViewProjectionMatrix, input.position); + output.position = mul(ModelViewMatrix, input.position); + output.normal = mul(ModelViewMatrix,float4(input.normal, 0)).xyz; +} + +// --------------------------------------------------------------------------- +// Geometry Shader +// --------------------------------------------------------------------------- + +OutputVertex +outputVertex(OutputVertex input, float3 normal) +{ + OutputVertex v = input; + v.normal = normal; + return v; +} + +#if defined(GEOMETRY_OUT_WIRE) || defined(GEOMETRY_OUT_LINE) +#ifdef PRIM_TRI + #define EDGE_VERTS 3 +#endif +#ifdef PRIM_QUAD + #define EDGE_VERTS 4 +#endif + +static float VIEWPORT_SCALE = 1024.0; // XXXdyu + +float edgeDistance(float2 p, float2 p0, float2 p1) +{ + return VIEWPORT_SCALE * + abs((p.x - p0.x) * (p1.y - p0.y) - + (p.y - p0.y) * (p1.x - p0.x)) / length(p1.xy - p0.xy); +} + +OutputVertex +outputWireVertex(OutputVertex input, float3 normal, + int index, float2 edgeVerts[EDGE_VERTS]) +{ + OutputVertex v = input; + v.normal = normal; + + v.edgeDistance[0] = + edgeDistance(edgeVerts[index], edgeVerts[0], edgeVerts[1]); + v.edgeDistance[1] = + edgeDistance(edgeVerts[index], edgeVerts[1], edgeVerts[2]); +#ifdef PRIM_TRI + v.edgeDistance[2] = + edgeDistance(edgeVerts[index], edgeVerts[2], edgeVerts[0]); +#endif +#ifdef PRIM_QUAD + v.edgeDistance[2] = + edgeDistance(edgeVerts[index], edgeVerts[2], edgeVerts[3]); + v.edgeDistance[3] = + edgeDistance(edgeVerts[index], edgeVerts[3], edgeVerts[0]); +#endif + + return v; +} +#endif + +[maxvertexcount(6)] +void gs_quad( lineadj OutputVertex input[4], + inout TriangleStream triStream ) +{ + float3 A = (input[0].position - input[1].position).xyz; + float3 B = (input[3].position - input[1].position).xyz; + float3 C = (input[2].position - input[1].position).xyz; + + float3 n0 = normalize(cross(B, A)); + + triStream.Append(outputVertex(input[0], n0)); + triStream.Append(outputVertex(input[1], n0)); + triStream.Append(outputVertex(input[3], n0)); + triStream.RestartStrip(); + triStream.Append(outputVertex(input[3], n0)); + triStream.Append(outputVertex(input[1], n0)); + triStream.Append(outputVertex(input[2], n0)); + triStream.RestartStrip(); +} + +#if defined(GEOMETRY_OUT_WIRE) || defined(GEOMETRY_OUT_LINE) +#ifdef PRIM_QUAD +[maxvertexcount(6)] +void gs_quad_wire( lineadj OutputVertex input[4], + inout TriangleStream triStream ) +{ + float3 A = (input[0].position - input[1].position).xyz; + float3 B = (input[3].position - input[1].position).xyz; + float3 C = (input[2].position - input[1].position).xyz; + + float3 n0 = normalize(cross(B, A)); + + float2 edgeVerts[4]; + edgeVerts[0] = input[0].positionOut.xy / input[0].positionOut.w; + edgeVerts[1] = input[1].positionOut.xy / input[1].positionOut.w; + edgeVerts[2] = input[2].positionOut.xy / input[2].positionOut.w; + edgeVerts[3] = input[3].positionOut.xy / input[3].positionOut.w; + + triStream.Append(outputWireVertex(input[0], n0, 0, edgeVerts)); + triStream.Append(outputWireVertex(input[1], n0, 1, edgeVerts)); + triStream.Append(outputWireVertex(input[3], n0, 3, edgeVerts)); + triStream.RestartStrip(); + triStream.Append(outputWireVertex(input[3], n0, 3, edgeVerts)); + triStream.Append(outputWireVertex(input[1], n0, 1, edgeVerts)); + triStream.Append(outputWireVertex(input[2], n0, 2, edgeVerts)); + triStream.RestartStrip(); +} +#endif +#endif + +[maxvertexcount(3)] +void gs_triangle( triangle OutputVertex input[3], + inout TriangleStream triStream ) +{ + float3 A = (input[0].position - input[1].position).xyz; + float3 B = (input[2].position - input[1].position).xyz; + + float3 n0 = normalize(cross(B, A)); + + triStream.Append(outputVertex(input[0], n0)); + triStream.Append(outputVertex(input[1], n0)); + triStream.Append(outputVertex(input[2], n0)); +} + +[maxvertexcount(3)] +void gs_triangle_smooth( triangle OutputVertex input[3], + inout TriangleStream triStream ) +{ + triStream.Append(outputVertex(input[0], input[0].normal)); + triStream.Append(outputVertex(input[1], input[1].normal)); + triStream.Append(outputVertex(input[2], input[2].normal)); +} + +#if defined(GEOMETRY_OUT_WIRE) || defined(GEOMETRY_OUT_LINE) +#ifdef PRIM_TRI +[maxvertexcount(3)] +void gs_triangle_wire( triangle OutputVertex input[3], + inout TriangleStream triStream ) +{ + float3 A = (input[0].position - input[1].position).xyz; + float3 B = (input[2].position - input[1].position).xyz; + + float3 n0 = normalize(cross(B, A)); + + float2 edgeVerts[3]; + edgeVerts[0] = input[0].positionOut.xy / input[0].positionOut.w; + edgeVerts[1] = input[1].positionOut.xy / input[1].positionOut.w; + edgeVerts[2] = input[2].positionOut.xy / input[2].positionOut.w; + + triStream.Append(outputWireVertex(input[0], n0, 0, edgeVerts)); + triStream.Append(outputWireVertex(input[1], n0, 1, edgeVerts)); + triStream.Append(outputWireVertex(input[2], n0, 2, edgeVerts)); +} + +[maxvertexcount(3)] +void gs_triangle_smooth_wire( triangle OutputVertex input[3], + inout TriangleStream triStream ) +{ + float2 edgeVerts[3]; + edgeVerts[0] = input[0].positionOut.xy / input[0].positionOut.w; + edgeVerts[1] = input[1].positionOut.xy / input[1].positionOut.w; + edgeVerts[2] = input[2].positionOut.xy / input[2].positionOut.w; + + triStream.Append(outputWireVertex(input[0], input[0].normal, 0, edgeVerts)); + triStream.Append(outputWireVertex(input[1], input[1].normal, 1, edgeVerts)); + triStream.Append(outputWireVertex(input[2], input[2].normal, 2, edgeVerts)); +} +#endif +#endif + +[maxvertexcount(1)] +void gs_point( point OutputVertex input[1], + inout PointStream pointStream ) +{ + OutputPointVertex v0; + v0.positionOut = input[0].positionOut; + + pointStream.Append(v0); +} + +// --------------------------------------------------------------------------- +// Lighting +// --------------------------------------------------------------------------- + +#define NUM_LIGHTS 2 + +struct LightSource { + float4 position; + float4 ambient; + float4 diffuse; + float4 specular; +}; + +cbuffer Lighting : register( b2 ) { + LightSource lightSource[NUM_LIGHTS]; +}; + +float4 +lighting(float3 Peye, float3 Neye) +{ + float4 color = float4(0.0, 0.0, 0.0, 0.0); + //float4 material = float4(0.4, 0.4, 0.8, 1); + float4 material = float4(0.13, 0.13, 0.61, 1); // sRGB (gamma 2.2) + + for (int i = 0; i < NUM_LIGHTS; ++i) { + + float4 Plight = lightSource[i].position; + + float3 l = (Plight.w == 0.0) + ? normalize(Plight.xyz) : normalize(Plight.xyz - Peye); + + float3 n = normalize(Neye); + float3 h = normalize(l + float3(0,0,1)); // directional viewer + + float d = max(0.0, dot(n, l)); + float s = pow(max(0.0, dot(n, h)), 500.0f); + + color += lightSource[i].ambient * material + + d * lightSource[i].diffuse * material + + s * lightSource[i].specular; + } + + + color.a = 1.0; + return color; +} + +// --------------------------------------------------------------------------- +// Pixel Shader +// --------------------------------------------------------------------------- + +float4 +edgeColor(float4 Cfill, float4 edgeDistance) +{ +#if defined(GEOMETRY_OUT_WIRE) || defined(GEOMETRY_OUT_LINE) +#ifdef PRIM_TRI + float d = + min(edgeDistance[0], min(edgeDistance[1], edgeDistance[2])); +#endif +#ifdef PRIM_QUAD + float d = + min(min(edgeDistance[0], edgeDistance[1]), + min(edgeDistance[2], edgeDistance[3])); +#endif + float4 Cedge = float4(1.0, 1.0, 0.0, 1.0); + float p = exp2(-2 * d * d); + +#if defined(GEOMETRY_OUT_WIRE) + if (p < 0.25) discard; +#endif + + Cfill.rgb = lerp(Cfill.rgb, Cedge.rgb, p); +#endif + return Cfill; +} + +// --------------------------------------------------------------------------- +// Pixel Shader +// --------------------------------------------------------------------------- + +void +ps_main( in OutputVertex input, + bool isFrontFacing : SV_IsFrontFace, + out float4 colorOut : SV_Target ) +{ + float3 N = (isFrontFacing ? input.normal : -input.normal); + colorOut = edgeColor(lighting(input.position.xyz, N), input.edgeDistance); +} + +void +ps_main_point( in OutputPointVertex input, + out float4 colorOut : SV_Target ) +{ + colorOut = float4(1, 1, 1, 1); +} diff --git a/examples/glBatchViewer/CMakeLists.txt b/examples/glBatchViewer/CMakeLists.txt index 5b065925..afd04e80 100644 --- a/examples/glBatchViewer/CMakeLists.txt +++ b/examples/glBatchViewer/CMakeLists.txt @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # # *** glViewer *** diff --git a/examples/glBatchViewer/delegate.cpp b/examples/glBatchViewer/delegate.cpp index f9a20d84..b9a84fe0 100644 --- a/examples/glBatchViewer/delegate.cpp +++ b/examples/glBatchViewer/delegate.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "delegate.h" diff --git a/examples/glBatchViewer/delegate.h b/examples/glBatchViewer/delegate.h index 15cbca77..feed67d9 100644 --- a/examples/glBatchViewer/delegate.h +++ b/examples/glBatchViewer/delegate.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 DELEGATE_H #define DELEGATE_H diff --git a/examples/glBatchViewer/effect.cpp b/examples/glBatchViewer/effect.cpp index cd3aaad5..8dc863fc 100644 --- a/examples/glBatchViewer/effect.cpp +++ b/examples/glBatchViewer/effect.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "effect.h" diff --git a/examples/glBatchViewer/effect.h b/examples/glBatchViewer/effect.h index 81c60b67..b1d5f5d6 100644 --- a/examples/glBatchViewer/effect.h +++ b/examples/glBatchViewer/effect.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 EFFECT_H #define EFFECT_H diff --git a/examples/glBatchViewer/effectRegistry.cpp b/examples/glBatchViewer/effectRegistry.cpp index 8c4ac2de..2b68ce9c 100644 --- a/examples/glBatchViewer/effectRegistry.cpp +++ b/examples/glBatchViewer/effectRegistry.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "effectRegistry.h" diff --git a/examples/glBatchViewer/effectRegistry.h b/examples/glBatchViewer/effectRegistry.h index f59712ae..b6ba56ee 100644 --- a/examples/glBatchViewer/effectRegistry.h +++ b/examples/glBatchViewer/effectRegistry.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 EFFECT_REGISTRY_H #define EFFECT_REGISTRY_H diff --git a/examples/glBatchViewer/shader.glsl b/examples/glBatchViewer/shader.glsl index 12a7550d..8d87db40 100644 --- a/examples/glBatchViewer/shader.glsl +++ b/examples/glBatchViewer/shader.glsl @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // #line 57 diff --git a/examples/glBatchViewer/shader_gl3.glsl b/examples/glBatchViewer/shader_gl3.glsl index cc991732..ab32ce51 100644 --- a/examples/glBatchViewer/shader_gl3.glsl +++ b/examples/glBatchViewer/shader_gl3.glsl @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // layout(std140) uniform Transform { diff --git a/examples/glBatchViewer/shapes.h b/examples/glBatchViewer/shapes.h index 94d0560c..0642523e 100644 --- a/examples/glBatchViewer/shapes.h +++ b/examples/glBatchViewer/shapes.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // void initializeShapes( ) { diff --git a/examples/glBatchViewer/viewer.cpp b/examples/glBatchViewer/viewer.cpp index 2fa2f0f4..87c823d4 100644 --- a/examples/glBatchViewer/viewer.cpp +++ b/examples/glBatchViewer/viewer.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // #if defined(__APPLE__) diff --git a/examples/glViewer/CMakeLists.txt b/examples/glViewer/CMakeLists.txt index fc775d43..2d09944a 100644 --- a/examples/glViewer/CMakeLists.txt +++ b/examples/glViewer/CMakeLists.txt @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # # *** glViewer *** diff --git a/examples/glViewer/shader.glsl b/examples/glViewer/shader.glsl index 612b1b17..3c2008b5 100644 --- a/examples/glViewer/shader.glsl +++ b/examples/glViewer/shader.glsl @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // #if defined(VARYING_COLOR) || defined(FACEVARYING_COLOR) diff --git a/examples/glViewer/shader_gl3.glsl b/examples/glViewer/shader_gl3.glsl index 04646710..369d6a20 100644 --- a/examples/glViewer/shader_gl3.glsl +++ b/examples/glViewer/shader_gl3.glsl @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // layout(std140) uniform Transform { diff --git a/examples/glViewer/viewer.cpp b/examples/glViewer/viewer.cpp index 0c27f71d..8e011000 100644 --- a/examples/glViewer/viewer.cpp +++ b/examples/glViewer/viewer.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // #if defined(__APPLE__) diff --git a/examples/limitEval/CMakeLists.txt b/examples/limitEval/CMakeLists.txt index 22904374..54e5f574 100644 --- a/examples/limitEval/CMakeLists.txt +++ b/examples/limitEval/CMakeLists.txt @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # # *** glViewer *** diff --git a/examples/limitEval/main.cpp b/examples/limitEval/main.cpp index 94302990..cecb41b8 100644 --- a/examples/limitEval/main.cpp +++ b/examples/limitEval/main.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // #if defined(__APPLE__) diff --git a/examples/mayaPtexViewer/CMakeLists.txt b/examples/mayaPtexViewer/CMakeLists.txt index 2dd76dbb..0ea81684 100644 --- a/examples/mayaPtexViewer/CMakeLists.txt +++ b/examples/mayaPtexViewer/CMakeLists.txt @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # # *** mayaPtexViewer *** diff --git a/examples/mayaPtexViewer/OpenSubdivPtexShader.cpp b/examples/mayaPtexViewer/OpenSubdivPtexShader.cpp index cf84766c..539fa2e8 100644 --- a/examples/mayaPtexViewer/OpenSubdivPtexShader.cpp +++ b/examples/mayaPtexViewer/OpenSubdivPtexShader.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // #if not defined(__APPLE__) diff --git a/examples/mayaPtexViewer/OpenSubdivPtexShader.h b/examples/mayaPtexViewer/OpenSubdivPtexShader.h index 2fe6fe22..23cd405a 100644 --- a/examples/mayaPtexViewer/OpenSubdivPtexShader.h +++ b/examples/mayaPtexViewer/OpenSubdivPtexShader.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 EXAMPLES_MAYAPTEXVIEWER_OPENSUBDIVPTEXSHADER_H_ #define EXAMPLES_MAYAPTEXVIEWER_OPENSUBDIVPTEXSHADER_H_ diff --git a/examples/mayaPtexViewer/OpenSubdivPtexShaderOverride.cpp b/examples/mayaPtexViewer/OpenSubdivPtexShaderOverride.cpp index 24d47b8e..7d781d23 100644 --- a/examples/mayaPtexViewer/OpenSubdivPtexShaderOverride.cpp +++ b/examples/mayaPtexViewer/OpenSubdivPtexShaderOverride.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // #if not defined(__APPLE__) diff --git a/examples/mayaPtexViewer/OpenSubdivPtexShaderOverride.h b/examples/mayaPtexViewer/OpenSubdivPtexShaderOverride.h index 9ac7c31f..9fe8b964 100644 --- a/examples/mayaPtexViewer/OpenSubdivPtexShaderOverride.h +++ b/examples/mayaPtexViewer/OpenSubdivPtexShaderOverride.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 EXAMPLES_MAYAPTEXVIEWER_OPENSUBDIVPTEXSHADEROVERRIDE_H_ diff --git a/examples/mayaPtexViewer/cudaUtil.cpp b/examples/mayaPtexViewer/cudaUtil.cpp index 953d2b6e..d0998dcf 100644 --- a/examples/mayaPtexViewer/cudaUtil.cpp +++ b/examples/mayaPtexViewer/cudaUtil.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // #ifdef OPENSUBDIV_HAS_CUDA diff --git a/examples/mayaPtexViewer/hbrUtil.cpp b/examples/mayaPtexViewer/hbrUtil.cpp index 634ccc68..fd21f03b 100644 --- a/examples/mayaPtexViewer/hbrUtil.cpp +++ b/examples/mayaPtexViewer/hbrUtil.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "hbrUtil.h" diff --git a/examples/mayaPtexViewer/hbrUtil.h b/examples/mayaPtexViewer/hbrUtil.h index 67c1e562..d7f4fdc7 100644 --- a/examples/mayaPtexViewer/hbrUtil.h +++ b/examples/mayaPtexViewer/hbrUtil.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 EXAMPLES_MAYAVIEWER_HBRUTIL_H_ #define EXAMPLES_MAYAVIEWER_HBRUTIL_H_ diff --git a/examples/mayaPtexViewer/osdPtexMeshData.cpp b/examples/mayaPtexViewer/osdPtexMeshData.cpp index caec1780..b2500659 100644 --- a/examples/mayaPtexViewer/osdPtexMeshData.cpp +++ b/examples/mayaPtexViewer/osdPtexMeshData.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // #if not defined(__APPLE__) diff --git a/examples/mayaPtexViewer/osdPtexMeshData.h b/examples/mayaPtexViewer/osdPtexMeshData.h index 9d169265..e597a7ca 100644 --- a/examples/mayaPtexViewer/osdPtexMeshData.h +++ b/examples/mayaPtexViewer/osdPtexMeshData.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 EXAMPLES_MAYAPTEXVIEWER_OSDPTEXMESHDATA_H_ #define EXAMPLES_MAYAPTEXVIEWER_OSDPTEXMESHDATA_H_ diff --git a/examples/mayaPtexViewer/shader.glsl b/examples/mayaPtexViewer/shader.glsl index 1520cc6f..853f0b34 100644 --- a/examples/mayaPtexViewer/shader.glsl +++ b/examples/mayaPtexViewer/shader.glsl @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // #line 57 diff --git a/examples/mayaViewer/CMakeLists.txt b/examples/mayaViewer/CMakeLists.txt index 45bd86b9..7e4585d9 100644 --- a/examples/mayaViewer/CMakeLists.txt +++ b/examples/mayaViewer/CMakeLists.txt @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # # *** mayaViewer *** diff --git a/examples/mayaViewer/OpenSubdivShader.cpp b/examples/mayaViewer/OpenSubdivShader.cpp index 2d223997..5f64c300 100644 --- a/examples/mayaViewer/OpenSubdivShader.cpp +++ b/examples/mayaViewer/OpenSubdivShader.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // #if defined(__APPLE__) diff --git a/examples/mayaViewer/OpenSubdivShader.h b/examples/mayaViewer/OpenSubdivShader.h index 2c63840a..4ac92bb4 100644 --- a/examples/mayaViewer/OpenSubdivShader.h +++ b/examples/mayaViewer/OpenSubdivShader.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 EXAMPLES_MAYAVIEWER_OPENSUBDIVSHADER_H_ diff --git a/examples/mayaViewer/OpenSubdivShaderOverride.cpp b/examples/mayaViewer/OpenSubdivShaderOverride.cpp index f6f537a3..2b1702af 100644 --- a/examples/mayaViewer/OpenSubdivShaderOverride.cpp +++ b/examples/mayaViewer/OpenSubdivShaderOverride.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // // ### OpenSubdivShaderOverride.cpp diff --git a/examples/mayaViewer/OpenSubdivShaderOverride.h b/examples/mayaViewer/OpenSubdivShaderOverride.h index 2dd147f6..d945d28e 100644 --- a/examples/mayaViewer/OpenSubdivShaderOverride.h +++ b/examples/mayaViewer/OpenSubdivShaderOverride.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 EXAMPLES_MAYAVIEWER_OPENSUBDIVSHADEROVERRIDE_H_ diff --git a/examples/mayaViewer/cudaUtil.cpp b/examples/mayaViewer/cudaUtil.cpp index 953d2b6e..d0998dcf 100644 --- a/examples/mayaViewer/cudaUtil.cpp +++ b/examples/mayaViewer/cudaUtil.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // #ifdef OPENSUBDIV_HAS_CUDA diff --git a/examples/mayaViewer/hbrUtil.cpp b/examples/mayaViewer/hbrUtil.cpp index f593a985..05e4ba55 100644 --- a/examples/mayaViewer/hbrUtil.cpp +++ b/examples/mayaViewer/hbrUtil.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "hbrUtil.h" diff --git a/examples/mayaViewer/hbrUtil.h b/examples/mayaViewer/hbrUtil.h index 67c1e562..d7f4fdc7 100644 --- a/examples/mayaViewer/hbrUtil.h +++ b/examples/mayaViewer/hbrUtil.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 EXAMPLES_MAYAVIEWER_HBRUTIL_H_ #define EXAMPLES_MAYAVIEWER_HBRUTIL_H_ diff --git a/examples/mayaViewer/mayaViewer.cpp b/examples/mayaViewer/mayaViewer.cpp index 6f0f99ef..7cb3e405 100644 --- a/examples/mayaViewer/mayaViewer.cpp +++ b/examples/mayaViewer/mayaViewer.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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/examples/mayaViewer/osdMeshData.cpp b/examples/mayaViewer/osdMeshData.cpp index d7ae494f..2dfe493c 100644 --- a/examples/mayaViewer/osdMeshData.cpp +++ b/examples/mayaViewer/osdMeshData.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // #if defined(__APPLE__) diff --git a/examples/mayaViewer/osdMeshData.h b/examples/mayaViewer/osdMeshData.h index 3765772e..a5e624da 100644 --- a/examples/mayaViewer/osdMeshData.h +++ b/examples/mayaViewer/osdMeshData.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 EXAMPLES_MAYAVIEWER_OSDMESHDATA_H_ #define EXAMPLES_MAYAVIEWER_OSDMESHDATA_H_ diff --git a/examples/mayaViewer/shader.glsl b/examples/mayaViewer/shader.glsl index 0856395e..5759ce45 100644 --- a/examples/mayaViewer/shader.glsl +++ b/examples/mayaViewer/shader.glsl @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // #line 57 diff --git a/examples/paintTest/CMakeLists.txt b/examples/paintTest/CMakeLists.txt index 6a119081..6e6e244f 100644 --- a/examples/paintTest/CMakeLists.txt +++ b/examples/paintTest/CMakeLists.txt @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # # *** paintTest *** diff --git a/examples/paintTest/main.cpp b/examples/paintTest/main.cpp index 560df621..915512aa 100644 --- a/examples/paintTest/main.cpp +++ b/examples/paintTest/main.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // #if defined(__APPLE__) diff --git a/examples/paintTest/paintShader.glsl b/examples/paintTest/paintShader.glsl index 02a3e77a..73ff6a88 100644 --- a/examples/paintTest/paintShader.glsl +++ b/examples/paintTest/paintShader.glsl @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // #line 58 diff --git a/examples/paintTest/shader.glsl b/examples/paintTest/shader.glsl index 6856c269..3a81b575 100644 --- a/examples/paintTest/shader.glsl +++ b/examples/paintTest/shader.glsl @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // vec4 PTexLookup(vec4 patchCoord, diff --git a/examples/ptexViewer/CMakeLists.txt b/examples/ptexViewer/CMakeLists.txt index 652c81ba..b10b353f 100644 --- a/examples/ptexViewer/CMakeLists.txt +++ b/examples/ptexViewer/CMakeLists.txt @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # # *** ptexViewer *** diff --git a/examples/ptexViewer/imageshader.glsl b/examples/ptexViewer/imageshader.glsl index 3dc08775..bb897478 100644 --- a/examples/ptexViewer/imageshader.glsl +++ b/examples/ptexViewer/imageshader.glsl @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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/examples/ptexViewer/shader.glsl b/examples/ptexViewer/shader.glsl index 48aa72af..1eff856b 100644 --- a/examples/ptexViewer/shader.glsl +++ b/examples/ptexViewer/shader.glsl @@ -1,60 +1,27 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // -#line 57 //-------------------------------------------------------------- // Common diff --git a/examples/ptexViewer/shader_gl3.glsl b/examples/ptexViewer/shader_gl3.glsl index dd1ef154..8ba021e5 100644 --- a/examples/ptexViewer/shader_gl3.glsl +++ b/examples/ptexViewer/shader_gl3.glsl @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // layout(std140) uniform Transform { diff --git a/examples/ptexViewer/skyshader.glsl b/examples/ptexViewer/skyshader.glsl index 205ec887..9bedb244 100644 --- a/examples/ptexViewer/skyshader.glsl +++ b/examples/ptexViewer/skyshader.glsl @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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/examples/ptexViewer/viewer.cpp b/examples/ptexViewer/viewer.cpp index 4b72226f..042634db 100644 --- a/examples/ptexViewer/viewer.cpp +++ b/examples/ptexViewer/viewer.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // #if defined(__APPLE__) diff --git a/examples/python/__init__.py b/examples/python/__init__.py index 71ae683c..24b46bef 100644 --- a/examples/python/__init__.py +++ b/examples/python/__init__.py @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # from main import main diff --git a/examples/python/canvas.py b/examples/python/canvas.py index ac987c2a..40160bd6 100644 --- a/examples/python/canvas.py +++ b/examples/python/canvas.py @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # from PyQt4 import QtCore diff --git a/examples/python/interactive.py b/examples/python/interactive.py index 255c505b..d67d5077 100644 --- a/examples/python/interactive.py +++ b/examples/python/interactive.py @@ -1,61 +1,27 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- - # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # from PyQt4 import QtGui, QtCore diff --git a/examples/python/main.py b/examples/python/main.py index 05bac997..f3313662 100644 --- a/examples/python/main.py +++ b/examples/python/main.py @@ -1,63 +1,28 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- - # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # - from PyQt4 import QtGui, QtCore from window import Window from renderer import Renderer diff --git a/examples/python/renderer.py b/examples/python/renderer.py index 9aa8948a..94445f41 100644 --- a/examples/python/renderer.py +++ b/examples/python/renderer.py @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # import math diff --git a/examples/python/shaders.py b/examples/python/shaders.py index 7ea04554..43910548 100644 --- a/examples/python/shaders.py +++ b/examples/python/shaders.py @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # from OpenGL.GL import * diff --git a/examples/python/simple.glsl b/examples/python/simple.glsl index a8012d4f..38310565 100644 --- a/examples/python/simple.glsl +++ b/examples/python/simple.glsl @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # -- xforms diff --git a/examples/python/utility.py b/examples/python/utility.py index 99f6212c..b5691ed7 100644 --- a/examples/python/utility.py +++ b/examples/python/utility.py @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # from OpenGL.GL import * diff --git a/examples/python/window.py b/examples/python/window.py index 75c6d963..22458088 100644 --- a/examples/python/window.py +++ b/examples/python/window.py @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # from PyQt4 import QtGui, QtCore diff --git a/examples/simpleCpu/CMakeLists.txt b/examples/simpleCpu/CMakeLists.txt index 7955a699..6885926d 100644 --- a/examples/simpleCpu/CMakeLists.txt +++ b/examples/simpleCpu/CMakeLists.txt @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # # *** simpleCpu *** diff --git a/examples/simpleCpu/algebra.h b/examples/simpleCpu/algebra.h index 5cb86e74..f8f1b718 100644 --- a/examples/simpleCpu/algebra.h +++ b/examples/simpleCpu/algebra.h @@ -1,3 +1,27 @@ +// +// Copyright 2013 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: +// +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. +// +// 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. +// #pragma once #include diff --git a/examples/simpleCpu/glhelpers.h b/examples/simpleCpu/glhelpers.h index 8fea18ba..19285e91 100644 --- a/examples/simpleCpu/glhelpers.h +++ b/examples/simpleCpu/glhelpers.h @@ -1,4 +1,27 @@ // +// Copyright 2013 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: +// +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. +// +// 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. + // This file contains standard OpenGL API calls that are mostly uninteresting if // you are purely trying to learn OSD. The following operations are implemented // here: diff --git a/examples/simpleCpu/main.cpp b/examples/simpleCpu/main.cpp index ff9f77d4..6dd8aab0 100644 --- a/examples/simpleCpu/main.cpp +++ b/examples/simpleCpu/main.cpp @@ -1,4 +1,27 @@ - +// +// Copyright 2013 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: +// +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. +// +// 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. +// #if defined(__APPLE__) #if defined(OSD_USES_GLEW) #include diff --git a/examples/simpleCpu/shader.glsl b/examples/simpleCpu/shader.glsl index a55ac939..ae844ffa 100644 --- a/examples/simpleCpu/shader.glsl +++ b/examples/simpleCpu/shader.glsl @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // //#version 330 diff --git a/examples/simpleCpu/simpleCpuSubdivision.cpp b/examples/simpleCpu/simpleCpuSubdivision.cpp index 45cec53d..4ea3a870 100644 --- a/examples/simpleCpu/simpleCpuSubdivision.cpp +++ b/examples/simpleCpu/simpleCpuSubdivision.cpp @@ -1,3 +1,28 @@ +// +// Copyright 2013 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: +// +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. +// +// 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. +// + // CPU Subdivision with OpenSubdiv // ------------------------------- // In this example program, we will setup an OpenGL application that uses OSD to @@ -56,63 +81,6 @@ // developed to target mobile devices. // -/* -Copyright (C) Pixar. All rights reserved. - -This license governs use of the accompanying software. If you -use the software, you accept this license. If you do not accept -the license, do not use the software. - -1. Definitions -The terms "reproduce," "reproduction," "derivative works," and -"distribution" have the same meaning here as under U.S. -copyright law. A "contribution" is the original software, or -any additions or changes to the software. -A "contributor" is any person or entity that distributes its -contribution under this license. -"Licensed patents" are a contributor's patent claims that read -directly on its contribution. - -2. Grant of Rights -(A) Copyright Grant- Subject to the terms of this license, -including the license conditions and limitations in section 3, -each contributor grants you a non-exclusive, worldwide, -royalty-free copyright license to reproduce its contribution, -prepare derivative works of its contribution, and distribute -its contribution or any derivative works that you create. -(B) Patent Grant- Subject to the terms of this license, -including the license conditions and limitations in section 3, -each contributor grants you a non-exclusive, worldwide, -royalty-free license under its licensed patents to make, have -made, use, sell, offer for sale, import, and/or otherwise -dispose of its contribution in the software or derivative works -of the contribution in the software. - -3. Conditions and Limitations -(A) No Trademark License- This license does not grant you -rights to use any contributor's name, logo, or trademarks. -(B) If you bring a patent claim against any contributor over -patents that you claim are infringed by the software, your -patent license from such contributor to the software ends -automatically. -(C) If you distribute any portion of the software, you must -retain all copyright, patent, trademark, and attribution -notices that are present in the software. -(D) If you distribute any portion of the software in source -code form, you may do so only under this license by including a -complete copy of this license with your distribution. If you -distribute any portion of the software in compiled or object -code form, you may only do so under a license that complies -with this license. -(E) The software is licensed "as-is." You bear the risk of -using it. The contributors give no express warranties, -guarantees or conditions. You may have additional consumer -rights under your local laws which this license cannot change. -To the extent permitted under your local laws, the contributors -exclude the implied warranties of merchantability, fitness for -a particular purpose and non-infringement. -*/ - // ### Helper Includes // Vector algebra and common GL machinations that have been isolated for diff --git a/examples/simpleCpu/simpleCpuSubdivision_org.cpp b/examples/simpleCpu/simpleCpuSubdivision_org.cpp index b7c467ce..22da069b 100644 --- a/examples/simpleCpu/simpleCpuSubdivision_org.cpp +++ b/examples/simpleCpu/simpleCpuSubdivision_org.cpp @@ -1,3 +1,28 @@ +// +// Copyright 2013 Pixar +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: +// +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. +// +// 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. +// + // CPU Subdivision with OpenSubdiv // ------------------------------- // In this example program, we will setup an OpenGL application that uses OSD to @@ -56,63 +81,6 @@ // developed to target mobile devices. // -/* -Copyright (C) Pixar. All rights reserved. - -This license governs use of the accompanying software. If you -use the software, you accept this license. If you do not accept -the license, do not use the software. - -1. Definitions -The terms "reproduce," "reproduction," "derivative works," and -"distribution" have the same meaning here as under U.S. -copyright law. A "contribution" is the original software, or -any additions or changes to the software. -A "contributor" is any person or entity that distributes its -contribution under this license. -"Licensed patents" are a contributor's patent claims that read -directly on its contribution. - -2. Grant of Rights -(A) Copyright Grant- Subject to the terms of this license, -including the license conditions and limitations in section 3, -each contributor grants you a non-exclusive, worldwide, -royalty-free copyright license to reproduce its contribution, -prepare derivative works of its contribution, and distribute -its contribution or any derivative works that you create. -(B) Patent Grant- Subject to the terms of this license, -including the license conditions and limitations in section 3, -each contributor grants you a non-exclusive, worldwide, -royalty-free license under its licensed patents to make, have -made, use, sell, offer for sale, import, and/or otherwise -dispose of its contribution in the software or derivative works -of the contribution in the software. - -3. Conditions and Limitations -(A) No Trademark License- This license does not grant you -rights to use any contributor's name, logo, or trademarks. -(B) If you bring a patent claim against any contributor over -patents that you claim are infringed by the software, your -patent license from such contributor to the software ends -automatically. -(C) If you distribute any portion of the software, you must -retain all copyright, patent, trademark, and attribution -notices that are present in the software. -(D) If you distribute any portion of the software in source -code form, you may do so only under this license by including a -complete copy of this license with your distribution. If you -distribute any portion of the software in compiled or object -code form, you may only do so under a license that complies -with this license. -(E) The software is licensed "as-is." You bear the risk of -using it. The contributors give no express warranties, -guarantees or conditions. You may have additional consumer -rights under your local laws which this license cannot change. -To the extent permitted under your local laws, the contributors -exclude the implied warranties of merchantability, fitness for -a particular purpose and non-infringement. -*/ - // ### Helper Includes // Vector algebra and common GL machinations that have been isolated for diff --git a/opensubdiv/CMakeLists.txt b/opensubdiv/CMakeLists.txt index 05cceaad..c6bff108 100644 --- a/opensubdiv/CMakeLists.txt +++ b/opensubdiv/CMakeLists.txt @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # if(OPENGL_FOUND OR OPENCL_FOUND OR DXSDK_FOUND OR CUDA_FOUND) diff --git a/opensubdiv/far/CMakeLists.txt b/opensubdiv/far/CMakeLists.txt index a74bc69b..f3193889 100644 --- a/opensubdiv/far/CMakeLists.txt +++ b/opensubdiv/far/CMakeLists.txt @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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/opensubdiv/far/bilinearSubdivisionTables.h b/opensubdiv/far/bilinearSubdivisionTables.h index 1fdf0615..54f335eb 100644 --- a/opensubdiv/far/bilinearSubdivisionTables.h +++ b/opensubdiv/far/bilinearSubdivisionTables.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 FAR_BILINEAR_SUBDIVISION_TABLES_H diff --git a/opensubdiv/far/bilinearSubdivisionTablesFactory.h b/opensubdiv/far/bilinearSubdivisionTablesFactory.h index 01ed6b2a..fa6e4fc1 100644 --- a/opensubdiv/far/bilinearSubdivisionTablesFactory.h +++ b/opensubdiv/far/bilinearSubdivisionTablesFactory.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 FAR_BILINEAR_SUBDIVISION_TABLES_FACTORY_H diff --git a/opensubdiv/far/catmarkSubdivisionTables.h b/opensubdiv/far/catmarkSubdivisionTables.h index e9a41d67..0bec9d6a 100644 --- a/opensubdiv/far/catmarkSubdivisionTables.h +++ b/opensubdiv/far/catmarkSubdivisionTables.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 FAR_CATMARK_SUBDIVISION_TABLES_H diff --git a/opensubdiv/far/catmarkSubdivisionTablesFactory.h b/opensubdiv/far/catmarkSubdivisionTablesFactory.h index 96e688b3..8e6bb331 100644 --- a/opensubdiv/far/catmarkSubdivisionTablesFactory.h +++ b/opensubdiv/far/catmarkSubdivisionTablesFactory.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 FAR_CATMARK_SUBDIVISION_TABLES_FACTORY_H diff --git a/opensubdiv/far/dispatcher.h b/opensubdiv/far/dispatcher.h index 240524ff..9a941285 100644 --- a/opensubdiv/far/dispatcher.h +++ b/opensubdiv/far/dispatcher.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 FAR_DISPATCHER_H #define FAR_DISPATCHER_H diff --git a/opensubdiv/far/kernelBatch.h b/opensubdiv/far/kernelBatch.h index 8c2c8000..9cde7427 100644 --- a/opensubdiv/far/kernelBatch.h +++ b/opensubdiv/far/kernelBatch.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 FAR_KERNEL_BATCH_H #define FAR_KERNEL_BATCH_H diff --git a/opensubdiv/far/kernelBatchFactory.h b/opensubdiv/far/kernelBatchFactory.h index dad8fe0a..a3d8c027 100644 --- a/opensubdiv/far/kernelBatchFactory.h +++ b/opensubdiv/far/kernelBatchFactory.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 FAR_KERNEL_BATCH_FACTORY_H #define FAR_KERNEL_BATCH_FACTORY_H diff --git a/opensubdiv/far/loopSubdivisionTables.h b/opensubdiv/far/loopSubdivisionTables.h index 68975b24..27957e8a 100644 --- a/opensubdiv/far/loopSubdivisionTables.h +++ b/opensubdiv/far/loopSubdivisionTables.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 FAR_LOOP_SUBDIVISION_TABLES_H diff --git a/opensubdiv/far/loopSubdivisionTablesFactory.h b/opensubdiv/far/loopSubdivisionTablesFactory.h index 4eb22c4c..8b03a6d1 100644 --- a/opensubdiv/far/loopSubdivisionTablesFactory.h +++ b/opensubdiv/far/loopSubdivisionTablesFactory.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 FAR_LOOP_SUBDIVISION_TABLES_FACTORY_H diff --git a/opensubdiv/far/mesh.h b/opensubdiv/far/mesh.h index 687ce170..18b46f1e 100644 --- a/opensubdiv/far/mesh.h +++ b/opensubdiv/far/mesh.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 FAR_MESH_H diff --git a/opensubdiv/far/meshFactory.h b/opensubdiv/far/meshFactory.h index ede6fa57..d94a73f5 100644 --- a/opensubdiv/far/meshFactory.h +++ b/opensubdiv/far/meshFactory.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 FAR_MESH_FACTORY_H diff --git a/opensubdiv/far/multiMeshFactory.h b/opensubdiv/far/multiMeshFactory.h index fe5dc64e..0a2e932a 100755 --- a/opensubdiv/far/multiMeshFactory.h +++ b/opensubdiv/far/multiMeshFactory.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 FAR_MULTI_MESH_FACTORY_H diff --git a/opensubdiv/far/patchMap.h b/opensubdiv/far/patchMap.h index 3955522c..6c811a9b 100644 --- a/opensubdiv/far/patchMap.h +++ b/opensubdiv/far/patchMap.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 FAR_PATCH_MAP_H diff --git a/opensubdiv/far/patchParam.h b/opensubdiv/far/patchParam.h index 9e3bb4db..a19aa7b7 100644 --- a/opensubdiv/far/patchParam.h +++ b/opensubdiv/far/patchParam.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 FAR_PATCH_PARAM_H diff --git a/opensubdiv/far/patchTables.h b/opensubdiv/far/patchTables.h index 0a7a2ec2..4c2d58eb 100644 --- a/opensubdiv/far/patchTables.h +++ b/opensubdiv/far/patchTables.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 FAR_PATCH_TABLES_H diff --git a/opensubdiv/far/patchTablesFactory.h b/opensubdiv/far/patchTablesFactory.h index a0b82b68..e0345942 100644 --- a/opensubdiv/far/patchTablesFactory.h +++ b/opensubdiv/far/patchTablesFactory.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 FAR_PATCH_TABLES_FACTORY_H diff --git a/opensubdiv/far/subdivisionTables.h b/opensubdiv/far/subdivisionTables.h index 709ef9d3..00f0e25c 100644 --- a/opensubdiv/far/subdivisionTables.h +++ b/opensubdiv/far/subdivisionTables.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 FAR_SUBDIVISION_TABLES_H diff --git a/opensubdiv/far/subdivisionTablesFactory.h b/opensubdiv/far/subdivisionTablesFactory.h index 98047fb0..53a2cb6b 100644 --- a/opensubdiv/far/subdivisionTablesFactory.h +++ b/opensubdiv/far/subdivisionTablesFactory.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 FAR_SUBDIVISION_TABLES_FACTORY_H diff --git a/opensubdiv/far/vertexEditTables.h b/opensubdiv/far/vertexEditTables.h index 6146fab1..12cdcfad 100644 --- a/opensubdiv/far/vertexEditTables.h +++ b/opensubdiv/far/vertexEditTables.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 FAR_VERTEX_EDIT_TABLES_H diff --git a/opensubdiv/far/vertexEditTablesFactory.h b/opensubdiv/far/vertexEditTablesFactory.h index 8987ec73..996a77a1 100644 --- a/opensubdiv/far/vertexEditTablesFactory.h +++ b/opensubdiv/far/vertexEditTablesFactory.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 FAR_VERTEX_EDIT_TABLES_FACTORY_H diff --git a/opensubdiv/hbr/CMakeLists.txt b/opensubdiv/hbr/CMakeLists.txt index e84e9e5a..f2ac420a 100644 --- a/opensubdiv/hbr/CMakeLists.txt +++ b/opensubdiv/hbr/CMakeLists.txt @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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/opensubdiv/hbr/allocator.h b/opensubdiv/hbr/allocator.h index ebbc783e..1b1d2e3d 100644 --- a/opensubdiv/hbr/allocator.h +++ b/opensubdiv/hbr/allocator.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 HBRALLOCATOR_H #define HBRALLOCATOR_H diff --git a/opensubdiv/hbr/bilinear.h b/opensubdiv/hbr/bilinear.h index ddc310ad..3a960780 100644 --- a/opensubdiv/hbr/bilinear.h +++ b/opensubdiv/hbr/bilinear.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 HBRBILINEAR_H #define HBRBILINEAR_H diff --git a/opensubdiv/hbr/catmark.h b/opensubdiv/hbr/catmark.h index 14fb5f6e..bde83759 100644 --- a/opensubdiv/hbr/catmark.h +++ b/opensubdiv/hbr/catmark.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 HBRCATMARK_H #define HBRCATMARK_H diff --git a/opensubdiv/hbr/cornerEdit.h b/opensubdiv/hbr/cornerEdit.h index ae086c20..2ef3ad6e 100644 --- a/opensubdiv/hbr/cornerEdit.h +++ b/opensubdiv/hbr/cornerEdit.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 HBRCORNEREDIT_H #define HBRCORNEREDIT_H diff --git a/opensubdiv/hbr/creaseEdit.h b/opensubdiv/hbr/creaseEdit.h index 497a61b1..0e935b8f 100644 --- a/opensubdiv/hbr/creaseEdit.h +++ b/opensubdiv/hbr/creaseEdit.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 HBRCREASEEDIT_H #define HBRCREASEEDIT_H diff --git a/opensubdiv/hbr/face.h b/opensubdiv/hbr/face.h index 3c631097..c41c0d84 100644 --- a/opensubdiv/hbr/face.h +++ b/opensubdiv/hbr/face.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 HBRFACE_H #define HBRFACE_H diff --git a/opensubdiv/hbr/faceEdit.h b/opensubdiv/hbr/faceEdit.h index 90134f32..812413e3 100644 --- a/opensubdiv/hbr/faceEdit.h +++ b/opensubdiv/hbr/faceEdit.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 HBRFACEEDIT_H #define HBRFACEEDIT_H diff --git a/opensubdiv/hbr/fvarData.h b/opensubdiv/hbr/fvarData.h index c2601232..ebaf8c4e 100644 --- a/opensubdiv/hbr/fvarData.h +++ b/opensubdiv/hbr/fvarData.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 HBRFVARDATA_H #define HBRFVARDATA_H diff --git a/opensubdiv/hbr/fvarEdit.h b/opensubdiv/hbr/fvarEdit.h index ebd25cd0..165bfb37 100644 --- a/opensubdiv/hbr/fvarEdit.h +++ b/opensubdiv/hbr/fvarEdit.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 HBRFVAREDIT_H #define HBRFVAREDIT_H diff --git a/opensubdiv/hbr/halfedge.h b/opensubdiv/hbr/halfedge.h index eba43c7d..022659fc 100644 --- a/opensubdiv/hbr/halfedge.h +++ b/opensubdiv/hbr/halfedge.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 HBRHALFEDGE_H #define HBRHALFEDGE_H diff --git a/opensubdiv/hbr/hierarchicalEdit.h b/opensubdiv/hbr/hierarchicalEdit.h index ef941262..44056958 100644 --- a/opensubdiv/hbr/hierarchicalEdit.h +++ b/opensubdiv/hbr/hierarchicalEdit.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 HBRHIERARCHICALEDIT_H #define HBRHIERARCHICALEDIT_H diff --git a/opensubdiv/hbr/holeEdit.h b/opensubdiv/hbr/holeEdit.h index e4110713..117c0de8 100644 --- a/opensubdiv/hbr/holeEdit.h +++ b/opensubdiv/hbr/holeEdit.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 HBRHOLEEDIT_H #define HBRHOLEEDIT_H diff --git a/opensubdiv/hbr/loop.h b/opensubdiv/hbr/loop.h index 5d444def..749ea61f 100644 --- a/opensubdiv/hbr/loop.h +++ b/opensubdiv/hbr/loop.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 HBRLOOP_H #define HBRLOOP_H diff --git a/opensubdiv/hbr/mesh.h b/opensubdiv/hbr/mesh.h index 73f74bd1..9ff55450 100644 --- a/opensubdiv/hbr/mesh.h +++ b/opensubdiv/hbr/mesh.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 HBRMESH_H #define HBRMESH_H diff --git a/opensubdiv/hbr/subdivision.h b/opensubdiv/hbr/subdivision.h index 3adf89b5..1cd2d2b1 100644 --- a/opensubdiv/hbr/subdivision.h +++ b/opensubdiv/hbr/subdivision.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 HBRSUBDIVISION_H #define HBRSUBDIVISION_H diff --git a/opensubdiv/hbr/vertex.h b/opensubdiv/hbr/vertex.h index 55ea0d23..31a8ed55 100644 --- a/opensubdiv/hbr/vertex.h +++ b/opensubdiv/hbr/vertex.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 HBRVERTEX_H #define HBRVERTEX_H diff --git a/opensubdiv/hbr/vertexEdit.h b/opensubdiv/hbr/vertexEdit.h index 30e2ec66..903b0f32 100644 --- a/opensubdiv/hbr/vertexEdit.h +++ b/opensubdiv/hbr/vertexEdit.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 HBRVERTEXEDIT_H #define HBRVERTEXEDIT_H diff --git a/opensubdiv/osd/Android.mk b/opensubdiv/osd/Android.mk index 56632bb9..d391f04b 100644 --- a/opensubdiv/osd/Android.mk +++ b/opensubdiv/osd/Android.mk @@ -1,59 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # # This file is used by the Android NDK to allow OpenSubdiv libraries diff --git a/opensubdiv/osd/CMakeLists.txt b/opensubdiv/osd/CMakeLists.txt index 9f7ce4be..c7bfa6f8 100644 --- a/opensubdiv/osd/CMakeLists.txt +++ b/opensubdiv/osd/CMakeLists.txt @@ -1,59 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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/opensubdiv/osd/clComputeContext.cpp b/opensubdiv/osd/clComputeContext.cpp index 004c5e83..53070f7d 100644 --- a/opensubdiv/osd/clComputeContext.cpp +++ b/opensubdiv/osd/clComputeContext.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "../far/mesh.h" diff --git a/opensubdiv/osd/clComputeContext.h b/opensubdiv/osd/clComputeContext.h index 5efaa1fc..d851181e 100644 --- a/opensubdiv/osd/clComputeContext.h +++ b/opensubdiv/osd/clComputeContext.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_CL_COMPUTE_CONTEXT_H #define OSD_CL_COMPUTE_CONTEXT_H diff --git a/opensubdiv/osd/clComputeController.cpp b/opensubdiv/osd/clComputeController.cpp index e84d195a..32c20b23 100644 --- a/opensubdiv/osd/clComputeController.cpp +++ b/opensubdiv/osd/clComputeController.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "../osd/clComputeController.h" diff --git a/opensubdiv/osd/clComputeController.h b/opensubdiv/osd/clComputeController.h index 429e5f98..eb588002 100644 --- a/opensubdiv/osd/clComputeController.h +++ b/opensubdiv/osd/clComputeController.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_CL_COMPUTE_CONTROLLER_H #define OSD_CL_COMPUTE_CONTROLLER_H diff --git a/opensubdiv/osd/clD3D11VertexBuffer.cpp b/opensubdiv/osd/clD3D11VertexBuffer.cpp index 8059973e..b7ea5be3 100644 --- a/opensubdiv/osd/clD3D11VertexBuffer.cpp +++ b/opensubdiv/osd/clD3D11VertexBuffer.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "../osd/clD3D11VertexBuffer.h" diff --git a/opensubdiv/osd/clD3D11VertexBuffer.h b/opensubdiv/osd/clD3D11VertexBuffer.h index eebcaa94..8eca68a1 100644 --- a/opensubdiv/osd/clD3D11VertexBuffer.h +++ b/opensubdiv/osd/clD3D11VertexBuffer.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_CL_D3D11_VERTEX_BUFFER_H #define OSD_CL_D3D11_VERTEX_BUFFER_H diff --git a/opensubdiv/osd/clGLVertexBuffer.cpp b/opensubdiv/osd/clGLVertexBuffer.cpp index 365ac3b1..06e0b347 100644 --- a/opensubdiv/osd/clGLVertexBuffer.cpp +++ b/opensubdiv/osd/clGLVertexBuffer.cpp @@ -1,60 +1,26 @@ - - // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "../osd/clGLVertexBuffer.h" diff --git a/opensubdiv/osd/clGLVertexBuffer.h b/opensubdiv/osd/clGLVertexBuffer.h index d8de2d28..f1763320 100644 --- a/opensubdiv/osd/clGLVertexBuffer.h +++ b/opensubdiv/osd/clGLVertexBuffer.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_CL_GL_VERTEX_BUFFER_H #define OSD_CL_GL_VERTEX_BUFFER_H diff --git a/opensubdiv/osd/clKernel.cl b/opensubdiv/osd/clKernel.cl index becef09c..04a721c5 100644 --- a/opensubdiv/osd/clKernel.cl +++ b/opensubdiv/osd/clKernel.cl @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 M_PI diff --git a/opensubdiv/osd/clKernelBundle.cpp b/opensubdiv/osd/clKernelBundle.cpp index 35a3408c..51f4d55e 100644 --- a/opensubdiv/osd/clKernelBundle.cpp +++ b/opensubdiv/osd/clKernelBundle.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // #if defined(_WIN32) diff --git a/opensubdiv/osd/clKernelBundle.h b/opensubdiv/osd/clKernelBundle.h index e790aa65..431df362 100644 --- a/opensubdiv/osd/clKernelBundle.h +++ b/opensubdiv/osd/clKernelBundle.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_CL_KERNEL_BUNDLE_H #define OSD_CL_KERNEL_BUNDLE_H diff --git a/opensubdiv/osd/clVertexBuffer.cpp b/opensubdiv/osd/clVertexBuffer.cpp index 98db7005..a675c2a5 100644 --- a/opensubdiv/osd/clVertexBuffer.cpp +++ b/opensubdiv/osd/clVertexBuffer.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "../osd/clVertexBuffer.h" diff --git a/opensubdiv/osd/clVertexBuffer.h b/opensubdiv/osd/clVertexBuffer.h index 75d5c0ca..b0eef084 100644 --- a/opensubdiv/osd/clVertexBuffer.h +++ b/opensubdiv/osd/clVertexBuffer.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_CL_VERTEX_BUFFER_H #define OSD_CL_VERTEX_BUFFER_H diff --git a/opensubdiv/osd/computeController.h b/opensubdiv/osd/computeController.h index 35b7bd0f..bb61a880 100644 --- a/opensubdiv/osd/computeController.h +++ b/opensubdiv/osd/computeController.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_COMPUTE_CONTROLLER_H #define OSD_COMPUTE_CONTROLLER_H diff --git a/opensubdiv/osd/cpuComputeContext.cpp b/opensubdiv/osd/cpuComputeContext.cpp index ad26fe17..004d90c9 100644 --- a/opensubdiv/osd/cpuComputeContext.cpp +++ b/opensubdiv/osd/cpuComputeContext.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "../far/mesh.h" diff --git a/opensubdiv/osd/cpuComputeContext.h b/opensubdiv/osd/cpuComputeContext.h index c20d8c43..4b7b29a1 100644 --- a/opensubdiv/osd/cpuComputeContext.h +++ b/opensubdiv/osd/cpuComputeContext.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_CPU_COMPUTE_CONTEXT_H #define OSD_CPU_COMPUTE_CONTEXT_H diff --git a/opensubdiv/osd/cpuComputeController.cpp b/opensubdiv/osd/cpuComputeController.cpp index c5261e86..f2bf905d 100644 --- a/opensubdiv/osd/cpuComputeController.cpp +++ b/opensubdiv/osd/cpuComputeController.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "../osd/cpuComputeContext.h" diff --git a/opensubdiv/osd/cpuComputeController.h b/opensubdiv/osd/cpuComputeController.h index 8513ef46..01eb778e 100644 --- a/opensubdiv/osd/cpuComputeController.h +++ b/opensubdiv/osd/cpuComputeController.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_CPU_COMPUTE_CONTROLLER_H #define OSD_CPU_COMPUTE_CONTROLLER_H diff --git a/opensubdiv/osd/cpuD3D11VertexBuffer.cpp b/opensubdiv/osd/cpuD3D11VertexBuffer.cpp index 0544a6fe..69002181 100644 --- a/opensubdiv/osd/cpuD3D11VertexBuffer.cpp +++ b/opensubdiv/osd/cpuD3D11VertexBuffer.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "../osd/cpuD3D11VertexBuffer.h" diff --git a/opensubdiv/osd/cpuD3D11VertexBuffer.h b/opensubdiv/osd/cpuD3D11VertexBuffer.h index fcca3b42..38916b91 100644 --- a/opensubdiv/osd/cpuD3D11VertexBuffer.h +++ b/opensubdiv/osd/cpuD3D11VertexBuffer.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_CPU_D3D11_VERTEX_BUFFER_H #define OSD_CPU_D3D11_VERTEX_BUFFER_H diff --git a/opensubdiv/osd/cpuEvalLimitContext.cpp b/opensubdiv/osd/cpuEvalLimitContext.cpp index ec85e006..44d18710 100644 --- a/opensubdiv/osd/cpuEvalLimitContext.cpp +++ b/opensubdiv/osd/cpuEvalLimitContext.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "../osd/cpuEvalLimitContext.h" diff --git a/opensubdiv/osd/cpuEvalLimitContext.h b/opensubdiv/osd/cpuEvalLimitContext.h index 5a113e17..ba09fe96 100644 --- a/opensubdiv/osd/cpuEvalLimitContext.h +++ b/opensubdiv/osd/cpuEvalLimitContext.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_CPU_EVAL_LIMIT_CONTEXT_H #define OSD_CPU_EVAL_LIMIT_CONTEXT_H diff --git a/opensubdiv/osd/cpuEvalLimitController.cpp b/opensubdiv/osd/cpuEvalLimitController.cpp index f1570824..7f214224 100644 --- a/opensubdiv/osd/cpuEvalLimitController.cpp +++ b/opensubdiv/osd/cpuEvalLimitController.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "../osd/cpuEvalLimitController.h" diff --git a/opensubdiv/osd/cpuEvalLimitController.h b/opensubdiv/osd/cpuEvalLimitController.h index ab1e47bf..c4211b89 100644 --- a/opensubdiv/osd/cpuEvalLimitController.h +++ b/opensubdiv/osd/cpuEvalLimitController.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_CPU_EVAL_LIMIT_CONTROLLER_H #define OSD_CPU_EVAL_LIMIT_CONTROLLER_H diff --git a/opensubdiv/osd/cpuEvalLimitKernel.cpp b/opensubdiv/osd/cpuEvalLimitKernel.cpp index 775119ba..96332145 100644 --- a/opensubdiv/osd/cpuEvalLimitKernel.cpp +++ b/opensubdiv/osd/cpuEvalLimitKernel.cpp @@ -1,1108 +1,1076 @@ -// -// Copyright (C) Pixar. All rights reserved. -// -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. -// -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. -// -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. -// -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. -// - -#include "../osd/cpuEvalLimitKernel.h" - -#include -#include -#include -#include -#include -#include -#include - -namespace OpenSubdiv { -namespace OPENSUBDIV_VERSION { - -void -evalBilinear(float u, float v, - unsigned int const * vertexIndices, - OsdVertexBufferDescriptor const & inDesc, - float const * inQ, - OsdVertexBufferDescriptor const & outDesc, - float * outQ) { - - assert( inDesc.length <= (outDesc.stride-outDesc.offset) ); - - float const * inOffset = inQ + inDesc.offset; - - float * Q = outQ + outDesc.offset; - - memset(Q, 0, inDesc.length*sizeof(float)); - - float ou = 1.0f - u, - ov = 1.0f - v, - w[4] = { ov*ou, v*ou, v*u, ov*u }; - - for (int i=0; i<4; ++i) { - - float const * in = inOffset + vertexIndices[i]*inDesc.stride; - - for (int k=0; k2) { - for (int k=0; k0); - float const * diagonal = inOffset + idx_diagonal * inDesc.stride; - - for (int k=0; k0 and idx_diagonal>0 ); - - float const * neighbor = inOffset + idx_neighbor * inDesc.stride, - * diagonal = inOffset + idx_diagonal * inDesc.stride; - - for (int k=0; k 2) { - float s1 = 3.0f - 2.0f*csf(n-3,2)-csf(np-3,2), - s2 = 2.0f*csf(n-3,2), - s3 = 3.0f -2.0f*cosf(2.0f*float(M_PI)/float(n)) - cosf(2.0f*float(M_PI)/float(nm)); - - for (int k=0, ofs=vofs; k +#include +#include +#include +#include +#include +#include + +namespace OpenSubdiv { +namespace OPENSUBDIV_VERSION { + +void +evalBilinear(float u, float v, + unsigned int const * vertexIndices, + OsdVertexBufferDescriptor const & inDesc, + float const * inQ, + OsdVertexBufferDescriptor const & outDesc, + float * outQ) { + + assert( inDesc.length <= (outDesc.stride-outDesc.offset) ); + + float const * inOffset = inQ + inDesc.offset; + + float * Q = outQ + outDesc.offset; + + memset(Q, 0, inDesc.length*sizeof(float)); + + float ou = 1.0f - u, + ov = 1.0f - v, + w[4] = { ov*ou, v*ou, v*u, ov*u }; + + for (int i=0; i<4; ++i) { + + float const * in = inOffset + vertexIndices[i]*inDesc.stride; + + for (int k=0; k2) { + for (int k=0; k0); + float const * diagonal = inOffset + idx_diagonal * inDesc.stride; + + for (int k=0; k0 and idx_diagonal>0 ); + + float const * neighbor = inOffset + idx_neighbor * inDesc.stride, + * diagonal = inOffset + idx_diagonal * inDesc.stride; + + for (int k=0; k 2) { + float s1 = 3.0f - 2.0f*csf(n-3,2)-csf(np-3,2), + s2 = 2.0f*csf(n-3,2), + s3 = 3.0f -2.0f*cosf(2.0f*float(M_PI)/float(n)) - cosf(2.0f*float(M_PI)/float(nm)); + + for (int k=0, ofs=vofs; k template struct DeviceVertex diff --git a/opensubdiv/osd/cudaVertexBuffer.cpp b/opensubdiv/osd/cudaVertexBuffer.cpp index b1c3114b..395431af 100644 --- a/opensubdiv/osd/cudaVertexBuffer.cpp +++ b/opensubdiv/osd/cudaVertexBuffer.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "../osd/cudaVertexBuffer.h" diff --git a/opensubdiv/osd/cudaVertexBuffer.h b/opensubdiv/osd/cudaVertexBuffer.h index 1d03d4f7..85ae8fad 100644 --- a/opensubdiv/osd/cudaVertexBuffer.h +++ b/opensubdiv/osd/cudaVertexBuffer.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_CUDA_VERTEX_BUFFER_H #define OSD_CUDA_VERTEX_BUFFER_H diff --git a/opensubdiv/osd/d3d11ComputeContext.cpp b/opensubdiv/osd/d3d11ComputeContext.cpp index 9aa18267..8a41e712 100644 --- a/opensubdiv/osd/d3d11ComputeContext.cpp +++ b/opensubdiv/osd/d3d11ComputeContext.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "../far/mesh.h" diff --git a/opensubdiv/osd/d3d11ComputeContext.h b/opensubdiv/osd/d3d11ComputeContext.h index 2c76d410..5b26a81c 100644 --- a/opensubdiv/osd/d3d11ComputeContext.h +++ b/opensubdiv/osd/d3d11ComputeContext.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_D3D11_COMPUTE_CONTEXT_H #define OSD_D3D11_COMPUTE_CONTEXT_H diff --git a/opensubdiv/osd/d3d11ComputeController.cpp b/opensubdiv/osd/d3d11ComputeController.cpp index 61c81368..da1f9838 100644 --- a/opensubdiv/osd/d3d11ComputeController.cpp +++ b/opensubdiv/osd/d3d11ComputeController.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "../osd/d3d11ComputeController.h" diff --git a/opensubdiv/osd/d3d11ComputeController.h b/opensubdiv/osd/d3d11ComputeController.h index 603c4c3f..123e0e54 100644 --- a/opensubdiv/osd/d3d11ComputeController.h +++ b/opensubdiv/osd/d3d11ComputeController.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_D3D11_COMPUTE_CONTROLLER_H #define OSD_D3D11_COMPUTE_CONTROLLER_H diff --git a/opensubdiv/osd/d3d11DrawContext.cpp b/opensubdiv/osd/d3d11DrawContext.cpp index ac702fab..a87e68a1 100644 --- a/opensubdiv/osd/d3d11DrawContext.cpp +++ b/opensubdiv/osd/d3d11DrawContext.cpp @@ -1,53 +1,27 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// 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. // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, #include "../far/dispatcher.h" #include "../far/loopSubdivisionTables.h" diff --git a/opensubdiv/osd/d3d11DrawContext.h b/opensubdiv/osd/d3d11DrawContext.h index 1cd58d7f..25c7d376 100644 --- a/opensubdiv/osd/d3d11DrawContext.h +++ b/opensubdiv/osd/d3d11DrawContext.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_D3D11L_DRAW_CONTEXT_H #define OSD_D3D11L_DRAW_CONTEXT_H diff --git a/opensubdiv/osd/d3d11DrawRegistry.cpp b/opensubdiv/osd/d3d11DrawRegistry.cpp index 73e1891a..238afe31 100644 --- a/opensubdiv/osd/d3d11DrawRegistry.cpp +++ b/opensubdiv/osd/d3d11DrawRegistry.cpp @@ -1,53 +1,27 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// 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. // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, #include "../osd/d3d11DrawRegistry.h" #include "../osd/error.h" diff --git a/opensubdiv/osd/d3d11DrawRegistry.h b/opensubdiv/osd/d3d11DrawRegistry.h index b00ee60c..92c16898 100644 --- a/opensubdiv/osd/d3d11DrawRegistry.h +++ b/opensubdiv/osd/d3d11DrawRegistry.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_D3D11_DRAW_REGISTRY_H #define OSD_D3D11_DRAW_REGISTRY_H diff --git a/opensubdiv/osd/d3d11KernelBundle.cpp b/opensubdiv/osd/d3d11KernelBundle.cpp index ce395191..1262bde5 100644 --- a/opensubdiv/osd/d3d11KernelBundle.cpp +++ b/opensubdiv/osd/d3d11KernelBundle.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "../osd/debug.h" diff --git a/opensubdiv/osd/d3d11KernelBundle.h b/opensubdiv/osd/d3d11KernelBundle.h index 63dd0ad4..e55180c1 100644 --- a/opensubdiv/osd/d3d11KernelBundle.h +++ b/opensubdiv/osd/d3d11KernelBundle.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_D3D11_COMPUTE_KERNEL_BUNDLE_H #define OSD_D3D11_COMPUTE_KERNEL_BUNDLE_H diff --git a/opensubdiv/osd/d3d11Mesh.h b/opensubdiv/osd/d3d11Mesh.h index 4efbf625..84391e63 100644 --- a/opensubdiv/osd/d3d11Mesh.h +++ b/opensubdiv/osd/d3d11Mesh.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_D3D11MESH_H #define OSD_D3D11MESH_H diff --git a/opensubdiv/osd/d3d11PtexTexture.cpp b/opensubdiv/osd/d3d11PtexTexture.cpp index 9c1d3eb1..ce6b6f01 100644 --- a/opensubdiv/osd/d3d11PtexTexture.cpp +++ b/opensubdiv/osd/d3d11PtexTexture.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "../osd/d3d11PtexTexture.h" diff --git a/opensubdiv/osd/d3d11PtexTexture.h b/opensubdiv/osd/d3d11PtexTexture.h index a7d12c81..792e87a9 100644 --- a/opensubdiv/osd/d3d11PtexTexture.h +++ b/opensubdiv/osd/d3d11PtexTexture.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_D3D11_PTEX_TEXTURE_H #define OSD_D3D11_PTEX_TEXTURE_H diff --git a/opensubdiv/osd/d3d11VertexBuffer.cpp b/opensubdiv/osd/d3d11VertexBuffer.cpp index 2ab2e200..e21c2b75 100644 --- a/opensubdiv/osd/d3d11VertexBuffer.cpp +++ b/opensubdiv/osd/d3d11VertexBuffer.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "../osd/d3d11VertexBuffer.h" diff --git a/opensubdiv/osd/d3d11VertexBuffer.h b/opensubdiv/osd/d3d11VertexBuffer.h index 60f6b620..403929b3 100644 --- a/opensubdiv/osd/d3d11VertexBuffer.h +++ b/opensubdiv/osd/d3d11VertexBuffer.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_D3D11_VERTEX_BUFFER_H #define OSD_D3D11_VERTEX_BUFFER_H diff --git a/opensubdiv/osd/debug.h b/opensubdiv/osd/debug.h index 10af5200..d642baaf 100644 --- a/opensubdiv/osd/debug.h +++ b/opensubdiv/osd/debug.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_DEBUG_H #define OSD_DEBUG_H diff --git a/opensubdiv/osd/drawContext.cpp b/opensubdiv/osd/drawContext.cpp index ea75a396..876e4596 100644 --- a/opensubdiv/osd/drawContext.cpp +++ b/opensubdiv/osd/drawContext.cpp @@ -1,53 +1,27 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// 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. // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, #include "../osd/drawContext.h" diff --git a/opensubdiv/osd/drawContext.h b/opensubdiv/osd/drawContext.h index a50a4372..3335820c 100644 --- a/opensubdiv/osd/drawContext.h +++ b/opensubdiv/osd/drawContext.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_DRAW_CONTEXT_H #define OSD_DRAW_CONTEXT_H diff --git a/opensubdiv/osd/drawRegistry.cpp b/opensubdiv/osd/drawRegistry.cpp index a813af9c..29f1361c 100644 --- a/opensubdiv/osd/drawRegistry.cpp +++ b/opensubdiv/osd/drawRegistry.cpp @@ -1,53 +1,27 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// 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. // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, #include "../osd/drawRegistry.h" diff --git a/opensubdiv/osd/drawRegistry.h b/opensubdiv/osd/drawRegistry.h index 1b87bbde..48907ab2 100644 --- a/opensubdiv/osd/drawRegistry.h +++ b/opensubdiv/osd/drawRegistry.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_DRAW_REGISTRY_H #define OSD_DRAW_REGISTRY_H diff --git a/opensubdiv/osd/error.cpp b/opensubdiv/osd/error.cpp index 9f0f24c9..76f95011 100644 --- a/opensubdiv/osd/error.cpp +++ b/opensubdiv/osd/error.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "../osd/error.h" diff --git a/opensubdiv/osd/error.h b/opensubdiv/osd/error.h index ab7ed89b..74aaa881 100644 --- a/opensubdiv/osd/error.h +++ b/opensubdiv/osd/error.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_ERROR_H #define OSD_ERROR_H diff --git a/opensubdiv/osd/evalLimitContext.cpp b/opensubdiv/osd/evalLimitContext.cpp index 8ddd70c7..c19cfbbf 100644 --- a/opensubdiv/osd/evalLimitContext.cpp +++ b/opensubdiv/osd/evalLimitContext.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "../osd/evalLimitContext.h" diff --git a/opensubdiv/osd/evalLimitContext.h b/opensubdiv/osd/evalLimitContext.h index ae001d34..23287628 100644 --- a/opensubdiv/osd/evalLimitContext.h +++ b/opensubdiv/osd/evalLimitContext.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_EVAL_LIMIT_CONTEXT_H #define OSD_EVAL_LIMIT_CONTEXT_H diff --git a/opensubdiv/osd/gcdComputeController.cpp b/opensubdiv/osd/gcdComputeController.cpp index 9b847376..67f68eb6 100644 --- a/opensubdiv/osd/gcdComputeController.cpp +++ b/opensubdiv/osd/gcdComputeController.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "../osd/cpuComputeContext.h" diff --git a/opensubdiv/osd/gcdComputeController.h b/opensubdiv/osd/gcdComputeController.h index 72328509..fd32860d 100644 --- a/opensubdiv/osd/gcdComputeController.h +++ b/opensubdiv/osd/gcdComputeController.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_GCD_COMPUTE_CONTROLLER_H #define OSD_GCD_COMPUTE_CONTROLLER_H diff --git a/opensubdiv/osd/gcdKernel.cpp b/opensubdiv/osd/gcdKernel.cpp index d7662c66..1267a7e8 100644 --- a/opensubdiv/osd/gcdKernel.cpp +++ b/opensubdiv/osd/gcdKernel.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "../osd/gcdKernel.h" diff --git a/opensubdiv/osd/gcdKernel.h b/opensubdiv/osd/gcdKernel.h index 895d9700..150b49b6 100644 --- a/opensubdiv/osd/gcdKernel.h +++ b/opensubdiv/osd/gcdKernel.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_GCD_KERNEL_H #define OSD_GCD_KERNEL_H diff --git a/opensubdiv/osd/glDrawContext.cpp b/opensubdiv/osd/glDrawContext.cpp index 83a78a09..752f0c7f 100644 --- a/opensubdiv/osd/glDrawContext.cpp +++ b/opensubdiv/osd/glDrawContext.cpp @@ -1,53 +1,27 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// 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. // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, #include "../far/dispatcher.h" #include "../far/loopSubdivisionTables.h" diff --git a/opensubdiv/osd/glDrawContext.h b/opensubdiv/osd/glDrawContext.h index a64397ff..b898e317 100644 --- a/opensubdiv/osd/glDrawContext.h +++ b/opensubdiv/osd/glDrawContext.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_GL_DRAW_CONTEXT_H #define OSD_GL_DRAW_CONTEXT_H diff --git a/opensubdiv/osd/glDrawRegistry.cpp b/opensubdiv/osd/glDrawRegistry.cpp index 4701318c..6a37419f 100644 --- a/opensubdiv/osd/glDrawRegistry.cpp +++ b/opensubdiv/osd/glDrawRegistry.cpp @@ -1,53 +1,27 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// 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. // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, #include "../osd/glDrawRegistry.h" #include "../osd/error.h" diff --git a/opensubdiv/osd/glDrawRegistry.h b/opensubdiv/osd/glDrawRegistry.h index 427c1b6b..5a16f362 100644 --- a/opensubdiv/osd/glDrawRegistry.h +++ b/opensubdiv/osd/glDrawRegistry.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_GL_DRAW_REGISTRY_H #define OSD_GL_DRAW_REGISTRY_H diff --git a/opensubdiv/osd/glMesh.h b/opensubdiv/osd/glMesh.h index a6780340..d191110f 100644 --- a/opensubdiv/osd/glMesh.h +++ b/opensubdiv/osd/glMesh.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_GL_MESH_H #define OSD_GL_MESH_H diff --git a/opensubdiv/osd/glPtexTexture.cpp b/opensubdiv/osd/glPtexTexture.cpp index 2c8ca163..5045149d 100644 --- a/opensubdiv/osd/glPtexTexture.cpp +++ b/opensubdiv/osd/glPtexTexture.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "../osd/glPtexTexture.h" diff --git a/opensubdiv/osd/glPtexTexture.h b/opensubdiv/osd/glPtexTexture.h index 1244c216..f4754cd0 100644 --- a/opensubdiv/osd/glPtexTexture.h +++ b/opensubdiv/osd/glPtexTexture.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_GL_PTEX_TEXTURE_H #define OSD_GL_PTEX_TEXTURE_H diff --git a/opensubdiv/osd/glVertexBuffer.cpp b/opensubdiv/osd/glVertexBuffer.cpp index b836bc05..ff884b6d 100644 --- a/opensubdiv/osd/glVertexBuffer.cpp +++ b/opensubdiv/osd/glVertexBuffer.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "../osd/glVertexBuffer.h" diff --git a/opensubdiv/osd/glVertexBuffer.h b/opensubdiv/osd/glVertexBuffer.h index 88e25593..b451c2f3 100644 --- a/opensubdiv/osd/glVertexBuffer.h +++ b/opensubdiv/osd/glVertexBuffer.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_GL_VERTEX_BUFFER_H #define OSD_GL_VERTEX_BUFFER_H diff --git a/opensubdiv/osd/glslComputeContext.cpp b/opensubdiv/osd/glslComputeContext.cpp index da286999..6a59c18b 100644 --- a/opensubdiv/osd/glslComputeContext.cpp +++ b/opensubdiv/osd/glslComputeContext.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "../far/mesh.h" diff --git a/opensubdiv/osd/glslComputeContext.h b/opensubdiv/osd/glslComputeContext.h index 4cd78e7c..115e5972 100644 --- a/opensubdiv/osd/glslComputeContext.h +++ b/opensubdiv/osd/glslComputeContext.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_GLSL_COMPUTE_CONTEXT_H #define OSD_GLSL_COMPUTE_CONTEXT_H diff --git a/opensubdiv/osd/glslComputeController.cpp b/opensubdiv/osd/glslComputeController.cpp index 49fc3f0d..2832780a 100644 --- a/opensubdiv/osd/glslComputeController.cpp +++ b/opensubdiv/osd/glslComputeController.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "../osd/glslComputeController.h" diff --git a/opensubdiv/osd/glslComputeController.h b/opensubdiv/osd/glslComputeController.h index 82e9cf44..9fc5d8c4 100644 --- a/opensubdiv/osd/glslComputeController.h +++ b/opensubdiv/osd/glslComputeController.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_GLSL_COMPUTE_CONTROLLER_H #define OSD_GLSL_COMPUTE_CONTROLLER_H diff --git a/opensubdiv/osd/glslComputeKernel.glsl b/opensubdiv/osd/glslComputeKernel.glsl index de910eb0..94b41ea3 100644 --- a/opensubdiv/osd/glslComputeKernel.glsl +++ b/opensubdiv/osd/glslComputeKernel.glsl @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // #version 430 diff --git a/opensubdiv/osd/glslKernelBundle.cpp b/opensubdiv/osd/glslKernelBundle.cpp index ce007a78..6758a7b2 100644 --- a/opensubdiv/osd/glslKernelBundle.cpp +++ b/opensubdiv/osd/glslKernelBundle.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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/opensubdiv/osd/glslKernelBundle.h b/opensubdiv/osd/glslKernelBundle.h index efa420e5..f2c51053 100644 --- a/opensubdiv/osd/glslKernelBundle.h +++ b/opensubdiv/osd/glslKernelBundle.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_GLSL_COMPUTE_KERNEL_BUNDLE_H #define OSD_GLSL_COMPUTE_KERNEL_BUNDLE_H diff --git a/opensubdiv/osd/glslPatchBSpline.glsl b/opensubdiv/osd/glslPatchBSpline.glsl index e40d8dc9..8b4e7b7b 100644 --- a/opensubdiv/osd/glslPatchBSpline.glsl +++ b/opensubdiv/osd/glslPatchBSpline.glsl @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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/opensubdiv/osd/glslPatchCommon.glsl b/opensubdiv/osd/glslPatchCommon.glsl index 8c163c6c..6f753091 100644 --- a/opensubdiv/osd/glslPatchCommon.glsl +++ b/opensubdiv/osd/glslPatchCommon.glsl @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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/opensubdiv/osd/glslPatchGregory.glsl b/opensubdiv/osd/glslPatchGregory.glsl index 52e529d0..96e8d884 100644 --- a/opensubdiv/osd/glslPatchGregory.glsl +++ b/opensubdiv/osd/glslPatchGregory.glsl @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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/opensubdiv/osd/glslPatchTransition.glsl b/opensubdiv/osd/glslPatchTransition.glsl index 36db20c9..af4823d9 100644 --- a/opensubdiv/osd/glslPatchTransition.glsl +++ b/opensubdiv/osd/glslPatchTransition.glsl @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // #if defined(OSD_TRANSITION_PATTERN00) || defined(OSD_TRANSITION_PATTERN01) || defined(OSD_TRANSITION_PATTERN02) || defined(OSD_TRANSITION_PATTERN10) || defined(OSD_TRANSITION_PATTERN11) || defined(OSD_TRANSITION_PATTERN12) || defined(OSD_TRANSITION_PATTERN13) || defined(OSD_TRANSITION_PATTERN21) || defined(OSD_TRANSITION_PATTERN22) || defined(OSD_TRANSITION_PATTERN23) diff --git a/opensubdiv/osd/glslTransformFeedbackComputeContext.cpp b/opensubdiv/osd/glslTransformFeedbackComputeContext.cpp index 340b6e56..765ca35c 100644 --- a/opensubdiv/osd/glslTransformFeedbackComputeContext.cpp +++ b/opensubdiv/osd/glslTransformFeedbackComputeContext.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "../version.h" diff --git a/opensubdiv/osd/glslTransformFeedbackComputeContext.h b/opensubdiv/osd/glslTransformFeedbackComputeContext.h index 23727c9a..46d5d584 100644 --- a/opensubdiv/osd/glslTransformFeedbackComputeContext.h +++ b/opensubdiv/osd/glslTransformFeedbackComputeContext.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_GLSL_TRANSFORM_FEEDBACK_COMPUTE_CONTEXT_H #define OSD_GLSL_TRANSFORM_FEEDBACK_COMPUTE_CONTEXT_H diff --git a/opensubdiv/osd/glslTransformFeedbackComputeController.cpp b/opensubdiv/osd/glslTransformFeedbackComputeController.cpp index 3fcbcab3..768d7269 100644 --- a/opensubdiv/osd/glslTransformFeedbackComputeController.cpp +++ b/opensubdiv/osd/glslTransformFeedbackComputeController.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "../osd/glslTransformFeedbackComputeController.h" diff --git a/opensubdiv/osd/glslTransformFeedbackComputeController.h b/opensubdiv/osd/glslTransformFeedbackComputeController.h index d201e7c5..77b16820 100644 --- a/opensubdiv/osd/glslTransformFeedbackComputeController.h +++ b/opensubdiv/osd/glslTransformFeedbackComputeController.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_GLSL_TRANSFORM_FEEDBACK_COMPUTE_CONTROLLER_H #define OSD_GLSL_TRANSFORM_FEEDBACK_COMPUTE_CONTROLLER_H diff --git a/opensubdiv/osd/glslTransformFeedbackKernel.glsl b/opensubdiv/osd/glslTransformFeedbackKernel.glsl index 94055532..1ad53e9c 100644 --- a/opensubdiv/osd/glslTransformFeedbackKernel.glsl +++ b/opensubdiv/osd/glslTransformFeedbackKernel.glsl @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // #version 420 diff --git a/opensubdiv/osd/glslTransformFeedbackKernelBundle.cpp b/opensubdiv/osd/glslTransformFeedbackKernelBundle.cpp index 1dea3ca0..cc20be6d 100644 --- a/opensubdiv/osd/glslTransformFeedbackKernelBundle.cpp +++ b/opensubdiv/osd/glslTransformFeedbackKernelBundle.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "../version.h" diff --git a/opensubdiv/osd/glslTransformFeedbackKernelBundle.h b/opensubdiv/osd/glslTransformFeedbackKernelBundle.h index e726ddf8..a3434ce8 100644 --- a/opensubdiv/osd/glslTransformFeedbackKernelBundle.h +++ b/opensubdiv/osd/glslTransformFeedbackKernelBundle.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_GLSL_TRANSFORM_FEEDBACK_KERNEL_BUNDLE_H #define OSD_GLSL_TRANSFORM_FEEDBACK_KERNEL_BUNDLE_H diff --git a/opensubdiv/osd/hlslComputeKernel.hlsl b/opensubdiv/osd/hlslComputeKernel.hlsl index 17bc6b37..e88732cb 100644 --- a/opensubdiv/osd/hlslComputeKernel.hlsl +++ b/opensubdiv/osd/hlslComputeKernel.hlsl @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // interface IComputeKernel { diff --git a/opensubdiv/osd/hlslPatchBSpline.hlsl b/opensubdiv/osd/hlslPatchBSpline.hlsl index 29d350da..20f2f2f2 100644 --- a/opensubdiv/osd/hlslPatchBSpline.hlsl +++ b/opensubdiv/osd/hlslPatchBSpline.hlsl @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // #ifdef OSD_TRANSITION_TRIANGLE_SUBPATCH diff --git a/opensubdiv/osd/hlslPatchCommon.hlsl b/opensubdiv/osd/hlslPatchCommon.hlsl index 84c6bc91..73396120 100644 --- a/opensubdiv/osd/hlslPatchCommon.hlsl +++ b/opensubdiv/osd/hlslPatchCommon.hlsl @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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/opensubdiv/osd/hlslPatchGregory.hlsl b/opensubdiv/osd/hlslPatchGregory.hlsl index 609293fb..84bc390e 100644 --- a/opensubdiv/osd/hlslPatchGregory.hlsl +++ b/opensubdiv/osd/hlslPatchGregory.hlsl @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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/opensubdiv/osd/hlslPatchTransition.hlsl b/opensubdiv/osd/hlslPatchTransition.hlsl index 62561368..a879bdbd 100644 --- a/opensubdiv/osd/hlslPatchTransition.hlsl +++ b/opensubdiv/osd/hlslPatchTransition.hlsl @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // #if defined(OSD_TRANSITION_PATTERN00) || defined(OSD_TRANSITION_PATTERN01) || defined(OSD_TRANSITION_PATTERN02) || defined(OSD_TRANSITION_PATTERN10) || defined(OSD_TRANSITION_PATTERN11) || defined(OSD_TRANSITION_PATTERN12) || defined(OSD_TRANSITION_PATTERN13) || defined(OSD_TRANSITION_PATTERN21) || defined(OSD_TRANSITION_PATTERN22) || defined(OSD_TRANSITION_PATTERN23) diff --git a/opensubdiv/osd/mesh.h b/opensubdiv/osd/mesh.h index 4c751365..4d51897d 100644 --- a/opensubdiv/osd/mesh.h +++ b/opensubdiv/osd/mesh.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_MESH_H #define OSD_MESH_H diff --git a/opensubdiv/osd/nonCopyable.h b/opensubdiv/osd/nonCopyable.h index 800488d4..596d7ea1 100644 --- a/opensubdiv/osd/nonCopyable.h +++ b/opensubdiv/osd/nonCopyable.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_NON_COPYABLE_H #define OSD_NON_COPYABLE_H diff --git a/opensubdiv/osd/ompComputeController.cpp b/opensubdiv/osd/ompComputeController.cpp index c990c0b3..53552326 100644 --- a/opensubdiv/osd/ompComputeController.cpp +++ b/opensubdiv/osd/ompComputeController.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "../osd/cpuComputeContext.h" diff --git a/opensubdiv/osd/ompComputeController.h b/opensubdiv/osd/ompComputeController.h index 168b40f4..076dc871 100644 --- a/opensubdiv/osd/ompComputeController.h +++ b/opensubdiv/osd/ompComputeController.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_OMP_COMPUTE_CONTROLLER_H #define OSD_OMP_COMPUTE_CONTROLLER_H diff --git a/opensubdiv/osd/ompKernel.cpp b/opensubdiv/osd/ompKernel.cpp index 785a0653..8d718662 100644 --- a/opensubdiv/osd/ompKernel.cpp +++ b/opensubdiv/osd/ompKernel.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "../osd/ompKernel.h" diff --git a/opensubdiv/osd/ompKernel.h b/opensubdiv/osd/ompKernel.h index b8fe25c3..0c54d89b 100644 --- a/opensubdiv/osd/ompKernel.h +++ b/opensubdiv/osd/ompKernel.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_OMP_KERNEL_H #define OSD_OMP_KERNEL_H diff --git a/opensubdiv/osd/opengl.h b/opensubdiv/osd/opengl.h index e3a8843a..b9d88fde 100644 --- a/opensubdiv/osd/opengl.h +++ b/opensubdiv/osd/opengl.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_OPENGL_H #define OSD_OPENGL_H diff --git a/opensubdiv/osd/ptexTextureLoader.cpp b/opensubdiv/osd/ptexTextureLoader.cpp index f5031b7c..3c298f8c 100644 --- a/opensubdiv/osd/ptexTextureLoader.cpp +++ b/opensubdiv/osd/ptexTextureLoader.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "../osd/error.h" diff --git a/opensubdiv/osd/ptexTextureLoader.h b/opensubdiv/osd/ptexTextureLoader.h index 5d5d005a..8fa9dac2 100644 --- a/opensubdiv/osd/ptexTextureLoader.h +++ b/opensubdiv/osd/ptexTextureLoader.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_PTEX_TEXTURE_LOADER_H #define OSD_PTEX_TEXTURE_LOADER_H diff --git a/opensubdiv/osd/vertex.h b/opensubdiv/osd/vertex.h index 2396e14a..b349c648 100644 --- a/opensubdiv/osd/vertex.h +++ b/opensubdiv/osd/vertex.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_VERTEX_H #define OSD_VERTEX_H diff --git a/opensubdiv/osd/vertexDescriptor.h b/opensubdiv/osd/vertexDescriptor.h index d7e5ce8c..e361cc08 100644 --- a/opensubdiv/osd/vertexDescriptor.h +++ b/opensubdiv/osd/vertexDescriptor.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSD_CPU_VERTEX_DESCRIPTOR_H #define OSD_CPU_VERTEX_DESCRIPTOR_H diff --git a/opensubdiv/osdutil/CMakeLists.txt b/opensubdiv/osdutil/CMakeLists.txt index bfd5015d..2a437b6e 100644 --- a/opensubdiv/osdutil/CMakeLists.txt +++ b/opensubdiv/osdutil/CMakeLists.txt @@ -1,59 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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/opensubdiv/osdutil/batch.h b/opensubdiv/osdutil/batch.h index 46eaad6d..473fd060 100644 --- a/opensubdiv/osdutil/batch.h +++ b/opensubdiv/osdutil/batch.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSDUTIL_MESH_BATCH_H #define OSDUTIL_MESH_BATCH_H diff --git a/opensubdiv/osdutil/batchCL.h b/opensubdiv/osdutil/batchCL.h index a6f465ee..05880fb7 100644 --- a/opensubdiv/osdutil/batchCL.h +++ b/opensubdiv/osdutil/batchCL.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSDUTIL_MESH_BATCH_CL_H #define OSDUTIL_MESH_BATCH_CL_H diff --git a/opensubdiv/osdutil/drawController.h b/opensubdiv/osdutil/drawController.h index 872f7203..036a94f8 100644 --- a/opensubdiv/osdutil/drawController.h +++ b/opensubdiv/osdutil/drawController.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSDUTIL_DRAW_CONTROLLER_H #define OSDUTIL_DRAW_CONTROLLER_H diff --git a/opensubdiv/osdutil/drawItem.h b/opensubdiv/osdutil/drawItem.h index 7d97267d..1be4bc42 100644 --- a/opensubdiv/osdutil/drawItem.h +++ b/opensubdiv/osdutil/drawItem.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OSDUTIL_DRAW_ITEM_H #define OSDUTIL_DRAW_ITEM_H diff --git a/opensubdiv/tools/stringify/CMakeLists.txt b/opensubdiv/tools/stringify/CMakeLists.txt index 0de4ed6c..d50c8127 100644 --- a/opensubdiv/tools/stringify/CMakeLists.txt +++ b/opensubdiv/tools/stringify/CMakeLists.txt @@ -1,59 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # add_executable(stringify diff --git a/opensubdiv/tools/stringify/main.cpp b/opensubdiv/tools/stringify/main.cpp index c1f68e32..8bf79427 100644 --- a/opensubdiv/tools/stringify/main.cpp +++ b/opensubdiv/tools/stringify/main.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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/opensubdiv/version.h b/opensubdiv/version.h index 25a7b6db..60b72013 100644 --- a/opensubdiv/version.h +++ b/opensubdiv/version.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 OPENSUBDIV_VERSION_H diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index c0cb9df8..e20ce4c4 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # if(PYTHONINTERP_FOUND AND SWIG_FOUND) diff --git a/python/doc/conf.py b/python/doc/conf.py index c301df3c..44104519 100644 --- a/python/doc/conf.py +++ b/python/doc/conf.py @@ -1,5 +1,28 @@ -# -*- coding: utf-8 -*- # +# Copyright 2013 Pixar +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: +# +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. +# +# 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. +# + # OpenSubdiv documentation build configuration file, created by # sphinx-quickstart on Wed Nov 21 15:45:14 2012. # diff --git a/python/osd/__init__.py b/python/osd/__init__.py index 26d9734a..674230ff 100644 --- a/python/osd/__init__.py +++ b/python/osd/__init__.py @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # from common import * diff --git a/python/osd/adapters.py b/python/osd/adapters.py index f5ffa1ec..8c00485d 100644 --- a/python/osd/adapters.py +++ b/python/osd/adapters.py @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # # Helper classes that present mesh data as a Pythonic list-like diff --git a/python/osd/buffer.h b/python/osd/buffer.h index e7d3f05a..7c8891f9 100644 --- a/python/osd/buffer.h +++ b/python/osd/buffer.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // #pragma once diff --git a/python/osd/common.py b/python/osd/common.py index 6e9514e2..73633b94 100644 --- a/python/osd/common.py +++ b/python/osd/common.py @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # class TopoError(Exception): diff --git a/python/osd/internal.h b/python/osd/internal.h index 5240c655..befaeaa5 100644 --- a/python/osd/internal.h +++ b/python/osd/internal.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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/python/osd/osdshim.i b/python/osd/osdshim.i index fc8787d3..7f9e8f7b 100644 --- a/python/osd/osdshim.i +++ b/python/osd/osdshim.i @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // %module shim diff --git a/python/osd/subdivider.cpp b/python/osd/subdivider.cpp index 09328428..1a91f263 100644 --- a/python/osd/subdivider.cpp +++ b/python/osd/subdivider.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "internal.h" diff --git a/python/osd/subdivider.h b/python/osd/subdivider.h index d072fa64..ab0f50ca 100644 --- a/python/osd/subdivider.h +++ b/python/osd/subdivider.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // #pragma once diff --git a/python/osd/subdivider.py b/python/osd/subdivider.py index 0b9c069d..6b3c1c7e 100644 --- a/python/osd/subdivider.py +++ b/python/osd/subdivider.py @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # from osd import * diff --git a/python/osd/topology.cpp b/python/osd/topology.cpp index e6eb2dad..3f329aa8 100644 --- a/python/osd/topology.cpp +++ b/python/osd/topology.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "internal.h" diff --git a/python/osd/topology.h b/python/osd/topology.h index c546879a..fddf95ac 100644 --- a/python/osd/topology.h +++ b/python/osd/topology.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // #pragma once diff --git a/python/osd/topology.py b/python/osd/topology.py index b885acc8..e03e43d0 100644 --- a/python/osd/topology.py +++ b/python/osd/topology.py @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # from common import * diff --git a/python/setup.py b/python/setup.py index b9095a3f..fdefc52c 100755 --- a/python/setup.py +++ b/python/setup.py @@ -1,60 +1,27 @@ #!/usr/bin/env python - # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # from distutils.core import setup, Command, Extension diff --git a/python/test/__init__.py b/python/test/__init__.py index 8c856d92..5f0ec180 100644 --- a/python/test/__init__.py +++ b/python/test/__init__.py @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # from simple import * diff --git a/python/test/simple.py b/python/test/simple.py index 546da07b..2f01fbf7 100755 --- a/python/test/simple.py +++ b/python/test/simple.py @@ -1,60 +1,27 @@ #!/usr/bin/env python - # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # import numpy as np diff --git a/regression/CMakeLists.txt b/regression/CMakeLists.txt index 99719fbd..ad306e02 100644 --- a/regression/CMakeLists.txt +++ b/regression/CMakeLists.txt @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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. # add_subdirectory(hbr_regression) diff --git a/regression/common/shape_utils.h b/regression/common/shape_utils.h index 343311d5..36effed6 100644 --- a/regression/common/shape_utils.h +++ b/regression/common/shape_utils.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 SHAPE_UTILS_H #define SHAPE_UTILS_H diff --git a/regression/far_regression/CMakeLists.txt b/regression/far_regression/CMakeLists.txt index 6d262e81..75477dbc 100644 --- a/regression/far_regression/CMakeLists.txt +++ b/regression/far_regression/CMakeLists.txt @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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_directories( diff --git a/regression/far_regression/example_createMesh.py b/regression/far_regression/example_createMesh.py index a9942b22..2a52e8ae 100644 --- a/regression/far_regression/example_createMesh.py +++ b/regression/far_regression/example_createMesh.py @@ -1,173 +1,140 @@ -#!/usr/bin/env python - -# -# Copyright (C) Pixar. All rights reserved. -# -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. -# -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. -# -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. -# -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. -# - -""" -Example - -Description: - Create a Maya Mesh using OpenMaya - - in Maya's python editor : - - import example_createMesh - reload(example_createMesh) - - example_createMesh.readPolyFile('/host/devel/rtc3/trees/dev/amber/bin/pbr2/script') - -""" - -from maya import OpenMaya as om -from itertools import chain -import maya.cmds as cmds - -def getDagPath(nodeName): - """Get an MDagPath for the associated node name - """ - selList = om.MSelectionList() - selList.add(nodeName) - dagPath = om.MDagPath() - selList.getDagPath(0, dagPath) - return dagPath - -def convertToMIntArray(listOfInts): - newMIntArray = om.MIntArray(len(listOfInts)) - for i in range(len(listOfInts)): - val = listOfInts[i] - newMIntArray.set(val, i) - return newMIntArray - - -def convertToMPointArray(listOfVertexTuples): - newMPointArray = om.MPointArray(len(listOfVertexTuples)) - for i in range(len(listOfVertexTuples)): - v = listOfVertexTuples[i] - newMPointArray.set(i, v[0], v[1], v[2], 1.0) - return newMPointArray - - -def createMesh(vertices, polygons, parent=None): - '''Create a mesh with the specified vertices and polygons - ''' - # The parameters used in MFnMesh.create() can all be derived from the - # input vertices and polygon lists - - numVertices = len(vertices) - numPolygons = len(polygons) - - verticesM = convertToMPointArray(vertices) - - polygonCounts = [len(i) for i in polygons] - polygonCountsM = convertToMIntArray(polygonCounts) - - # Flatten the list of lists - # Reference: http://stackoverflow.com/questions/952914/making-a-flat-list-out-of-list-of-lists-in-python - polygonConnects = list(chain.from_iterable(polygons)) - polygonConnectsM = convertToMIntArray(polygonConnects) - - # Determine parent - if parent == None: - parentM = om.MObject() - else: - parentM = getDagPath(parent).node() - - # Create Mesh - newMesh = om.MFnMesh() - newTransformOrShape = newMesh.create( - numVertices, - numPolygons, - verticesM, - polygonCountsM, - polygonConnectsM, - parentM) - - dagpath = om.MDagPath() - om.MDagPath.getAPathTo( newTransformOrShape, dagpath ) - - # Assign the default shader to the mesh. - cmds.sets( - dagpath.fullPathName(), - edit=True, - forceElement='initialShadingGroup') - - return dagpath.partialPathName() - -def readPolyFile(path): - polys = '' - try: - with open(path, 'r') as f: - polys = '' - for line in f.readlines(): - polys += line.rstrip() - except: - print 'Cannot read '+str(path) - - polys = eval(polys) - - tx = 0.0 - ty = 0.0 - for poly in polys: - verts = poly['verts'] - faces = poly['faces'] - parent = None - dagpath = createMesh(verts, faces, parent) - cmds.move( tx, ty, 0, dagpath, absolute=True ) - tx+=4.0 - if tx > 16.0: - tx=0.0 - ty+=4.0 +#!/usr/bin/env python +# +# Copyright 2013 Pixar +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: +# +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. +# +# 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. +# + +""" +Example + +Description: + Create a Maya Mesh using OpenMaya + + in Maya's python editor : + + import example_createMesh + reload(example_createMesh) + + example_createMesh.readPolyFile('/host/devel/rtc3/trees/dev/amber/bin/pbr2/script') + +""" + +from maya import OpenMaya as om +from itertools import chain +import maya.cmds as cmds + +def getDagPath(nodeName): + """Get an MDagPath for the associated node name + """ + selList = om.MSelectionList() + selList.add(nodeName) + dagPath = om.MDagPath() + selList.getDagPath(0, dagPath) + return dagPath + +def convertToMIntArray(listOfInts): + newMIntArray = om.MIntArray(len(listOfInts)) + for i in range(len(listOfInts)): + val = listOfInts[i] + newMIntArray.set(val, i) + return newMIntArray + + +def convertToMPointArray(listOfVertexTuples): + newMPointArray = om.MPointArray(len(listOfVertexTuples)) + for i in range(len(listOfVertexTuples)): + v = listOfVertexTuples[i] + newMPointArray.set(i, v[0], v[1], v[2], 1.0) + return newMPointArray + + +def createMesh(vertices, polygons, parent=None): + '''Create a mesh with the specified vertices and polygons + ''' + # The parameters used in MFnMesh.create() can all be derived from the + # input vertices and polygon lists + + numVertices = len(vertices) + numPolygons = len(polygons) + + verticesM = convertToMPointArray(vertices) + + polygonCounts = [len(i) for i in polygons] + polygonCountsM = convertToMIntArray(polygonCounts) + + # Flatten the list of lists + # Reference: http://stackoverflow.com/questions/952914/making-a-flat-list-out-of-list-of-lists-in-python + polygonConnects = list(chain.from_iterable(polygons)) + polygonConnectsM = convertToMIntArray(polygonConnects) + + # Determine parent + if parent == None: + parentM = om.MObject() + else: + parentM = getDagPath(parent).node() + + # Create Mesh + newMesh = om.MFnMesh() + newTransformOrShape = newMesh.create( + numVertices, + numPolygons, + verticesM, + polygonCountsM, + polygonConnectsM, + parentM) + + dagpath = om.MDagPath() + om.MDagPath.getAPathTo( newTransformOrShape, dagpath ) + + # Assign the default shader to the mesh. + cmds.sets( + dagpath.fullPathName(), + edit=True, + forceElement='initialShadingGroup') + + return dagpath.partialPathName() + +def readPolyFile(path): + polys = '' + try: + with open(path, 'r') as f: + polys = '' + for line in f.readlines(): + polys += line.rstrip() + except: + print 'Cannot read '+str(path) + + polys = eval(polys) + + tx = 0.0 + ty = 0.0 + for poly in polys: + verts = poly['verts'] + faces = poly['faces'] + parent = None + dagpath = createMesh(verts, faces, parent) + cmds.move( tx, ty, 0, dagpath, absolute=True ) + tx+=4.0 + if tx > 16.0: + tx=0.0 + ty+=4.0 diff --git a/regression/far_regression/main.cpp b/regression/far_regression/main.cpp index 9ba05d30..39c29dce 100644 --- a/regression/far_regression/main.cpp +++ b/regression/far_regression/main.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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/regression/hbr_regression/CMakeLists.txt b/regression/hbr_regression/CMakeLists.txt index 160b1b41..e779e5c9 100644 --- a/regression/hbr_regression/CMakeLists.txt +++ b/regression/hbr_regression/CMakeLists.txt @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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_directories( diff --git a/regression/hbr_regression/baseline.cpp b/regression/hbr_regression/baseline.cpp index 7cbdb15a..95148cc2 100644 --- a/regression/hbr_regression/baseline.cpp +++ b/regression/hbr_regression/baseline.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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/regression/hbr_regression/init_shapes.h b/regression/hbr_regression/init_shapes.h index 5748e829..a2469866 100644 --- a/regression/hbr_regression/init_shapes.h +++ b/regression/hbr_regression/init_shapes.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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 "../common/shape_utils.h" diff --git a/regression/hbr_regression/main.cpp b/regression/hbr_regression/main.cpp index 7a40deef..72fafc99 100644 --- a/regression/hbr_regression/main.cpp +++ b/regression/hbr_regression/main.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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/regression/osd_regression/CMakeLists.txt b/regression/osd_regression/CMakeLists.txt index f7e00307..0e0e93d1 100644 --- a/regression/osd_regression/CMakeLists.txt +++ b/regression/osd_regression/CMakeLists.txt @@ -1,58 +1,26 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# 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_directories( diff --git a/regression/osd_regression/main.cpp b/regression/osd_regression/main.cpp index ffe1fa70..da6cb85d 100644 --- a/regression/osd_regression/main.cpp +++ b/regression/osd_regression/main.cpp @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // #if defined(__APPLE__) diff --git a/regression/shapes/bilinear_cube.h b/regression/shapes/bilinear_cube.h index 602f44a9..6bd91d14 100644 --- a/regression/shapes/bilinear_cube.h +++ b/regression/shapes/bilinear_cube.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string bilinear_cube = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_bishop.h b/regression/shapes/catmark_bishop.h index bd24f32e..7e6b0859 100644 --- a/regression/shapes/catmark_bishop.h +++ b/regression/shapes/catmark_bishop.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_bishop = std::string( "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_car.h b/regression/shapes/catmark_car.h index ed2ab059..997d49e8 100644 --- a/regression/shapes/catmark_car.h +++ b/regression/shapes/catmark_car.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_car = std::string( "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_cube.h b/regression/shapes/catmark_cube.h index 63060b02..b1586825 100644 --- a/regression/shapes/catmark_cube.h +++ b/regression/shapes/catmark_cube.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_cube = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_cube_corner0.h b/regression/shapes/catmark_cube_corner0.h index b0691650..58a0f6d5 100644 --- a/regression/shapes/catmark_cube_corner0.h +++ b/regression/shapes/catmark_cube_corner0.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_cube_corner0 = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_cube_corner1.h b/regression/shapes/catmark_cube_corner1.h index e27247ec..2f729593 100644 --- a/regression/shapes/catmark_cube_corner1.h +++ b/regression/shapes/catmark_cube_corner1.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_cube_corner1 = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_cube_corner2.h b/regression/shapes/catmark_cube_corner2.h index 0dfb3d25..a03e3987 100644 --- a/regression/shapes/catmark_cube_corner2.h +++ b/regression/shapes/catmark_cube_corner2.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_cube_corner2 = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_cube_corner3.h b/regression/shapes/catmark_cube_corner3.h index a75a6634..75f78b19 100644 --- a/regression/shapes/catmark_cube_corner3.h +++ b/regression/shapes/catmark_cube_corner3.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_cube_corner3 = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_cube_corner4.h b/regression/shapes/catmark_cube_corner4.h index d8101479..f5418185 100644 --- a/regression/shapes/catmark_cube_corner4.h +++ b/regression/shapes/catmark_cube_corner4.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_cube_corner4 = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_cube_creases0.h b/regression/shapes/catmark_cube_creases0.h index 4eaa81da..42025b34 100644 --- a/regression/shapes/catmark_cube_creases0.h +++ b/regression/shapes/catmark_cube_creases0.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_cube_creases0 = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_cube_creases1.h b/regression/shapes/catmark_cube_creases1.h index daaa7636..06a64ce0 100644 --- a/regression/shapes/catmark_cube_creases1.h +++ b/regression/shapes/catmark_cube_creases1.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_cube_creases1 = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_dart_edgecorner.h b/regression/shapes/catmark_dart_edgecorner.h index 752b77f5..589b68c3 100644 --- a/regression/shapes/catmark_dart_edgecorner.h +++ b/regression/shapes/catmark_dart_edgecorner.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_dart_edgecorner = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_dart_edgeonly.h b/regression/shapes/catmark_dart_edgeonly.h index dca47fab..9ff3477d 100644 --- a/regression/shapes/catmark_dart_edgeonly.h +++ b/regression/shapes/catmark_dart_edgeonly.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_dart_edgeonly = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_edgecorner.h b/regression/shapes/catmark_edgecorner.h index 6fa92979..2df9c289 100644 --- a/regression/shapes/catmark_edgecorner.h +++ b/regression/shapes/catmark_edgecorner.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_edgecorner = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_edgeonly.h b/regression/shapes/catmark_edgeonly.h index c5c17ecd..61f6e419 100644 --- a/regression/shapes/catmark_edgeonly.h +++ b/regression/shapes/catmark_edgeonly.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_edgeonly = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_flap.h b/regression/shapes/catmark_flap.h index 089403d5..82d3feb4 100644 --- a/regression/shapes/catmark_flap.h +++ b/regression/shapes/catmark_flap.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_flap = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_flap2.h b/regression/shapes/catmark_flap2.h index d539481f..f3238bc5 100644 --- a/regression/shapes/catmark_flap2.h +++ b/regression/shapes/catmark_flap2.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_flap2 = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_gregory_test1.h b/regression/shapes/catmark_gregory_test1.h index 64a0c464..7c6cd10e 100644 --- a/regression/shapes/catmark_gregory_test1.h +++ b/regression/shapes/catmark_gregory_test1.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_gregory_test1 = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_gregory_test2.h b/regression/shapes/catmark_gregory_test2.h index 124b3732..46e465f7 100644 --- a/regression/shapes/catmark_gregory_test2.h +++ b/regression/shapes/catmark_gregory_test2.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_gregory_test2 = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_gregory_test3.h b/regression/shapes/catmark_gregory_test3.h index a42fff08..ba397ca5 100644 --- a/regression/shapes/catmark_gregory_test3.h +++ b/regression/shapes/catmark_gregory_test3.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_gregory_test3 = "v 1.000000 1.000000 -0.000000\n" diff --git a/regression/shapes/catmark_gregory_test4.h b/regression/shapes/catmark_gregory_test4.h index 5b4c52a1..6e3cb9a5 100644 --- a/regression/shapes/catmark_gregory_test4.h +++ b/regression/shapes/catmark_gregory_test4.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_gregory_test4 = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_helmet.h b/regression/shapes/catmark_helmet.h index 9c5e8794..1ed7210f 100644 --- a/regression/shapes/catmark_helmet.h +++ b/regression/shapes/catmark_helmet.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_helmet = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_hole_test1.h b/regression/shapes/catmark_hole_test1.h index 4e1d21bc..da48c441 100644 --- a/regression/shapes/catmark_hole_test1.h +++ b/regression/shapes/catmark_hole_test1.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_hole_test1 = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_hole_test2.h b/regression/shapes/catmark_hole_test2.h index 56340e14..916899fc 100644 --- a/regression/shapes/catmark_hole_test2.h +++ b/regression/shapes/catmark_hole_test2.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_hole_test2 = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_pawn.h b/regression/shapes/catmark_pawn.h index ce747d2d..357c7fcd 100644 --- a/regression/shapes/catmark_pawn.h +++ b/regression/shapes/catmark_pawn.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_pawn = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_pyramid.h b/regression/shapes/catmark_pyramid.h index 773fbd1a..be9dfaed 100644 --- a/regression/shapes/catmark_pyramid.h +++ b/regression/shapes/catmark_pyramid.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_pyramid = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_pyramid_creases0.h b/regression/shapes/catmark_pyramid_creases0.h index 1873826b..2fecd804 100644 --- a/regression/shapes/catmark_pyramid_creases0.h +++ b/regression/shapes/catmark_pyramid_creases0.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_pyramid_creases0 = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_pyramid_creases1.h b/regression/shapes/catmark_pyramid_creases1.h index 9b2da241..5b66419b 100644 --- a/regression/shapes/catmark_pyramid_creases1.h +++ b/regression/shapes/catmark_pyramid_creases1.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_pyramid_creases1 = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_pyramid_creases2.h b/regression/shapes/catmark_pyramid_creases2.h index d3fd6069..c0ae9dca 100644 --- a/regression/shapes/catmark_pyramid_creases2.h +++ b/regression/shapes/catmark_pyramid_creases2.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_pyramid_creases2 = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_rook.h b/regression/shapes/catmark_rook.h index c6624f66..ad7ddd0d 100644 --- a/regression/shapes/catmark_rook.h +++ b/regression/shapes/catmark_rook.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_rook = std::string( "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_square_hedit0.h b/regression/shapes/catmark_square_hedit0.h index af915e0e..02b8c71d 100644 --- a/regression/shapes/catmark_square_hedit0.h +++ b/regression/shapes/catmark_square_hedit0.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_square_hedit0 = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_square_hedit1.h b/regression/shapes/catmark_square_hedit1.h index f56acdb2..b8d2f913 100644 --- a/regression/shapes/catmark_square_hedit1.h +++ b/regression/shapes/catmark_square_hedit1.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_square_hedit1 = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_square_hedit2.h b/regression/shapes/catmark_square_hedit2.h index f73dc4f8..e18556a5 100644 --- a/regression/shapes/catmark_square_hedit2.h +++ b/regression/shapes/catmark_square_hedit2.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_square_hedit2 = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_square_hedit3.h b/regression/shapes/catmark_square_hedit3.h index 69e1bd98..87a5da9e 100644 --- a/regression/shapes/catmark_square_hedit3.h +++ b/regression/shapes/catmark_square_hedit3.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_square_hedit3 = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_square_hedit4.h b/regression/shapes/catmark_square_hedit4.h index 3e360ffd..5a2f2eb5 100644 --- a/regression/shapes/catmark_square_hedit4.h +++ b/regression/shapes/catmark_square_hedit4.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_square_hedit4 = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_tent.h b/regression/shapes/catmark_tent.h index ee2c55aa..e1cab440 100644 --- a/regression/shapes/catmark_tent.h +++ b/regression/shapes/catmark_tent.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_tent = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_tent_creases0.h b/regression/shapes/catmark_tent_creases0.h index cac49891..a559d309 100644 --- a/regression/shapes/catmark_tent_creases0.h +++ b/regression/shapes/catmark_tent_creases0.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_tent_creases0 = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_tent_creases1.h b/regression/shapes/catmark_tent_creases1.h index 62ba3867..d698fc04 100644 --- a/regression/shapes/catmark_tent_creases1.h +++ b/regression/shapes/catmark_tent_creases1.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_tent_creases1 = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_torus.h b/regression/shapes/catmark_torus.h index df5edc37..fc5278e8 100644 --- a/regression/shapes/catmark_torus.h +++ b/regression/shapes/catmark_torus.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_torus = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_torus_creases0.h b/regression/shapes/catmark_torus_creases0.h index 84792765..9b462719 100644 --- a/regression/shapes/catmark_torus_creases0.h +++ b/regression/shapes/catmark_torus_creases0.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_torus_creases0 = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/catmark_torus_creases1.h b/regression/shapes/catmark_torus_creases1.h index 2aea62a4..f118b56a 100644 --- a/regression/shapes/catmark_torus_creases1.h +++ b/regression/shapes/catmark_torus_creases1.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string catmark_torus_creases1 = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/loop_cube.h b/regression/shapes/loop_cube.h index 10df4f85..6ef68916 100644 --- a/regression/shapes/loop_cube.h +++ b/regression/shapes/loop_cube.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string loop_cube = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/loop_cube_creases0.h b/regression/shapes/loop_cube_creases0.h index 5fc22e02..e251420e 100644 --- a/regression/shapes/loop_cube_creases0.h +++ b/regression/shapes/loop_cube_creases0.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string loop_cube_creases0 = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/loop_cube_creases1.h b/regression/shapes/loop_cube_creases1.h index d8ca63fc..afc71087 100644 --- a/regression/shapes/loop_cube_creases1.h +++ b/regression/shapes/loop_cube_creases1.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string loop_cube_creases1 = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/loop_icosahedron.h b/regression/shapes/loop_icosahedron.h index c3daa269..c5197c1f 100644 --- a/regression/shapes/loop_icosahedron.h +++ b/regression/shapes/loop_icosahedron.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string loop_icosahedron = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/loop_saddle_edgecorner.h b/regression/shapes/loop_saddle_edgecorner.h index 4f0d9af2..9eb078d9 100644 --- a/regression/shapes/loop_saddle_edgecorner.h +++ b/regression/shapes/loop_saddle_edgecorner.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string loop_saddle_edgecorner = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/loop_saddle_edgeonly.h b/regression/shapes/loop_saddle_edgeonly.h index 73b5a210..3fbc2dfd 100644 --- a/regression/shapes/loop_saddle_edgeonly.h +++ b/regression/shapes/loop_saddle_edgeonly.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string loop_saddle_edgeonly = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/loop_triangle_edgecorner.h b/regression/shapes/loop_triangle_edgecorner.h index 9880d2ec..05b64ba3 100644 --- a/regression/shapes/loop_triangle_edgecorner.h +++ b/regression/shapes/loop_triangle_edgecorner.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string loop_triangle_edgecorner = "# This file uses centimeters as units for non-parametric coordinates.\n" diff --git a/regression/shapes/loop_triangle_edgeonly.h b/regression/shapes/loop_triangle_edgeonly.h index 43164403..1d131112 100644 --- a/regression/shapes/loop_triangle_edgeonly.h +++ b/regression/shapes/loop_triangle_edgeonly.h @@ -1,58 +1,26 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// 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. // static const std::string loop_triangle_edgeonly = "# This file uses centimeters as units for non-parametric coordinates.\n"