diff --git a/CMakeLists.txt b/CMakeLists.txt index 57ae87b7..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) @@ -250,7 +218,9 @@ endif() find_package(OpenGL) find_package(OpenGLES) find_package(OpenCL 1.1) -find_package(CUDA 4.0) +if(NOT NO_CUDA) + find_package(CUDA 4.0) +endif() find_package(GLFW 2.7.0) find_package(PTex 2.0) find_package(PythonInterp 2.6) @@ -383,57 +353,6 @@ else() ) endif() -if(PYTHONINTERP_FOUND AND SWIG_FOUND AND NOT NO_PYTHON) - message(STATUS "Python and SWIG found. Looking for numpy...") - execute_process( - COMMAND - ${PYTHON_EXECUTABLE} -c "import numpy; print numpy.get_include()" - OUTPUT_VARIABLE NUMPY_INCLUDE_PATH - RESULT_VARIABLE NUMPY_ERR - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - if(NUMPY_ERR) - message(WARNING "Unable to import numpy.") - else() - message(STATUS "Numpy package has been located.") - set(PYCMD ${PYTHON_EXECUTABLE} setup.py build ) - list(APPEND PYCMD --osddir=${LIBRARY_OUTPUT_PATH} ) - list(APPEND PYCMD --build-platlib=${PROJECT_BINARY_DIR}/python ) - list(APPEND PYCMD --build-temp=${PROJECT_BINARY_DIR}/temp ) - - # grab all compiler definitions and add '-D' - get_directory_property( TMP DIRECTORY ${CMAKE_SOURCE_DIR} COMPILE_DEFINITIONS ) - foreach(FLAG ${TMP}) - list(APPEND SWIG_COMPILE_FLAGS "-D${FLAG}") - endforeach() - - # append platform specific compiler flags - list(APPEND SWIG_COMPILE_FLAGS ${OSD_COMPILER_FLAGS}) - list(APPEND PYCMD --cxxflags="${SWIG_COMPILE_FLAGS}" ) - - # add Swig -builtin optimization build flag - if(SWIG_VERSION VERSION_GREATER 2.0.4) - list(APPEND SWIG_OPTS "-builtin") - endif() - list(APPEND PYCMD --swigopts="${SWIG_OPTS}" ) - - add_custom_command( - OUTPUT ${PROJECT_BINARY_DIR}/python/osd - COMMAND ${PYCMD} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/python - DEPENDS osd_static_cpu osd_dynamic_cpu - COMMENT "Building Python bindings with distutils" - ) - add_custom_target(python ALL - DEPENDS ${PROJECT_BINARY_DIR}/python/osd - ) - install(CODE "execute_process( - WORKING_DIRECTORY ../python - COMMAND ${PYCMD} install --user)" - ) - endif() -endif() - # Link examples & regressions dynamically against Osd set( OSD_LINK_TARGET osd_dynamic_cpu osd_dynamic_gpu ) @@ -468,38 +387,42 @@ endif() # Macro for processing public headers into the build area for doxygen processing +#set_property(GLOBAL PROPERTY USE_FOLDERS ON) + add_custom_target( public_headers ) macro(_add_doxy_headers headers) + if (NOT NO_DOC AND DOXYGEN_FOUND) + file(RELATIVE_PATH path ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ) - file(RELATIVE_PATH path ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ) + string(REPLACE "/" "_" targetpath ${path}) - string(REPLACE "/" "_" targetpath ${path}) + foreach (header ${headers}) - foreach (header ${headers}) + set(infile ${CMAKE_CURRENT_SOURCE_DIR}/${header}) + set(outfile ${CMAKE_BINARY_DIR}/public_headers/${path}/${header}) + set(targetname "${targetpath}_${header}") - set(infile ${CMAKE_CURRENT_SOURCE_DIR}/${header}) - set(outfile ${CMAKE_BINARY_DIR}/public_headers/${path}/${header}) - set(targetname "${targetpath}_${header}") + add_custom_command( + OUTPUT + ${outfile} + COMMAND + ${CMAKE_COMMAND} + ARGS + -E copy ${infile} ${outfile} + DEPENDS + ${infile} + ) - add_custom_command( - OUTPUT - ${outfile} - COMMAND - ${CMAKE_COMMAND} - ARGS - -E copy ${infile} ${outfile} - DEPENDS - ${infile} - ) + add_custom_target(${targetname} DEPENDS ${outfile}) + + #set_target_properties(${targetname} PROPERTIES FOLDER "public_headers/") - add_custom_target(${targetname} DEPENDS ${outfile}) - - list(APPEND headerfiles ${targetname} ) - endforeach() - - add_dependencies( public_headers DEPENDS ${headerfiles} ) + list(APPEND headerfiles ${targetname} ) + endforeach() + add_dependencies( public_headers DEPENDS ${headerfiles} ) + endif() endmacro() @@ -561,4 +484,10 @@ if (NOT NO_EXAMPLES) add_subdirectory(examples) endif() -add_subdirectory(documentation) +if (NOT NO_PYTHON) + add_subdirectory(python) +endif() + +if (NOT NO_DOC) + add_subdirectory(documentation) +endif() 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 053243ee..70f094c3 100644 --- a/documentation/CMakeLists.txt +++ b/documentation/CMakeLists.txt @@ -1,251 +1,218 @@ # -# Copyright (C) Pixar. All rights reserved. +# Copyright 2013 Pixar # -# This license governs use of the accompanying software. If you -# use the software, you accept this license. If you do not accept -# the license, do not use the software. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License +# and the following modification to it: Section 6 Trademarks. +# deleted and replaced with: # -# 1. Definitions -# The terms "reproduce," "reproduction," "derivative works," and -# "distribution" have the same meaning here as under U.S. -# copyright law. A "contribution" is the original software, or -# any additions or changes to the software. -# A "contributor" is any person or entity that distributes its -# contribution under this license. -# "Licensed patents" are a contributor's patent claims that read -# directly on its contribution. +# 6. Trademarks. This License does not grant permission to use the +# trade names, trademarks, service marks, or product names of the +# Licensor and its affiliates, except as required for reproducing +# the content of the NOTICE file. # -# 2. Grant of Rights -# (A) Copyright Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free copyright license to reproduce its contribution, -# prepare derivative works of its contribution, and distribute -# its contribution or any derivative works that you create. -# (B) Patent Grant- Subject to the terms of this license, -# including the license conditions and limitations in section 3, -# each contributor grants you a non-exclusive, worldwide, -# royalty-free license under its licensed patents to make, have -# made, use, sell, offer for sale, import, and/or otherwise -# dispose of its contribution in the software or derivative works -# of the contribution in the software. +# You may obtain a copy of the License at # -# 3. Conditions and Limitations -# (A) No Trademark License- This license does not grant you -# rights to use any contributor's name, logo, or trademarks. -# (B) If you bring a patent claim against any contributor over -# patents that you claim are infringed by the software, your -# patent license from such contributor to the software ends -# automatically. -# (C) If you distribute any portion of the software, you must -# retain all copyright, patent, trademark, and attribution -# notices that are present in the software. -# (D) If you distribute any portion of the software in source -# code form, you may do so only under this license by including a -# complete copy of this license with your distribution. If you -# distribute any portion of the software in compiled or object -# code form, you may only do so under a license that complies -# with this license. -# (E) The software is licensed "as-is." You bear the risk of -# using it. The contributors give no express warranties, -# guarantees or conditions. You may have additional consumer -# rights under your local laws which this license cannot change. -# To the extent permitted under your local laws, the contributors -# exclude the implied warranties of merchantability, fitness for -# a particular purpose and non-infringement. +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT 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 NO_DOC) - if (DOXYGEN_FOUND) +# Doxygen documentation +if (DOXYGEN_FOUND) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/OpenSubdiv.doxy ${CMAKE_CURRENT_BINARY_DIR}/OpenSubdiv.doxy @ONLY) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/OpenSubdiv.doxy ${CMAKE_CURRENT_BINARY_DIR}/OpenSubdiv.doxy @ONLY) - add_custom_target(doc_doxy - ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/OpenSubdiv.doxy - WORKING_DIRECTORY - ${CMAKE_BINARY_DIR}/public_headers/ - DEPENDS - public_headers - COMMENT - "Generating API documentation with Doxygen" VERBATIM - ) + add_custom_target(doc_doxy + ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/OpenSubdiv.doxy + WORKING_DIRECTORY + ${CMAKE_BINARY_DIR}/public_headers/ + DEPENDS + public_headers + COMMENT + "Generating API documentation with Doxygen" VERBATIM + ) - list(APPEND DOC_TARGETS doc_doxy) + list(APPEND DOC_TARGETS doc_doxy) - install( - DIRECTORY - ${CMAKE_CURRENT_BINARY_DIR}/doxy_html - DESTINATION - ${CMAKE_INSTALL_PREFIX}/documentation - ) - - else() + install( + DIRECTORY + ${CMAKE_CURRENT_BINARY_DIR}/doxy_html + DESTINATION + ${CMAKE_INSTALL_PREFIX}/documentation + ) - message(WARNING - "Doxyen was not found : support for Doxygen automated API documentation is disabled.") +else() - endif() - - - - if (DOCUTILS_FOUND AND PYTHONINTERP_FOUND) - - set(HTML_FILES - search.html - ) - - set(RST_FILES - api_overview.rst - intro.rst - cmake_build.rst - code_examples.rst - dxviewer.rst - getting_started.rst - glviewer.rst - glbatchviewer.rst - limiteval.rst - ptexviewer.rst - release_notes.rst - subdivision_surfaces.rst - using_osd.rst - using_osd_compile.rst - using_osd_hbr.rst - using_osd_textures.rst - ) - - # process rst markup files - foreach(src ${RST_FILES}) - get_filename_component(BASENAME ${src} NAME_WE) - - set(infile ${CMAKE_CURRENT_SOURCE_DIR}/${src}) - set(outfile ${CMAKE_CURRENT_BINARY_DIR}/${BASENAME}.html) - - add_custom_command( - OUTPUT - ${outfile} - COMMAND - ${RST2HTML_EXECUTABLE} - ARGS - --date - --time - --no-xml-declaration - --initial-header-level=3 - --strip-comments - --template=${CMAKE_CURRENT_SOURCE_DIR}/rst_template.txt - --stylesheet=css/rst.css - --link-stylesheet - ${infile} ${outfile} - DEPENDS - ${infile} rst_template.txt nav_template.txt - ) - - add_custom_target(${src} DEPENDS ${outfile}) - - list(APPEND RST_TARGETS ${src}) - - install( - FILES - ${outfile} - DESTINATION - ${CMAKE_INSTALL_PREFIX}/documentation - PERMISSIONS - OWNER_READ GROUP_READ WORLD_READ - ) - - endforeach() - - # copy html files to the build area - foreach(src ${HTML_FILES}) - set(infile ${CMAKE_CURRENT_SOURCE_DIR}/${src}) - set(outfile ${CMAKE_CURRENT_BINARY_DIR}/${src}) - - add_custom_command( - OUTPUT - ${outfile} - COMMAND - ${CMAKE_COMMAND} - ARGS - -E copy ${infile} ${outfile} - ) - - add_custom_target( ${src} DEPENDS ${outfile}) - - list(APPEND HTML_TARGETS ${src}) - - install( - FILES - ${outfile} - DESTINATION - ${CMAKE_INSTALL_PREFIX}/documentation - ) - endforeach() - - # copy the site resources to the build area so that the - # documentation can be read without an install - add_custom_target(doc_html_images - COMMAND - ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/images ${CMAKE_CURRENT_BINARY_DIR}/images - ) - - add_custom_target(doc_html_css - COMMAND - ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/css ${CMAKE_CURRENT_BINARY_DIR}/css - ) - - add_custom_target(doc_tipuesearch - COMMAND - ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/tipuesearch ${CMAKE_CURRENT_BINARY_DIR}/tipuesearch - ) - - # build search index and insert navigation tab - add_custom_target(search_index - COMMAND - ${PYTHON_EXECUTABLE} - ${CMAKE_CURRENT_SOURCE_DIR}/processHtml.py - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/nav_template.txt - DEPENDS - ${HTML_TARGETS} - ${RST_TARGETS} - doc_tipuesearch - ) - - add_custom_target(doc_html - DEPENDS - search_index - ${HTML_TARGETS} - ${RST_TARGETS} - doc_html_images - doc_html_css - doc_tipuesearch - ) - - install( - DIRECTORY - ${CMAKE_CURRENT_BINARY_DIR}/tipuesearch - DESTINATION - ${CMAKE_INSTALL_PREFIX}/documentation - ) - - - install( - DIRECTORY - ${CMAKE_CURRENT_BINARY_DIR}/images - DESTINATION - ${CMAKE_INSTALL_PREFIX}/documentation - ) - - install( - DIRECTORY - ${CMAKE_CURRENT_BINARY_DIR}/css - DESTINATION - ${CMAKE_INSTALL_PREFIX}/documentation - ) - - list(APPEND DOC_TARGETS doc_html) - endif() - - add_custom_target(doc ALL DEPENDS ${DOC_TARGETS}) + message(WARNING + "Doxyen was not found : support for Doxygen automated API documentation is disabled.") endif() + + +# ReST - HTML documentation +if (DOCUTILS_FOUND AND PYTHONINTERP_FOUND) + + set(HTML_FILES + search.html + ) + + set(RST_FILES + api_overview.rst + intro.rst + cmake_build.rst + code_examples.rst + dxviewer.rst + getting_started.rst + glviewer.rst + glbatchviewer.rst + limiteval.rst + painttest.rst + ptexviewer.rst + release_notes.rst + subdivision_surfaces.rst + using_osd.rst + using_osd_compile.rst + using_osd_hbr.rst + using_osd_textures.rst + ) + + # process rst markup files + foreach(src ${RST_FILES}) + get_filename_component(BASENAME ${src} NAME_WE) + + set(infile ${CMAKE_CURRENT_SOURCE_DIR}/${src}) + set(outfile ${CMAKE_CURRENT_BINARY_DIR}/${BASENAME}.html) + + add_custom_command( + OUTPUT + ${outfile} + COMMAND + ${RST2HTML_EXECUTABLE} + ARGS + --date + --time + --no-xml-declaration + --initial-header-level=3 + --strip-comments + --template=${CMAKE_CURRENT_SOURCE_DIR}/rst_template.txt + --stylesheet=css/rst.css + --link-stylesheet + ${infile} ${outfile} + DEPENDS + ${infile} rst_template.txt nav_template.txt + ) + + add_custom_target(${src} DEPENDS ${outfile}) + + list(APPEND RST_TARGETS ${src}) + + install( + FILES + ${outfile} + DESTINATION + ${CMAKE_INSTALL_PREFIX}/documentation + PERMISSIONS + OWNER_READ GROUP_READ WORLD_READ + ) + + endforeach() + + # copy html files to the build area + foreach(src ${HTML_FILES}) + set(infile ${CMAKE_CURRENT_SOURCE_DIR}/${src}) + set(outfile ${CMAKE_CURRENT_BINARY_DIR}/${src}) + + add_custom_command( + OUTPUT + ${outfile} + COMMAND + ${CMAKE_COMMAND} + ARGS + -E copy ${infile} ${outfile} + ) + + add_custom_target( ${src} DEPENDS ${outfile}) + + list(APPEND HTML_TARGETS ${src}) + + install( + FILES + ${outfile} + DESTINATION + ${CMAKE_INSTALL_PREFIX}/documentation + ) + endforeach() + + # copy the site resources to the build area so that the + # documentation can be read without an install + add_custom_target(doc_html_images + COMMAND + ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/images ${CMAKE_CURRENT_BINARY_DIR}/images + ) + + add_custom_target(doc_html_css + COMMAND + ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/css ${CMAKE_CURRENT_BINARY_DIR}/css + ) + + add_custom_target(doc_tipuesearch + COMMAND + ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/tipuesearch ${CMAKE_CURRENT_BINARY_DIR}/tipuesearch + ) + + # build search index and insert navigation tab + add_custom_target(search_index + COMMAND + ${PYTHON_EXECUTABLE} + ${CMAKE_CURRENT_SOURCE_DIR}/processHtml.py + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/nav_template.txt + DEPENDS + ${HTML_TARGETS} + ${RST_TARGETS} + doc_tipuesearch + ) + + add_custom_target(doc_html + DEPENDS + search_index + ${HTML_TARGETS} + ${RST_TARGETS} + doc_html_images + doc_html_css + doc_tipuesearch + ) + + install( + DIRECTORY + ${CMAKE_CURRENT_BINARY_DIR}/tipuesearch + DESTINATION + ${CMAKE_INSTALL_PREFIX}/documentation + ) + + + install( + DIRECTORY + ${CMAKE_CURRENT_BINARY_DIR}/images + DESTINATION + ${CMAKE_INSTALL_PREFIX}/documentation + ) + + install( + DIRECTORY + ${CMAKE_CURRENT_BINARY_DIR}/css + DESTINATION + ${CMAKE_INSTALL_PREFIX}/documentation + ) + + list(APPEND DOC_TARGETS doc_html) +endif() + +add_custom_target(doc ALL DEPENDS ${DOC_TARGETS}) diff --git a/documentation/OpenSubdiv.doxy b/documentation/OpenSubdiv.doxy index 8accade8..944fe2af 100644 --- a/documentation/OpenSubdiv.doxy +++ b/documentation/OpenSubdiv.doxy @@ -1650,7 +1650,7 @@ INCLUDE_FILE_PATTERNS = # undefined via #undef or recursively expanded use the := operator # instead of the = operator. -PREDEFINED = +PREDEFINED = doxygen # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. diff --git a/documentation/README b/documentation/README index 7cf47c25..89065973 100644 --- a/documentation/README +++ b/documentation/README @@ -1,57 +1,25 @@ - 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. + 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. ReST Documentation diff --git a/documentation/api_overview.rst b/documentation/api_overview.rst index 7db3be0d..d725095e 100644 --- a/documentation/api_overview.rst +++ b/documentation/api_overview.rst @@ -1,58 +1,26 @@ .. - 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. + 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. API Overview @@ -112,7 +80,7 @@ Data flows are mostly 1-directional, from top to bottom as a number of algorithm are preparing the coarse mesh data to be refined and passing their results to the next element in the processing chain. -.. image:: images/api_workflows.png +.. image:: images/api_data_flow.png :align: center ---- @@ -123,12 +91,11 @@ Representation vs. Implementation Layers One of the core performance goals of our subdivision algorithms is to leverage interactive performance out of massively parallel code execution wherever possible. In order to support a large diversity of discrete compute devices through -multiple dedicated SDKs, it is critical to distill the critical computations into -the smallest and simplest kernels possible. These can in turn be safely ported and +multiple dedicated SDKs, it is critical to distill the computations into the +smallest and simplest kernels possible. These can in turn be safely ported and optimized for each of the hardware platforms. .. image:: images/api_representations.png - :align: center This separation of general purpose against hardware-specific code is translated into two types of layers : the **implementation** layer against the **representation** @@ -154,7 +121,7 @@ This allows authoring applications to easily access "neighboring" components in order to make topology edits or manipulate properties of the components themselves. The key to achieving efficient many-core processing is to reduce data interdependencies. However, by definition, the bulk of topological mesh data is -the very description of the connections (dependencies) between vertices. +the very description of these connections (dependencies) between vertices. .. image:: images/api_serialized_data.png :align: center @@ -163,9 +130,14 @@ This is why OpenSubdiv provides specific representations for mesh data: - Hbr is a half-edge relational representation - Far is a serialized representation -A typical workflow is to manipulate Hbr meshes in authoring applications. Once the -topology of the mesh has stabilized, it is processed into a serialized form that -can then be evaluated at interactive framerates. +A typical workflow would be to manipulate the topology in authoring applications, +maybe using Hbr meshes for common editing operations. Once the topology of the mesh +has stabilized, it is processed into a serialized form that can then be evaluated +at interactive framerates. The serialized form is embodied by Far, which can then +be migrated by the device-specific functions in Osd. + +.. image:: images/api_workflows.png + :align: center ---- @@ -202,7 +174,9 @@ edge can only access a single neighboring edge cycle. :align: center This is a fundamental limitation of the half-edge data structure, in that it -cannot represent non-manifold geometry, in particular fan-type topologies. +cannot represent non-manifold geometry, in particular fan-type topologies. A +different approach to topology will probably be necessary in order to accomodate +non-manifold geometry. ---- @@ -246,7 +220,22 @@ the CVs of cubic patches, then the cubic patches are tessellated on with GLSL or OpenSubdiv enforces the same results for the different computation backends with a series of regression tests that compare the methods to each other. -The OpenSubdiv layer is comprised of 3 modules : Refine, Draw and Eval. +The OpenSubdiv layer is comprised of 3 maine modules : Refine, Draw and Eval. + +.. image:: images/api_osd_modules.png + +These modules are identified by their name spaces (**OsdRefine**, **OsdDraw**, +**OsdEval**) and encapsulate atomic functationality. The vertex data is carried +in interoperable buffers that can be exchanged between modules. + +The typical use pattern is to pose the coarse vertices of a mesh for a given frame. +The buffer is submitted to the **Refine** module which applies the subdivision rules +and produces refined control vertices. This new buffer can be passed to the **Draw** +module which will put them on screen. + +However, the same buffer of refined control vertices could be passed instead to +the **Eval** module (and be projected onto another surface for instance) before +being sent for display to the **Draw** module. .. container:: impnotip diff --git a/documentation/cmake_build.rst b/documentation/cmake_build.rst index 0af2521f..5d567b46 100644 --- a/documentation/cmake_build.rst +++ b/documentation/cmake_build.rst @@ -1,58 +1,26 @@ .. - 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. + 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. Building with Cmake @@ -142,11 +110,13 @@ The following configuration arguments can be passed to the cmake command line. -DGLFW_LOCATION=[path to GLFW] -DMAYA_LOCATION=[path to Maya] + -DNO_LIB=1 // disable the opensubdiv libs build (caveat emptor) -DNO_EXAMPLES=1 // disable examples build -DNO_REGRESSION=1 // disable regression tests build -DNO_PYTHON=1 // disable Python SWIG build -DNO_DOC=1 // disable documentation build -DNO_OMP=1 // disable OpenMP + -DNO_CUDA=1 // disable CUDA -DNO_GCD=1 // disable GrandCentralDispatch on OSX Environment Variables diff --git a/documentation/code_examples.rst b/documentation/code_examples.rst index 5d1944e2..1ac70500 100644 --- a/documentation/code_examples.rst +++ b/documentation/code_examples.rst @@ -1,58 +1,26 @@ .. - 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. + 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. Code Examples diff --git a/documentation/css/default.css b/documentation/css/default.css new file mode 100644 index 00000000..2dc8bec9 --- /dev/null +++ b/documentation/css/default.css @@ -0,0 +1,251 @@ + /* + 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. +*/ + +/*-------------------------------GENERAL STYLES-------------------------------*/ + +html, body { + margin:0; + padding:0; + font-family:Arial, Helvetica, Sans-serif; + background:#000; +} +a img { + border:none; +} +a { + text-decoration:none; + color:#999 +} +a:hover { + color:#333; +} +a:active { + color:#000; +} +p { + color:#444; + font-family:Helvetica, Arial, sans-serif; +} +#mainNav { + float:right; +} +.twoThird, #twoThird { + width:66%; + float:left; +} +.oneThird, #oneThird { + width:33%; + float:right; +} +.hidden { + display:none; +} +.creatorMainNavActive a { + color:#333 +} +.twoColumn { + float: left; + padding: 0 40px 0 0; + text-align: justify; + width: 450px; +} +.threeColumn { + float: left; + padding: 0 15px 0 0; + text-align: justify; + width: 310px; +} +.fourColumn { + float: left; + padding: 0 15px 0 0; + text-align: justify; + width: 230px; +} +.floatLeft { + float:left; +} +.floatRight { + float:right; +} +.clearBoth, .clearFloat { + clear:both; +} +.fullWidth, .fluidWidth { + width:100%; +} +.dateStamp { + font-size: 11px; + padding:0; + font-weight:bold; + color: #AAAAAA; + font-style: italic; +} +.socialLinksInPage { + margin-bottom:10px; +} +#mainSubNavigation ul, ul.creatorFooterNav, #headerSubNav ul, #blogPostPreview ul, #mainSiteNavigation ul, form#userRegistrationForm ul, #blogEntriesForSection ul, #galleryEntriesForSection ul { + list-style-type:none; + margin:0; + padding:0; +} +.breadcrumbs { + font-size: 10px; + padding: 10px 0 0; + text-align: right; +} +.center { + width:980px; + display:none; + margin:0 auto; +} +.logo { + float: left; + padding: 10px; +} +.adSidebar { + float:left; + margin:10px 0; +} +.sidebarLeft { + width:300px; + float:left; +} +.sidebarRight { + width:300px; + float:right; +} +.articleTextLeft { + width:640px; + padding:0 0 20px 20px; + float:left; + border-left: 1px solid #EEEEEE; +} +.articleTextRight { + width:640px; + padding:0 20px 20px 0; + float:left; + border-right:1px solid #ddd; +} +h2.commentHeading { + border-top:1px solid #ddd; + padding-top:20px; +} +/*-------------------------------BLOG STYLES-------------------------------*/ +.blogPostSynopsis { + border-bottom: 1px solid #DDDDDD; + float: left; + margin-bottom: 20px; + padding-bottom: 50px; +} +.blogPostSynopsis h2 { + font-size: 21px; + margin: 0; +} +.blog .articleTextLeft { + border-left: 1px solid #EEEEEE; + float: left; + margin-left: 15px; + padding: 0 0 20px 20px; + width: 640px; +} +.blog .articleRightLeft { + border-right: 1px solid #EEEEEE; + float: left; + margin-right: 15px; + padding: 0 0 20px 20px; + width: 640px; +} + +/*-------------------------------FOOTER STYLES-------------------------------*/ +.footerColor p { + margin:0; + padding:0; +} +.footerColumn, #footerRight { + background:#ddd; + float:left; +} +ul.creatorFooterNav { + border-top:1px solid #686868; + margin-top:20px; +} +ul.creatorFooterNav li a { + float: left; + padding: 10px 25px 10px 0; +} + + +/*-------------------------------COLOR STYLES-------------------------------*/ +.headerColor { + border-bottom: 1px solid #EEEEEE; + float: left; +} +.subHeaderColor { + border-bottom: 1px solid #EEEEEE; + float: left; +} +.footerColor { + float: left; + background:#000; + margin-top: 20px; +} +#flavorLogo { + float:left; + width:300px; + height:100px; +} +/*-------------------------------NAVIGATION STYLES-------------------------------*/ + +#mainSiteNavigation { + float:right; +} +#mainSiteNavigation li { + float: left; + padding: 10px; +} +#headerSubNav { + float:right; +} +#headerSubNav li { + float: left; + font-size: 13px; + padding: 10px; +} +#headerSubNav li a.active { + color:#222; +} +#mainSubNavigation { + font-family:'Oswald', Arial, Helvetica, sans-serif; + padding:20px; +} +#mainSubNavigation ul li { + line-height: 30px; +} +#mainSubNavigation li.navbarLabel { + font-size: 18px; + font-weight: bold; + margin: 20px 0 5px; +} + diff --git a/documentation/css/doxy.css b/documentation/css/doxy.css index 376179a1..4726d369 100644 --- a/documentation/css/doxy.css +++ b/documentation/css/doxy.css @@ -1,58 +1,26 @@ /* - 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. + 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. */ #top { diff --git a/documentation/css/flavor.css b/documentation/css/flavor.css new file mode 100644 index 00000000..9870136f --- /dev/null +++ b/documentation/css/flavor.css @@ -0,0 +1,1065 @@ +/* + 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. +*/ + +/* Basic Styles +________________________*/ +body { + background-color: #000000; +} +a { + color: #FFCC03; +} +a:visited { +} +a:hover { + color: #fff; +} +a:active { + color: #FFCC03; +} +.center { + width: 944px; + margin:0 auto; + display:block!important; +} +.noBullets { + list-style-type:none; +} +.center ul li { + list-style-type: none; + padding-left: 15px; +} +ol { + margin: 0 0 0 28px; + padding: 0; + background:none; +} +ol li { + list-style-type: decimal-leading-zero; + font-weight: bold; + font-size: 14px!important; + color: #CCC!important; +} +ol li h3 { + font-size:20px!important; + color: #ccc!important; +} +ol li p { + font-size: 13px!important; + font-weight:normal!important; + color: #999!important; +} +p.fine-print { + font-size: 9px!important; +} +.noBullets { + list-style-type:none; +} +#mainContentContainer { + width: 944px; + padding-bottom: 20px; + margin: 10px 0 0px; + border: 1px solid #666; + border-radius : 7px; + -moz-border-radius : 7px; + -webkit-border-radius: 7px; + color: #CCCCCC; + background-color: #2C2C2C; + float:left; + position:relative; +} +.marginL0 { + margin-left:0!important; +} +.paddingL0 { + padding-left:0!important +} +#mainFooterContainer { + width: 944px; + margin: 0 auto 0; + color: #CCCCCC; +} +h2.title { + margin-bottom: 10px; + color: #CCC; + line-height: 26px; + margin-top: 20px; +} +h1.title { + float: left; + padding-left: 25px; + padding-right: 25px; +} +.floatLeft { + float:left!important; +} +h1.title, h1 { + margin: 20px 0 10px; +} +#mainContentContainer h1, #mainContentContainer h2, #mainContentContainer h3, #mainContentContainer h4, #mainContentContainer h5, #mainFooterContainer h1, #mainFooterContainer h2, #mainFooterContainer h3, #mainFooterContainer h4, #mainFooterContainer h5 { + font-weight:lighter; +} +#mainContentContainer h1, #mainFooterContainer h1 { + font-size: 38px; + line-height: 35px; + margin-bottom:10px; +} +#mainContentContainer h2, #mainFooterContainer h2 { + font-size: 26px; + margin-bottom:5px; +} +#mainContentContainer h3, #mainFooterContainer h3 { + font-size:20px; + clear: left; + line-height: 23px; + margin-bottom:0; +} +#mainFooterContainer h4 { + margin: 10px 0 5px; +} +ul.creatorFooterNav li { + background: none; + display: inline-block; + float: left; + padding: 0; + font-size: 16px; +} + +/* Table Styles +________________________*/ +table { +} +table a { + color:#00ccff +} +td { +} +#mainContentContainer p { + color: #999999; + font-size: 13px; + line-height: 18px; + margin-top: 5px; + margin-right: 0; + margin-bottom: 15px; + margin-left: 15px; +} +#mainContentContainer li { + color: #999; + font-size: 12px; + line-height:14px; + margin: 5px 0; +} +#mainFooterContainer p { + color: #999; + font-size: 12px; + line-height: 16px; + margin: 0 0 5px 0; +} +#mainFooterContainer a.readMore { + font-size:12px; +} +ul.creatorFooterNav { + float: left; + margin: 0; + border:none; +} +ul.creatorFooterNav li a { + color: #666666; + text-decoration: none; + margin-left:10px; + float:left; + padding: 20px 10px!important; +} +ul.creatorFooterNav li a:hover, a h4:hover { + color:#fff; +} +ul.creatorFooterNav li.creatorMainNavActive a, ul.creatorFooterNav li a:active, a h4:active { + color:#FFCC03; +} +.headerColor { + background: none; + border-bottom: medium none; + color:#606060; +} +a.logo { + float: left; + margin:-35px 0px 0px 20px; + padding: 0px 0px 0px 0px; +} +.featuredSynopsis h3 { + color:#ccc; + margin: 5px 0!important; +} +.featuredSynopsis a.targetUrl h3 { + color:#ccc; + margin: 5px 0!important; +} +.featuredSynopsis a.targetUrl h3:hover { + color:#fff; +} +.featuredSynopsis a.targetUrl h3:active { + color:#FFCC03; +} +/*Pixar Align Styles +________________________*/ +.paddingL0 { + padding-left:0; +} +.paddingR0 { + padding-right:0; +} +.padding20 { + padding:20px; +} +.padding15 { + padding:15px; +} +.paddingL25 { + padding-left:25px!important; +} +.paddingR25 { + padding-right:25px!important; +} +.paddingLR25 { + padding-left:25px!important; + padding-right:25px!important; +} +.paddingLR10 { + padding-left:10px!important; + padding-right:10px!important; +} +.paddingNone ul { + padding-right:0!important; + padding-left:0!important; +} +.paddingB50 { + padding-bottom:50px; +} +.width300 { + width:300px!important; +} +.marginTB10 { + margin-top:10px!important; + margin-bottom:10px!important; +} +.marginTB0 { + margin-top:0px!important; + margin-bottom:0px!important; +} +.marginT10 { + margin-top:10px; +} +.marginT20 { + margin-top:20px; +} +.marginT15 { + margin-top:15px; +} +.marginT10 { + margin-top:10px; +} +.marginT5 { + margin-top:5px; +} +.marginL20 { + margin-left:20px!important; +} +.marginL100 { + margin-top:100px; +} +.setWidth { + width:944px; +} +.setTextHeight { + height:150px; +} +.setTextHeightCustom { + height:328px; +} +.marginR10 { + margin-right:10px; +} +.marginR15 { + margin-right:15px; +} +.marginR20 { + margin-right:20px; +} +marginLR25 { + margin-left:25px; + margin-right:25px; +} +.marginL50 { + margin-left:50px; +} +.marginL125 { + margin-left: 125px; +} +.marginT5 { + margin-top: 5px; +} +.marginT75 { + margin-top: 75px; +} +.marginT50 { + margin-top: 50px; +} +.marginT52 { + margin-top: 52px; +} +.marginT62 { + margin-top: 62px; +} +.marginT60 { + margin-top: 60px; +} +.marginT30 { + margin-top: 30px; +} +.marginT40 { + margin-top: 40px; +} +.marginB20 { + margin-bottom: 20px!important; +} +.marginB40 { + margin-bottom:40px; +} +.padding10 { + padding:10px; +} +.marginT25 { + margin-top:25px; +} +.marginB0 { + margin-bottom:0!important; +} +.paddingB0 { + padding-bottom:0!important; +} +.buttonPaddingRegister { + padding:20px 15px; +} +.height350 { + height:350px; +} + +.dateStamp { + color: #00CCFF; + font-size: 13px; + font-style: normal; + font-weight: normal; + padding: 0; +} +.featuredSynopsis .dateStamp { + margin-top: 30px; +} +.copyrightText { + position:absolute; + right:10px; + bottom:5px; + color:#fff; + font-size:10px; + opacity:.5; + text-align: right; +} +/*Pixar Main Nav Styles +________________________*/ + +#mainSiteNavigation { + float: left; + padding: 7px 0 0; + width: 944px; + background: none; + color: #CCCCCC; + border-bottom: 1px solid #666666; +} +#mainSiteNavigation .creatorMainNav { + margin: 4px 10px 10px 10px; + padding: 0px; +} +#mainSiteNavigation .creatorMainNav li { + padding: 0px; + margin: 8px 15px; + background:none; + font-size: 14px; +} +#mainSiteNavigation .creatorMainNav li a { + color: #9a9a9a; + letter-spacing: 1px; + text-decoration: none; + font-size: 14px; +} +#mainSiteNavigation .creatorMainNav li a:hover { + color: #ffffff; +} +#mainSiteNavigation .creatorMainNav li a:active { + color: #FFCC03; +} +#mainSiteNavigation .creatorMainNav li.creatorMainNavActive a { + color: #FFCC03; +} +a.readMore { + font-size:14px; + color:#666; +} +a.readMore:hover { + color:#fff!important; +} +a.readMore:active { + color:#ffcc03!important +} +/*Pixar Logo Styles +________________________*/ + +div.homeRenderManLink { + float: left; + height: 45px; + margin: 0 0px 0 5px; + width: 300px; + color: #999; + font-size: 32px; + font-family: Futura, Arial, Helvetica, sans-serif; + text-indent: 10px; +} +div.homeRenderManLinkWide { + float: left; + height: 45px; + margin: 0 0px 0 5px; + width: 900px; + color: #999; + font-size: 32px; + font-family: Futura, Arial, Helvetica, sans-serif; + text-indent: 10px; +} +div.homeRenderManLink a { + color: #999; +} +div.homeRenderManLink a:hover { + /*background-position:-178px 0;*/ +} +.blueButton { + -moz-border-radius: 15px; + -webkit-border-radius: 15px; + border: 1px solid black; + background: #F8C600; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#204D79', endColorstr='#003260'); + background: -webkit-gradient(linear, left top, left bottom, from(#204D79), to(#003260)); + background: -moz-linear-gradient(bottom, #003260, #204D79); + box-shadow: 0 1px 0px #3471aa inset; + -webkit-box-shadow: 0 1px 0px #3471aa inset; + -moz-box-shadow: 0 1px 0 #3471aa inset; + color: #ccc!important; + float: right; + font-size: 11px; + font-weight: bold; + text-shadow: 0 1px 0 black; + text-transform: uppercase; + padding: 7px 0; + width: 115px; + text-align: center; +} +.blueButton:hover { + color: #ccc!important; + background: #f8c600; +filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#275d8e', endColorstr='#003d72'); + background: -webkit-gradient(linear, left top, left bottom, from(#275d8e), to(#003d72)); + background: -moz-linear-gradient(bottom, #003d72, #275d8e); + cursor:pointer; +} +.blueButton:active { + color:#fff!important; + background: #000; +filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#002345', endColorstr='#204D79'); + background: -webkit-gradient(linear, left top, left bottom, from(#002345), to(#204D79)); + background: -moz-linear-gradient(bottom, #204D79, #002345); + box-shadow: 0px 1px 0px #444; + -webkit-box-shadow: 0px 1px 0px #444; + -moz-box-shadow: 0px 1px 0px #444; +} + + +/*Pixar Home Slideshow Styles +________________________*/ + +#homeSlider { + clear: left; + float: left; + height: 420px; + margin-bottom: -21px; +} +#lofslidecontent-home .lof-slidecontent, #lofslidecontent-home .lof-slidecontent a { + color:#FFF; +} +#lofslidecontent-home .lof-slidecontent { + position:absolute; + overflow:hidden; +} +#lofslidecontent-home .lof-main-outer { + position:relative; + height:100%; + width:980px; + z-index:3px; + overflow:hidden; +} +#lofslidecontent-home .lof-main-outer-small { + position:relative; + height:100%; + width:980px; + z-index:3px; + overflow:hidden; +} +#lofslidecontent-home ul.lof-main-wapper li { + overflow:hidden; + padding:0px; + margin:1px; + float:left; + position:relative; + height: 420px; +} +#lofslidecontent-home ul.lof-main-wapper li img { + padding:0; +} +#lofslidecontent-home .options { + width: 300px; + background: rgba(23, 23, 23, 0.75); + border: 1px solid rgba(0, 0, 0, 0.25); + padding: 10px; + position: absolute; + top: 20%; + left: 20px; + z-index: 9; + -moz-border-radius: 10px; + -webkit-border-radius: 10px; + -ms-border-radius: 10px; + border-radius: 10px; + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.75); + -moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.75); + -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.75); + -ms-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.75); +} +#lofslidecontent-home .options-banner { + top: 0px; + left: 0px; + margin-top: 325px; + height: 90px; + width: 942px; + background: #000; + box-shadow: 0; + -webkit-box-shadow: 0; + border: 1px solid rgba(0, 0, 0, 0.25); + padding: 10px; + position: absolute; + z-index: 9; + -moz-border-radius: 10px; + -webkit-border-radius: 10px; + -ms-border-radius: 10px; + border-radius: 10px; + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.75); + -moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.75); + -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.75); + -ms-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.75); +} +.options-banner h2 { + margin-left: 10px; +} +.options-banner p { + margin-top: 10px!important; + margin-left: 10px!important; +} +#lofslidecontent-home .copyright { + font-size: 11px; + font-weight:bold; + color:#fff; + bottom:5px; + left:30px; + z-index: 70; + position: absolute; +} +#lofslidecontent-home ul.lof-main-wapper { + overflow:hidden; + padding:0px; + margin:0; + position:absolute; + overflow:hidden; +} +#mainContent, .mainContent { + float:left; + width: 550px; + padding-bottom: 20px; +} +#mainContent h3, .mainContent h3 { + margin-top: 0; +} + +/*Pixar Press Section Styles +________________________*/ + +.copyrightFooter { + color: #666; + float: right; + font-size: 11px; + margin-right: 10px; + margin-top: 25px; +} +div.articleSynopsis p { + padding: 0px 25px; + margin: 0 0 10px; +} + +h4.synopsis-head { + font-size: 16px; + font-weight: bold; + line-height: 1.3em; + margin: 10px 0 5px 3px; +} +h1.articleContentTitle { + font-size: 38px; + float: left; + font-weight: lighter; + margin-top: 35px; + padding: 0px 25px; + width: 95%; + line-height: 40px!important; +} +h1.articleContentTitle a { + float:left; + margin-right: 5px; + font-size:38px; +} +h1.articleContentTitle span { + float:left; + font-size:38px; +} + +h2.articleContentTitle { + font-size: 24px; + float: left; + font-weight: lighter; + margin-top: 20px; + padding: 0px 10px; + width: 95%; + line-height: 1.6em!important; +} +h2.articleContentTitle a { + float:left; + margin-right: 5px; + font-size:24px; +} +h2.articleContentTitle span { + float:left; + font-size:24px; +} +/*Pixar Footer Styles +________________________*/ + +#footerLeftEntriesForSection, #footerCenterEntriesForSection, #footerRightEntriesForSection { + float: left; + margin: 20px 0 25px 23px; + width: 285px; +} +#footerLeftEntriesForSection h4, #footerCenterEntriesForSection h4, #footerRightEntriesForSection h4 { + text-transform:uppercase; +} +#footerLeftEntriesForSection ul, #footerCenterEntriesForSection ul, #footerRightEntriesForSection ul { + float:left; + display:inline-block; + list-style-type:none; + margin: 0; + padding: 0; +} +#footerLeftEntriesForSection ul li, #footerCenterEntriesForSection ul li, #footerRightEntriesForSection ul li { + float:left; + margin: 0; + padding: 0 0 10px 0; + display:inline-block; + list-style-type:none; + background: none; + width: 285px; +} +.featuredSynopsis h3.title, h3.simpleLinkContainer { + margin: 5px 0; + padding:0; +} +.featuredSynopsis-schedule h3.title { + margin-top: 20px; + color: #e0e0e0; +} +h3.title { + color: 00CCFF; +} +/*Pixar Video Page Styles +________________________*/ + +.featuredSynopsis { + float: left; + margin: 0 0 0px; +} +.featuredSynopsis-schedule { + margin: 0 0 0px; +} +.borderTop { + border-top:1px solid #666; + margin-top: 20px; + padding-top: 20px; + margin-bottom: 0; +} +.featuredSynopsisWide { + float: left; + width: 896px; + margin: 0 0 20px; + border-top: 1px solid #666666; +} +.featuredSynopsisWide .ogImage { + float: right; + margin-top: 30px; + margin-left: 30px; +} +th { + text-align:left; +} + +/*Pixar Color Styles +________________________*/ +.footerColor a { + color: #cccccc; +} +.footerColor { + background-color: #2C2C2C; + margin: 20px 0 0 0; + border: 1px solid #666; + -moz-border-radius : 7px; + -webkit-border-radius: 7px; + height: 265px; +} +hr { + background-color: #666666; + border: 0 none; + clear: both; + color: #666666; + float: left; + height: 1px; + margin: 15px 25px 15px 25px; + width: 894px; +} + + +/*Pixar Code Styles +________________________*/ + + +pre, code { + border: 1px dashed #555555; + background:#222; + padding: 5px 10px; + line-height: 21px; + word-wrap:break-word; + text-align: left; + width: 96%; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; +} +.code-keyword { + color:#036eff; +} +.code-quote { + color:#13db03; +} +.code-object { + color:#e403ff; +} +.entranceList ul { + padding:0 25px; +} +.entranceList li { + background: #222222; + border: 1px solid #000000; + -moz-box-shadow: 0 1px 0 #555555 inset; + -webkit-box-shadow: 0 1px 0 #555555 inset; + float: left; + margin: 0px 15px 30px!important; + position:relative; + padding: 1px; + width: 45%; +} +.entranceList li:hover { + background:#333; +} +.entranceList li:hover h3 { + color:#fff!important; +} +.entranceList li h3 { + clear:none!important; +} +.entranceList li:active h3 { + color: #FFCC03!important; +} +.entranceList li img { + height:100px; + width:100px; + border-right: 1px solid #000000; + float:left; +} +.entranceList li h3 { + float: left; + margin: 10px 0px 0 15px!important; + width: 70%; +} +.entranceList li div.synopsis div.news-author p { + float: left; + line-height: 16px !important; + margin: 5px 0 0 15px !important; + width: 70%; +} +.entranceList li div.synopsis p { + float: left!important; +} +div.news-author { + font-style:italic; +} +div.news-author:before { + content: "-"; +} +.entranceList li a.clickableDiv { + height: 105px; + left: 0; + position: absolute; + top: 0; + width: 412px; +} +.entranceList ul li { + background:#222!important; + padding: 0; +} +.hidden, .displayNone { + display:none; +} +.button { + border: 1px solid black; + background: #111; +filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#000000'); + background: -webkit-gradient(linear, left top, left bottom, from(#333333), to(#000)); + background: -moz-linear-gradient(bottom, #000, #333333); + box-shadow: 0 1px 0px #666 inset; + -webkit-box-shadow: 0 1px 0px #666 inset; + -moz-box-shadow: 0 1px 0 #666 inset; + color: #ccc; + float:left; + min-width:90px; + font-size: 11px; + font-weight: bold; + text-shadow: 0 1px 0 black; + text-transform: uppercase; + padding: 10px; + text-align: center; +} +.blueButton { + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border: 1px solid black; + background: #F8C600; +filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#204D79', endColorstr='#003260'); + background: -webkit-gradient(linear, left top, left bottom, from(#204D79), to(#003260)); + background: -moz-linear-gradient(bottom, #003260, #204D79); + box-shadow: 0 1px 0px #3471aa inset; + -webkit-box-shadow: 0 1px 0px #3471aa inset; + -moz-box-shadow: 0 1px 0 #3471aa inset; + color: #ccc; + float: right; + font-size: 11px; + font-weight: bold; + text-shadow: 0 1px 0 black; + text-transform: uppercase; + padding: 7px 0; + width: 115px; + text-align: center; +} +.blueButton:hover { + background: #f8c600; /* for non-css3 browsers */ +filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#275d8e', endColorstr='#003d72'); /* for IE */ + background: -webkit-gradient(linear, left top, left bottom, from(#275d8e), to(#003d72)); /* for webkit browsers */ + background: -moz-linear-gradient(bottom, #003d72, #275d8e); /* for firefox 3.6+ */ + cursor:pointer; +} +.blueButton:active { + color:#fff; + background: #000; /* for non-css3 browsers */ +filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#002345', endColorstr='#204D79'); /* for IE */ + background: -webkit-gradient(linear, left top, left bottom, from(#002345), to(#204D79)); /* for webkit browsers */ + background: -moz-linear-gradient(bottom, #204D79, #002345); /* for firefox 3.6+ */ + box-shadow: 0px 1px 0px #444; + -webkit-box-shadow: 0px 1px 0px #444; + -moz-box-shadow: 0px 1px 0px #444; +} +.margin0 { + margin:0; +} +.padding0 { + padding:0; +} +.width944 { + width:944px; +} +.width450 { + width:450px; +} +.width475 { + width:475px; +} +.width500 { + width:500px; +} +.paddingLR20 { + padding-left:20px; + padding-right:20px; +} +.mediaTile td { + border-bottom: 1px solid #222; + border-top: 1px solid #333; + margin: 0; + padding: 15px 0 0; +} + +.clickableBox { +width: 100%; +height: 100%; +position: absolute; +z-index: 300; +background: transparent; +} + +/*Margin and Padding*/ +.padding0 {padding:0!important} +.padding5 {padding:5px!important;} +.padding10 {padding:10px!important;} +.padding15 {padding:15px!important;} +.padding20 {padding:20px!important;} + +.paddingTB0 {padding-top:0;padding-bottom:0;!important} +.paddingTB5 {padding-top:5px;padding-bottom:5px;!important} +.paddingTB10 {padding-top:10px;padding-bottom:10px;!important} +.paddingTB15 {padding-top:15px;padding-bottom:15px;!important} +.paddingTB20 {padding-top:20px;padding-bottom:20px;!important} +.paddingTB30 {padding-top:30px;padding-bottom:30px;!important} + +.paddingLR0 {padding-left:0;padding-right:0;!important} +.paddingLR5 {padding-left:5px;padding-right:5px;!important} +.paddingLR7 {padding-left:7px;padding-right:7px;!important} +.paddingLR10 {padding-left:10px;padding-right:10px;!important} +.paddingLR15 {padding-left:15px;padding-right:15px;!important} +.paddingLR20 {padding-left:20px;padding-right:20px;!important} +.paddingLR30 {padding-left:30px;padding-right:30px;!important} + +.paddingT5 {padding-top:5px!important;} +.paddingT10 {padding-top:10px!important;} +.paddingT15 {padding-top:15px!important;} +.paddingT20 {padding-top:20px!important;} + +.paddingB5 {padding-bottom:5px!important;} +.paddingB10 {padding-bottom:10px!important;} +.paddingB15 {padding-bottom:15px!important;} +.paddingB20 {padding-bottom:20px!important;} +.paddingB30 {padding-bottom:30px!important;} +.paddingB40 {padding-bottom:40px!important;} +.paddingB50 {padding-bottom:50px!important;} + +.paddingR5 {padding-right:5px!important;} +.paddingR10 {padding-right:10px!important;} +.paddingR15 {padding-right:15px!important;} +.paddingR20 {padding-right:20px!important;} +.paddingR30 {padding-right:30px!important;} + +.paddingL5 {padding-left:5px!important;} +.paddingL10 {padding-left:10px!important;} +.paddingL15 {padding-left:15px!important;} +.paddingL20 {padding-left:20px!important;} +.paddingL30 {padding-left:30px!important;} + +.marginTB0 {margin-top:0;margin-bottom:0;!important} +.marginTB5 {margin-top:5px;margin-bottom:5px;!important} +.marginTB10 {margin-top:10px;margin-bottom:10px;!important} +.marginTB15 {margin-top:15px;margin-bottom:15px;!important} +.marginTB20 {margin-top:20px;margin-bottom:20px;!important} +.marginTB30 {margin-top:30px;margin-bottom:30px;!important} + +.marginLR0 {margin-left:0;margin-right:0;!important} +.marginLR5 {margin-left:5px;margin-right:5px;!important} +.marginLR10 {margin-left:10px;margin-right:10px;!important} +.marginLR15 {margin-left:15px;margin-right:0;!important} +.marginLR20 {margin-left:20px;margin-right:20px;!important} + +.margin0 {margin:0!important} +.margin5 {margin:5px!important;} +.margin10 {margin:10px!important;} +.margin15 {margin:15px!important;} +.margin20 {margin:20px!important;} + +.marginT0 {margin-top:0px!important;} +.marginT5 {margin-top:5px!important;} +.marginT10 {margin-top:10px!important;} +.marginT15 {margin-top:15px!important;} +.marginT20 {margin-top:20px!important;} + +.marginB0 {margin-bottom:0px!important;} +.marginB5 {margin-bottom:5px!important;} +.marginB10 {margin-bottom:10px!important;} +.marginB15 {margin-bottom:15px!important;} +.marginB20 {margin-bottom:20px!important;} +.marginB30 {margin-bottom:30px!important;} + +.marginR0 {margin-right:0px!important;} +.marginR5 {margin-right:5px!important;} +.marginR10 {margin-right:10px!important;} +.marginR15 {margin-right:15px!important;} +.marginR20 {margin-right:20px!important;} +.marginR30 {margin-right:30px!important;} + +.marginL0 {margin-left:0px!important;} +.marginL5 {margin-left:5px!important;} +.marginL10 {margin-left:10px!important;} +.marginL15 {margin-left:15px!important;} +.marginL20 {margin-left:20px!important;} + +.marginTminus20 {margin-top:-20px!important;} +.marginBminus20 {margin-bottom:-20px!important;} +.marginTminus15 {margin-top:-15px!important;} +.marginBminus15 {margin-bottom:-15px!important;} +.marginTminus10 {margin-top:-10px!important;} +.marginBminus10 {margin-bottom:-10px!important;} +.marginTminus5 {margin-top:-5px!important;} +.marginBminus5 {margin-bottom:-5px!important;} + + +.halfWidth {width:49%;} + + +.primaryTextColor, .ui-state-active a {color:#ffcc03!important;}/*yellow*/ +.secondaryTextColor {color:#036eff;} /*light blue*/ + +.imgLeft {float:left;margin:0 10px 10px 0;} +.imgRight {float:right;margin:0 0 10px 10px;} + + +#mainContentContainer h1,#mainContentContainer h2,#mainContentContainer h3,#mainContentContainer h4,#mainContentContainer h5,#mainFooterContainer h1,#mainFooterContainer h2,#mainFooterContainer h3,#mainFooterContainer h4,#mainFooterContainer h5,#mainSubNavigation,#profilePageCreator #profileInfo h1,#profilePageCreator h1,#profilePageCreator h2,#profilePageCreator h3,#profilePageCreator h4,#profilePageCreator h5,.creatorMainNav li a,.fontFutura,.homeText h4,ol,ul.creatorFooterNav li a {font-family:"futura",sans-serif;}#mainContentContainer p,#mainFooterContainer a,#mainFooterContainer p,.fontNewsGothic,.homeText,.tk-news-gothic-std,h1.articleContentTitle,h1.articleContentTitle a,h1.articleContentTitle span{font-family:"gothic",sans-serif;} diff --git a/documentation/css/renderman-university.css b/documentation/css/renderman-university.css new file mode 100644 index 00000000..25ce8cf4 --- /dev/null +++ b/documentation/css/renderman-university.css @@ -0,0 +1,106 @@ +/* + 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. +*/ +.coursewareBackground { + background: #efefef; + float: left; + margin: 0 25px 25px; + padding: 30px 50px; + width: 796px; + color: #333; + font-size: 13px!important; +} +.coursewareBackground hr { + display:none; +} +.coursewareBackground img { + margin-bottom:20px; + max-width: 776px; +} +.coursewareBackground strong, .coursewareBackground p, .coursewareBackground h1, .coursewareBackground h2, .coursewareBackground h3, .coursewareBackground h4, .coursewareBackground h5, .coursewareBackground h6, .coursewareBackground li, .coursewareBackground li a { + color:#333; +} +.coursewareBackground a { + color:#000; + text-decoration:underline; +} +.coursewareBackground a:hover { + color: #CC9900!important; +} +.coursewareBackground pre, .coursewareBackground code { + background:#ddd; +} +.coursewareBackground ul li { + padding-left: 6px!important; + list-style-type:square!important; +} +.coursewareBackground h1, .coursewareBackground h2, .coursewareBackground h1 a, .coursewareBackground h2 a { + padding-bottom:10px; + margin-bottom:10px!important; + clear: left; + border-bottom:1px solid #ccc; + text-decoration:none; +} +.coursewareBackground div.note { + margin-left: 15px; + margin-right: 15px; + padding:10px 5px 10px 5px; + clear: left; + border:1px solid #333; + background: #ccc; +} +.imageLeft { + float:left; + padding:0 10px 10px 0; + margin:0 10px 10px 0; +} +#mainContentContainer p { + font-family:Arial, Helvetica, sans-serif!important; + color:#333!important; +} +#mainContentContainer .entranceList p { + color: #aaa!important; +} +#mainContentContainer .entranceList h3 { + color: #FFCC03; +} +#mainContentContainer a:hover { + color: #FFCC03; +} +h1.articleContentTitle { + width:620px!important; +} +#mainContentContainer ul li { + color:#333; + font-weight:normal; +} +#mainContentContainer ol li { + color: #333!important; + font-weight: normal; + font-family: arial, sans-serif; + font-size: 13px!important; +} +ol img { + margin-left:-28px; +} diff --git a/documentation/css/rst.css b/documentation/css/rst.css index 04042bb0..0f0abf21 100644 --- a/documentation/css/rst.css +++ b/documentation/css/rst.css @@ -1,62 +1,30 @@ /* - 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. + 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. */ -/*Pixar Code Styles +/*Code Styles ________________________*/ @@ -526,13 +494,14 @@ div.navigation a:hover { div.document { background: rgb(240,240,240); - margin-top: 5px; +/* margin-left: 255px; - + margin-top: 5px; padding-top: 15px; padding-left: 15px; padding-right: 15px; padding-bottom: 15px; +*/ border-top-left-radius: 15px; -moz-border-top-left-radius: 15px; @@ -555,7 +524,7 @@ div.document a:hover { } div.footer { - background: #FFF; + /* background: #FFF;*/ margin-left: 255px; padding-top: 15px; padding-left: 5px; diff --git a/documentation/diagrams.odg b/documentation/diagrams.odg index 39497150..ee711471 100644 Binary files a/documentation/diagrams.odg and b/documentation/diagrams.odg differ diff --git a/documentation/dxviewer.rst b/documentation/dxviewer.rst index 9508bf38..94f80fa6 100644 --- a/documentation/dxviewer.rst +++ b/documentation/dxviewer.rst @@ -1,58 +1,26 @@ .. - 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. + 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. dxViewer diff --git a/documentation/getting_started.rst b/documentation/getting_started.rst index 559a5470..32e63994 100644 --- a/documentation/getting_started.rst +++ b/documentation/getting_started.rst @@ -1,58 +1,26 @@ .. - 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. + 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. Getting Started diff --git a/documentation/glbatchviewer.rst b/documentation/glbatchviewer.rst index ca2fb253..f9c469d0 100644 --- a/documentation/glbatchviewer.rst +++ b/documentation/glbatchviewer.rst @@ -1,58 +1,26 @@ .. - 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. + 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. glBatchViewer diff --git a/documentation/glviewer.rst b/documentation/glviewer.rst index 6d365c68..6bb3f786 100644 --- a/documentation/glviewer.rst +++ b/documentation/glviewer.rst @@ -1,58 +1,26 @@ .. - 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. + 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. glViewer @@ -100,7 +68,6 @@ SEE ALSO ======== `Code Examples `__, \ -`glViewer `__, \ `glBatchViewer `__, \ `ptexViewer `__, \ `paintTest `__, \ diff --git a/documentation/images/api_data_flow.png b/documentation/images/api_data_flow.png new file mode 100644 index 00000000..95682575 Binary files /dev/null and b/documentation/images/api_data_flow.png differ diff --git a/documentation/images/api_layers.png b/documentation/images/api_layers.png index c53042a8..14c0cfd2 100644 Binary files a/documentation/images/api_layers.png and b/documentation/images/api_layers.png differ diff --git a/documentation/images/api_osd_modules.png b/documentation/images/api_osd_modules.png new file mode 100644 index 00000000..71ecd473 Binary files /dev/null and b/documentation/images/api_osd_modules.png differ diff --git a/documentation/images/api_representations.png b/documentation/images/api_representations.png index 1f70ea8b..6d31d691 100644 Binary files a/documentation/images/api_representations.png and b/documentation/images/api_representations.png differ diff --git a/documentation/images/barb_1.jpg b/documentation/images/barb_1.jpg new file mode 100644 index 00000000..9bcfea04 Binary files /dev/null and b/documentation/images/barb_1.jpg differ diff --git a/documentation/images/gtruck.jpg b/documentation/images/gtruck.jpg new file mode 100644 index 00000000..3c42aceb Binary files /dev/null and b/documentation/images/gtruck.jpg differ diff --git a/documentation/images/painttest.jpg b/documentation/images/painttest.jpg new file mode 100644 index 00000000..6e084c1e Binary files /dev/null and b/documentation/images/painttest.jpg differ diff --git a/documentation/intro.rst b/documentation/intro.rst index 34c2fe5f..71a6f9e6 100644 --- a/documentation/intro.rst +++ b/documentation/intro.rst @@ -1,58 +1,26 @@ .. - 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. + 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. Introduction diff --git a/documentation/limiteval.rst b/documentation/limiteval.rst index 0e173b3f..0335392d 100644 --- a/documentation/limiteval.rst +++ b/documentation/limiteval.rst @@ -1,58 +1,26 @@ .. - 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. + 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. limitEval diff --git a/documentation/nav_template.txt b/documentation/nav_template.txt index 3d9b8712..bd721a8f 100644 --- a/documentation/nav_template.txt +++ b/documentation/nav_template.txt @@ -1,67 +1,30 @@

-
- -
-
-
@@ -70,12 +33,10 @@
-

diff --git a/documentation/painttest.rst b/documentation/painttest.rst new file mode 100644 index 00000000..d75a77a4 --- /dev/null +++ b/documentation/painttest.rst @@ -0,0 +1,86 @@ +.. + 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. + + +paintTest +--------- + +.. contents:: + :local: + :backlinks: none + +SYNOPSIS +======== + +.. parsed-literal:: + :class: codefhead + + **paintTest** + [**-f**] + *objfile(s)* + +DESCRIPTION +=========== + +``ptexViewer`` is a stand-alone application that showcases advanced HDR shading +with color, displacement, occlusion and specular ptex maps. Multiple controls +are available to experiment with the algorithms. + +.. image:: images/painttest.jpg + :width: 400px + :align: center + :target: images/painttest.jpg + +OPTIONS +======= + +**-f** + Launches the application in full-screen mode (if is supported by GLFW on the + OS) + +*objfile(s)* + A sequence of obj files used as an animation loop (the topology has to match + the data contained in all the ptex files !) + + +Keyboard Controls +================= + + .. code:: c++ + + c : use texture as color + d : use texture as displacement + + +SEE ALSO +======== + +`Code Examples `__, \ +`glViewer `__, \ +`glBatchViewer `__, \ +`ptexViewer `__, \ +`limitEval `__, \ +`dxViewer `__, \ + + diff --git a/documentation/processHtml.py b/documentation/processHtml.py index d0eb01bd..76011984 100755 --- a/documentation/processHtml.py +++ b/documentation/processHtml.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 os @@ -109,6 +76,7 @@ class HtmlToTextParser(HTMLParser.HTMLParser): def GetTitle(self): return self.m_title + #------------------------------------------------------------------------------- def StripHTMLComments(data): regex = re.compile('\') @@ -210,9 +178,15 @@ for root, dirs, files in os.walk(rootDir): msg += "added navigation" - f.seek(0) - f.write(html) - f.close() + # replace the article title placeholder with the real title + if title: + html = string.replace(html,"OSD_ARTICLE_TITLE", title) + else: + html = string.replace(html,"OSD_ARTICLE_TITLE", "") + + f.seek(0) + f.write(html) + f.close() print msg diff --git a/documentation/ptexviewer.rst b/documentation/ptexviewer.rst index f741aa05..3f09135c 100644 --- a/documentation/ptexviewer.rst +++ b/documentation/ptexviewer.rst @@ -1,58 +1,26 @@ .. - 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. + 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. ptexViewer @@ -91,10 +59,10 @@ DESCRIPTION with color, displacement, occlusion and specular ptex maps. Multiple controls are available to experiment with the algorithms. -.. image:: images/ptexviewer.png +.. image:: images/barb_1.jpg :width: 400px :align: center - :target: images/ptexviewer.png + :target: images/barb_1.jpg OPTIONS ======= @@ -166,7 +134,6 @@ SEE ALSO `Code Examples `__, \ `glViewer `__, \ `glBatchViewer `__, \ -`ptexViewer `__, \ `paintTest `__, \ `limitEval `__, \ `dxViewer `__, \ diff --git a/documentation/release_notes.rst b/documentation/release_notes.rst index fb7b49e0..e118b3ad 100644 --- a/documentation/release_notes.rst +++ b/documentation/release_notes.rst @@ -1,58 +1,26 @@ .. - 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. + 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. Release Notes @@ -62,6 +30,28 @@ Release Notes :local: :backlinks: none +---- + +Release 2.0.0 +============= + +**New Features** + - New CMake build flags: NO_LIB, NO_CUDA, NO_PYTHON) + +**Changes** + - OpenSubdiv is now under Apache 2.0 license + - HbrHalfedge and HbrFVarData copy constructors are now private + - Documentation style matched to graphics.pixar.com + new content + - Add an animation freeze button to ptexViewer + - Variable name changes for better readability across all example + shader code + +**Bug Fixes** + + - Fix incorrect patch generation for patches with 2 non-consecutive boundary edges + - Fix "undefined gl_PrimitiveID" shader build errors + - Fix for shader macro "OSD_DISPLACEMENT_CALLBACK" + - Fix out-of-bounds std::vector access in FarPatchTablesFactory ---- diff --git a/documentation/rst_template.txt b/documentation/rst_template.txt index 3bcd9b5d..558b6252 100644 --- a/documentation/rst_template.txt +++ b/documentation/rst_template.txt @@ -2,8 +2,100 @@ %(head)s %(stylesheet)s + + + + %(body_prefix)s %(body_pre_docinfo)s %(docinfo)s + +
+
+
+
+
+ OpenSubdiv Logo +
+ + + +
+
+
+ + +
+ +

OSD_ARTICLE_TITLE

+ +
+ +
+ +
+ +
+ + +
%(body)s %(body_suffix)s + +
+
+
+ + +
+ + +
+ +
+
+ + + + + +
diff --git a/documentation/search.html b/documentation/search.html index aa79686a..e1dfb9bb 100644 --- a/documentation/search.html +++ b/documentation/search.html @@ -1,59 +1,27 @@ @@ -66,9 +34,69 @@ + + + + + +
+
+
+
+
+ OpenSubdiv Logo +
+ + + +
+
+
+ + +
+ +

Search Results

+ +
+ +
+ +
+ +
+ + +
+
+
+
+ +
+ + +
+ +
+
+ + + + + +
diff --git a/documentation/subdivision_surfaces.rst b/documentation/subdivision_surfaces.rst index 4878aa35..d1337c32 100644 --- a/documentation/subdivision_surfaces.rst +++ b/documentation/subdivision_surfaces.rst @@ -1,58 +1,26 @@ .. - 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. + 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. Subdivision Surfaces @@ -104,17 +72,16 @@ animates or how closely it is viewed. Ordinary cubic B-spline surfaces are rectangular grids of tensor-product patches. Subdivision surfaces generalize these to control grids with arbitrary connectivity. - .. image:: images/tetra.0.jpg - :width: 20% +.. raw:: html - .. image:: images/tetra.1.jpg - :width: 20% - - .. image:: images/tetra.2.jpg - :width: 20% - - .. image:: images/tetra.3.jpg - :width: 20% +
+

+ + + + +

+
---- @@ -159,6 +126,11 @@ XXXX Semi-Sharp Creases ================== +.. image:: images/gtruck.jpg + :align: center + :height: 300 + :target: images/gtruck.jpg + XXXX ---- @@ -180,12 +152,10 @@ A hierarchical edit overrides these values. This allows for a compact specificat of localized detail on a subdivision surface, without having to express information about the rest of the subdivision surface at the same level of detail. -.. container:: fourcol - - .. image:: images/hedit_example1.png - :align: center - :height: 300 - :target: images/hedit_example1.png +.. image:: images/hedit_example1.png + :align: center + :height: 300 + :target: images/hedit_example1.png ---- diff --git a/documentation/tipuesearch/tipuesearch.css b/documentation/tipuesearch/tipuesearch.css index 4bc9b90e..4a7be011 100644 --- a/documentation/tipuesearch/tipuesearch.css +++ b/documentation/tipuesearch/tipuesearch.css @@ -115,9 +115,9 @@ http://www.tipue.com/search } div.search_result { - background: #FFF; + /* background: #FFF;*/ margin-top: 5px; - margin-left: 255px; + /* margin-left: 255px;*/ padding-top: 15px; padding-left: 15px; diff --git a/documentation/using_osd.rst b/documentation/using_osd.rst index c7f396f9..c4112c98 100644 --- a/documentation/using_osd.rst +++ b/documentation/using_osd.rst @@ -1,58 +1,26 @@ .. - 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. + 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. Using OpenSubdiv @@ -62,4 +30,13 @@ Using OpenSubdiv :local: :backlinks: none +.. image:: images/barb_1.jpg + :width: 400px + :align: center + +Using OpenSubdiv +================ + + + diff --git a/documentation/using_osd_compile.rst b/documentation/using_osd_compile.rst index 661d930a..ad4a2a73 100644 --- a/documentation/using_osd_compile.rst +++ b/documentation/using_osd_compile.rst @@ -1,58 +1,26 @@ .. - 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. + 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. Using OpenSubdiv diff --git a/documentation/using_osd_hbr.rst b/documentation/using_osd_hbr.rst index 31a879d4..5d297997 100644 --- a/documentation/using_osd_hbr.rst +++ b/documentation/using_osd_hbr.rst @@ -1,58 +1,26 @@ .. - 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. + 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. Using Hbr @@ -351,7 +319,7 @@ The rule-set can be selected using the following accessors: .. container:: impnotip - **Note** + **Warning** The boundary interpolation rules **must** be set before the call to *HbrMesh::Finish()*, which sets the sharpness values to boundary edges @@ -434,7 +402,7 @@ Holes -.. container:: impnotip +.. container:: note **Note** @@ -514,9 +482,9 @@ to `this example `__. Face-varying Data ================= -Here is a simple example of how to store face-varying data for a (u,v) pair. +Here is a walk-through of how to store face-varying data for a (u,v) pair. Unlike vertex and varying data which is accessed through the templated vertex -API, face-varying data is aggregated as vectors of float data. +API, face-varying data is directly aggregated as vectors of float data. Instantiating the *HbrMesh* @@ -566,11 +534,12 @@ Here is some sample code: if (not fvt.IsInitialized()) { + // if no fvar daa exists yet on the vertex fvt.SetAllData(2, fvdata); } else if (not fvt.CompareAll(2, fvdata)) { - // if there is a boundary in the fvar-data, add the new data + // if there already is fvar data and there is a boundary add the new data OpenSubdiv::HbrFVarData & nfvt = e->GetOrgVertex()->NewFVarData(f); nfvt.SetAllData(2, fvdata); @@ -578,3 +547,65 @@ Here is some sample code: } } + +Retrieving the Face-Varying Data +******************************** + +The HbrFVarData structures are expanded during the refinement process, with every +sub-face being assigned a set of interpolated face-varying data. This data can be +accessed in 2 ways : + +From a face, passing a vertex index: + +.. code:: c++ + + // OpenSubdiv::HbrFace * f + + OpenSubdiv::HbrFVarData const &fv = f.GetFVarData(vindex); + + const float * data = fv.GetData() + + +From a vertex, passing a pointer to an incident face: + +.. code:: c++ + + // OpenSubdiv::HbrFace * f + + OpenSubdiv::HbrFVarData const &fv = myVertex.GetFVarData(f); + + const float * data = fv.GetData() + + +---- + +Valence Operators +================= + +When manipulating meshes, it is often necessary to iterate over neighboring faces +or vertices. Rather than gather lists of pointers and return them, Hbr exposes +an operator pattern that guarantees consistent mesh traversals. + +The following example shows how to use an operator to count the number of neighboring +vertices (use HbrVertex::GetValence() for proper valence counts) + +.. code:: c++ + + //OpenSubdiv::HbrVertex * v; + + class MyOperator : public OpenSubdiv::HbrVertexOperator { + + public: + int count; + + MyOperator() : count(0) { } + + virtual void operator() (OpenSubdiv::HbrVertex &v) { + ++count; + } + }; + + MyOperator op; + + v->ApplyOperatorSurroundingVertices( op ); + diff --git a/documentation/using_osd_textures.rst b/documentation/using_osd_textures.rst index d7623bf7..73748145 100644 --- a/documentation/using_osd_textures.rst +++ b/documentation/using_osd_textures.rst @@ -1,59 +1,27 @@ .. - 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. - + 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. + Using Textures -------------- 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 5335cf77..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 LevelBase; - }; - - 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->LevelBase = 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 76e8bb00..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" @@ -172,7 +140,7 @@ MyDrawDelegate::DrawElements(OpenSubdiv::OsdDrawContext::PatchArray const &patch // apply patch color _currentEffect->BindDrawConfig(config, patchArray.GetDescriptor()); - glUniform1i(config->levelBaseUniform, patchArray.GetPatchIndex()); + glUniform1i(config->primitiveIdBaseUniform, patchArray.GetPatchIndex()); if (patchArray.GetDescriptor().GetType() == OpenSubdiv::FarPatchTables::GREGORY || patchArray.GetDescriptor().GetType() == OpenSubdiv::FarPatchTables::GREGORY_BOUNDARY){ glUniform1i(config->gregoryQuadOffsetBaseUniform, patchArray.GetQuadOffsetIndex()); 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 5d374cf3..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" @@ -174,25 +142,22 @@ MyEffectRegistry::_CreateDrawConfig(DescType const & desc, SourceConfigType cons if (uboIndex != GL_INVALID_INDEX) glUniformBlockBinding(program, uboIndex, g_lightingBinding); -// g_gregoryQuadOffsetBaseMap[program] = glGetUniformLocation(program, "GregoryQuadOffsetBase"); -// g_levelBaseMap[program] = glGetUniformLocation(program, "LevelBase"); - // currently, these are used only in conjunction with tessellation shaders #if defined(GL_EXT_direct_state_access) || defined(GL_VERSION_4_1) GLint loc; - if ((loc = glGetUniformLocation(program, "g_VertexBuffer")) != -1) { + if ((loc = glGetUniformLocation(program, "OsdVertexBuffer")) != -1) { glProgramUniform1i(program, loc, 0); // GL_TEXTURE0 } - if ((loc = glGetUniformLocation(program, "g_ValenceBuffer")) != -1) { + if ((loc = glGetUniformLocation(program, "OsdValenceBuffer")) != -1) { glProgramUniform1i(program, loc, 1); // GL_TEXTURE1 } - if ((loc = glGetUniformLocation(program, "g_QuadOffsetBuffer")) != -1) { + if ((loc = glGetUniformLocation(program, "OsdQuadOffsetBuffer")) != -1) { glProgramUniform1i(program, loc, 2); // GL_TEXTURE2 } - if ((loc = glGetUniformLocation(program, "g_ptexIndicesBuffer")) != -1) { + if ((loc = glGetUniformLocation(program, "OsdPatchParamBuffer")) != -1) { glProgramUniform1i(program, loc, 3); // GL_TEXTURE3 } - if ((loc = glGetUniformLocation(program, "g_uvFVarBuffer")) != -1) { + if ((loc = glGetUniformLocation(program, "OsdFVarDataBuffer")) != -1) { glProgramUniform1i(program, loc, 4); // GL_TEXTURE4 } #endif 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 d00acdc2..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 @@ -210,7 +178,7 @@ void main() #ifdef FACEVARYING_COLOR // Offset based on prim id and offset into patch-type fvar data table - int uvOffset = (gl_PrimitiveID+LevelBase) * 4; + int uvOffset = (gl_PrimitiveID+OsdPrimitiveIdBase) * 4; uvs[0] = vec2( texelFetch( g_uvFVarBuffer, (uvOffset+0)*2 ).s, texelFetch( g_uvFVarBuffer, (uvOffset+0)*2+1 ).s ); 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 ecb732e9..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) @@ -160,7 +128,8 @@ void emit(int index, vec3 normal) #else vec2 st = inpt[index].v.tessCoord; #endif - vec2 uv = ComputeFaceVarying2(/*fvarOffset=*/0, st); + vec2 uv; + OSD_COMPUTE_FACE_VARYING_2(uv, /*fvarOffset=*/0, st); outpt.color = vec3(uv.s, uv.t, 0); #endif 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 267569b3..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__) @@ -1068,35 +1036,35 @@ EffectDrawRegistry::_CreateDrawConfig( GLint loc; #if not defined(GL_ARB_separate_shader_objects) || defined(GL_VERSION_4_1) glUseProgram(config->program); - if ((loc = glGetUniformLocation(config->program, "g_VertexBuffer")) != -1) { + if ((loc = glGetUniformLocation(config->program, "OsdVertexBuffer")) != -1) { glUniform1i(loc, 0); // GL_TEXTURE0 } - if ((loc = glGetUniformLocation(config->program, "g_ValenceBuffer")) != -1) { + if ((loc = glGetUniformLocation(config->program, "OsdValenceBuffer")) != -1) { glUniform1i(loc, 1); // GL_TEXTURE1 } - if ((loc = glGetUniformLocation(config->program, "g_QuadOffsetBuffer")) != -1) { + if ((loc = glGetUniformLocation(config->program, "OsdQuadOffsetBuffer")) != -1) { glUniform1i(loc, 2); // GL_TEXTURE2 } - if ((loc = glGetUniformLocation(config->program, "g_ptexIndicesBuffer")) != -1) { + if ((loc = glGetUniformLocation(config->program, "OsdPatchParamBuffer")) != -1) { glUniform1i(loc, 3); // GL_TEXTURE3 } - if ((loc = glGetUniformLocation(config->program, "g_fvarDataBuffer")) != -1) { + if ((loc = glGetUniformLocation(config->program, "OsdFVarDataBuffer")) != -1) { glUniform1i(loc, 4); // GL_TEXTURE4 } #else - if ((loc = glGetUniformLocation(config->program, "g_VertexBuffer")) != -1) { + if ((loc = glGetUniformLocation(config->program, "OsdVertexBuffer")) != -1) { glProgramUniform1i(config->program, loc, 0); // GL_TEXTURE0 } - if ((loc = glGetUniformLocation(config->program, "g_ValenceBuffer")) != -1) { + if ((loc = glGetUniformLocation(config->program, "OsdValenceBuffer")) != -1) { glProgramUniform1i(config->program, loc, 1); // GL_TEXTURE1 } - if ((loc = glGetUniformLocation(config->program, "g_QuadOffsetBuffer")) != -1) { + if ((loc = glGetUniformLocation(config->program, "OsdQuadOffsetBuffer")) != -1) { glProgramUniform1i(config->program, loc, 2); // GL_TEXTURE2 } - if ((loc = glGetUniformLocation(config->program, "g_ptexIndicesBuffer")) != -1) { + if ((loc = glGetUniformLocation(config->program, "OsdPatchParamBuffer")) != -1) { glProgramUniform1i(config->program, loc, 3); // GL_TEXTURE3 } - if ((loc = glGetUniformLocation(config->program, "g_fvarDataBuffer")) != -1) { + if ((loc = glGetUniformLocation(config->program, "OsdFVarDataBuffer")) != -1) { glProgramUniform1i(config->program, loc, 4); // GL_TEXTURE4 } #endif @@ -1298,20 +1266,29 @@ display() { GLuint program = bindProgram(GetEffect(), patch); GLuint diffuseColor = glGetUniformLocation(program, "diffuseColor"); - + if (g_displayPatchColor and primType == GL_PATCHES) { float const * color = getAdaptivePatchColor( desc ); glProgramUniform4f(program, diffuseColor, color[0], color[1], color[2], color[3]); } else { glProgramUniform4f(program, diffuseColor, 0.4f, 0.4f, 0.8f, 1); } - - GLuint uniformGregoryQuadOffset = glGetUniformLocation(program, "GregoryQuadOffsetBase"); - GLuint uniformLevelBase = glGetUniformLocation(program, "LevelBase"); - glProgramUniform1i(program, uniformGregoryQuadOffset, patch.GetQuadOffsetIndex()); - glProgramUniform1i(program, uniformLevelBase, patch.GetPatchIndex()); + + GLuint uniformGregoryQuadOffsetBase = + glGetUniformLocation(program, "OsdGregoryQuadOffsetBase"); + GLuint uniformPrimitiveIdBase = + glGetUniformLocation(program, "OsdPrimitiveIdBase"); + + glProgramUniform1i(program, uniformGregoryQuadOffsetBase, + patch.GetQuadOffsetIndex()); + glProgramUniform1i(program, uniformPrimitiveIdBase, + patch.GetPatchIndex()); #else - bindProgram(GetEffect(), patch); + GLuint program = bindProgram(GetEffect(), patch); + GLint uniformPrimitiveIdBase = + glGetUniformLocation(program, "OsdPrimitiveIdBase"); + if (uniformPrimitiveIdBase != -1) + glUniform1i(uniformPrimitiveIdBase, patch.GetPatchIndex()); #endif if (g_displayStyle == kWire) { 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 d0ea038e..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__) @@ -335,21 +303,18 @@ EffectDrawRegistry::_CreateDrawConfig( CHECK_GL_ERROR("CreateDrawConfig B \n"); GLint loc; - if ((loc = glGetUniformLocation(config->program, "g_VertexBuffer")) != -1) { + if ((loc = glGetUniformLocation(config->program, "OsdVertexBuffer")) != -1) { glProgramUniform1i(config->program, loc, 0); // GL_TEXTURE0 } - if ((loc = glGetUniformLocation(config->program, "g_ValenceBuffer")) != -1) { + if ((loc = glGetUniformLocation(config->program, "OsdValenceBuffer")) != -1) { glProgramUniform1i(config->program, loc, 1); // GL_TEXTURE1 } - if ((loc = glGetUniformLocation(config->program, "g_QuadOffsetBuffer")) != -1) { + if ((loc = glGetUniformLocation(config->program, "OsdQuadOffsetBuffer")) != -1) { glProgramUniform1i(config->program, loc, 2); // GL_TEXTURE2 } - if ((loc = glGetUniformLocation(config->program, "g_patchLevelBuffer")) != -1) { + if ((loc = glGetUniformLocation(config->program, "OsdPatchParamBuffer")) != -1) { glProgramUniform1i(config->program, loc, 3); // GL_TEXTURE3 } - if ((loc = glGetUniformLocation(config->program, "g_ptexIndicesBuffer")) != -1) { - glProgramUniform1i(config->program, loc, 4); // GL_TEXTURE4 - } CHECK_GL_ERROR("CreateDrawConfig leave\n"); @@ -769,31 +734,26 @@ OpenSubdivPtexShader::draw(const MHWRender::MDrawContext &mDrawContext, if (patch.desc.type != OpenSubdiv::kNonPatch) { glPatchParameteri(GL_PATCH_VERTICES, patch.desc.GetPatchSize()); - if (osdDrawContext->vertexTextureBuffer) { + if (osdDrawContext->GetVertexTextureBuffer()) { glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_BUFFER, - osdDrawContext->vertexTextureBuffer); + osdDrawContext->GetVertexTextureBuffer()); glTexBuffer(GL_TEXTURE_BUFFER, GL_R32F, bPosition); } - if (osdDrawContext->vertexValenceTextureBuffer) { + if (osdDrawContext->GetVertexValenceTextureBuffer()) { glActiveTexture(GL_TEXTURE1); glBindTexture(GL_TEXTURE_BUFFER, - osdDrawContext->vertexValenceTextureBuffer); + osdDrawContext->GetVertexValenceTextureBuffer()); } - if (osdDrawContext->quadOffsetTextureBuffer) { + if (osdDrawContext->GetQuadOffsetsTextureBuffer()) { glActiveTexture(GL_TEXTURE2); glBindTexture(GL_TEXTURE_BUFFER, - osdDrawContext->quadOffsetTextureBuffer); + osdDrawContext->GetQuadOffsetsTextureBuffer()); } - if (osdDrawContext->patchLevelTextureBuffer) { + if (osdDrawContext->GetPatchParamTextureBuffer()) { glActiveTexture(GL_TEXTURE3); glBindTexture(GL_TEXTURE_BUFFER, - osdDrawContext->patchLevelTextureBuffer); - } - if (osdDrawContext->ptexCoordinateTextureBuffer) { - glActiveTexture(GL_TEXTURE4); - glBindTexture(GL_TEXTURE_BUFFER, - osdDrawContext->ptexCoordinateTextureBuffer); + osdDrawContext->GetPatchParamTextureBuffer()); } glActiveTexture(GL_TEXTURE0); @@ -978,12 +938,12 @@ OpenSubdivPtexShader::bindProgram(const MHWRender::MDrawContext & mDrawConte struct Tessellation { float TessLevel; int GregoryQuadOffsetBase; - int LevelBase; + int PrimitiveIdBase; } tessellationData; tessellationData.TessLevel = static_cast(1 << _tessFactor); - tessellationData.GregoryQuadOffsetBase = patch.gregoryQuadOffsetBase; - tessellationData.LevelBase = patch.levelBase; + tessellationData.GregoryQuadOffsetBase = patch.GetQuadOffsetBase; + tessellationData.PrimitiveIdBase = patch.GetPatchIndex();; if (!g_tessellationUB) { glGenBuffers(1, &g_tessellationUB); 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 ad4ff50a..853f0b34 100644 --- a/examples/mayaPtexViewer/shader.glsl +++ b/examples/mayaPtexViewer/shader.glsl @@ -1,79 +1,43 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT 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 //-------------------------------------------------------------- -uniform isamplerBuffer g_ptexIndicesBuffer; -uniform int nonAdaptiveLevel; vec4 GeneratePatchCoord(vec2 localUV) // for non-adpative { - ivec2 ptexIndex = texelFetch(g_ptexIndicesBuffer, gl_PrimitiveID).xy; - int faceID = abs(ptexIndex.x); - int lv = 1 << nonAdaptiveLevel; - if (ptexIndex.x < 0) lv >>= 1; - - int u = ptexIndex.y >> 16; - int v = (ptexIndex.y & 0xffff); + ivec2 ptexIndex = texelFetch(OsdPatchParamBuffer, gl_PrimitiveID).xy; + int faceID = ptexIndex.x; + int lv = 1 << ((ptexIndex.y & 0xf) - ((ptexIndex.y >> 4) & 1)); + int u = (ptexIndex.y >> 17) & 0x3ff; + int v = (ptexIndex.y >> 7) & 0x3ff; vec2 uv = localUV; uv = (uv * vec2(1.0)/lv) + vec2(u, v)/lv; - return vec4(uv.x, uv.y, lv+0.5, faceID+0.5); + } vec4 PTexLookup(vec4 patchCoord, 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 d59f253f..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__) @@ -327,19 +295,19 @@ EffectDrawRegistry::_CreateDrawConfig( // Specify texture buffer ID uniforms in shader GLint loc; - if ((loc = glGetUniformLocation(config->program, "g_VertexBuffer")) != -1) { + if ((loc = glGetUniformLocation(config->program, "OsdVertexBuffer")) != -1) { glProgramUniform1i(config->program, loc, 0); // GL_TEXTURE0 } - if ((loc = glGetUniformLocation(config->program, "g_ValenceBuffer")) != -1) { + if ((loc = glGetUniformLocation(config->program, "OsdValenceBuffer")) != -1) { glProgramUniform1i(config->program, loc, 1); // GL_TEXTURE1 } - if ((loc = glGetUniformLocation(config->program, "g_QuadOffsetBuffer")) != -1) { + if ((loc = glGetUniformLocation(config->program, "OsdQuadOffsetBuffer")) != -1) { glProgramUniform1i(config->program, loc, 2); // GL_TEXTURE2 } - if ((loc = glGetUniformLocation(config->program, "g_ptexIndicesBuffer")) != -1) { + if ((loc = glGetUniformLocation(config->program, "OsdPatchParamBuffer")) != -1) { glProgramUniform1i(config->program, loc, 3); // GL_TEXTURE3 } - if ((loc = glGetUniformLocation(config->program, "g_uvFVarBuffer")) != -1) { + if ((loc = glGetUniformLocation(config->program, "OsdFVarDataBuffer")) != -1) { glProgramUniform1i(config->program, loc, 4); // GL_TEXTURE4 } @@ -672,10 +640,14 @@ OpenSubdivShader::draw(const MHWRender::MDrawContext &mDrawContext, GLuint program = bindProgram(mDrawContext, osdDrawContext, patch); - GLuint uniformGregoryQuadOffset = glGetUniformLocation(program, "GregoryQuadOffsetBase"); - GLuint uniformLevelBase = glGetUniformLocation(program, "LevelBase"); - glProgramUniform1i(program, uniformGregoryQuadOffset, patch.GetQuadOffsetIndex()); - glProgramUniform1i(program, uniformLevelBase, patch.GetPatchIndex()); + GLuint uniformGregoryQuadOffsetBase = + glGetUniformLocation(program, "OsdGregoryQuadOffsetBase"); + GLuint uniformPrimitiveIdBase = + glGetUniformLocation(program, "OsdPrimitiveIdBase"); + glProgramUniform1i(program, uniformGregoryQuadOffsetBase, + patch.GetQuadOffsetIndex()); + glProgramUniform1i(program, uniformPrimitiveIdBase, + patch.GetPatchIndex()); GLenum primType = GL_PATCHES; if (patch.GetDescriptor().GetType() == OpenSubdiv::FarPatchTables::QUADS) { 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 fd2b4d36..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. // @@ -622,7 +590,7 @@ OpenSubdivShader::bindProgram(const MHWRender::MDrawContext & mDrawContext, float TessLevelInner[MAX_LEVEL][4]; float TessLevelOuter[MAX_LEVEL][4]; int GregoryQuadOffsetBase; - int LevelBase; + int PrimitiveIdBase; } tessellationData; int tessFactor = 2 << _tessFactor; @@ -631,8 +599,8 @@ OpenSubdivShader::bindProgram(const MHWRender::MDrawContext & mDrawContext, tessellationData.TessLevelOuter[i][0] = float(std::max(tessFactor >> i, 1)); } - tessellationData.GregoryQuadOffsetBase = patch.gregoryQuadOffsetBase; - tessellationData.LevelBase = patch.levelBase; + tessellationData.GregoryQuadOffsetBase = patch.GetQuadOffsetIndex(); + tessellationData.PrimitiveIdBase = patch.GetPatchIndex(); if (!g_tessellationUB) { glGenBuffers(1, &g_tessellationUB); 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 b574a785..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 @@ -197,7 +165,7 @@ void main() // prim 0 prim 1 // Offset based on prim id and offset into patch-type fvar data table - int uvOffset = (gl_PrimitiveID+LevelBase) * 4; + int uvOffset = (gl_PrimitiveID+PrimitiveIdBase) * 4; vec2 uvs[4]; uvs[0] = vec2( texelFetch( g_uvFVarBuffer, (uvOffset+0)*2 ).s, 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 b5fc8015..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__) @@ -597,16 +565,16 @@ EffectDrawRegistry::_CreateDrawConfig( glUniformBlockBinding(config->program, uboIndex, g_lightingBinding); GLint loc; - if ((loc = glGetUniformLocation(config->program, "g_VertexBuffer")) != -1) { + if ((loc = glGetUniformLocation(config->program, "OsdVertexBuffer")) != -1) { glProgramUniform1i(config->program, loc, 0); // GL_TEXTURE0 } - if ((loc = glGetUniformLocation(config->program, "g_ValenceBuffer")) != -1) { + if ((loc = glGetUniformLocation(config->program, "OsdValenceBuffer")) != -1) { glProgramUniform1i(config->program, loc, 1); // GL_TEXTURE1 } - if ((loc = glGetUniformLocation(config->program, "g_QuadOffsetBuffer")) != -1) { + if ((loc = glGetUniformLocation(config->program, "OsdQuadOffsetBuffer")) != -1) { glProgramUniform1i(config->program, loc, 2); // GL_TEXTURE2 } - if ((loc = glGetUniformLocation(config->program, "g_ptexIndicesBuffer")) != -1) { + if ((loc = glGetUniformLocation(config->program, "OsdPatchParamBuffer")) != -1) { glProgramUniform1i(config->program, loc, 3); // GL_TEXTURE3 } @@ -811,10 +779,14 @@ display() { GLuint diffuseColor = glGetUniformLocation(program, "diffuseColor"); glProgramUniform4f(program, diffuseColor, 1, 1, 1, 1); - GLuint uniformGregoryQuadOffset = glGetUniformLocation(program, "GregoryQuadOffsetBase"); - GLuint uniformLevelBase = glGetUniformLocation(program, "LevelBase"); - glProgramUniform1i(program, uniformGregoryQuadOffset, patch.GetQuadOffsetIndex()); - glProgramUniform1i(program, uniformLevelBase, patch.GetPatchIndex()); + GLuint uniformGregoryQuadOffsetBase = + glGetUniformLocation(program, "OsdGregoryQuadOffsetBase"); + GLuint uniformPrimitiveIdBase = + glGetUniformLocation(program, "OsdPrimitiveIdBase"); + glProgramUniform1i(program, uniformGregoryQuadOffsetBase, + patch.GetQuadOffsetIndex()); + glProgramUniform1i(program, uniformPrimitiveIdBase, + patch.GetPatchIndex()); if (g_wire == 0) { glDisable(GL_CULL_FACE); @@ -975,10 +947,14 @@ drawStroke(int x, int y) effect.paint = 1; GLuint program = bindProgram(effect, patch); - GLuint uniformGregoryQuadOffset = glGetUniformLocation(program, "GregoryQuadOffsetBase"); - GLuint uniformLevelBase = glGetUniformLocation(program, "LevelBase"); - glProgramUniform1i(program, uniformGregoryQuadOffset, patch.GetQuadOffsetIndex()); - glProgramUniform1i(program, uniformLevelBase, patch.GetPatchIndex()); + GLuint uniformGregoryQuadOffsetBase = + glGetUniformLocation(program, "OsdGregoryQuadOffsetBase"); + GLuint uniformPrimitiveIdBase = + glGetUniformLocation(program, "OsdPrimitiveIdBase"); + glProgramUniform1i(program, uniformGregoryQuadOffsetBase, + patch.GetQuadOffsetIndex()); + glProgramUniform1i(program, uniformPrimitiveIdBase, + patch.GetPatchIndex()); glDrawElements(primType, patch.GetNumIndices(), GL_UNSIGNED_INT, 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 a25d798c..1eff856b 100644 --- a/examples/ptexViewer/shader.glsl +++ b/examples/ptexViewer/shader.glsl @@ -1,71 +1,37 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT 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 //-------------------------------------------------------------- -uniform int nonAdaptiveLevel; uniform float displacementScale = 1.0; uniform float bumpScale = 1.0; vec4 GeneratePatchCoord(vec2 localUV) // for non-adpative { - ivec2 ptexIndex = texelFetch(g_ptexIndicesBuffer, gl_PrimitiveID).xy; + ivec2 ptexIndex = texelFetch(OsdPatchParamBuffer, gl_PrimitiveID).xy; int faceID = ptexIndex.x; int lv = 1 << ((ptexIndex.y & 0xf) - ((ptexIndex.y >> 4) & 1)); int u = (ptexIndex.y >> 17) & 0x3ff; @@ -94,6 +60,7 @@ vec4 PTexLookup(vec4 patchCoord, #ifdef USE_PTEX_DISPLACEMENT +#undef OSD_DISPLACEMENT_CALLBACK #define OSD_DISPLACEMENT_CALLBACK \ outpt.v.position = \ displacement(outpt.v.position, \ @@ -139,8 +106,6 @@ void main() //-------------------------------------------------------------- #ifdef GEOMETRY_SHADER -//uniform int nonAdaptiveLevel; - #ifdef PRIM_QUAD layout(lines_adjacency) in; diff --git a/examples/ptexViewer/shader_gl3.glsl b/examples/ptexViewer/shader_gl3.glsl index ae3126e1..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 { @@ -65,7 +33,7 @@ layout(std140) uniform Transform { //-------------------------------------------------------------- // Common //-------------------------------------------------------------- -uniform isamplerBuffer g_ptexIndicesBuffer; +uniform isamplerBuffer OsdPatchParamBuffer; uniform int nonAdaptiveLevel; vec4 PTexLookup(vec4 patchCoord, @@ -86,6 +54,7 @@ vec4 PTexLookup(vec4 patchCoord, #ifdef USE_PTEX_DISPLACEMENT +#undef OSD_DISPLACEMENT_CALLBACK #define OSD_DISPLACEMENT_CALLBACK \ outpt.v.position = \ displacement(outpt.v.position, \ @@ -210,13 +179,11 @@ void emit(int index, vec4 position, vec3 normal, vec4 patchCoord, vec4 edgeVerts vec4 GeneratePatchCoord(vec2 localUV) // for non-adpative { - ivec2 ptexIndex = texelFetch(g_ptexIndicesBuffer, gl_PrimitiveID).xy; - int faceID = abs(ptexIndex.x); - int lv = 1 << nonAdaptiveLevel; - if (ptexIndex.x < 0) lv >>= 1; - - int u = ptexIndex.y >> 16; - int v = (ptexIndex.y & 0xffff); + ivec2 ptexIndex = texelFetch(OsdPatchParamBuffer, gl_PrimitiveID).xy; + int faceID = ptexIndex.x; + int lv = 1 << ((ptexIndex.y & 0xf) - ((ptexIndex.y >> 4) & 1)); + int u = (ptexIndex.y >> 17) & 0x3ff; + int v = (ptexIndex.y >> 7) & 0x3ff; vec2 uv = localUV; uv = (uv * vec2(1.0)/lv) + vec2(u, v)/lv; return vec4(uv.x, uv.y, lv+0.5, faceID+0.5); 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 d7fc8499..285848f2 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__) @@ -198,7 +166,8 @@ enum HudCheckBox { HUD_CB_ADAPTIVE, HUD_CB_FRACTIONAL_SPACING, HUD_CB_PATCH_CULL, HUD_CB_IBL, - HUD_CB_BLOOM }; + HUD_CB_BLOOM, + HUD_CB_FREEZE }; //----------------------------------------------------------------------------- int g_frame = 0, @@ -227,7 +196,8 @@ bool g_adaptive = false, g_screenSpaceTess = true, g_fractionalSpacing = false, g_ibl = false, - g_bloom = false; + g_bloom = false, + g_freeze = false; GLuint g_transformUB = 0, g_transformBinding = 0, @@ -280,7 +250,6 @@ std::vector g_positions, g_normals; std::vector > g_animPositions; -std::vector g_animPositionBuffers; GLuint g_primQuery = 0; GLuint g_vao = 0; @@ -396,19 +365,6 @@ updateGeom() { } g_mesh->UpdateVertexBuffer(&vertex[0], 0, nverts); -/* - if (g_kernel != kCPU && g_kernel != kOPENMP) { - glBindBuffer(GL_COPY_READ_BUFFER, g_animPositionBuffers[g_frame%nkey]); - glBindBuffer(GL_COPY_WRITE_BUFFER, g_mesh->BindVertexBuffer()); - glCopyBufferSubData(GL_COPY_READ_BUFFER, GL_COPY_WRITE_BUFFER, - 0, 0, nverts * 3 * sizeof(float)); - glBindBuffer(GL_COPY_READ_BUFFER, 0); - glBindBuffer(GL_COPY_WRITE_BUFFER, 0); - } else { - g_mesh->UpdateVertexBuffer(&g_animPositions[g_frame%nkey][0], 0, nverts); - } -*/ - } else { std::vector vertex; vertex.reserve(nverts*6); @@ -829,31 +785,31 @@ EffectDrawRegistry::_CreateDrawConfig( GLint loc; #if defined(GL_ARB_separate_shader_objects) || defined(GL_VERSION_4_1) - if ((loc = glGetUniformLocation(config->program, "g_VertexBuffer")) != -1) { + if ((loc = glGetUniformLocation(config->program, "OsdVertexBuffer")) != -1) { glProgramUniform1i(config->program, loc, 0); // GL_TEXTURE0 } - if ((loc = glGetUniformLocation(config->program, "g_ValenceBuffer")) != -1) { + if ((loc = glGetUniformLocation(config->program, "OsdValenceBuffer")) != -1) { glProgramUniform1i(config->program, loc, 1); // GL_TEXTURE1 } - if ((loc = glGetUniformLocation(config->program, "g_QuadOffsetBuffer")) != -1) { + if ((loc = glGetUniformLocation(config->program, "OsdQuadOffsetBuffer")) != -1) { glProgramUniform1i(config->program, loc, 2); // GL_TEXTURE2 } - if ((loc = glGetUniformLocation(config->program, "g_ptexIndicesBuffer")) != -1) { + if ((loc = glGetUniformLocation(config->program, "OsdPatchParamBuffer")) != -1) { glProgramUniform1i(config->program, loc, 3); // GL_TEXTURE3 } #else glUseProgram(config->program); - if ((loc = glGetUniformLocation(config->program, "g_VertexBuffer")) != -1) { + if ((loc = glGetUniformLocation(config->program, "OsdVertexBuffer")) != -1) { glUniform1i(loc, 0); // GL_TEXTURE0 } - if ((loc = glGetUniformLocation(config->program, "g_ValenceBuffer")) != -1) { + if ((loc = glGetUniformLocation(config->program, "OsdValenceBuffer")) != -1) { glUniform1i(loc, 1); // GL_TEXTURE1 } - if ((loc = glGetUniformLocation(config->program, "g_QuadOffsetBuffer")) != -1) { + if ((loc = glGetUniformLocation(config->program, "OsdQuadOffsetBuffer")) != -1) { glUniform1i(loc, 2); // GL_TEXTURE2 } - if ((loc = glGetUniformLocation(config->program, "g_ptexIndicesBuffer")) != -1) { - glUniform1i(loc, 4); // GL_TEXTURE3 + if ((loc = glGetUniformLocation(config->program, "OsdPatchParamBuffer")) != -1) { + glUniform1i(loc, 3); // GL_TEXTURE3 } #endif @@ -1139,12 +1095,22 @@ compileImageShader(const char *define) { glDeleteShader(vs); glDeleteShader(fs); +#if defined(GL_ARB_separate_shader_objects) || defined(GL_VERSION_4_1) GLint colorMap = glGetUniformLocation(program, "colorMap"); if (colorMap != -1) glProgramUniform1i(program, colorMap, 0); // GL_TEXTURE0 GLint depthMap = glGetUniformLocation(program, "depthMap"); if (depthMap != -1) glProgramUniform1i(program, depthMap, 1); // GL_TEXTURE1 +#else + glUseProgram(program); + GLint colorMap = glGetUniformLocation(program, "colorMap"); + if (colorMap != -1) + glUniform1i(colorMap, 0); // GL_TEXTURE0 + GLint depthMap = glGetUniformLocation(program, "depthMap"); + if (depthMap != -1) + glUniform1i(depthMap, 1); // GL_TEXTURE1 +#endif return program; } @@ -1436,6 +1402,7 @@ drawModel() { #endif } +#if defined(GL_ARB_tessellation_shader) || defined(GL_VERSION_4_0) if (g_mesh->GetDrawContext()->GetVertexTextureBuffer()) { glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_BUFFER, @@ -1452,6 +1419,7 @@ drawModel() { glBindTexture(GL_TEXTURE_BUFFER, g_mesh->GetDrawContext()->GetQuadOffsetsTextureBuffer()); } +#endif if (g_mesh->GetDrawContext()->GetPatchParamTextureBuffer()) { glActiveTexture(GL_TEXTURE3); glBindTexture(GL_TEXTURE_BUFFER, @@ -1508,11 +1476,22 @@ drawModel() { glDisable(GL_CULL_FACE); } - GLuint uniformGregoryQuadOffset = glGetUniformLocation(program, "GregoryQuadOffsetBase"); - GLuint uniformLevelBase = glGetUniformLocation(program, "LevelBase"); + GLuint uniformGregoryQuadOffsetBase = + glGetUniformLocation(program, "OsdGregoryQuadOffsetBase"); + GLuint uniformPrimitiveIdBase = + glGetUniformLocation(program, "OsdPrimitiveIdBase"); - glProgramUniform1i(program, uniformGregoryQuadOffset, patch.GetQuadOffsetIndex()); - glProgramUniform1i(program, uniformLevelBase, patch.GetPatchIndex()); +#if defined(GL_ARB_tessellation_shader) || defined(GL_VERSION_4_0) + glProgramUniform1i(program, uniformGregoryQuadOffsetBase, + patch.GetQuadOffsetIndex()); + glProgramUniform1i(program, uniformPrimitiveIdBase, + patch.GetPatchIndex()); +#else + glUniform1i(uniformGregoryQuadOffsetBase, + patch.GetQuadOffsetIndex()); + glUniform1i(uniformPrimitiveIdBase, + patch.GetPatchIndex()); +#endif glDrawElements(primType, patch.GetNumIndices(), GL_UNSIGNED_INT, @@ -1618,12 +1597,14 @@ display() { GLuint numPrimsGenerated = 0; glGetQueryObjectuiv(g_primQuery, GL_QUERY_RESULT, &numPrimsGenerated); - if (g_hud.IsVisible()) { - g_fpsTimer.Stop(); - float elapsed = (float)g_fpsTimer.GetElapsed(); + g_fpsTimer.Stop(); + float elapsed = (float)g_fpsTimer.GetElapsed(); + if (not g_freeze) g_animTime += elapsed; + g_fpsTimer.Start(); + + if (g_hud.IsVisible()) { double fps = 1.0/elapsed; - g_fpsTimer.Start(); // Avereage fps over a defined number of time samples for // easier reading in the HUD @@ -1635,8 +1616,6 @@ display() { averageFps += g_fpsTimeSamples[i]/(float)NUM_FPS_TIME_SAMPLES; } - - g_hud.DrawString(10, -180, "Tess level (+/-): %d", g_tessLevel); if (numPrimsGenerated > 1000000) { g_hud.DrawString(10, -160, "Primitives : %3.1f million", (float)numPrimsGenerated/1000000.0); @@ -1741,8 +1720,6 @@ void uninitGL() { delete g_glslComputeController; #endif - if (g_animPositionBuffers.size()) - glDeleteBuffers((int)g_animPositionBuffers.size(), &g_animPositionBuffers[0]); if (g_diffuseEnvironmentMap) glDeleteTextures(1, &g_diffuseEnvironmentMap); if (g_specularEnvironmentMap) glDeleteTextures(1, &g_specularEnvironmentMap); @@ -1838,6 +1815,9 @@ callbackCheckBox(bool checked, int button) case HUD_CB_BLOOM: g_bloom = checked; break; + case HUD_CB_FREEZE: + g_freeze = checked; + break; } if (rebuild) @@ -1897,7 +1877,9 @@ keyboard(int key, int event) { void idle() { - g_frame++; + if (not g_freeze) + g_frame++; + updateGeom(); if(g_repeatCount != 0 && g_frame >= g_repeatCount) @@ -2208,6 +2190,8 @@ int main(int argc, char ** argv) { 450, 90, callbackCheckBox, HUD_CB_PATCH_CULL, 'b'); g_hud.AddCheckBox("Bloom (Y)", g_bloom, 450, 110, callbackCheckBox, HUD_CB_BLOOM, 'y'); + g_hud.AddCheckBox("Freeze (spc)", g_freeze, + 450, 130, callbackCheckBox, HUD_CB_FREEZE, ' '); if (OpenSubdiv::OsdGLDrawContext::SupportsAdaptiveTessellation()) g_hud.AddCheckBox("Adaptive (`)", g_adaptive, 10, 150, callbackCheckBox, HUD_CB_ADAPTIVE, '`'); @@ -2237,16 +2221,13 @@ int main(int argc, char ** argv) { // load animation obj sequences (optional) if (not animobjs.empty()) { -// g_animPositionBuffers.resize(animobjs.size()); -// glGenBuffers((int)animobjs.size(), &g_animPositionBuffers[0]); - for (int i = 0; i < (int)animobjs.size(); ++i) { std::ifstream ifs(animobjs[i].c_str()); if (ifs) { std::stringstream ss; ss << ifs.rdbuf(); ifs.close(); - + printf("Reading %s\r", animobjs[i].c_str()); std::string str = ss.str(); shape *shape = shape::parseShape(str.c_str()); @@ -2257,10 +2238,6 @@ int main(int argc, char ** argv) { } g_animPositions.push_back(shape->verts); - -// glBindBuffer(GL_ARRAY_BUFFER, g_animPositionBuffers[i]); -// glBufferData(GL_ARRAY_BUFFER, shape->verts.size()*sizeof(float), &shape->verts[0], GL_STATIC_DRAW); - delete shape; } else { printf("Error in reading %s\n", animobjs[i].c_str()); 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 70d0f57b..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 @@ -80,7 +48,7 @@ template class FarBilinearSubdivisionTablesFactory { protected: template friend class FarMeshFactory; - /// Creates a FarBilinearSubdivisiontables instance. + /// \brief Creates a FarBilinearSubdivisiontables instance. /// /// @param meshFactory a valid FarMeshFactory instance /// diff --git a/opensubdiv/far/catmarkSubdivisionTables.h b/opensubdiv/far/catmarkSubdivisionTables.h index d6018a8d..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 @@ -79,8 +47,8 @@ template class FarCatmarkSubdivisionTables : public FarSubdivisionTabl public: - /// Returns the number of indexing tables needed to represent this particular - /// subdivision scheme. + /// \brief Returns the number of indexing tables needed to represent this + /// particular subdivision scheme. virtual int GetNumTables() const { return 7; } private: diff --git a/opensubdiv/far/catmarkSubdivisionTablesFactory.h b/opensubdiv/far/catmarkSubdivisionTablesFactory.h index cffced74..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 @@ -81,7 +49,7 @@ template class FarCatmarkSubdivisionTablesFactory { protected: template friend class FarMeshFactory; - /// Creates a FarCatmarkSubdivisiontables instance. + /// \brief Creates a FarCatmarkSubdivisiontables instance. /// /// @param meshFactory a valid FarMeshFactory instance /// diff --git a/opensubdiv/far/dispatcher.h b/opensubdiv/far/dispatcher.h index a463b6f0..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 @@ -84,9 +52,18 @@ namespace OPENSUBDIV_VERSION { /// /// Note : the caller is responsible for deleting a custom dispatcher /// - class FarDispatcher { public: + /// \brief Launches the processing of a vector of kernel batches + /// + /// @param controller refinement controller implementation + /// + /// @param batches batches of kernels that need to be processed + /// + /// @param maxlevel process vertex batches up to this level + /// + /// @param clientdata custom client data passed to the controller + /// template static void Refine(CONTROLLER const *controller, FarKernelBatchVector const & batches, int maxlevel, void * clientdata=0); }; @@ -148,10 +125,12 @@ FarDispatcher::Refine(CONTROLLER const *controller, FarKernelBatchVector const & // ----------------------------------------------------------------------------- - +/// \brief Far default controller implementation +/// +/// This is Far's default implementation of a kernal batch controller. +/// template -class FarComputeController -{ +class FarComputeController { public: void Refine(FarMesh * mesh, int maxlevel=-1) const; diff --git a/opensubdiv/far/kernelBatch.h b/opensubdiv/far/kernelBatch.h index 1f8860ab..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 @@ -112,7 +80,7 @@ public: HIERARCHICAL_EDIT, }; - /// Constructor. + /// \brief Constructor. /// /// @param kernelType the type of compute kernel kernel /// @@ -148,74 +116,74 @@ public: _meshIndex(meshIndex) { } - /// Returns the type of kernel to apply to the vertices in the batch. + /// \brief Returns the type of kernel to apply to the vertices in the batch. KernelType GetKernelType() const { return _kernelType; } - /// Returns the subdivision level of the vertices in the batch + /// \brief Returns the subdivision level of the vertices in the batch int GetLevel() const { return _level; } - /// Returns the index of the first vertex in the batch + /// \brief Returns the index of the first vertex in the batch int GetStart() const { return _start; } - /// Returns the index of the first vertex in the batch + /// \brief Returns the index of the first vertex in the batch const int * GetStartPtr() const { return & _start; } - /// Returns the index of the last vertex in the batch + /// \brief Returns the index of the last vertex in the batch int GetEnd() const { return _end; } - /// Returns the index of the last vertex in the batch + /// \brief Returns the index of the last vertex in the batch const int * GetEndPtr() const { return & _end; } - /// Returns the edit index (for the hierarchical edit kernels only) + /// \brief Returns the edit index (for the hierarchical edit kernels only) int GetTableIndex() const { return _tableIndex; } - /// Returns + /// \brief Returns int GetTableOffset() const { return _tableOffset; } - /// Returns + /// \brief Returns const int * GetTableOffsetPtr() const { return & _tableOffset; } - /// Returns + /// \brief Returns int GetVertexOffset() const { return _vertexOffset; } - /// Returns + /// \brief Returns const int * GetVertexOffsetPtr() const { return & _vertexOffset; } - /// Returns the mesh index (used in batching) + /// \brief Returns the mesh index (used in batching) int GetMeshIndex() const { return _meshIndex; } diff --git a/opensubdiv/far/kernelBatchFactory.h b/opensubdiv/far/kernelBatchFactory.h index 33af87ae..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 @@ -69,7 +37,7 @@ class FarVertexKernelBatchFactory { public: - /// Constructor. + /// \brief Constructor. /// /// @param start index of the first vertex in the batch /// @@ -81,13 +49,15 @@ public: } - /// Adds a vertex-vertex to the appropriate compute batch based on "Rank". + /// \brief Adds a vertex-vertex to the appropriate compute batch based on "Rank". + /// /// Ranking is based on the interpolation required (Smooth, Dart, Crease, /// or Corner). With semi-sharp creases, two passes of interpolation are /// required, from which we derive a matrix of compute kernel combinations. /// /// The kernel combinatorial matrix : /// +#ifndef doxygen /// Rules +----+----+----+----+----+----+----+----+----+----+ /// Pass 0 | Dt | Sm | Sm | Dt | Sm | Dt | Sm | Cr | Co | Cr | /// Pass 1 | | | | Co | Co | Cr | Cr | Co | | | @@ -97,6 +67,24 @@ public: /// +----+----+----+----+----+----+----+----+----+----+ /// Rank | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | /// +----+----+----+----+----+----+----+----+----+----+ +#else + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + ///
Rules
Pass 0 Dart SmoothSmooth Dart Smooth Dart Smooth Crease Corner Crease
Pass 1 Corner Corner CreaseCrease Corner
Kernel
Pass 0 B B B B B B B A A A
Pass 1 A A A A A
+#endif /// with : /// - A : compute kernel applying k_Crease / k_Corner rules /// - B : compute kernel applying k_Smooth / k_Dart rules @@ -110,7 +98,7 @@ public: - /// Appends a FarKernelBatch to a vector of batches for Catmark subdivision + /// \brief Appends a FarKernelBatch to a vector of batches for Catmark subdivision /// /// @param level the subdivision level of the vertices in the batch /// @@ -124,7 +112,7 @@ public: - /// Appends a FarKernelBatch to a vector of batches for Loop subdivision + /// \brief Appends a FarKernelBatch to a vector of batches for Loop subdivision /// /// @param level the subdivision level of the vertices in the batch /// 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 70175c25..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 @@ -81,7 +49,7 @@ template class FarLoopSubdivisionTablesFactory { protected: template friend class FarMeshFactory; - /// Creates a FarLoopSubdivisiontables instance. + /// \brief Creates a FarLoopSubdivisiontables instance. /// /// @param meshFactory a valid FarMeshFactory instance /// diff --git a/opensubdiv/far/mesh.h b/opensubdiv/far/mesh.h index 538f68f7..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 @@ -84,39 +52,39 @@ public: ~FarMesh(); - /// Returns the subdivision method + /// \brief Returns the subdivision method FarSubdivisionTables const * GetSubdivisionTables() const { return _subdivisionTables; } - /// Returns patch tables + /// \brief Returns patch tables FarPatchTables const * GetPatchTables() const { return _patchTables; } - /// Returns the total number of vertices in the mesh across across all depths + /// \brief Returns the total number of vertices in the mesh across across all depths int GetNumVertices() const { return GetSubdivisionTables()->GetNumVertices(); } - /// Returns the list of vertices in the mesh (from subdiv level 0 to N) + /// \brief Returns the list of vertices in the mesh (from subdiv level 0 to N) std::vector & GetVertices() { return _vertices; } - /// Returns a reference to the vertex at the given index + /// \brief Returns a reference to the vertex at the given index /// /// @param index the index fo the vertex /// U & GetVertex(int index) { return _vertices[index]; } - /// Returns the width of the interleaved face-varying data + /// \brief Returns the width of the interleaved face-varying data int GetTotalFVarWidth() const { return _totalFVarWidth; } - /// Returns vertex edit tables + /// \brief Returns vertex edit tables FarVertexEditTables const * GetVertexEdit() const { return _vertexEditTables; } - /// Returns the total number of vertices in the mesh across across all depths + /// \brief Returns the total number of vertices in the mesh across across all depths int GetNumPtexFaces() const { return _numPtexFaces; } - /// True if the mesh tables support the feature-adaptive mode. + /// \brief True if the mesh tables support the feature-adaptive mode. bool IsFeatureAdaptive() const { return _patchTables->IsFeatureAdaptive(); } - /// Returns an ordered vector of batches of compute kernels. The kernels - /// describe the sequence of computations required to apply the subdivision - /// scheme to the vertices in the mesh. + /// \brief Returns an ordered vector of batches of compute kernels. + /// The kernels describe the sequence of computations required to apply the + /// subdivision scheme to the vertices in the mesh. const FarKernelBatchVector & GetKernelBatches() const { return _batches; } private: diff --git a/opensubdiv/far/meshFactory.h b/opensubdiv/far/meshFactory.h index cce805ea..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 @@ -122,7 +90,7 @@ public: /// FarMeshFactory(HbrMesh * mesh, int maxlevel, bool adaptive=false, int firstLevel=-1); - /// Create a table-based mesh representation + /// \brief Create a table-based mesh representation /// /// @param requireFVarData create a face-varying table /// @@ -130,7 +98,7 @@ public: /// FarMesh * Create( bool requireFVarData=false ); - /// Computes the minimum number of adaptive feature isolation levels required + /// \brief Computes the minimum number of adaptive feature isolation levels required /// in order for the limit surface to be an accurate representation of the /// shape given all the tags and edits. /// @@ -145,19 +113,19 @@ public: /// static int ComputeMinIsolation( HbrMesh const * mesh, int nfaces, int cornerIsolate=5 ); - /// The Hbr mesh that this factory is converting + /// \brief The Hbr mesh that this factory is converting HbrMesh const * GetHbrMesh() const { return _hbrMesh; } - /// Maximum level of subidivision supported by this factory + /// \brief Maximum level of subidivision supported by this factory int GetMaxLevel() const { return _maxlevel; } - /// The number of coarse vertices found in the HbrMesh before refinement + /// \brief The number of coarse vertices found in the HbrMesh before refinement /// /// @return The number of coarse vertices /// int GetNumCoarseVertices() const { return _numCoarseVertices; } - /// Total number of faces up to a given level of subdivision + /// \brief Total number of faces up to a given level of subdivision /// /// @param level The number of faces up to 'level' of subdivision /// @@ -167,7 +135,8 @@ public: return sumList *>(_facesList, level); } - /// Returns the corresponding index of the HbrVertex in the new FarMesh + /// \brief Returns the corresponding index of the HbrVertex in the new + /// FarMesh /// /// @param v the vertex /// @@ -175,7 +144,8 @@ public: /// int GetVertexID( HbrVertex * v ); - /// Returns a the mapping between HbrVertex->GetID() and Far vertices indices + /// \brief Returns a the mapping between HbrVertex->GetID() and Far + /// vertices indices /// /// @return the table that maps HbrMesh to FarMesh vertex indices /// @@ -189,6 +159,13 @@ private: friend class FarVertexEditTablesFactory; friend class FarPatchTablesFactory; + template struct VertCompare { + bool operator()(HbrVertex const * v1, HbrVertex const * v2 ) const { + //return v1->GetID() < v2->GetID(); + return (void*)(v1) < (void*)(v2); + } + }; + // Non-copyable, so these are not implemented: FarMeshFactory( FarMeshFactory const & ); FarMeshFactory & operator=(FarMeshFactory const &); @@ -433,12 +410,6 @@ FarMeshFactory::refineVertexNeighbors(HbrVertex * v) { } while (next and next!=start); } -template struct VertCompare { - bool operator()(HbrVertex const * v1, HbrVertex const * v2 ) const { - //return v1->GetID() < v2->GetID(); - return (void*)(v1) < (void*)(v2); - } -}; // Refines an Hbr Catmark mesh adaptively around extraordinary features template int @@ -493,9 +464,9 @@ FarMeshFactory::refineAdaptive( HbrMesh * mesh, int maxIsolate ) { v->_adaptiveFlags.isTagged=true; nextverts.insert(v); } - + // Quad-faces with 2 non-consecutive boundaries need to be flagged - // as "non-patch" + // for refinement as boundary patches. // // o ........ o ........ o ........ o // . | | . ... b.undary edge @@ -505,10 +476,21 @@ FarMeshFactory::refineAdaptive( HbrMesh * mesh, int maxIsolate ) { // o ........ o ........ o ........ o // if ( e->IsBoundary() and (not f->_adaptiveFlags.isTagged) and nv==4 ) { + if (e->GetPrev() and (not e->GetPrev()->IsBoundary()) and e->GetNext() and (not e->GetNext()->IsBoundary()) and e->GetNext() and e->GetNext()->GetNext() and e->GetNext()->GetNext()->IsBoundary()) { + + // Tag the face so that we don't check for this again f->_adaptiveFlags.isTagged=true; + + // Tag all 4 vertices of the face to make sure 4 boundary + // sub-patches are generated + for (int k=0; k<4; ++k) { + HbrVertex * v = f->GetVertex(j); + v->_adaptiveFlags.isTagged=true; + nextverts.insert(v); + } } } } diff --git a/opensubdiv/far/multiMeshFactory.h b/opensubdiv/far/multiMeshFactory.h index 63f5e655..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 @@ -85,10 +53,10 @@ public: typedef std::vector const *> FarMeshVector; - /// Constructor. + /// \brief Constructor. FarMultiMeshFactory() {} - /// Splices a vector of Far meshes into a single Far mesh + /// \brief Splices a vector of Far meshes into a single Far mesh /// /// @param meshes a vector of Far meshes to splice /// diff --git a/opensubdiv/far/patchMap.h b/opensubdiv/far/patchMap.h index c84b7f9b..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 @@ -80,20 +48,20 @@ namespace OPENSUBDIV_VERSION { class FarPatchMap { public: - /// Handle that can be used as unique patch identifier within FarPatchTables + /// \brief Handle that can be used as unique patch identifier within FarPatchTables struct Handle { unsigned int patchArrayIdx, // OsdPatchArray containing the patch patchIdx, // Absolute index of the patch vertexOffset; // Offset to the first CV of the patch }; - - /// Constructor + + /// \brief Constructor /// /// @param patchTables A valid set of FarPatchTables /// FarPatchMap( FarPatchTables const & patchTables ); - /// Returns a handle to the sub-patch of the face at the given (u,v). + /// \brief Returns a handle to the sub-patch of the face at the given (u,v). /// Note : the faceid corresponds to quadrangulated face indices (ie. quads /// count as 1 index, non-quads add as many indices as they have vertices) /// diff --git a/opensubdiv/far/patchParam.h b/opensubdiv/far/patchParam.h index 9a5ed6da..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 @@ -74,15 +42,16 @@ namespace OPENSUBDIV_VERSION { /// but has to be remapped to a specific layout for uv textures. /// /// Bitfield layout : -/// -/// -/// -/// -/// -/// -/// -/// -///
Field Bits Content
level 4 the subdivision level of the patch
nonquad 1 whether the patch is the child of a non-quad face
rotation 2 patch rotations necessary to match CCW face-winding
v 10 log2 value of u parameter at first patch corner
u 10 log2 value of v parameter at first patch corner
reserved1 5 padding
+/// +/// Field | Bits | Content +/// -----------|:----:|------------------------------------------------------ +/// level | 4 | the subdivision level of the patch +/// nonquad | 1 | whether the patch is the child of a non-quad face +/// rotation | 2 | patch rotations necessary to match CCW face-winding +/// v | 10 | log2 value of u parameter at first patch corner +/// u | 10 | log2 value of v parameter at first patch corner +/// reserved1 | 5 | padding +/// /// Note : the bitfield is not expanded in the struct due to differences in how /// GPU & CPU compilers pack bit-fields and endian-ness. /// @@ -92,7 +61,7 @@ struct FarPatchParam { struct BitField { unsigned int field:32; - /// Sets the values of the bit fields + /// \brief Sets the values of the bit fields /// /// @param u value of the u parameter for the first corner of the face /// @param v value of the v parameter for the first corner of the face @@ -109,25 +78,25 @@ struct FarPatchParam { (nonquad ? depth+1 : depth); } - /// Returns the log2 value of the u parameter at the top left corner of + /// \brief Returns the log2 value of the u parameter at the top left corner of /// the patch unsigned short GetU() const { return (field >> 17) & 0x3ff; } - /// Returns the log2 value of the v parameter at the top left corner of + /// \brief Returns the log2 value of the v parameter at the top left corner of /// the patch unsigned short GetV() const { return (field >> 7) & 0x3ff; } - /// Returns the rotation of the patch (the number of CCW parameter winding) + /// \brief Returns the rotation of the patch (the number of CCW parameter winding) unsigned char GetRotation() const { return (field >> 5) & 0x3; } - /// True if the parent coarse face is a non-quad + /// \brief True if the parent coarse face is a non-quad bool NonQuadRoot() const { return (field >> 4) & 0x1; } - /// Returns the fratcion of normalized parametric space covered by the + /// \brief Returns the fratcion of normalized parametric space covered by the /// sub-patch. float GetParamFraction() const; - /// Returns the level of subdivision of the patch + /// \brief Returns the level of subdivision of the patch unsigned char GetDepth() const { return (field & 0xf); } /// The (u,v) pair is normalized to this sub-parametric space. @@ -138,7 +107,7 @@ struct FarPatchParam { /// void Normalize( float & u, float & v ) const; - /// Rotate (u,v) pair to compensate for transition pattern and boundary + /// \brief Rotate (u,v) pair to compensate for transition pattern and boundary /// orientations. /// /// @param u u parameter @@ -147,12 +116,12 @@ struct FarPatchParam { /// void Rotate( float & u, float & v ) const; - /// Resets the values to 0 + /// \brief Resets the values to 0 void Clear() { field = 0; } } bitField; - /// Sets the values of the bit fields + /// \brief Sets the values of the bit fields /// /// @param faceid ptex face index /// @@ -168,7 +137,7 @@ struct FarPatchParam { bitField.Set(u,v,rots,depth,nonquad); } - /// Resets everything to 0 + /// \brief Resets everything to 0 void Clear() { faceIndex = 0; bitField.Clear(); diff --git a/opensubdiv/far/patchTables.h b/opensubdiv/far/patchTables.h index 11d2fd16..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 @@ -86,17 +54,17 @@ public: typedef std::vector FVarDataTable; enum Type { - NON_PATCH = 0, // undefined + NON_PATCH = 0, ///< undefined - POINTS, // points (useful for cage drawing) - LINES, // lines (useful for cage drawing) + POINTS, ///< points (useful for cage drawing) + LINES, ///< lines (useful for cage drawing) - QUADS, // bilinear quads-only patches - TRIANGLES, // bilinear triangles-only mesh + QUADS, ///< bilinear quads-only patches + TRIANGLES, ///< bilinear triangles-only mesh - LOOP, // Loop patch (unsupported) - - REGULAR, // feature-adaptive bicubic patches + LOOP, ///< Loop patch (unsupported) + + REGULAR, ///< feature-adaptive bicubic patches BOUNDARY, CORNER, GREGORY, @@ -133,77 +101,79 @@ public: class Descriptor { public: - /// Default constructor. + /// \brief Default constructor. Descriptor() : _type(NON_PATCH), _pattern(NON_TRANSITION), _rotation(0) {} - /// Constructor + /// \brief Constructor Descriptor(int type, int pattern, unsigned char rotation) : _type(type), _pattern(pattern), _rotation(rotation) { } - /// Copy Constructor + /// \brief Copy Constructor Descriptor( Descriptor const & d ) : _type(d.GetType()), _pattern(d.GetPattern()), _rotation(d.GetRotation()) { } - /// Returns the type of the patch + /// \brief Returns the type of the patch Type GetType() const { return (Type)_type; } - /// Returns the transition pattern of the patch if any (5 types) + /// \brief Returns the transition pattern of the patch if any (5 types) TransitionPattern GetPattern() const { return (TransitionPattern)_pattern; } - /// Returns the rotation of the patch (4 rotations) + /// \brief Returns the rotation of the patch (4 rotations) unsigned char GetRotation() const { return _rotation; } - /// Returns the number of control vertices expected for a patch of the + /// \brief Returns the number of control vertices expected for a patch of the /// type described static short GetNumControlVertices( Type t ); - /// Returns the number of control vertices expected for a patch of the + /// \brief Returns the number of control vertices expected for a patch of the /// type described short GetNumControlVertices() const { return GetNumControlVertices( this->GetType() ); } - /// Iterates through the patches in the following preset order + /// \brief Iterates through the patches in the following preset order /// - /// NON_TRANSITION ( REGULAR - /// BOUNDARY - /// CORNER - /// GREGORY - /// GREGORY_BOUNDARY ) + /// Order: /// - /// PATTERN0 ( REGULAR - /// BOUNDARY ROT0 ROT1 ROT2 ROT3 - /// CORNER ROT0 ROT1 ROT2 ROT3 ) + /// NON_TRANSITION ( REGULAR + /// BOUNDARY + /// CORNER + /// GREGORY + /// GREGORY_BOUNDARY ) /// - /// PATTERN1 ( REGULAR - /// BOUNDARY ROT0 ROT1 ROT2 ROT3 - /// CORNER ROT0 ROT1 ROT2 ROT3 ) - /// ... + /// PATTERN0 ( REGULAR + /// BOUNDARY ROT0 ROT1 ROT2 ROT3 + /// CORNER ROT0 ROT1 ROT2 ROT3 ) /// - /// NON_TRANSITION NON_PATCH ROT0 (end) + /// PATTERN1 ( REGULAR + /// BOUNDARY ROT0 ROT1 ROT2 ROT3 + /// CORNER ROT0 ROT1 ROT2 ROT3 ) + /// ... + /// + /// NON_TRANSITION NON_PATCH ROT0 (end) /// Descriptor & operator ++ (); - /// Allows ordering of patches by type + /// \brief Allows ordering of patches by type bool operator < ( Descriptor const other ) const; - /// True if the descriptors are identical + /// \brief True if the descriptors are identical bool operator == ( Descriptor const other ) const; - /// Descriptor Iterator + /// \brief Descriptor Iterator class iterator; - /// Returns an iterator to the first type of patch (REGULAR NON_TRANSITION ROT0) + /// \brief Returns an iterator to the first type of patch (REGULAR NON_TRANSITION ROT0) static iterator begin(); - /// Returns an iterator to the end of the list of patch types (NON_PATCH) + /// \brief Returns an iterator to the end of the list of patch types (NON_PATCH) static iterator end(); private: @@ -222,7 +192,7 @@ public: class PatchArray { public: - /// Constructor. + /// \brief Constructor. /// /// @param desc descriptor information for the patches in /// the array @@ -249,7 +219,7 @@ public: /// \brief Describes the range of patches in a PatchArray struct ArrayRange { - /// Constructor + /// \brief Constructor /// /// @param vertIndex absolute index to the first control vertex /// of the first patch in the PTable @@ -271,28 +241,29 @@ public: quadOffsetIndex; // absolute index of the first quad offset entry }; - /// Returns a array range struct + /// \brief Returns a array range struct ArrayRange const & GetArrayRange() const { return _range; } - /// Returns the index of the first control vertex of the first patch + /// \brief Returns the index of the first control vertex of the first patch /// of this array in the global PTable unsigned int GetVertIndex() const { return _range.vertIndex; } - /// Returns the global index of the first patch in this array (Used to + /// \brief Returns the global index of the first patch in this array (Used to /// access param / fvar table data) unsigned int GetPatchIndex() const { return _range.patchIndex; } - /// Returns the number of patches in the array + /// \brief Returns the number of patches in the array unsigned int GetNumPatches() const { return _range.npatches; } + /// \brief Returns the index to the first entry in the QuadOffsetTable unsigned int GetQuadOffsetIndex() const { return _range.quadOffsetIndex; } @@ -307,7 +278,7 @@ public: typedef std::vector PatchArrayVector; - /// Constructor + /// \brief Constructor /// /// @param patchArrays Vector of descriptors and ranges for arrays of patches /// @@ -331,20 +302,20 @@ public: FVarDataTable const * fvarData, int maxValence); - /// Get the table of patch control vertices + /// \brief Get the table of patch control vertices PTable const & GetPatchTable() const { return _patches; } - /// Returns a pointer to the array of patches matching the descriptor + /// \brief Returns a pointer to the array of patches matching the descriptor PatchArray const * GetPatchArray( Descriptor desc ) const { return const_cast(this)->findPatchArray( desc ); } - /// Returns all arrays of patches + /// \brief Returns all arrays of patches PatchArrayVector const & GetPatchArrayVector() const { return _patchArrays; } - /// Returns a pointer to the vertex indices of uniformly subdivided faces + /// \brief Returns a pointer to the vertex indices of uniformly subdivided faces /// /// @param level the level of subdivision of the faces (returns the highest /// level by default) @@ -354,7 +325,7 @@ public: /// unsigned int const * GetFaceVertices(int level=0) const; - /// Returns the number of faces in a uniformly subdivided mesh at a given level + /// \brief Returns the number of faces in a uniformly subdivided mesh at a given level /// /// @param level the level of subdivision of the faces (returns the highest /// level by default) @@ -364,16 +335,16 @@ public: /// int GetNumFaces(int level=0) const; - /// Returns a vertex valence table used by Gregory patches + /// \brief Returns a vertex valence table used by Gregory patches VertexValenceTable const & GetVertexValenceTable() const { return _vertexValenceTable; } - /// Returns a quad offsets table used by Gregory patches + /// \brief Returns a quad offsets table used by Gregory patches QuadOffsetTable const & GetQuadOffsetTable() const { return _quadOffsetTable; } - /// Returns a PatchParamTable for each type of patch + /// \brief Returns a PatchParamTable for each type of patch PatchParamTable const & GetPatchParamTable() const { return _paramTable; } - /// Returns an FVarDataTable for each type of patch + /// \brief Returns an FVarDataTable for each type of patch /// The data is stored as a run of totalFVarWidth floats per-vertex per-face /// e.g.: for UV data it has the structure of float[p][4][2] where /// p=primitiveID and totalFVarWidth=2: @@ -381,28 +352,28 @@ public: /// prim 0 prim 1 FVarDataTable const & GetFVarDataTable() const { return _fvarTable; } - /// Ringsize of Regular Patches in table. + /// \brief Ringsize of Regular Patches in table. static int GetRegularPatchRingsize() { return 16; } - /// Ringsize of Boundary Patches in table. + /// \brief Ringsize of Boundary Patches in table. static int GetBoundaryPatchRingsize() { return 12; } - /// Ringsize of Boundary Patches in table. + /// \brief Ringsize of Boundary Patches in table. static int GetCornerPatchRingsize() { return 9; } - /// Ringsize of Gregory (and Gregory Boundary) Patches in table. + /// \brief Ringsize of Gregory (and Gregory Boundary) Patches in table. static int GetGregoryPatchRingsize() { return 4; } - /// Returns the total number of patches stored in the tables + /// \brief Returns the total number of patches stored in the tables int GetNumPatches() const; - /// Returns the total number of control vertex indices in the tables + /// \brief Returns the total number of control vertex indices in the tables int GetNumControlVertices() const; - /// Returns max vertex valence + /// \brief Returns max vertex valence int GetMaxValence() const { return _maxValence; } - /// True if the patches are of feature adaptive types + /// \brief True if the patches are of feature adaptive types bool IsFeatureAdaptive() const; private: diff --git a/opensubdiv/far/patchTablesFactory.h b/opensubdiv/far/patchTablesFactory.h index c5d78eb3..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 @@ -77,7 +45,7 @@ template class FarPatchTablesFactory { protected: template friend class FarMeshFactory; - /// Factory constructor for feature-adaptive meshes + /// \brief Factory constructor for feature-adaptive meshes /// /// @param mesh Hbr mesh to generate tables for /// @@ -87,7 +55,7 @@ protected: /// FarPatchTablesFactory( HbrMesh const * mesh, int nfaces, std::vector const & remapTable ); - /// Returns a feature-adaptive FarPatchTables instance + /// \brief Returns a feature-adaptive FarPatchTables instance /// /// @param maxlevel Highest level of refinement processed /// @@ -102,7 +70,7 @@ protected: typedef std::vector *> > FacesList; - /// Factory constructor for uniform meshes + /// \brief Factory constructor for uniform meshes /// /// @param mesh Hbr mesh to generate tables for /// @@ -313,7 +281,7 @@ FarPatchTablesFactory::Create( HbrMesh const * mesh, FacesList const & fli unsigned int * iptr = &result->_patches[0]; FarPatchParam * pptr = &result->_paramTable[0]; - float * fptr = requireFVarData ? &result->_fvarTable[0] : 0; + float * fptr = fvarwidth>0 ? &result->_fvarTable[0] : 0; for (int level=firstArray; level<(int)flist.size(); ++level) { @@ -327,7 +295,7 @@ FarPatchTablesFactory::Create( HbrMesh const * mesh, FacesList const & fli pptr = computePatchParam(f, pptr); - if (requireFVarData) + if (fvarwidth>0) fptr = computeFVarData(f, fvarwidth, fptr, /*isAdaptive=*/false); } } diff --git a/opensubdiv/far/subdivisionTables.h b/opensubdiv/far/subdivisionTables.h index 7041d7b3..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 @@ -99,69 +67,69 @@ template class FarSubdivisionTables { public: enum TableType { - E_IT, // edge-vertices adjacency indexing table - E_W, // edge-vertices weights + E_IT, ///< edge-vertices adjacency indexing table + E_W, ///< edge-vertices weights - V_ITa, // vertex-vertices adjacency indexing table - V_IT, // vertex-vertices indexing table - V_W, // vertex-vertices weights + V_ITa, ///< vertex-vertices adjacency indexing table + V_IT, ///< vertex-vertices indexing table + V_W, ///< vertex-vertices weights - F_ITa, // face-vertices adjacency indexing table - F_IT, // face-vertices indexing table + F_ITa, ///< face-vertices adjacency indexing table + F_IT, ///< face-vertices indexing table TABLE_TYPES_COUNT // number of different types of tables }; - /// Destructor + /// \brief Destructor virtual ~FarSubdivisionTables() {} - /// Return the highest level of subdivision possible with these tables + /// \brief Return the highest level of subdivision possible with these tables int GetMaxLevel() const { return (int)(_vertsOffsets.size()-1); } - /// Memory required to store the indexing tables + /// \brief Memory required to store the indexing tables int GetMemoryUsed() const; - /// Pointer back to the mesh owning the table + /// \brief Pointer back to the mesh owning the table FarMesh * GetMesh() { return _mesh; } - /// The index of the first vertex that belongs to the level of subdivision + /// \brief The index of the first vertex that belongs to the level of subdivision /// represented by this set of FarCatmarkSubdivisionTables int GetFirstVertexOffset( int level ) const; - /// Returns the total number of vertex adressed by the tables (this is the + /// \brief Returns the total number of vertex adressed by the tables (this is the /// length that a vertex buffer object should be allocating int GetNumVertices( ) const; - /// Returns the number of vertices at a given level + /// \brief Returns the number of vertices at a given level int GetNumVertices( int level ) const; - /// Returns the summation of the number of vertices up to a given level + /// \brief Returns the summation of the number of vertices up to a given level int GetNumVerticesTotal( int level ) const; - /// Indexing tables accessors + // Indexing tables accessors - /// Returns the face vertices codex table + /// \brief Returns the face vertices codex table std::vector const & Get_F_ITa( ) const { return _F_ITa; } - /// Returns the face vertices indexing table + /// \brief Returns the face vertices indexing table std::vector const & Get_F_IT( ) const { return _F_IT; } - /// Returns the edge vertices indexing table + /// \brief Returns the edge vertices indexing table std::vector const & Get_E_IT() const { return _E_IT; } - /// Returns the edge vertices weights table + /// \brief Returns the edge vertices weights table std::vector const & Get_E_W() const { return _E_W; } - /// Returns the vertex vertices codex table + /// \brief Returns the vertex vertices codex table std::vector const & Get_V_ITa() const { return _V_ITa; } - /// Returns the vertex vertices indexing table + /// \brief Returns the vertex vertices indexing table std::vector const & Get_V_IT() const { return _V_IT; } - /// Returns the vertex vertices weights table + /// \brief Returns the vertex vertices weights table std::vector const & Get_V_W() const { return _V_W; } - /// Returns the number of indexing tables needed to represent this particular + /// \brief Returns the number of indexing tables needed to represent this particular /// subdivision scheme. virtual int GetNumTables() const { return 5; } diff --git a/opensubdiv/far/subdivisionTablesFactory.h b/opensubdiv/far/subdivisionTablesFactory.h index 20ff1eeb..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 @@ -93,30 +61,30 @@ protected: // Hbr vertex indices to the FarVertexEdit tables. FarSubdivisionTablesFactory( HbrMesh const * mesh, int maxlevel, std::vector & remapTable ); - /// Returns the number of coarse vertices found in the mesh + // Returns the number of coarse vertices found in the mesh int GetNumCoarseVertices() const { return (int)(_vertVertsList[0].size()); } - /// Total number of face vertices up to 'level' + // Total number of face vertices up to 'level' int GetNumFaceVerticesTotal(int level) const { return sumList *>(_faceVertsList, level); } - /// Total number of edge vertices up to 'level' + // Total number of edge vertices up to 'level' int GetNumEdgeVerticesTotal(int level) const { return sumList *>(_edgeVertsList, level); } - /// Total number of vertex vertices up to 'level' + // Total number of vertex vertices up to 'level' int GetNumVertexVerticesTotal(int level) const { return sumList *>(_vertVertsList, level); } - /// Valence summation up to 'level' + // Valence summation up to 'level' int GetFaceVertsValenceSum() const { return _faceVertsValenceSum; } - /// Valence summation for face vertices + // Valence summation for face vertices int GetVertVertsValenceSum() const { return _vertVertsValenceSum; } // Returns an integer based on the order in which the kernels are applied diff --git a/opensubdiv/far/vertexEditTables.h b/opensubdiv/far/vertexEditTables.h index 78a62e89..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 @@ -86,16 +54,16 @@ public: /// Note : subtract edits are converted to Add edits for better serialization }; - /// Get the type of operation + /// \brief Get the type of operation Operation GetOperation() const { return _op; } - /// Return index of variable this edit applies to + /// \brief Return index of variable this edit applies to int GetIndex() const { return _index; } - /// Return width of the variable + /// \brief Return width of the variable int GetWidth() const { return _width; } - /// Get the numerical value of the edit + /// \brief Get the numerical value of the edit const float* GetEdit() const { return _edit; } private: @@ -115,37 +83,38 @@ private: template class FarVertexEditTables { public: + /// \brief Constructor FarVertexEditTables( FarMesh * mesh ); // Note : Subtract type edits are converted into Adds in order to save kernel calls. - int GetNumBatches() const { - return (int)_batches.size(); - } - - // This class holds an array of edits. each batch has unique index/width/operation + /// \brief This class holds an array of edits. each batch has unique index/width/operation class VertexEditBatch { public: + /// \brief Constructor VertexEditBatch(int index, int width, FarVertexEdit::Operation operation); - // copy vertex id and edit values into table + /// \brief Copy vertex id and edit values into table void Append(int level, int vertexID, const float *values, bool negate); - // Compute-kernel applied to vertices + /// \brief Compute-kernel applied to vertices void ApplyVertexEdits(U * vsrc, int offset, int tableOffset, int start, int end) const; // Edit tables accessors - // Returns the edit offset table + /// \brief Returns the edit offset table const std::vector &GetVertexIndices() const { return _vertIndices; } - // Returns the edit values table + /// \brief Returns the edit values table const std::vector &GetValues() const { return _edits; } + /// \brief Returns the edit operand (Set / Add) FarVertexEdit::Operation GetOperation() const { return _op; } + /// \brief Returns the index of the primvar affected by the edit int GetPrimvarIndex() const { return _primvarIndex; } + /// \brief Returns the width of the primvar (number of elements) int GetPrimvarWidth() const { return _primvarWidth; } private: @@ -160,6 +129,15 @@ public: FarVertexEdit::Operation _op; // edit operation (Set, Add) }; + /// \brief Returns the number of edit batches + int GetNumBatches() const { + return (int)_batches.size(); + } + + /// \brief Returns a batch of vertex edits + /// + /// @param index batch index + /// VertexEditBatch const & GetBatch(int index) const { return _batches[index]; } diff --git a/opensubdiv/far/vertexEditTablesFactory.h b/opensubdiv/far/vertexEditTablesFactory.h index f7f868c4..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 @@ -80,12 +48,12 @@ template class FarVertexEditTablesFactory { protected: template friend class FarMeshFactory; - /// Compares the number of subfaces in an edit (for sorting purposes) + /// \brief Compares the number of subfaces in an edit (for sorting purposes) static bool compareEdits(HbrVertexEdit const *a, HbrVertexEdit const *b); static void insertHEditBatch(FarKernelBatchVector *batches, int batchIndex, int batchLevel, int batchCount, int tableOffset); - /// Creates a FarVertexEditTables instance. + /// \brief Creates a FarVertexEditTables instance. static FarVertexEditTables * Create( FarMeshFactory const * factory, FarMesh * mesh, FarKernelBatchVector *batches, int maxlevel ); }; 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 df98bb7a..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 @@ -67,14 +35,14 @@ namespace OPENSUBDIV_VERSION { template class HbrFVarEdit; template class HbrFace; +template class HbrVertex; // This class implements a "face varying vector item". Really it's // just a smart wrapper around face varying data (itself just a bunch // of floats) stored on each vertex. template class HbrFVarData { -public: - +private: HbrFVarData() : faceid(0), initialized(0) { } @@ -83,6 +51,10 @@ public: Uninitialize(); } + HbrFVarData(const HbrFVarData &data) {} + +public: + // Sets the face id void SetFaceID(int id) { faceid = id; @@ -181,6 +153,8 @@ public: // Modify the data of the item with an edit void ApplyFVarEdit(const HbrFVarEdit& edit); + friend class HbrVertex; + private: unsigned int faceid:31; unsigned int initialized:1; 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 77b99608..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 @@ -82,8 +50,7 @@ template std::ostream& operator<<(std::ostream& out, const HbrHalfedge template class HbrHalfedge { -public: - +private: HbrHalfedge(): opposite(0), incidentVertex(-1), vchild(-1), sharpness(0.0f) #ifdef HBRSTITCH , stitchccw(1), raystitchccw(1) @@ -92,6 +59,8 @@ public: { } + HbrHalfedge(const HbrHalfedge &e) {} + ~HbrHalfedge(); void Clear(); @@ -99,6 +68,7 @@ public: // Finish the initialization of the halfedge. Should only be // called by HbrFace void Initialize(HbrHalfedge* opposite, int index, HbrVertex* origin, unsigned int *fvarbits, HbrFace* face); +public: // Returns the opposite half edge HbrHalfedge* GetOpposite() const { return opposite; } @@ -412,6 +382,8 @@ public: void SetCoarse(bool c) { coarse = c; } bool IsCoarse() const { return coarse; } + friend class HbrFace; + private: HbrHalfedge* opposite; // Index of incident vertex 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 172b52ac..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. # #------------------------------------------------------------------------------- @@ -442,63 +409,66 @@ source_group("Kernels" FILES ${KERNEL_FILES}) source_group("Inc" FILES ${INC_FILES}) -_add_possibly_cuda_library(osd_static_cpu STATIC - ${CPU_SOURCE_FILES} - ${PRIVATE_HEADER_FILES} - ${PUBLIC_HEADER_FILES} -) -set_target_properties(osd_static_cpu PROPERTIES OUTPUT_NAME osdCPU CLEAN_DIRECT_OUTPUT 1) +if (NOT NO_LIB) -target_link_libraries(osd_static_cpu - ${PLATFORM_LIBRARIES} -) - -_add_possibly_cuda_library(osd_static_gpu STATIC - ${GPU_SOURCE_FILES} - ${PRIVATE_HEADER_FILES} - ${PUBLIC_HEADER_FILES} - ${KERNEL_FILES} - ${INC_FILES} -) -set_target_properties(osd_static_gpu PROPERTIES OUTPUT_NAME osdGPU CLEAN_DIRECT_OUTPUT 1) - -target_link_libraries(osd_static_gpu - ${PLATFORM_LIBRARIES} -) - -install( TARGETS osd_static_cpu DESTINATION ${CMAKE_LIBDIR_BASE} ) -install( TARGETS osd_static_gpu DESTINATION ${CMAKE_LIBDIR_BASE} ) - -if (NOT WIN32 AND NOT IOS) - _add_possibly_cuda_library(osd_dynamic_cpu SHARED + _add_possibly_cuda_library(osd_static_cpu STATIC ${CPU_SOURCE_FILES} ${PRIVATE_HEADER_FILES} ${PUBLIC_HEADER_FILES} ) + set_target_properties(osd_static_cpu PROPERTIES OUTPUT_NAME osdCPU CLEAN_DIRECT_OUTPUT 1) - set_target_properties(osd_dynamic_cpu PROPERTIES OUTPUT_NAME osdCPU CLEAN_DIRECT_OUTPUT 1) - - target_link_libraries(osd_dynamic_cpu + target_link_libraries(osd_static_cpu ${PLATFORM_LIBRARIES} ) - _add_possibly_cuda_library(osd_dynamic_gpu SHARED + _add_possibly_cuda_library(osd_static_gpu STATIC ${GPU_SOURCE_FILES} ${PRIVATE_HEADER_FILES} ${PUBLIC_HEADER_FILES} ${KERNEL_FILES} ${INC_FILES} ) + set_target_properties(osd_static_gpu PROPERTIES OUTPUT_NAME osdGPU CLEAN_DIRECT_OUTPUT 1) - set_target_properties(osd_dynamic_gpu PROPERTIES OUTPUT_NAME osdGPU CLEAN_DIRECT_OUTPUT 1) - - target_link_libraries(osd_dynamic_gpu - osd_dynamic_cpu + target_link_libraries(osd_static_gpu ${PLATFORM_LIBRARIES} ) - - install( TARGETS osd_dynamic_cpu DESTINATION ${CMAKE_LIBDIR_BASE} ) - install( TARGETS osd_dynamic_gpu DESTINATION ${CMAKE_LIBDIR_BASE} ) + + install( TARGETS osd_static_cpu DESTINATION ${CMAKE_LIBDIR_BASE} ) + install( TARGETS osd_static_gpu DESTINATION ${CMAKE_LIBDIR_BASE} ) + + if (NOT WIN32 AND NOT IOS) + _add_possibly_cuda_library(osd_dynamic_cpu SHARED + ${CPU_SOURCE_FILES} + ${PRIVATE_HEADER_FILES} + ${PUBLIC_HEADER_FILES} + ) + + set_target_properties(osd_dynamic_cpu PROPERTIES OUTPUT_NAME osdCPU CLEAN_DIRECT_OUTPUT 1) + + target_link_libraries(osd_dynamic_cpu + ${PLATFORM_LIBRARIES} + ) + + _add_possibly_cuda_library(osd_dynamic_gpu SHARED + ${GPU_SOURCE_FILES} + ${PRIVATE_HEADER_FILES} + ${PUBLIC_HEADER_FILES} + ${KERNEL_FILES} + ${INC_FILES} + ) + + set_target_properties(osd_dynamic_gpu PROPERTIES OUTPUT_NAME osdGPU CLEAN_DIRECT_OUTPUT 1) + + target_link_libraries(osd_dynamic_gpu + osd_dynamic_cpu + ${PLATFORM_LIBRARIES} + ) + + install( TARGETS osd_dynamic_cpu DESTINATION ${CMAKE_LIBDIR_BASE} ) + install( TARGETS osd_dynamic_gpu DESTINATION ${CMAKE_LIBDIR_BASE} ) + endif() endif() _add_doxy_headers( "${DOXY_HEADER_FILES}" ) 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 ef5e2668..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" @@ -103,6 +77,7 @@ createTextureBuffer(T const &data, GLint format, int offset=0) glBindTexture(GL_TEXTURE_BUFFER, texture); glTexBuffer(GL_TEXTURE_BUFFER, format, buffer); + glBindTexture(GL_TEXTURE_BUFFER, 0); glDeleteBuffers(1, &buffer); #endif 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 e556d4cf..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" @@ -326,8 +300,10 @@ OsdGLDrawRegistryBase::_CreateDrawConfig( } config->program = program; - config->levelBaseUniform = glGetUniformLocation(program, "LevelBase"); - config->gregoryQuadOffsetBaseUniform = glGetUniformLocation(program, "GregoryQuadOffsetBase"); + config->primitiveIdBaseUniform = + glGetUniformLocation(program, "OsdPrimitiveIdBase"); + config->gregoryQuadOffsetBaseUniform = + glGetUniformLocation(program, "OsdGregoryQuadOffsetBase"); return config; } diff --git a/opensubdiv/osd/glDrawRegistry.h b/opensubdiv/osd/glDrawRegistry.h index 882ea66c..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 @@ -73,12 +41,12 @@ namespace OPENSUBDIV_VERSION { struct OsdGLDrawConfig : public OsdDrawConfig { OsdGLDrawConfig() : program(0), - levelBaseUniform(-1), + primitiveIdBaseUniform(-1), gregoryQuadOffsetBaseUniform(-1) {} virtual ~OsdGLDrawConfig(); GLuint program; - GLint levelBaseUniform; + GLint primitiveIdBaseUniform; GLint gregoryQuadOffsetBaseUniform; }; 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 7d55cfa0..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. // //---------------------------------------------------------- @@ -188,7 +156,7 @@ void main() // +0.5 to avoid interpolation error of integer value outpt[ID].v.patchCoord = vec4(0, 0, patchLevel+0.5, - gl_PrimitiveID+LevelBase+0.5); + gl_PrimitiveID+OsdPrimitiveIdBase+0.5); OSD_COMPUTE_PTEX_COORD_TESSCONTROL_SHADER; diff --git a/opensubdiv/osd/glslPatchCommon.glsl b/opensubdiv/osd/glslPatchCommon.glsl index d495dadc..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. // //---------------------------------------------------------- @@ -153,10 +121,8 @@ layout(std140) uniform Tessellation { float TessLevel; }; -//layout(std140) uniform PrimitiveBufferOffset { -uniform int GregoryQuadOffsetBase; -uniform int LevelBase; -//}; +uniform int OsdGregoryQuadOffsetBase; +uniform int OsdPrimitiveIdBase; float GetTessLevel(int patchLevel) { @@ -191,15 +157,17 @@ float TessAdaptive(vec3 p0, vec3 p1) // ptex coordinates // ---------------------------------------------------------------------------- -uniform isamplerBuffer g_ptexIndicesBuffer; +uniform isamplerBuffer OsdPatchParamBuffer; #define GetPatchLevel() \ - (texelFetch(g_ptexIndicesBuffer, gl_PrimitiveID + LevelBase).y & 0xf) + (texelFetch(OsdPatchParamBuffer, gl_PrimitiveID + \ + OsdPrimitiveIdBase).y & 0xf) #define OSD_COMPUTE_PTEX_COORD_TESSCONTROL_SHADER \ { \ - ivec2 ptexIndex = texelFetch(g_ptexIndicesBuffer, \ - gl_PrimitiveID + LevelBase).xy; \ + ivec2 ptexIndex = texelFetch(OsdPatchParamBuffer, \ + gl_PrimitiveID + \ + OsdPrimitiveIdBase).xy; \ int faceID = ptexIndex.x; \ int lv = 1 << ((ptexIndex.y & 0xf) - ((ptexIndex.y >> 4) & 1)); \ int u = (ptexIndex.y >> 17) & 0x3ff; \ @@ -241,75 +209,70 @@ uniform isamplerBuffer g_ptexIndicesBuffer; // face varyings // ---------------------------------------------------------------------------- -uniform samplerBuffer g_fvarDataBuffer; +uniform samplerBuffer OsdFVarDataBuffer; #ifndef OSD_FVAR_WIDTH #define OSD_FVAR_WIDTH 0 #endif // XXX: quad only for now -float ComputeFaceVarying1(int fvarOffset, vec2 tessCoord) -{ - float v[4]; - int primOffset = (gl_PrimitiveID + LevelBase) * 4; - for (int i = 0; i < 4; ++i) { - v[i] = texelFetch(g_fvarDataBuffer, - (primOffset+i)*OSD_FVAR_WIDTH + fvarOffset).s; +#define OSD_COMPUTE_FACE_VARYING_1(result, fvarOffset, tessCoord) \ + { \ + float v[4]; \ + int primOffset = (gl_PrimitiveID + OsdPrimitiveIdBase) * 4; \ + for (int i = 0; i < 4; ++i) { \ + int index = (primOffset+i)*OSD_FVAR_WIDTH + fvarOffset; \ + v[i] = texelFetch(OsdFVarDataBuffer, index).s \ + } \ + result = mix(mix(v[0], v[1], tessCoord.s), \ + mix(v[3], v[2], tessCoord.s), \ + tessCoord.t); \ } - return mix(mix(v[0], v[1], tessCoord.s), - mix(v[3], v[2], tessCoord.s), - tessCoord.t); -} -vec2 ComputeFaceVarying2(int fvarOffset, vec2 tessCoord) -{ - vec2 v[4]; - int primOffset = (gl_PrimitiveID + LevelBase) * 4; - for (int i = 0; i < 4; ++i) { - v[i] = vec2(texelFetch(g_fvarDataBuffer, - (primOffset+i)*OSD_FVAR_WIDTH + fvarOffset).s, - texelFetch(g_fvarDataBuffer, - (primOffset+i)*OSD_FVAR_WIDTH + fvarOffset + 1).s); - } - return mix(mix(v[0], v[1], tessCoord.s), - mix(v[3], v[2], tessCoord.s), - tessCoord.t); -} -vec3 ComputeFaceVarying3(int fvarOffset, vec2 tessCoord) -{ - vec3 v[4]; - int primOffset = (gl_PrimitiveID + LevelBase) * 4; - for (int i = 0; i < 4; ++i) { - v[i] = vec3(texelFetch(g_fvarDataBuffer, - (primOffset+i)*OSD_FVAR_WIDTH + fvarOffset).s, - texelFetch(g_fvarDataBuffer, - (primOffset+i)*OSD_FVAR_WIDTH + fvarOffset + 1).s, - texelFetch(g_fvarDataBuffer, - (primOffset+i)*OSD_FVAR_WIDTH + fvarOffset + 2).s); +#define OSD_COMPUTE_FACE_VARYING_2(result, fvarOffset, tessCoord) \ + { \ + vec2 v[4]; \ + int primOffset = (gl_PrimitiveID + OsdPrimitiveIdBase) * 4; \ + for (int i = 0; i < 4; ++i) { \ + int index = (primOffset+i)*OSD_FVAR_WIDTH + fvarOffset; \ + v[i] = vec2(texelFetch(OsdFVarDataBuffer, index).s, \ + texelFetch(OsdFVarDataBuffer, index + 1).s); \ + } \ + result = mix(mix(v[0], v[1], tessCoord.s), \ + mix(v[3], v[2], tessCoord.s), \ + tessCoord.t); \ } - return mix(mix(v[0], v[1], tessCoord.s), - mix(v[3], v[2], tessCoord.s), - tessCoord.t); -} -vec4 ComputeFaceVarying4(int fvarOffset, vec2 tessCoord) -{ - vec4 v[4]; - int primOffset = (gl_PrimitiveID + LevelBase) * 4; - for (int i = 0; i < 4; ++i) { - v[i] = vec4(texelFetch(g_fvarDataBuffer, - (primOffset+i)*OSD_FVAR_WIDTH + fvarOffset).s, - texelFetch(g_fvarDataBuffer, - (primOffset+i)*OSD_FVAR_WIDTH + fvarOffset + 1).s, - texelFetch(g_fvarDataBuffer, - (primOffset+i)*OSD_FVAR_WIDTH + fvarOffset + 2).s, - texelFetch(g_fvarDataBuffer, - (primOffset+i)*OSD_FVAR_WIDTH + fvarOffset + 3).s); +#define OSD_COMPUTE_FACE_VARYING_3(result, fvarOffset, tessCoord) \ + { \ + vec3 v[4]; \ + int primOffset = (gl_PrimitiveID + OsdPrimitiveIdBase) * 4; \ + for (int i = 0; i < 4; ++i) { \ + int index = (primOffset+i)*OSD_FVAR_WIDTH + fvarOffset; \ + v[i] = vec3(texelFetch(OsdFVarDataBuffer, index).s, \ + texelFetch(OsdFVarDataBuffer, index + 1).s, \ + texelFetch(OsdFVarDataBuffer, index + 2).s); \ + } \ + result = mix(mix(v[0], v[1], tessCoord.s), \ + mix(v[3], v[2], tessCoord.s), \ + tessCoord.t); \ + } + +#define OSD_COMPUTE_FACE_VARYING_4(result, fvarOffset, tessCoord) \ + { \ + vec4 v[4]; \ + int primOffset = (gl_PrimitiveID + OsdPrimitiveIdBase) * 4; \ + for (int i = 0; i < 4; ++i) { \ + int index = (primOffset+i)*OSD_FVAR_WIDTH + fvarOffset; \ + v[i] = vec3(texelFetch(OsdFVarDataBuffer, index).s, \ + texelFetch(OsdFVarDataBuffer, index + 1).s, \ + texelFetch(OsdFVarDataBuffer, index + 2).s, \ + texelFetch(OsdFVarDataBuffer, index + 3).s); \ + } \ + result = mix(mix(v[0], v[1], tessCoord.s), \ + mix(v[3], v[2], tessCoord.s), \ + tessCoord.t); \ } - return mix(mix(v[0], v[1], tessCoord.s), - mix(v[3], v[2], tessCoord.s), - tessCoord.t); -} // ---------------------------------------------------------------------------- // patch culling diff --git a/opensubdiv/osd/glslPatchGregory.glsl b/opensubdiv/osd/glslPatchGregory.glsl index b2833c17..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. // //---------------------------------------------------------- @@ -90,8 +58,8 @@ float csf(uint n, uint j) //---------------------------------------------------------- #ifdef OSD_PATCH_VERTEX_GREGORY_SHADER -uniform samplerBuffer g_VertexBuffer; -uniform isamplerBuffer g_ValenceBuffer; +uniform samplerBuffer OsdVertexBuffer; +uniform isamplerBuffer OsdValenceBuffer; layout (location=0) in vec4 position; OSD_USER_VARYING_ATTRIBUTE_DECLARE @@ -109,7 +77,7 @@ void main() OSD_PATCH_CULL_COMPUTE_CLIPFLAGS(position); OSD_USER_VARYING_PER_VERTEX(); - int ivalence = texelFetch(g_ValenceBuffer,int(vID * (2 * OSD_MAX_VALENCE + 1))).x; + int ivalence = texelFetch(OsdValenceBuffer,int(vID * (2 * OSD_MAX_VALENCE + 1))).x; outpt.v.valence = ivalence; uint valence = uint(abs(ivalence)); @@ -129,11 +97,11 @@ void main() uint im=(i+valence-1)%valence; uint ip=(i+1)%valence; - uint idx_neighbor = uint(texelFetch(g_ValenceBuffer, int(vID * (2*OSD_MAX_VALENCE+1) + 2*i + 0 + 1)).x); + uint idx_neighbor = uint(texelFetch(OsdValenceBuffer, int(vID * (2*OSD_MAX_VALENCE+1) + 2*i + 0 + 1)).x); #ifdef OSD_PATCH_GREGORY_BOUNDARY bool isBoundaryNeighbor = false; - int valenceNeighbor = texelFetch(g_ValenceBuffer,int(idx_neighbor * (2*OSD_MAX_VALENCE+1))).x; + int valenceNeighbor = texelFetch(OsdValenceBuffer,int(idx_neighbor * (2*OSD_MAX_VALENCE+1))).x; if (valenceNeighbor < 0) { isBoundaryNeighbor = true; @@ -153,37 +121,37 @@ void main() #endif vec3 neighbor = - vec3(texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*idx_neighbor)).x, - texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*idx_neighbor+1)).x, - texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*idx_neighbor+2)).x); + vec3(texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*idx_neighbor)).x, + texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*idx_neighbor+1)).x, + texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*idx_neighbor+2)).x); - uint idx_diagonal = uint(texelFetch(g_ValenceBuffer, int(vID * (2*OSD_MAX_VALENCE+1) + 2*i + 1 + 1)).x); + uint idx_diagonal = uint(texelFetch(OsdValenceBuffer, int(vID * (2*OSD_MAX_VALENCE+1) + 2*i + 1 + 1)).x); vec3 diagonal = - vec3(texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*idx_diagonal)).x, - texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*idx_diagonal+1)).x, - texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*idx_diagonal+2)).x); + vec3(texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*idx_diagonal)).x, + texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*idx_diagonal+1)).x, + texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*idx_diagonal+2)).x); - uint idx_neighbor_p = uint(texelFetch(g_ValenceBuffer, int(vID * (2*OSD_MAX_VALENCE+1) + 2*ip + 0 + 1)).x); + uint idx_neighbor_p = uint(texelFetch(OsdValenceBuffer, int(vID * (2*OSD_MAX_VALENCE+1) + 2*ip + 0 + 1)).x); vec3 neighbor_p = - vec3(texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*idx_neighbor_p)).x, - texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*idx_neighbor_p+1)).x, - texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*idx_neighbor_p+2)).x); + vec3(texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*idx_neighbor_p)).x, + texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*idx_neighbor_p+1)).x, + texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*idx_neighbor_p+2)).x); - uint idx_neighbor_m = uint(texelFetch(g_ValenceBuffer, int(vID * (2*OSD_MAX_VALENCE+1) + 2*im + 0 + 1)).x); + uint idx_neighbor_m = uint(texelFetch(OsdValenceBuffer, int(vID * (2*OSD_MAX_VALENCE+1) + 2*im + 0 + 1)).x); vec3 neighbor_m = - vec3(texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*idx_neighbor_m)).x, - texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*idx_neighbor_m+1)).x, - texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*idx_neighbor_m+2)).x); + vec3(texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*idx_neighbor_m)).x, + texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*idx_neighbor_m+1)).x, + texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*idx_neighbor_m+2)).x); - uint idx_diagonal_m = uint(texelFetch(g_ValenceBuffer, int(vID * (2*OSD_MAX_VALENCE+1) + 2*im + 1 + 1)).x); + uint idx_diagonal_m = uint(texelFetch(OsdValenceBuffer, int(vID * (2*OSD_MAX_VALENCE+1) + 2*im + 1 + 1)).x); vec3 diagonal_m = - vec3(texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*idx_diagonal_m)).x, - texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*idx_diagonal_m+1)).x, - texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*idx_diagonal_m+2)).x); + vec3(texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*idx_diagonal_m)).x, + texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*idx_diagonal_m+1)).x, + texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*idx_diagonal_m+2)).x); f[i] = (pos * float(valence) + (neighbor_p + neighbor)*2.0f + diagonal) / (float(valence)+5.0f); @@ -216,24 +184,24 @@ void main() if (ivalence < 0) { if (valence > 2) { outpt.v.position = ( - vec3(texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0])).x, - texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0]+1)).x, - texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0]+2)).x) + - vec3(texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1])).x, - texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1]+1)).x, - texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1]+2)).x) + + vec3(texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0])).x, + texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0]+1)).x, + texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0]+2)).x) + + vec3(texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1])).x, + texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1]+1)).x, + texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1]+2)).x) + 4.0f * pos)/6.0f; } else { outpt.v.position = pos; } outpt.v.e0 = ( - vec3(texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0])).x, - texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0]+1)).x, - texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0]+2)).x) - - vec3(texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1])).x, - texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1]+1)).x, - texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1]+2)).x) + vec3(texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0])).x, + texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0]+1)).x, + texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0]+2)).x) - + vec3(texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1])).x, + texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1]+1)).x, + texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1]+2)).x) )/6.0; float k = float(float(valence) - 1.0f); //k is the number of faces @@ -244,20 +212,20 @@ void main() float beta_0 = s/(3.0f*k + c); - int idx_diagonal = texelFetch(g_ValenceBuffer,int((vID) * (2*OSD_MAX_VALENCE+1) + 2*zerothNeighbor + 1 + 1)).x; + int idx_diagonal = texelFetch(OsdValenceBuffer,int((vID) * (2*OSD_MAX_VALENCE+1) + 2*zerothNeighbor + 1 + 1)).x; idx_diagonal = abs(idx_diagonal); vec3 diagonal = - vec3(texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*idx_diagonal)).x, - texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*idx_diagonal+1)).x, - texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*idx_diagonal+2)).x); + vec3(texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*idx_diagonal)).x, + texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*idx_diagonal+1)).x, + texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*idx_diagonal+2)).x); outpt.v.e1 = gamma * pos + - alpha_0k * vec3(texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0])).x, - texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0]+1)).x, - texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0]+2)).x) + - alpha_0k * vec3(texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1])).x, - texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1]+1)).x, - texelFetch(g_VertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1]+2)).x) + + alpha_0k * vec3(texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0])).x, + texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0]+1)).x, + texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0]+2)).x) + + alpha_0k * vec3(texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1])).x, + texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1]+1)).x, + texelFetch(OsdVertexBuffer, int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1]+2)).x) + beta_0 * diagonal; for (uint x=1; x g_ptexIndicesBuffer : register( t3 ); +Buffer OsdPatchParamBuffer : register( t3 ); #define GetPatchLevel(primitiveID) \ - (g_ptexIndicesBuffer[primitiveID + LevelBase].y & 0xf) + (OsdPatchParamBuffer[primitiveID + PrimitiveIdBase].y & 0xf) #define OSD_COMPUTE_PTEX_COORD_HULL_SHADER \ { \ - int2 ptexIndex = g_ptexIndicesBuffer[ID + LevelBase].xy; \ + int2 ptexIndex = OsdPatchParamBuffer[ID + PrimitiveIdBase].xy; \ int faceID = ptexIndex.x; \ int lv = 1 << ((ptexIndex.y & 0xf) - ((ptexIndex.y >> 4) & 1)); \ int u = (ptexIndex.y >> 17) & 0x3ff; \ diff --git a/opensubdiv/osd/hlslPatchGregory.hlsl b/opensubdiv/osd/hlslPatchGregory.hlsl index c96c5846..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. // //---------------------------------------------------------- @@ -89,8 +57,8 @@ float csf(uint n, uint j) // Patches.TessVertexGregory //---------------------------------------------------------- -Buffer g_VertexBuffer : register( t0 ); -Buffer g_ValenceBuffer : register( t1 ); +Buffer OsdVertexBuffer : register( t0 ); +Buffer OsdValenceBuffer : register( t1 ); void vs_main_patches( in InputVertex input, uint vID : SV_VertexID, @@ -99,7 +67,7 @@ void vs_main_patches( in InputVertex input, output.hullPosition = mul(ModelViewMatrix, input.position).xyz; OSD_PATCH_CULL_COMPUTE_CLIPFLAGS(input.position); - int ivalence = g_ValenceBuffer[int(vID * (2 * OSD_MAX_VALENCE + 1))]; + int ivalence = OsdValenceBuffer[int(vID * (2 * OSD_MAX_VALENCE + 1))]; output.valence = ivalence; uint valence = uint(abs(ivalence)); @@ -119,11 +87,11 @@ void vs_main_patches( in InputVertex input, uint im=(i+valence-1)%valence; uint ip=(i+1)%valence; - uint idx_neighbor = uint(g_ValenceBuffer[int(vID * (2*OSD_MAX_VALENCE+1) + 2*i + 0 + 1)]); + uint idx_neighbor = uint(OsdValenceBuffer[int(vID * (2*OSD_MAX_VALENCE+1) + 2*i + 0 + 1)]); #ifdef OSD_PATCH_GREGORY_BOUNDARY bool isBoundaryNeighbor = false; - int valenceNeighbor = g_ValenceBuffer[int(idx_neighbor * (2*OSD_MAX_VALENCE+1))]; + int valenceNeighbor = OsdValenceBuffer[int(idx_neighbor * (2*OSD_MAX_VALENCE+1))]; if (valenceNeighbor < 0) { isBoundaryNeighbor = true; @@ -143,37 +111,37 @@ void vs_main_patches( in InputVertex input, #endif float3 neighbor = - float3(g_VertexBuffer[int(OSD_NUM_ELEMENTS*idx_neighbor)], - g_VertexBuffer[int(OSD_NUM_ELEMENTS*idx_neighbor+1)], - g_VertexBuffer[int(OSD_NUM_ELEMENTS*idx_neighbor+2)]); + float3(OsdVertexBuffer[int(OSD_NUM_ELEMENTS*idx_neighbor)], + OsdVertexBuffer[int(OSD_NUM_ELEMENTS*idx_neighbor+1)], + OsdVertexBuffer[int(OSD_NUM_ELEMENTS*idx_neighbor+2)]); - uint idx_diagonal = uint(g_ValenceBuffer[int(vID * (2*OSD_MAX_VALENCE+1) + 2*i + 1 + 1)]); + uint idx_diagonal = uint(OsdValenceBuffer[int(vID * (2*OSD_MAX_VALENCE+1) + 2*i + 1 + 1)]); float3 diagonal = - float3(g_VertexBuffer[int(OSD_NUM_ELEMENTS*idx_diagonal)], - g_VertexBuffer[int(OSD_NUM_ELEMENTS*idx_diagonal+1)], - g_VertexBuffer[int(OSD_NUM_ELEMENTS*idx_diagonal+2)]); + float3(OsdVertexBuffer[int(OSD_NUM_ELEMENTS*idx_diagonal)], + OsdVertexBuffer[int(OSD_NUM_ELEMENTS*idx_diagonal+1)], + OsdVertexBuffer[int(OSD_NUM_ELEMENTS*idx_diagonal+2)]); - uint idx_neighbor_p = uint(g_ValenceBuffer[int(vID * (2*OSD_MAX_VALENCE+1) + 2*ip + 0 + 1)]); + uint idx_neighbor_p = uint(OsdValenceBuffer[int(vID * (2*OSD_MAX_VALENCE+1) + 2*ip + 0 + 1)]); float3 neighbor_p = - float3(g_VertexBuffer[int(OSD_NUM_ELEMENTS*idx_neighbor_p)], - g_VertexBuffer[int(OSD_NUM_ELEMENTS*idx_neighbor_p+1)], - g_VertexBuffer[int(OSD_NUM_ELEMENTS*idx_neighbor_p+2)]); + float3(OsdVertexBuffer[int(OSD_NUM_ELEMENTS*idx_neighbor_p)], + OsdVertexBuffer[int(OSD_NUM_ELEMENTS*idx_neighbor_p+1)], + OsdVertexBuffer[int(OSD_NUM_ELEMENTS*idx_neighbor_p+2)]); - uint idx_neighbor_m = uint(g_ValenceBuffer[int(vID * (2*OSD_MAX_VALENCE+1) + 2*im + 0 + 1)]); + uint idx_neighbor_m = uint(OsdValenceBuffer[int(vID * (2*OSD_MAX_VALENCE+1) + 2*im + 0 + 1)]); float3 neighbor_m = - float3(g_VertexBuffer[int(OSD_NUM_ELEMENTS*idx_neighbor_m)], - g_VertexBuffer[int(OSD_NUM_ELEMENTS*idx_neighbor_m+1)], - g_VertexBuffer[int(OSD_NUM_ELEMENTS*idx_neighbor_m+2)]); + float3(OsdVertexBuffer[int(OSD_NUM_ELEMENTS*idx_neighbor_m)], + OsdVertexBuffer[int(OSD_NUM_ELEMENTS*idx_neighbor_m+1)], + OsdVertexBuffer[int(OSD_NUM_ELEMENTS*idx_neighbor_m+2)]); - uint idx_diagonal_m = uint(g_ValenceBuffer[int(vID * (2*OSD_MAX_VALENCE+1) + 2*im + 1 + 1)]); + uint idx_diagonal_m = uint(OsdValenceBuffer[int(vID * (2*OSD_MAX_VALENCE+1) + 2*im + 1 + 1)]); float3 diagonal_m = - float3(g_VertexBuffer[int(OSD_NUM_ELEMENTS*idx_diagonal_m)], - g_VertexBuffer[int(OSD_NUM_ELEMENTS*idx_diagonal_m+1)], - g_VertexBuffer[int(OSD_NUM_ELEMENTS*idx_diagonal_m+2)]); + float3(OsdVertexBuffer[int(OSD_NUM_ELEMENTS*idx_diagonal_m)], + OsdVertexBuffer[int(OSD_NUM_ELEMENTS*idx_diagonal_m+1)], + OsdVertexBuffer[int(OSD_NUM_ELEMENTS*idx_diagonal_m+2)]); f[i] = (pos * float(valence) + (neighbor_p + neighbor)*2.0f + diagonal) / (float(valence)+5.0f); @@ -206,24 +174,24 @@ void vs_main_patches( in InputVertex input, if (ivalence < 0) { if (valence > 2) { output.position = ( - float3(g_VertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0])], - g_VertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0]+1)], - g_VertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0]+2)]) + - float3(g_VertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1])], - g_VertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1]+1)], - g_VertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1]+2)]) + + float3(OsdVertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0])], + OsdVertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0]+1)], + OsdVertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0]+2)]) + + float3(OsdVertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1])], + OsdVertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1]+1)], + OsdVertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1]+2)]) + 4.0f * pos)/6.0f; } else { output.position = pos; } output.e0 = ( - float3(g_VertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0])], - g_VertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0]+1)], - g_VertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0]+2)]) - - float3(g_VertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1])], - g_VertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1]+1)], - g_VertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1]+2)]) + float3(OsdVertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0])], + OsdVertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0]+1)], + OsdVertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0]+2)]) - + float3(OsdVertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1])], + OsdVertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1]+1)], + OsdVertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1]+2)]) )/6.0; float k = float(float(valence) - 1.0f); //k is the number of faces @@ -234,20 +202,20 @@ void vs_main_patches( in InputVertex input, float beta_0 = s/(3.0f*k + c); - int idx_diagonal = g_ValenceBuffer[int((vID) * (2*OSD_MAX_VALENCE+1) + 2*zerothNeighbor + 1 + 1)]; + int idx_diagonal = OsdValenceBuffer[int((vID) * (2*OSD_MAX_VALENCE+1) + 2*zerothNeighbor + 1 + 1)]; idx_diagonal = abs(idx_diagonal); float3 diagonal = - float3(g_VertexBuffer[int(OSD_NUM_ELEMENTS*idx_diagonal)], - g_VertexBuffer[int(OSD_NUM_ELEMENTS*idx_diagonal+1)], - g_VertexBuffer[int(OSD_NUM_ELEMENTS*idx_diagonal+2)]); + float3(OsdVertexBuffer[int(OSD_NUM_ELEMENTS*idx_diagonal)], + OsdVertexBuffer[int(OSD_NUM_ELEMENTS*idx_diagonal+1)], + OsdVertexBuffer[int(OSD_NUM_ELEMENTS*idx_diagonal+2)]); output.e1 = gamma * pos + - alpha_0k * float3(g_VertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0])], - g_VertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0]+1)], - g_VertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0]+2)]) + - alpha_0k * float3(g_VertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1])], - g_VertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1]+1)], - g_VertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1]+2)]) + + alpha_0k * float3(OsdVertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0])], + OsdVertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0]+1)], + OsdVertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[0]+2)]) + + alpha_0k * float3(OsdVertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1])], + OsdVertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1]+1)], + OsdVertexBuffer[int(OSD_NUM_ELEMENTS*boundaryEdgeNeighbors[1]+2)]) + beta_0 * diagonal; for (uint x=1; x g_QuadOffsetBuffer : register( t2 ); +Buffer OsdQuadOffsetBuffer : register( t2 ); HS_CONSTANT_FUNC_OUT HSConstFunc( InputPatch patch, @@ -337,12 +305,12 @@ GregDomainVertex hs_main_patches( GregDomainVertex output; output.position = patch[ID].position; - uint start = uint(g_QuadOffsetBuffer[int(4*primitiveID+base + i)]) & 0x00ffu; - uint prev = uint(g_QuadOffsetBuffer[int(4*primitiveID+base + i)]) & 0xff00u; + uint start = uint(OsdQuadOffsetBuffer[int(4*primitiveID+base + i)]) & 0x00ffu; + uint prev = uint(OsdQuadOffsetBuffer[int(4*primitiveID+base + i)]) & 0xff00u; prev = uint(prev/256); - uint start_m = uint(g_QuadOffsetBuffer[int(4*primitiveID+base + im)]) & 0x00ffu; - uint prev_p = uint(g_QuadOffsetBuffer[int(4*primitiveID+base + ip)]) & 0xff00u; + uint start_m = uint(OsdQuadOffsetBuffer[int(4*primitiveID+base + im)]) & 0x00ffu; + uint prev_p = uint(OsdQuadOffsetBuffer[int(4*primitiveID+base + ip)]) & 0xff00u; prev_p = uint(prev_p/256); uint np = abs(patch[ip].valence); @@ -471,7 +439,7 @@ GregDomainVertex hs_main_patches( int patchLevel = GetPatchLevel(primitiveID); output.patchCoord = float4(0, 0, patchLevel+0.5f, - primitiveID+LevelBase+0.5f); + primitiveID+PrimitiveIdBase+0.5f); OSD_COMPUTE_PTEX_COORD_HULL_SHADER; 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..00549b9f 100644 --- a/opensubdiv/version.h +++ b/opensubdiv/version.h @@ -1,63 +1,31 @@ // -// Copyright (C) Pixar. All rights reserved. +// Copyright 2013 Pixar // -// This license governs use of the accompanying software. If you -// use the software, you accept this license. If you do not accept -// the license, do not use the software. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License +// and the following modification to it: Section 6 Trademarks. +// deleted and replaced with: // -// 1. Definitions -// The terms "reproduce," "reproduction," "derivative works," and -// "distribution" have the same meaning here as under U.S. -// copyright law. A "contribution" is the original software, or -// any additions or changes to the software. -// A "contributor" is any person or entity that distributes its -// contribution under this license. -// "Licensed patents" are a contributor's patent claims that read -// directly on its contribution. +// 6. Trademarks. This License does not grant permission to use the +// trade names, trademarks, service marks, or product names of the +// Licensor and its affiliates, except as required for reproducing +// the content of the NOTICE file. // -// 2. Grant of Rights -// (A) Copyright Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free copyright license to reproduce its contribution, -// prepare derivative works of its contribution, and distribute -// its contribution or any derivative works that you create. -// (B) Patent Grant- Subject to the terms of this license, -// including the license conditions and limitations in section 3, -// each contributor grants you a non-exclusive, worldwide, -// royalty-free license under its licensed patents to make, have -// made, use, sell, offer for sale, import, and/or otherwise -// dispose of its contribution in the software or derivative works -// of the contribution in the software. +// You may obtain a copy of the License at // -// 3. Conditions and Limitations -// (A) No Trademark License- This license does not grant you -// rights to use any contributor's name, logo, or trademarks. -// (B) If you bring a patent claim against any contributor over -// patents that you claim are infringed by the software, your -// patent license from such contributor to the software ends -// automatically. -// (C) If you distribute any portion of the software, you must -// retain all copyright, patent, trademark, and attribution -// notices that are present in the software. -// (D) If you distribute any portion of the software in source -// code form, you may do so only under this license by including a -// complete copy of this license with your distribution. If you -// distribute any portion of the software in compiled or object -// code form, you may only do so under a license that complies -// with this license. -// (E) The software is licensed "as-is." You bear the risk of -// using it. The contributors give no express warranties, -// guarantees or conditions. You may have additional consumer -// rights under your local laws which this license cannot change. -// To the extent permitted under your local laws, the contributors -// exclude the implied warranties of merchantability, fitness for -// a particular purpose and non-infringement. +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT 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 #define OPENSUBDIV_VERSION_H -#define OPENSUBDIV_VERSION v1_2_4 +#define OPENSUBDIV_VERSION v2_0_0 #endif /* OPENSUBDIV_VERSION_H */ diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt new file mode 100644 index 00000000..e20ce4c4 --- /dev/null +++ b/python/CMakeLists.txt @@ -0,0 +1,84 @@ +# +# 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(PYTHONINTERP_FOUND AND SWIG_FOUND) + message(STATUS "Python and SWIG found. Looking for numpy...") + execute_process( + COMMAND + ${PYTHON_EXECUTABLE} -c "import numpy; print numpy.get_include()" + OUTPUT_VARIABLE NUMPY_INCLUDE_PATH + RESULT_VARIABLE NUMPY_ERR + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + if(NUMPY_ERR) + message(WARNING "Unable to import numpy.") + else() + message(STATUS "Numpy package has been located.") + set(PYCMD ${PYTHON_EXECUTABLE} setup.py build ) + list(APPEND PYCMD --osddir=${LIBRARY_OUTPUT_PATH} ) + list(APPEND PYCMD --build-platlib=${PROJECT_BINARY_DIR}/python ) + list(APPEND PYCMD --build-temp=${PROJECT_BINARY_DIR}/temp ) + + # grab all compiler definitions and add '-D' + get_directory_property( TMP DIRECTORY ${CMAKE_SOURCE_DIR} COMPILE_DEFINITIONS ) + foreach(FLAG ${TMP}) + list(APPEND SWIG_COMPILE_FLAGS "-D${FLAG}") + endforeach() + + # append platform specific compiler flags + list(APPEND SWIG_COMPILE_FLAGS ${OSD_COMPILER_FLAGS}) + list(APPEND PYCMD --cxxflags="${SWIG_COMPILE_FLAGS}" ) + + # add Swig -builtin optimization build flag + if(SWIG_VERSION VERSION_GREATER 2.0.4) + list(APPEND SWIG_OPTS "-builtin") + endif() + list(APPEND PYCMD --swigopts="${SWIG_OPTS}" ) + + add_custom_command( + OUTPUT + ${CURRENT_BINARY_DIR}/osd + COMMAND + ${PYCMD} + WORKING_DIRECTORY + ${CMAKE_SOURCE_DIR}/python + DEPENDS + osd_static_cpu + osd_dynamic_cpu + COMMENT + "Building Python bindings with distutils" + ) + add_custom_target(python ALL + DEPENDS + ${CURRENT_BINARY_DIR}/osd + ) + install(CODE "execute_process( + WORKING_DIRECTORY + ../python + COMMAND + ${PYCMD} install --user)" + ) + endif() +endif() 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/baseline/catmark_flap2_level0.obj b/regression/hbr_regression/baseline/catmark_flap2_level0.obj new file mode 100644 index 00000000..21ef04dc --- /dev/null +++ b/regression/hbr_regression/baseline/catmark_flap2_level0.obj @@ -0,0 +1,46 @@ +# This file uses centimeters as units for non-parametric coordinates. +v -0.46875 -0.09375 0 +v -0.375 -0.125 0 +v -0.375 0 0 +v -0.5 0 0 +v -0.25 -0.125 0 +v -0.25 0 0 +v -0.125 0 0 +v -0.25 0.125 0 +v -0.375 0.125 0 +v -0.46875 0.09375 0 +v -0.125 -0.125 0 +v 0 -0.125 0 +v 0 0 0 +v 0.125 0 0 +v 0 0.125 0 +v -0.125 0.125 0 +v 0.125 -0.125 0 +v 0.25 -0.125 0 +v 0.25 0 0 +v 0.375 0 0 +v 0.25 0.125 0 +v 0.125 0.125 0 +v 0.375 -0.125 0 +v 0.46875 -0.09375 0 +v 0.5 0 0 +v 0.46875 0.09375 0 +v 0.375 0.125 0 +s off +f 0/0/0 1/1/1 2/2/2 3/3/3 +f 1/1/1 4/4/4 5/5/5 2/2/2 +f 2/2/2 5/5/5 7/7/7 8/8/8 +f 3/3/3 2/2/2 8/8/8 9/9/9 +f 4/4/4 10/10/10 6/6/6 5/5/5 +f 10/10/10 11/11/11 12/12/12 6/6/6 +f 6/6/6 12/12/12 14/14/14 15/15/15 +f 5/5/5 6/6/6 15/15/15 7/7/7 +f 11/11/11 16/16/16 13/13/13 12/12/12 +f 16/16/16 17/17/17 18/18/18 13/13/13 +f 13/13/13 18/18/18 20/20/20 21/21/21 +f 12/12/12 13/13/13 21/21/21 14/14/14 +f 17/17/17 22/22/22 19/19/19 18/18/18 +f 22/22/22 23/23/23 24/24/24 19/19/19 +f 19/19/19 24/24/24 25/25/25 26/26/26 +f 18/18/18 19/19/19 26/26/26 20/20/20 +; diff --git a/regression/hbr_regression/baseline/catmark_flap2_level1.obj b/regression/hbr_regression/baseline/catmark_flap2_level1.obj new file mode 100644 index 00000000..61adc6f5 --- /dev/null +++ b/regression/hbr_regression/baseline/catmark_flap2_level1.obj @@ -0,0 +1,152 @@ +# This file uses centimeters as units for non-parametric coordinates. +v -0.4609375 -0.0859375 0 +v -0.421875 -0.109375 0 +v -0.4296875 -0.0546875 0 +v -0.484375 -0.046875 0 +v -0.37109375 -0.12109375 0 +v -0.373046875 -0.060546875 0 +v -0.3125 -0.0625 0 +v -0.374023438 0 0 +v -0.3125 0.0625 0 +v -0.4296875 0.0546875 0 +v -0.43359375 0 0 +v -0.4921875 0 0 +v -0.3125 -0.125 0 +v -0.25 -0.125 0 +v -0.25 -0.0625 0 +v -0.1875 -0.0625 0 +v -0.25 0 0 +v -0.1875 0.0625 0 +v -0.3125 0 0 +v -0.373046875 0.060546875 0 +v -0.25 0.0625 0 +v -0.25 0.125 0 +v -0.3125 0.125 0 +v -0.37109375 0.12109375 0 +v -0.484375 0.046875 0 +v -0.421875 0.109375 0 +v -0.4609375 0.0859375 0 +v -0.1875 -0.125 0 +v -0.125 -0.125 0 +v -0.125 -0.0625 0 +v -0.0625 -0.0625 0 +v -0.125 0 0 +v -0.0625 0.0625 0 +v -0.1875 0 0 +v -0.0625 -0.125 0 +v 0 -0.125 0 +v 0 -0.0625 0 +v 0.0625 -0.0625 0 +v 0 0 0 +v 0.0625 0.0625 0 +v -0.0625 0 0 +v -0.125 0.0625 0 +v 0 0.0625 0 +v 0 0.125 0 +v -0.0625 0.125 0 +v -0.125 0.125 0 +v -0.1875 0.125 0 +v 0.0625 -0.125 0 +v 0.125 -0.125 0 +v 0.125 -0.0625 0 +v 0.1875 -0.0625 0 +v 0.125 0 0 +v 0.1875 0.0625 0 +v 0.0625 0 0 +v 0.1875 -0.125 0 +v 0.25 -0.125 0 +v 0.25 -0.0625 0 +v 0.3125 -0.0625 0 +v 0.25 0 0 +v 0.3125 0.0625 0 +v 0.1875 0 0 +v 0.125 0.0625 0 +v 0.25 0.0625 0 +v 0.25 0.125 0 +v 0.1875 0.125 0 +v 0.125 0.125 0 +v 0.0625 0.125 0 +v 0.3125 -0.125 0 +v 0.37109375 -0.12109375 0 +v 0.373046875 -0.060546875 0 +v 0.4296875 -0.0546875 0 +v 0.374023438 0 0 +v 0.4296875 0.0546875 0 +v 0.3125 0 0 +v 0.421875 -0.109375 0 +v 0.4609375 -0.0859375 0 +v 0.484375 -0.046875 0 +v 0.4921875 0 0 +v 0.43359375 0 0 +v 0.373046875 0.060546875 0 +v 0.484375 0.046875 0 +v 0.4609375 0.0859375 0 +v 0.421875 0.109375 0 +v 0.37109375 0.12109375 0 +v 0.3125 0.125 0 +s off +f 0/0/0 1/1/1 2/2/2 3/3/3 +f 1/1/1 4/4/4 5/5/5 2/2/2 +f 2/2/2 5/5/5 7/7/7 10/10/10 +f 3/3/3 2/2/2 10/10/10 11/11/11 +f 4/4/4 12/12/12 6/6/6 5/5/5 +f 12/12/12 13/13/13 14/14/14 6/6/6 +f 6/6/6 14/14/14 16/16/16 18/18/18 +f 5/5/5 6/6/6 18/18/18 7/7/7 +f 7/7/7 18/18/18 8/8/8 19/19/19 +f 18/18/18 16/16/16 20/20/20 8/8/8 +f 8/8/8 20/20/20 21/21/21 22/22/22 +f 19/19/19 8/8/8 22/22/22 23/23/23 +f 11/11/11 10/10/10 9/9/9 24/24/24 +f 10/10/10 7/7/7 19/19/19 9/9/9 +f 9/9/9 19/19/19 23/23/23 25/25/25 +f 24/24/24 9/9/9 25/25/25 26/26/26 +f 13/13/13 27/27/27 15/15/15 14/14/14 +f 27/27/27 28/28/28 29/29/29 15/15/15 +f 15/15/15 29/29/29 31/31/31 33/33/33 +f 14/14/14 15/15/15 33/33/33 16/16/16 +f 28/28/28 34/34/34 30/30/30 29/29/29 +f 34/34/34 35/35/35 36/36/36 30/30/30 +f 30/30/30 36/36/36 38/38/38 40/40/40 +f 29/29/29 30/30/30 40/40/40 31/31/31 +f 31/31/31 40/40/40 32/32/32 41/41/41 +f 40/40/40 38/38/38 42/42/42 32/32/32 +f 32/32/32 42/42/42 43/43/43 44/44/44 +f 41/41/41 32/32/32 44/44/44 45/45/45 +f 16/16/16 33/33/33 17/17/17 20/20/20 +f 33/33/33 31/31/31 41/41/41 17/17/17 +f 17/17/17 41/41/41 45/45/45 46/46/46 +f 20/20/20 17/17/17 46/46/46 21/21/21 +f 35/35/35 47/47/47 37/37/37 36/36/36 +f 47/47/47 48/48/48 49/49/49 37/37/37 +f 37/37/37 49/49/49 51/51/51 53/53/53 +f 36/36/36 37/37/37 53/53/53 38/38/38 +f 48/48/48 54/54/54 50/50/50 49/49/49 +f 54/54/54 55/55/55 56/56/56 50/50/50 +f 50/50/50 56/56/56 58/58/58 60/60/60 +f 49/49/49 50/50/50 60/60/60 51/51/51 +f 51/51/51 60/60/60 52/52/52 61/61/61 +f 60/60/60 58/58/58 62/62/62 52/52/52 +f 52/52/52 62/62/62 63/63/63 64/64/64 +f 61/61/61 52/52/52 64/64/64 65/65/65 +f 38/38/38 53/53/53 39/39/39 42/42/42 +f 53/53/53 51/51/51 61/61/61 39/39/39 +f 39/39/39 61/61/61 65/65/65 66/66/66 +f 42/42/42 39/39/39 66/66/66 43/43/43 +f 55/55/55 67/67/67 57/57/57 56/56/56 +f 67/67/67 68/68/68 69/69/69 57/57/57 +f 57/57/57 69/69/69 71/71/71 73/73/73 +f 56/56/56 57/57/57 73/73/73 58/58/58 +f 68/68/68 74/74/74 70/70/70 69/69/69 +f 74/74/74 75/75/75 76/76/76 70/70/70 +f 70/70/70 76/76/76 77/77/77 78/78/78 +f 69/69/69 70/70/70 78/78/78 71/71/71 +f 71/71/71 78/78/78 72/72/72 79/79/79 +f 78/78/78 77/77/77 80/80/80 72/72/72 +f 72/72/72 80/80/80 81/81/81 82/82/82 +f 79/79/79 72/72/72 82/82/82 83/83/83 +f 58/58/58 73/73/73 59/59/59 62/62/62 +f 73/73/73 71/71/71 79/79/79 59/59/59 +f 59/59/59 79/79/79 83/83/83 84/84/84 +f 62/62/62 59/59/59 84/84/84 63/63/63 +; diff --git a/regression/hbr_regression/baseline/catmark_flap2_level2.obj b/regression/hbr_regression/baseline/catmark_flap2_level2.obj new file mode 100644 index 00000000..e0fd1192 --- /dev/null +++ b/regression/hbr_regression/baseline/catmark_flap2_level2.obj @@ -0,0 +1,556 @@ +# This file uses centimeters as units for non-parametric coordinates. +v -0.458984375 -0.083984375 0 +v -0.44140625 -0.09765625 0 +v -0.44921875 -0.07421875 0 +v -0.47265625 -0.06640625 0 +v -0.420410156 -0.107910156 0 +v -0.424926758 -0.0811767578 0 +v -0.398925781 -0.0864257812 0 +v -0.428817749 -0.0543212891 0 +v -0.402587891 -0.0288085938 0 +v -0.459960938 -0.025390625 0 +v -0.455810547 -0.0502929688 0 +v -0.482421875 -0.0458984375 0 +v -0.396484375 -0.115234375 0 +v -0.370117188 -0.120117188 0 +v -0.371337891 -0.0900878906 0 +v -0.342285156 -0.0922851562 0 +v -0.372406006 -0.0600585938 0 +v -0.343017578 -0.0307617188 0 +v -0.401062012 -0.0576171875 0 +v -0.43145752 -0.0272216797 0 +v -0.373168945 -0.0300292969 0 +v -0.373474121 0 0 +v -0.343017578 0.0307617188 0 +v -0.402587891 0.0288085938 0 +v -0.403198242 0 0 +v -0.4324646 0 0 +v -0.459960938 0.025390625 0 +v -0.48828125 -0.0234375 0 +v -0.461425781 0 0 +v -0.490234375 0 0 +v -0.341796875 -0.123046875 0 +v -0.312011719 -0.124511719 0 +v -0.312133789 -0.0933837891 0 +v -0.28125 -0.09375 0 +v -0.312240601 -0.0622558594 0 +v -0.28125 -0.03125 0 +v -0.342712402 -0.0615234375 0 +v -0.28125 -0.125 0 +v -0.25 -0.125 0 +v -0.25 -0.09375 0 +v -0.21875 -0.09375 0 +v -0.25 -0.0625 0 +v -0.21875 -0.03125 0 +v -0.28125 -0.0625 0 +v -0.312316895 -0.0311279297 0 +v -0.25 -0.03125 0 +v -0.25 0 0 +v -0.21875 0.03125 0 +v -0.28125 0.03125 0 +v -0.28125 0 0 +v -0.312347412 0 0 +v -0.343139648 0 0 +v -0.373168945 0.0300292969 0 +v -0.312316895 0.0311279297 0 +v -0.312240601 0.0622558594 0 +v -0.28125 0.09375 0 +v -0.342285156 0.0922851562 0 +v -0.342712402 0.0615234375 0 +v -0.372406006 0.0600585938 0 +v -0.398925781 0.0864257812 0 +v -0.25 0.03125 0 +v -0.25 0.0625 0 +v -0.21875 0.09375 0 +v -0.28125 0.0625 0 +v -0.312133789 0.0933837891 0 +v -0.25 0.09375 0 +v -0.25 0.125 0 +v -0.28125 0.125 0 +v -0.312011719 0.124511719 0 +v -0.371337891 0.0900878906 0 +v -0.341796875 0.123046875 0 +v -0.370117188 0.120117188 0 +v -0.48828125 0.0234375 0 +v -0.43145752 0.0272216797 0 +v -0.428817749 0.0543212891 0 +v -0.44921875 0.07421875 0 +v -0.455810547 0.0502929688 0 +v -0.482421875 0.0458984375 0 +v -0.401062012 0.0576171875 0 +v -0.424926758 0.0811767578 0 +v -0.396484375 0.115234375 0 +v -0.420410156 0.107910156 0 +v -0.47265625 0.06640625 0 +v -0.44140625 0.09765625 0 +v -0.458984375 0.083984375 0 +v -0.21875 -0.125 0 +v -0.1875 -0.125 0 +v -0.1875 -0.09375 0 +v -0.15625 -0.09375 0 +v -0.1875 -0.0625 0 +v -0.15625 -0.03125 0 +v -0.21875 -0.0625 0 +v -0.15625 -0.125 0 +v -0.125 -0.125 0 +v -0.125 -0.09375 0 +v -0.09375 -0.09375 0 +v -0.125 -0.0625 0 +v -0.09375 -0.03125 0 +v -0.15625 -0.0625 0 +v -0.1875 -0.03125 0 +v -0.125 -0.03125 0 +v -0.125 0 0 +v -0.09375 0.03125 0 +v -0.15625 0.03125 0 +v -0.15625 0 0 +v -0.1875 0 0 +v -0.21875 0 0 +v -0.09375 -0.125 0 +v -0.0625 -0.125 0 +v -0.0625 -0.09375 0 +v -0.03125 -0.09375 0 +v -0.0625 -0.0625 0 +v -0.03125 -0.03125 0 +v -0.09375 -0.0625 0 +v -0.03125 -0.125 0 +v 0 -0.125 0 +v 0 -0.09375 0 +v 0.03125 -0.09375 0 +v 0 -0.0625 0 +v 0.03125 -0.03125 0 +v -0.03125 -0.0625 0 +v -0.0625 -0.03125 0 +v 0 -0.03125 0 +v 0 0 0 +v 0.03125 0.03125 0 +v -0.03125 0.03125 0 +v -0.03125 0 0 +v -0.0625 0 0 +v -0.09375 0 0 +v -0.125 0.03125 0 +v -0.0625 0.03125 0 +v -0.0625 0.0625 0 +v -0.03125 0.09375 0 +v -0.09375 0.09375 0 +v -0.09375 0.0625 0 +v -0.125 0.0625 0 +v -0.15625 0.09375 0 +v 0 0.03125 0 +v 0 0.0625 0 +v 0.03125 0.09375 0 +v -0.03125 0.0625 0 +v -0.0625 0.09375 0 +v 0 0.09375 0 +v 0 0.125 0 +v -0.03125 0.125 0 +v -0.0625 0.125 0 +v -0.125 0.09375 0 +v -0.09375 0.125 0 +v -0.125 0.125 0 +v -0.1875 0.03125 0 +v -0.1875 0.0625 0 +v -0.21875 0.0625 0 +v -0.15625 0.0625 0 +v -0.1875 0.09375 0 +v -0.15625 0.125 0 +v -0.1875 0.125 0 +v -0.21875 0.125 0 +v 0.03125 -0.125 0 +v 0.0625 -0.125 0 +v 0.0625 -0.09375 0 +v 0.09375 -0.09375 0 +v 0.0625 -0.0625 0 +v 0.09375 -0.03125 0 +v 0.03125 -0.0625 0 +v 0.09375 -0.125 0 +v 0.125 -0.125 0 +v 0.125 -0.09375 0 +v 0.15625 -0.09375 0 +v 0.125 -0.0625 0 +v 0.15625 -0.03125 0 +v 0.09375 -0.0625 0 +v 0.0625 -0.03125 0 +v 0.125 -0.03125 0 +v 0.125 0 0 +v 0.15625 0.03125 0 +v 0.09375 0.03125 0 +v 0.09375 0 0 +v 0.0625 0 0 +v 0.03125 0 0 +v 0.15625 -0.125 0 +v 0.1875 -0.125 0 +v 0.1875 -0.09375 0 +v 0.21875 -0.09375 0 +v 0.1875 -0.0625 0 +v 0.21875 -0.03125 0 +v 0.15625 -0.0625 0 +v 0.21875 -0.125 0 +v 0.25 -0.125 0 +v 0.25 -0.09375 0 +v 0.28125 -0.09375 0 +v 0.25 -0.0625 0 +v 0.28125 -0.03125 0 +v 0.21875 -0.0625 0 +v 0.1875 -0.03125 0 +v 0.25 -0.03125 0 +v 0.25 0 0 +v 0.28125 0.03125 0 +v 0.21875 0.03125 0 +v 0.21875 0 0 +v 0.1875 0 0 +v 0.15625 0 0 +v 0.125 0.03125 0 +v 0.1875 0.03125 0 +v 0.1875 0.0625 0 +v 0.21875 0.09375 0 +v 0.15625 0.09375 0 +v 0.15625 0.0625 0 +v 0.125 0.0625 0 +v 0.09375 0.09375 0 +v 0.25 0.03125 0 +v 0.25 0.0625 0 +v 0.28125 0.09375 0 +v 0.21875 0.0625 0 +v 0.1875 0.09375 0 +v 0.25 0.09375 0 +v 0.25 0.125 0 +v 0.21875 0.125 0 +v 0.1875 0.125 0 +v 0.125 0.09375 0 +v 0.15625 0.125 0 +v 0.125 0.125 0 +v 0.0625 0.03125 0 +v 0.0625 0.0625 0 +v 0.03125 0.0625 0 +v 0.09375 0.0625 0 +v 0.0625 0.09375 0 +v 0.09375 0.125 0 +v 0.0625 0.125 0 +v 0.03125 0.125 0 +v 0.28125 -0.125 0 +v 0.312011719 -0.124511719 0 +v 0.312133789 -0.0933837891 0 +v 0.342285156 -0.0922851562 0 +v 0.312240601 -0.0622558594 0 +v 0.343017578 -0.0307617188 0 +v 0.28125 -0.0625 0 +v 0.341796875 -0.123046875 0 +v 0.370117188 -0.120117188 0 +v 0.371337891 -0.0900878906 0 +v 0.398925781 -0.0864257812 0 +v 0.372406006 -0.0600585938 0 +v 0.402587891 -0.0288085938 0 +v 0.342712402 -0.0615234375 0 +v 0.312316895 -0.0311279297 0 +v 0.373168945 -0.0300292969 0 +v 0.373474121 0 0 +v 0.402587891 0.0288085938 0 +v 0.343017578 0.0307617188 0 +v 0.343139648 0 0 +v 0.312347412 0 0 +v 0.28125 0 0 +v 0.396484375 -0.115234375 0 +v 0.420410156 -0.107910156 0 +v 0.424926758 -0.0811767578 0 +v 0.44921875 -0.07421875 0 +v 0.428817749 -0.0543212891 0 +v 0.459960938 -0.025390625 0 +v 0.401062012 -0.0576171875 0 +v 0.44140625 -0.09765625 0 +v 0.458984375 -0.083984375 0 +v 0.47265625 -0.06640625 0 +v 0.482421875 -0.0458984375 0 +v 0.455810547 -0.0502929688 0 +v 0.43145752 -0.0272216797 0 +v 0.48828125 -0.0234375 0 +v 0.490234375 0 0 +v 0.461425781 0 0 +v 0.459960938 0.025390625 0 +v 0.4324646 0 0 +v 0.403198242 0 0 +v 0.373168945 0.0300292969 0 +v 0.43145752 0.0272216797 0 +v 0.428817749 0.0543212891 0 +v 0.44921875 0.07421875 0 +v 0.398925781 0.0864257812 0 +v 0.401062012 0.0576171875 0 +v 0.372406006 0.0600585938 0 +v 0.342285156 0.0922851562 0 +v 0.48828125 0.0234375 0 +v 0.482421875 0.0458984375 0 +v 0.455810547 0.0502929688 0 +v 0.424926758 0.0811767578 0 +v 0.47265625 0.06640625 0 +v 0.458984375 0.083984375 0 +v 0.44140625 0.09765625 0 +v 0.420410156 0.107910156 0 +v 0.371337891 0.0900878906 0 +v 0.396484375 0.115234375 0 +v 0.370117188 0.120117188 0 +v 0.312316895 0.0311279297 0 +v 0.312240601 0.0622558594 0 +v 0.28125 0.0625 0 +v 0.342712402 0.0615234375 0 +v 0.312133789 0.0933837891 0 +v 0.341796875 0.123046875 0 +v 0.312011719 0.124511719 0 +v 0.28125 0.125 0 +s off +f 0/0/0 1/1/1 2/2/2 3/3/3 +f 1/1/1 4/4/4 5/5/5 2/2/2 +f 2/2/2 5/5/5 7/7/7 10/10/10 +f 3/3/3 2/2/2 10/10/10 11/11/11 +f 4/4/4 12/12/12 6/6/6 5/5/5 +f 12/12/12 13/13/13 14/14/14 6/6/6 +f 6/6/6 14/14/14 16/16/16 18/18/18 +f 5/5/5 6/6/6 18/18/18 7/7/7 +f 7/7/7 18/18/18 8/8/8 19/19/19 +f 18/18/18 16/16/16 20/20/20 8/8/8 +f 8/8/8 20/20/20 21/21/21 24/24/24 +f 19/19/19 8/8/8 24/24/24 25/25/25 +f 11/11/11 10/10/10 9/9/9 27/27/27 +f 10/10/10 7/7/7 19/19/19 9/9/9 +f 9/9/9 19/19/19 25/25/25 28/28/28 +f 27/27/27 9/9/9 28/28/28 29/29/29 +f 13/13/13 30/30/30 15/15/15 14/14/14 +f 30/30/30 31/31/31 32/32/32 15/15/15 +f 15/15/15 32/32/32 34/34/34 36/36/36 +f 14/14/14 15/15/15 36/36/36 16/16/16 +f 31/31/31 37/37/37 33/33/33 32/32/32 +f 37/37/37 38/38/38 39/39/39 33/33/33 +f 33/33/33 39/39/39 41/41/41 43/43/43 +f 32/32/32 33/33/33 43/43/43 34/34/34 +f 34/34/34 43/43/43 35/35/35 44/44/44 +f 43/43/43 41/41/41 45/45/45 35/35/35 +f 35/35/35 45/45/45 46/46/46 49/49/49 +f 44/44/44 35/35/35 49/49/49 50/50/50 +f 16/16/16 36/36/36 17/17/17 20/20/20 +f 36/36/36 34/34/34 44/44/44 17/17/17 +f 17/17/17 44/44/44 50/50/50 51/51/51 +f 20/20/20 17/17/17 51/51/51 21/21/21 +f 21/21/21 51/51/51 22/22/22 52/52/52 +f 51/51/51 50/50/50 53/53/53 22/22/22 +f 22/22/22 53/53/53 54/54/54 57/57/57 +f 52/52/52 22/22/22 57/57/57 58/58/58 +f 50/50/50 49/49/49 48/48/48 53/53/53 +f 49/49/49 46/46/46 60/60/60 48/48/48 +f 48/48/48 60/60/60 61/61/61 63/63/63 +f 53/53/53 48/48/48 63/63/63 54/54/54 +f 54/54/54 63/63/63 55/55/55 64/64/64 +f 63/63/63 61/61/61 65/65/65 55/55/55 +f 55/55/55 65/65/65 66/66/66 67/67/67 +f 64/64/64 55/55/55 67/67/67 68/68/68 +f 58/58/58 57/57/57 56/56/56 69/69/69 +f 57/57/57 54/54/54 64/64/64 56/56/56 +f 56/56/56 64/64/64 68/68/68 70/70/70 +f 69/69/69 56/56/56 70/70/70 71/71/71 +f 29/29/29 28/28/28 26/26/26 72/72/72 +f 28/28/28 25/25/25 73/73/73 26/26/26 +f 26/26/26 73/73/73 74/74/74 76/76/76 +f 72/72/72 26/26/26 76/76/76 77/77/77 +f 25/25/25 24/24/24 23/23/23 73/73/73 +f 24/24/24 21/21/21 52/52/52 23/23/23 +f 23/23/23 52/52/52 58/58/58 78/78/78 +f 73/73/73 23/23/23 78/78/78 74/74/74 +f 74/74/74 78/78/78 59/59/59 79/79/79 +f 78/78/78 58/58/58 69/69/69 59/59/59 +f 59/59/59 69/69/69 71/71/71 80/80/80 +f 79/79/79 59/59/59 80/80/80 81/81/81 +f 77/77/77 76/76/76 75/75/75 82/82/82 +f 76/76/76 74/74/74 79/79/79 75/75/75 +f 75/75/75 79/79/79 81/81/81 83/83/83 +f 82/82/82 75/75/75 83/83/83 84/84/84 +f 38/38/38 85/85/85 40/40/40 39/39/39 +f 85/85/85 86/86/86 87/87/87 40/40/40 +f 40/40/40 87/87/87 89/89/89 91/91/91 +f 39/39/39 40/40/40 91/91/91 41/41/41 +f 86/86/86 92/92/92 88/88/88 87/87/87 +f 92/92/92 93/93/93 94/94/94 88/88/88 +f 88/88/88 94/94/94 96/96/96 98/98/98 +f 87/87/87 88/88/88 98/98/98 89/89/89 +f 89/89/89 98/98/98 90/90/90 99/99/99 +f 98/98/98 96/96/96 100/100/100 90/90/90 +f 90/90/90 100/100/100 101/101/101 104/104/104 +f 99/99/99 90/90/90 104/104/104 105/105/105 +f 41/41/41 91/91/91 42/42/42 45/45/45 +f 91/91/91 89/89/89 99/99/99 42/42/42 +f 42/42/42 99/99/99 105/105/105 106/106/106 +f 45/45/45 42/42/42 106/106/106 46/46/46 +f 93/93/93 107/107/107 95/95/95 94/94/94 +f 107/107/107 108/108/108 109/109/109 95/95/95 +f 95/95/95 109/109/109 111/111/111 113/113/113 +f 94/94/94 95/95/95 113/113/113 96/96/96 +f 108/108/108 114/114/114 110/110/110 109/109/109 +f 114/114/114 115/115/115 116/116/116 110/110/110 +f 110/110/110 116/116/116 118/118/118 120/120/120 +f 109/109/109 110/110/110 120/120/120 111/111/111 +f 111/111/111 120/120/120 112/112/112 121/121/121 +f 120/120/120 118/118/118 122/122/122 112/112/112 +f 112/112/112 122/122/122 123/123/123 126/126/126 +f 121/121/121 112/112/112 126/126/126 127/127/127 +f 96/96/96 113/113/113 97/97/97 100/100/100 +f 113/113/113 111/111/111 121/121/121 97/97/97 +f 97/97/97 121/121/121 127/127/127 128/128/128 +f 100/100/100 97/97/97 128/128/128 101/101/101 +f 101/101/101 128/128/128 102/102/102 129/129/129 +f 128/128/128 127/127/127 130/130/130 102/102/102 +f 102/102/102 130/130/130 131/131/131 134/134/134 +f 129/129/129 102/102/102 134/134/134 135/135/135 +f 127/127/127 126/126/126 125/125/125 130/130/130 +f 126/126/126 123/123/123 137/137/137 125/125/125 +f 125/125/125 137/137/137 138/138/138 140/140/140 +f 130/130/130 125/125/125 140/140/140 131/131/131 +f 131/131/131 140/140/140 132/132/132 141/141/141 +f 140/140/140 138/138/138 142/142/142 132/132/132 +f 132/132/132 142/142/142 143/143/143 144/144/144 +f 141/141/141 132/132/132 144/144/144 145/145/145 +f 135/135/135 134/134/134 133/133/133 146/146/146 +f 134/134/134 131/131/131 141/141/141 133/133/133 +f 133/133/133 141/141/141 145/145/145 147/147/147 +f 146/146/146 133/133/133 147/147/147 148/148/148 +f 46/46/46 106/106/106 47/47/47 60/60/60 +f 106/106/106 105/105/105 149/149/149 47/47/47 +f 47/47/47 149/149/149 150/150/150 151/151/151 +f 60/60/60 47/47/47 151/151/151 61/61/61 +f 105/105/105 104/104/104 103/103/103 149/149/149 +f 104/104/104 101/101/101 129/129/129 103/103/103 +f 103/103/103 129/129/129 135/135/135 152/152/152 +f 149/149/149 103/103/103 152/152/152 150/150/150 +f 150/150/150 152/152/152 136/136/136 153/153/153 +f 152/152/152 135/135/135 146/146/146 136/136/136 +f 136/136/136 146/146/146 148/148/148 154/154/154 +f 153/153/153 136/136/136 154/154/154 155/155/155 +f 61/61/61 151/151/151 62/62/62 65/65/65 +f 151/151/151 150/150/150 153/153/153 62/62/62 +f 62/62/62 153/153/153 155/155/155 156/156/156 +f 65/65/65 62/62/62 156/156/156 66/66/66 +f 115/115/115 157/157/157 117/117/117 116/116/116 +f 157/157/157 158/158/158 159/159/159 117/117/117 +f 117/117/117 159/159/159 161/161/161 163/163/163 +f 116/116/116 117/117/117 163/163/163 118/118/118 +f 158/158/158 164/164/164 160/160/160 159/159/159 +f 164/164/164 165/165/165 166/166/166 160/160/160 +f 160/160/160 166/166/166 168/168/168 170/170/170 +f 159/159/159 160/160/160 170/170/170 161/161/161 +f 161/161/161 170/170/170 162/162/162 171/171/171 +f 170/170/170 168/168/168 172/172/172 162/162/162 +f 162/162/162 172/172/172 173/173/173 176/176/176 +f 171/171/171 162/162/162 176/176/176 177/177/177 +f 118/118/118 163/163/163 119/119/119 122/122/122 +f 163/163/163 161/161/161 171/171/171 119/119/119 +f 119/119/119 171/171/171 177/177/177 178/178/178 +f 122/122/122 119/119/119 178/178/178 123/123/123 +f 165/165/165 179/179/179 167/167/167 166/166/166 +f 179/179/179 180/180/180 181/181/181 167/167/167 +f 167/167/167 181/181/181 183/183/183 185/185/185 +f 166/166/166 167/167/167 185/185/185 168/168/168 +f 180/180/180 186/186/186 182/182/182 181/181/181 +f 186/186/186 187/187/187 188/188/188 182/182/182 +f 182/182/182 188/188/188 190/190/190 192/192/192 +f 181/181/181 182/182/182 192/192/192 183/183/183 +f 183/183/183 192/192/192 184/184/184 193/193/193 +f 192/192/192 190/190/190 194/194/194 184/184/184 +f 184/184/184 194/194/194 195/195/195 198/198/198 +f 193/193/193 184/184/184 198/198/198 199/199/199 +f 168/168/168 185/185/185 169/169/169 172/172/172 +f 185/185/185 183/183/183 193/193/193 169/169/169 +f 169/169/169 193/193/193 199/199/199 200/200/200 +f 172/172/172 169/169/169 200/200/200 173/173/173 +f 173/173/173 200/200/200 174/174/174 201/201/201 +f 200/200/200 199/199/199 202/202/202 174/174/174 +f 174/174/174 202/202/202 203/203/203 206/206/206 +f 201/201/201 174/174/174 206/206/206 207/207/207 +f 199/199/199 198/198/198 197/197/197 202/202/202 +f 198/198/198 195/195/195 209/209/209 197/197/197 +f 197/197/197 209/209/209 210/210/210 212/212/212 +f 202/202/202 197/197/197 212/212/212 203/203/203 +f 203/203/203 212/212/212 204/204/204 213/213/213 +f 212/212/212 210/210/210 214/214/214 204/204/204 +f 204/204/204 214/214/214 215/215/215 216/216/216 +f 213/213/213 204/204/204 216/216/216 217/217/217 +f 207/207/207 206/206/206 205/205/205 218/218/218 +f 206/206/206 203/203/203 213/213/213 205/205/205 +f 205/205/205 213/213/213 217/217/217 219/219/219 +f 218/218/218 205/205/205 219/219/219 220/220/220 +f 123/123/123 178/178/178 124/124/124 137/137/137 +f 178/178/178 177/177/177 221/221/221 124/124/124 +f 124/124/124 221/221/221 222/222/222 223/223/223 +f 137/137/137 124/124/124 223/223/223 138/138/138 +f 177/177/177 176/176/176 175/175/175 221/221/221 +f 176/176/176 173/173/173 201/201/201 175/175/175 +f 175/175/175 201/201/201 207/207/207 224/224/224 +f 221/221/221 175/175/175 224/224/224 222/222/222 +f 222/222/222 224/224/224 208/208/208 225/225/225 +f 224/224/224 207/207/207 218/218/218 208/208/208 +f 208/208/208 218/218/218 220/220/220 226/226/226 +f 225/225/225 208/208/208 226/226/226 227/227/227 +f 138/138/138 223/223/223 139/139/139 142/142/142 +f 223/223/223 222/222/222 225/225/225 139/139/139 +f 139/139/139 225/225/225 227/227/227 228/228/228 +f 142/142/142 139/139/139 228/228/228 143/143/143 +f 187/187/187 229/229/229 189/189/189 188/188/188 +f 229/229/229 230/230/230 231/231/231 189/189/189 +f 189/189/189 231/231/231 233/233/233 235/235/235 +f 188/188/188 189/189/189 235/235/235 190/190/190 +f 230/230/230 236/236/236 232/232/232 231/231/231 +f 236/236/236 237/237/237 238/238/238 232/232/232 +f 232/232/232 238/238/238 240/240/240 242/242/242 +f 231/231/231 232/232/232 242/242/242 233/233/233 +f 233/233/233 242/242/242 234/234/234 243/243/243 +f 242/242/242 240/240/240 244/244/244 234/234/234 +f 234/234/234 244/244/244 245/245/245 248/248/248 +f 243/243/243 234/234/234 248/248/248 249/249/249 +f 190/190/190 235/235/235 191/191/191 194/194/194 +f 235/235/235 233/233/233 243/243/243 191/191/191 +f 191/191/191 243/243/243 249/249/249 250/250/250 +f 194/194/194 191/191/191 250/250/250 195/195/195 +f 237/237/237 251/251/251 239/239/239 238/238/238 +f 251/251/251 252/252/252 253/253/253 239/239/239 +f 239/239/239 253/253/253 255/255/255 257/257/257 +f 238/238/238 239/239/239 257/257/257 240/240/240 +f 252/252/252 258/258/258 254/254/254 253/253/253 +f 258/258/258 259/259/259 260/260/260 254/254/254 +f 254/254/254 260/260/260 261/261/261 262/262/262 +f 253/253/253 254/254/254 262/262/262 255/255/255 +f 255/255/255 262/262/262 256/256/256 263/263/263 +f 262/262/262 261/261/261 264/264/264 256/256/256 +f 256/256/256 264/264/264 265/265/265 266/266/266 +f 263/263/263 256/256/256 266/266/266 268/268/268 +f 240/240/240 257/257/257 241/241/241 244/244/244 +f 257/257/257 255/255/255 263/263/263 241/241/241 +f 241/241/241 263/263/263 268/268/268 269/269/269 +f 244/244/244 241/241/241 269/269/269 245/245/245 +f 245/245/245 269/269/269 246/246/246 270/270/270 +f 269/269/269 268/268/268 271/271/271 246/246/246 +f 246/246/246 271/271/271 272/272/272 275/275/275 +f 270/270/270 246/246/246 275/275/275 276/276/276 +f 268/268/268 266/266/266 267/267/267 271/271/271 +f 266/266/266 265/265/265 278/278/278 267/267/267 +f 267/267/267 278/278/278 279/279/279 280/280/280 +f 271/271/271 267/267/267 280/280/280 272/272/272 +f 272/272/272 280/280/280 273/273/273 281/281/281 +f 280/280/280 279/279/279 282/282/282 273/273/273 +f 273/273/273 282/282/282 283/283/283 284/284/284 +f 281/281/281 273/273/273 284/284/284 285/285/285 +f 276/276/276 275/275/275 274/274/274 286/286/286 +f 275/275/275 272/272/272 281/281/281 274/274/274 +f 274/274/274 281/281/281 285/285/285 287/287/287 +f 286/286/286 274/274/274 287/287/287 288/288/288 +f 195/195/195 250/250/250 196/196/196 209/209/209 +f 250/250/250 249/249/249 289/289/289 196/196/196 +f 196/196/196 289/289/289 290/290/290 291/291/291 +f 209/209/209 196/196/196 291/291/291 210/210/210 +f 249/249/249 248/248/248 247/247/247 289/289/289 +f 248/248/248 245/245/245 270/270/270 247/247/247 +f 247/247/247 270/270/270 276/276/276 292/292/292 +f 289/289/289 247/247/247 292/292/292 290/290/290 +f 290/290/290 292/292/292 277/277/277 293/293/293 +f 292/292/292 276/276/276 286/286/286 277/277/277 +f 277/277/277 286/286/286 288/288/288 294/294/294 +f 293/293/293 277/277/277 294/294/294 295/295/295 +f 210/210/210 291/291/291 211/211/211 214/214/214 +f 291/291/291 290/290/290 293/293/293 211/211/211 +f 211/211/211 293/293/293 295/295/295 296/296/296 +f 214/214/214 211/211/211 296/296/296 215/215/215 +; diff --git a/regression/hbr_regression/baseline/catmark_flap2_level3.obj b/regression/hbr_regression/baseline/catmark_flap2_level3.obj new file mode 100644 index 00000000..341ec9a5 --- /dev/null +++ b/regression/hbr_regression/baseline/catmark_flap2_level3.obj @@ -0,0 +1,2132 @@ +# This file uses centimeters as units for non-parametric coordinates. +v -0.458496094 -0.0834960938 0 +v -0.450195312 -0.0908203125 0 +v -0.455566406 -0.0805664062 0 +v -0.465820312 -0.0751953125 0 +v -0.440979004 -0.0972290039 0 +v -0.445045471 -0.0856704712 0 +v -0.433990479 -0.0902404785 0 +v -0.448926687 -0.0740184784 0 +v -0.439693451 -0.0650024414 0 +v -0.465026855 -0.0592041016 0 +v -0.460617065 -0.070098877 0 +v -0.472167969 -0.0660400391 0 +v -0.430908203 -0.102783203 0 +v -0.420043945 -0.107543945 0 +v -0.42237854 -0.09425354 0 +v -0.410186768 -0.0976867676 0 +v -0.424630642 -0.0809440613 0 +v -0.413433075 -0.0698852539 0 +v -0.436957359 -0.0776596069 0 +v -0.452437401 -0.0621795654 0 +v -0.426717758 -0.0675964355 0 +v -0.428557396 -0.0541915894 0 +v -0.415981293 -0.0419921875 0 +v -0.444011688 -0.0393066406 0 +v -0.442083359 -0.052230835 0 +v -0.455453396 -0.0501213074 0 +v -0.471618652 -0.0362548828 0 +v -0.477539062 -0.0561523438 0 +v -0.468719482 -0.0479125977 0 +v -0.481933594 -0.0456542969 0 +v -0.408447266 -0.111572266 0 +v -0.396179199 -0.114929199 0 +v -0.397453308 -0.100578308 0 +v -0.384216309 -0.102966309 0 +v -0.398686647 -0.0862255096 0 +v -0.385932922 -0.0735473633 0 +v -0.411868095 -0.0837936401 0 +v -0.383300781 -0.117675781 0 +v -0.369873047 -0.119873047 0 +v -0.370513916 -0.104888916 0 +v -0.356384277 -0.106384277 0 +v -0.371134758 -0.0899047852 0 +v -0.357185364 -0.0759887695 0 +v -0.385103226 -0.0882568359 0 +v -0.399838448 -0.0718688965 0 +v -0.371715546 -0.0749206543 0 +v -0.372236252 -0.0599365234 0 +v -0.357826233 -0.0455932617 0 +v -0.387306213 -0.044128418 0 +v -0.386676788 -0.0588378906 0 +v -0.400867939 -0.0575065613 0 +v -0.414823532 -0.0559539795 0 +v -0.430067062 -0.0407104492 0 +v -0.401734352 -0.0431365967 0 +v -0.402400732 -0.02876091 0 +v -0.3881073 -0.0147094727 0 +v -0.417427063 -0.0140075684 0 +v -0.416863441 -0.0280075073 0 +v -0.431202412 -0.0271720886 0 +v -0.446327209 -0.0131530762 0 +v -0.372676849 -0.0449523926 0 +v -0.373017311 -0.0299682617 0 +v -0.358200073 -0.0151977539 0 +v -0.387792587 -0.0294189453 0 +v -0.402830124 -0.0143814087 0 +v -0.37323761 -0.0149841309 0 +v -0.373317719 0 0 +v -0.358200073 0.0151977539 0 +v -0.3881073 0.0147094727 0 +v -0.388221741 0 0 +v -0.402985573 0 0 +v -0.417427063 0.0140075684 0 +v -0.431919098 -0.0135955811 0 +v -0.417629242 0 0 +v -0.432172775 0 0 +v -0.446327209 0.0131530762 0 +v -0.485351562 -0.0346679688 0 +v -0.457850456 -0.0378112793 0 +v -0.459599733 -0.0253124237 0 +v -0.474975586 -0.0122070312 0 +v -0.473709106 -0.0243225098 0 +v -0.487792969 -0.0233154297 0 +v -0.445439339 -0.0262680054 0 +v -0.460672379 -0.0126876831 0 +v -0.4466362 0 0 +v -0.461039543 0 0 +v -0.474975586 0.0122070312 0 +v -0.489257812 -0.01171875 0 +v -0.475402832 0 0 +v -0.489746094 0 0 +v -0.355957031 -0.121582031 0 +v -0.34161377 -0.12286377 0 +v -0.341880798 -0.107505798 0 +v -0.327056885 -0.108306885 0 +v -0.342139482 -0.0921478271 0 +v -0.327342987 -0.0773620605 0 +v -0.356798172 -0.0911865234 0 +v -0.326904297 -0.123779297 0 +v -0.311889648 -0.124389648 0 +v -0.311965942 -0.108840942 0 +v -0.296661377 -0.109161377 0 +v -0.312039852 -0.0932922363 0 +v -0.296718597 -0.0779724121 0 +v -0.327204704 -0.0928344727 0 +v -0.342381477 -0.076789856 0 +v -0.312108994 -0.0777435303 0 +v -0.312170982 -0.0621948242 0 +v -0.296764374 -0.0467834473 0 +v -0.327571869 -0.0464172363 0 +v -0.327466965 -0.0618896484 0 +v -0.342598438 -0.0614318848 0 +v -0.357532501 -0.0607910156 0 +v -0.296630859 -0.124755859 0 +v -0.281188965 -0.124938965 0 +v -0.281196594 -0.109321594 0 +v -0.265625 -0.109375 0 +v -0.281203985 -0.0937042236 0 +v -0.265625 -0.078125 0 +v -0.296690941 -0.0935668945 0 +v -0.265625 -0.125 0 +v -0.25 -0.125 0 +v -0.25 -0.109375 0 +v -0.234375 -0.109375 0 +v -0.25 -0.09375 0 +v -0.234375 -0.078125 0 +v -0.265625 -0.09375 0 +v -0.281210899 -0.078086853 0 +v -0.25 -0.078125 0 +v -0.25 -0.0625 0 +v -0.234375 -0.046875 0 +v -0.265625 -0.046875 0 +v -0.265625 -0.0625 0 +v -0.281217098 -0.0624694824 0 +v -0.296743393 -0.0623779297 0 +v -0.312223434 -0.0466461182 0 +v -0.281222343 -0.0468521118 0 +v -0.281226397 -0.0312347412 0 +v -0.265625 -0.015625 0 +v -0.296791077 -0.0155944824 0 +v -0.296780586 -0.0311889648 0 +v -0.312263966 -0.0310974121 0 +v -0.327705383 -0.0154724121 0 +v -0.25 -0.046875 0 +v -0.25 -0.03125 0 +v -0.234375 -0.015625 0 +v -0.265625 -0.03125 0 +v -0.281229019 -0.0156173706 0 +v -0.25 -0.015625 0 +v -0.25 0 0 +v -0.234375 0.015625 0 +v -0.265625 0.015625 0 +v -0.265625 0 0 +v -0.281229973 0 0 +v -0.296791077 0.0155944824 0 +v -0.312290192 -0.0155487061 0 +v -0.296794891 0 0 +v -0.312299728 0 0 +v -0.327705383 0.0154724121 0 +v -0.342782021 -0.0460739136 0 +v -0.34292388 -0.0307159424 0 +v -0.358053207 -0.0303955078 0 +v -0.327652931 -0.0309448242 0 +v -0.343015671 -0.0153579712 0 +v -0.327724457 0 0 +v -0.343049049 0 0 +v -0.358253479 0 0 +v -0.37323761 0.0149841309 0 +v -0.343015671 0.0153579712 0 +v -0.34292388 0.0307159424 0 +v -0.327571869 0.0464172363 0 +v -0.357826233 0.0455932617 0 +v -0.358053207 0.0303955078 0 +v -0.373017311 0.0299682617 0 +v -0.387306213 0.044128418 0 +v -0.312290192 0.0155487061 0 +v -0.312263966 0.0310974121 0 +v -0.296764374 0.0467834473 0 +v -0.327652931 0.0309448242 0 +v -0.342782021 0.0460739136 0 +v -0.312223434 0.0466461182 0 +v -0.312170982 0.0621948242 0 +v -0.296718597 0.0779724121 0 +v -0.327342987 0.0773620605 0 +v -0.327466965 0.0618896484 0 +v -0.342598438 0.0614318848 0 +v -0.357185364 0.0759887695 0 +v -0.372676849 0.0449523926 0 +v -0.357532501 0.0607910156 0 +v -0.372236252 0.0599365234 0 +v -0.385932922 0.0735473633 0 +v -0.281229019 0.0156173706 0 +v -0.281226397 0.0312347412 0 +v -0.265625 0.046875 0 +v -0.296780586 0.0311889648 0 +v -0.25 0.015625 0 +v -0.25 0.03125 0 +v -0.234375 0.046875 0 +v -0.265625 0.03125 0 +v -0.281222343 0.0468521118 0 +v -0.25 0.046875 0 +v -0.25 0.0625 0 +v -0.234375 0.078125 0 +v -0.265625 0.078125 0 +v -0.265625 0.0625 0 +v -0.281217098 0.0624694824 0 +v -0.296743393 0.0623779297 0 +v -0.312108994 0.0777435303 0 +v -0.281210899 0.078086853 0 +v -0.281203985 0.0937042236 0 +v -0.265625 0.109375 0 +v -0.296661377 0.109161377 0 +v -0.296690941 0.0935668945 0 +v -0.312039852 0.0932922363 0 +v -0.327056885 0.108306885 0 +v -0.25 0.078125 0 +v -0.25 0.09375 0 +v -0.234375 0.109375 0 +v -0.265625 0.09375 0 +v -0.281196594 0.109321594 0 +v -0.25 0.109375 0 +v -0.25 0.125 0 +v -0.265625 0.125 0 +v -0.281188965 0.124938965 0 +v -0.311965942 0.108840942 0 +v -0.296630859 0.124755859 0 +v -0.311889648 0.124389648 0 +v -0.371715546 0.0749206543 0 +v -0.342381477 0.076789856 0 +v -0.342139482 0.0921478271 0 +v -0.356384277 0.106384277 0 +v -0.356798172 0.0911865234 0 +v -0.371134758 0.0899047852 0 +v -0.384216309 0.102966309 0 +v -0.327204704 0.0928344727 0 +v -0.341880798 0.107505798 0 +v -0.326904297 0.123779297 0 +v -0.34161377 0.12286377 0 +v -0.370513916 0.104888916 0 +v -0.355957031 0.121582031 0 +v -0.369873047 0.119873047 0 +v -0.489257812 0.01171875 0 +v -0.460672379 0.0126876831 0 +v -0.459599733 0.0253124237 0 +v -0.444011688 0.0393066406 0 +v -0.471618652 0.0362548828 0 +v -0.473709106 0.0243225098 0 +v -0.487792969 0.0233154297 0 +v -0.431919098 0.0135955811 0 +v -0.431202412 0.0271720886 0 +v -0.415981293 0.0419921875 0 +v -0.445439339 0.0262680054 0 +v -0.457850456 0.0378112793 0 +v -0.430067062 0.0407104492 0 +v -0.428557396 0.0541915894 0 +v -0.413433075 0.0698852539 0 +v -0.439693451 0.0650024414 0 +v -0.442083359 0.052230835 0 +v -0.455453396 0.0501213074 0 +v -0.465026855 0.0592041016 0 +v -0.485351562 0.0346679688 0 +v -0.468719482 0.0479125977 0 +v -0.481933594 0.0456542969 0 +v -0.402830124 0.0143814087 0 +v -0.402400732 0.02876091 0 +v -0.416863441 0.0280075073 0 +v -0.387792587 0.0294189453 0 +v -0.401734352 0.0431365967 0 +v -0.386676788 0.0588378906 0 +v -0.400867939 0.0575065613 0 +v -0.414823532 0.0559539795 0 +v -0.426717758 0.0675964355 0 +v -0.399838448 0.0718688965 0 +v -0.398686647 0.0862255096 0 +v -0.410186768 0.0976867676 0 +v -0.411868095 0.0837936401 0 +v -0.424630642 0.0809440613 0 +v -0.433990479 0.0902404785 0 +v -0.385103226 0.0882568359 0 +v -0.397453308 0.100578308 0 +v -0.383300781 0.117675781 0 +v -0.396179199 0.114929199 0 +v -0.42237854 0.09425354 0 +v -0.408447266 0.111572266 0 +v -0.420043945 0.107543945 0 +v -0.477539062 0.0561523438 0 +v -0.452437401 0.0621795654 0 +v -0.448926687 0.0740184784 0 +v -0.455566406 0.0805664062 0 +v -0.460617065 0.070098877 0 +v -0.472167969 0.0660400391 0 +v -0.436957359 0.0776596069 0 +v -0.445045471 0.0856704712 0 +v -0.430908203 0.102783203 0 +v -0.440979004 0.0972290039 0 +v -0.465820312 0.0751953125 0 +v -0.450195312 0.0908203125 0 +v -0.458496094 0.0834960938 0 +v -0.234375 -0.125 0 +v -0.21875 -0.125 0 +v -0.21875 -0.109375 0 +v -0.203125 -0.109375 0 +v -0.21875 -0.09375 0 +v -0.203125 -0.078125 0 +v -0.234375 -0.09375 0 +v -0.203125 -0.125 0 +v -0.1875 -0.125 0 +v -0.1875 -0.109375 0 +v -0.171875 -0.109375 0 +v -0.1875 -0.09375 0 +v -0.171875 -0.078125 0 +v -0.203125 -0.09375 0 +v -0.21875 -0.078125 0 +v -0.1875 -0.078125 0 +v -0.1875 -0.0625 0 +v -0.171875 -0.046875 0 +v -0.203125 -0.046875 0 +v -0.203125 -0.0625 0 +v -0.21875 -0.0625 0 +v -0.234375 -0.0625 0 +v -0.171875 -0.125 0 +v -0.15625 -0.125 0 +v -0.15625 -0.109375 0 +v -0.140625 -0.109375 0 +v -0.15625 -0.09375 0 +v -0.140625 -0.078125 0 +v -0.171875 -0.09375 0 +v -0.140625 -0.125 0 +v -0.125 -0.125 0 +v -0.125 -0.109375 0 +v -0.109375 -0.109375 0 +v -0.125 -0.09375 0 +v -0.109375 -0.078125 0 +v -0.140625 -0.09375 0 +v -0.15625 -0.078125 0 +v -0.125 -0.078125 0 +v -0.125 -0.0625 0 +v -0.109375 -0.046875 0 +v -0.140625 -0.046875 0 +v -0.140625 -0.0625 0 +v -0.15625 -0.0625 0 +v -0.171875 -0.0625 0 +v -0.1875 -0.046875 0 +v -0.15625 -0.046875 0 +v -0.15625 -0.03125 0 +v -0.140625 -0.015625 0 +v -0.171875 -0.015625 0 +v -0.171875 -0.03125 0 +v -0.1875 -0.03125 0 +v -0.203125 -0.015625 0 +v -0.125 -0.046875 0 +v -0.125 -0.03125 0 +v -0.109375 -0.015625 0 +v -0.140625 -0.03125 0 +v -0.15625 -0.015625 0 +v -0.125 -0.015625 0 +v -0.125 0 0 +v -0.109375 0.015625 0 +v -0.140625 0.015625 0 +v -0.140625 0 0 +v -0.15625 0 0 +v -0.171875 0.015625 0 +v -0.1875 -0.015625 0 +v -0.171875 0 0 +v -0.1875 0 0 +v -0.203125 0.015625 0 +v -0.21875 -0.046875 0 +v -0.21875 -0.03125 0 +v -0.234375 -0.03125 0 +v -0.203125 -0.03125 0 +v -0.21875 -0.015625 0 +v -0.203125 0 0 +v -0.21875 0 0 +v -0.234375 0 0 +v -0.109375 -0.125 0 +v -0.09375 -0.125 0 +v -0.09375 -0.109375 0 +v -0.078125 -0.109375 0 +v -0.09375 -0.09375 0 +v -0.078125 -0.078125 0 +v -0.109375 -0.09375 0 +v -0.078125 -0.125 0 +v -0.0625 -0.125 0 +v -0.0625 -0.109375 0 +v -0.046875 -0.109375 0 +v -0.0625 -0.09375 0 +v -0.046875 -0.078125 0 +v -0.078125 -0.09375 0 +v -0.09375 -0.078125 0 +v -0.0625 -0.078125 0 +v -0.0625 -0.0625 0 +v -0.046875 -0.046875 0 +v -0.078125 -0.046875 0 +v -0.078125 -0.0625 0 +v -0.09375 -0.0625 0 +v -0.109375 -0.0625 0 +v -0.046875 -0.125 0 +v -0.03125 -0.125 0 +v -0.03125 -0.109375 0 +v -0.015625 -0.109375 0 +v -0.03125 -0.09375 0 +v -0.015625 -0.078125 0 +v -0.046875 -0.09375 0 +v -0.015625 -0.125 0 +v 0 -0.125 0 +v 0 -0.109375 0 +v 0.015625 -0.109375 0 +v 0 -0.09375 0 +v 0.015625 -0.078125 0 +v -0.015625 -0.09375 0 +v -0.03125 -0.078125 0 +v 0 -0.078125 0 +v 0 -0.0625 0 +v 0.015625 -0.046875 0 +v -0.015625 -0.046875 0 +v -0.015625 -0.0625 0 +v -0.03125 -0.0625 0 +v -0.046875 -0.0625 0 +v -0.0625 -0.046875 0 +v -0.03125 -0.046875 0 +v -0.03125 -0.03125 0 +v -0.015625 -0.015625 0 +v -0.046875 -0.015625 0 +v -0.046875 -0.03125 0 +v -0.0625 -0.03125 0 +v -0.078125 -0.015625 0 +v 0 -0.046875 0 +v 0 -0.03125 0 +v 0.015625 -0.015625 0 +v -0.015625 -0.03125 0 +v -0.03125 -0.015625 0 +v 0 -0.015625 0 +v 0 0 0 +v 0.015625 0.015625 0 +v -0.015625 0.015625 0 +v -0.015625 0 0 +v -0.03125 0 0 +v -0.046875 0.015625 0 +v -0.0625 -0.015625 0 +v -0.046875 0 0 +v -0.0625 0 0 +v -0.078125 0.015625 0 +v -0.09375 -0.046875 0 +v -0.09375 -0.03125 0 +v -0.109375 -0.03125 0 +v -0.078125 -0.03125 0 +v -0.09375 -0.015625 0 +v -0.078125 0 0 +v -0.09375 0 0 +v -0.109375 0 0 +v -0.125 0.015625 0 +v -0.09375 0.015625 0 +v -0.09375 0.03125 0 +v -0.078125 0.046875 0 +v -0.109375 0.046875 0 +v -0.109375 0.03125 0 +v -0.125 0.03125 0 +v -0.140625 0.046875 0 +v -0.0625 0.015625 0 +v -0.0625 0.03125 0 +v -0.046875 0.046875 0 +v -0.078125 0.03125 0 +v -0.09375 0.046875 0 +v -0.0625 0.046875 0 +v -0.0625 0.0625 0 +v -0.046875 0.078125 0 +v -0.078125 0.078125 0 +v -0.078125 0.0625 0 +v -0.09375 0.0625 0 +v -0.109375 0.078125 0 +v -0.125 0.046875 0 +v -0.109375 0.0625 0 +v -0.125 0.0625 0 +v -0.140625 0.078125 0 +v -0.03125 0.015625 0 +v -0.03125 0.03125 0 +v -0.015625 0.046875 0 +v -0.046875 0.03125 0 +v 0 0.015625 0 +v 0 0.03125 0 +v 0.015625 0.046875 0 +v -0.015625 0.03125 0 +v -0.03125 0.046875 0 +v 0 0.046875 0 +v 0 0.0625 0 +v 0.015625 0.078125 0 +v -0.015625 0.078125 0 +v -0.015625 0.0625 0 +v -0.03125 0.0625 0 +v -0.046875 0.0625 0 +v -0.0625 0.078125 0 +v -0.03125 0.078125 0 +v -0.03125 0.09375 0 +v -0.015625 0.109375 0 +v -0.046875 0.109375 0 +v -0.046875 0.09375 0 +v -0.0625 0.09375 0 +v -0.078125 0.109375 0 +v 0 0.078125 0 +v 0 0.09375 0 +v 0.015625 0.109375 0 +v -0.015625 0.09375 0 +v -0.03125 0.109375 0 +v 0 0.109375 0 +v 0 0.125 0 +v -0.015625 0.125 0 +v -0.03125 0.125 0 +v -0.0625 0.109375 0 +v -0.046875 0.125 0 +v -0.0625 0.125 0 +v -0.125 0.078125 0 +v -0.09375 0.078125 0 +v -0.09375 0.09375 0 +v -0.109375 0.109375 0 +v -0.109375 0.09375 0 +v -0.125 0.09375 0 +v -0.140625 0.109375 0 +v -0.078125 0.09375 0 +v -0.09375 0.109375 0 +v -0.078125 0.125 0 +v -0.09375 0.125 0 +v -0.125 0.109375 0 +v -0.109375 0.125 0 +v -0.125 0.125 0 +v -0.21875 0.015625 0 +v -0.21875 0.03125 0 +v -0.203125 0.046875 0 +v -0.234375 0.03125 0 +v -0.1875 0.015625 0 +v -0.1875 0.03125 0 +v -0.171875 0.046875 0 +v -0.203125 0.03125 0 +v -0.21875 0.046875 0 +v -0.1875 0.046875 0 +v -0.1875 0.0625 0 +v -0.171875 0.078125 0 +v -0.203125 0.078125 0 +v -0.203125 0.0625 0 +v -0.21875 0.0625 0 +v -0.234375 0.0625 0 +v -0.15625 0.015625 0 +v -0.15625 0.03125 0 +v -0.171875 0.03125 0 +v -0.140625 0.03125 0 +v -0.15625 0.046875 0 +v -0.140625 0.0625 0 +v -0.15625 0.0625 0 +v -0.171875 0.0625 0 +v -0.1875 0.078125 0 +v -0.15625 0.078125 0 +v -0.15625 0.09375 0 +v -0.171875 0.109375 0 +v -0.171875 0.09375 0 +v -0.1875 0.09375 0 +v -0.203125 0.109375 0 +v -0.140625 0.09375 0 +v -0.15625 0.109375 0 +v -0.140625 0.125 0 +v -0.15625 0.125 0 +v -0.1875 0.109375 0 +v -0.171875 0.125 0 +v -0.1875 0.125 0 +v -0.21875 0.078125 0 +v -0.21875 0.09375 0 +v -0.234375 0.09375 0 +v -0.203125 0.09375 0 +v -0.21875 0.109375 0 +v -0.203125 0.125 0 +v -0.21875 0.125 0 +v -0.234375 0.125 0 +v 0.015625 -0.125 0 +v 0.03125 -0.125 0 +v 0.03125 -0.109375 0 +v 0.046875 -0.109375 0 +v 0.03125 -0.09375 0 +v 0.046875 -0.078125 0 +v 0.015625 -0.09375 0 +v 0.046875 -0.125 0 +v 0.0625 -0.125 0 +v 0.0625 -0.109375 0 +v 0.078125 -0.109375 0 +v 0.0625 -0.09375 0 +v 0.078125 -0.078125 0 +v 0.046875 -0.09375 0 +v 0.03125 -0.078125 0 +v 0.0625 -0.078125 0 +v 0.0625 -0.0625 0 +v 0.078125 -0.046875 0 +v 0.046875 -0.046875 0 +v 0.046875 -0.0625 0 +v 0.03125 -0.0625 0 +v 0.015625 -0.0625 0 +v 0.078125 -0.125 0 +v 0.09375 -0.125 0 +v 0.09375 -0.109375 0 +v 0.109375 -0.109375 0 +v 0.09375 -0.09375 0 +v 0.109375 -0.078125 0 +v 0.078125 -0.09375 0 +v 0.109375 -0.125 0 +v 0.125 -0.125 0 +v 0.125 -0.109375 0 +v 0.140625 -0.109375 0 +v 0.125 -0.09375 0 +v 0.140625 -0.078125 0 +v 0.109375 -0.09375 0 +v 0.09375 -0.078125 0 +v 0.125 -0.078125 0 +v 0.125 -0.0625 0 +v 0.140625 -0.046875 0 +v 0.109375 -0.046875 0 +v 0.109375 -0.0625 0 +v 0.09375 -0.0625 0 +v 0.078125 -0.0625 0 +v 0.0625 -0.046875 0 +v 0.09375 -0.046875 0 +v 0.09375 -0.03125 0 +v 0.109375 -0.015625 0 +v 0.078125 -0.015625 0 +v 0.078125 -0.03125 0 +v 0.0625 -0.03125 0 +v 0.046875 -0.015625 0 +v 0.125 -0.046875 0 +v 0.125 -0.03125 0 +v 0.140625 -0.015625 0 +v 0.109375 -0.03125 0 +v 0.09375 -0.015625 0 +v 0.125 -0.015625 0 +v 0.125 0 0 +v 0.140625 0.015625 0 +v 0.109375 0.015625 0 +v 0.109375 0 0 +v 0.09375 0 0 +v 0.078125 0.015625 0 +v 0.0625 -0.015625 0 +v 0.078125 0 0 +v 0.0625 0 0 +v 0.046875 0.015625 0 +v 0.03125 -0.046875 0 +v 0.03125 -0.03125 0 +v 0.015625 -0.03125 0 +v 0.046875 -0.03125 0 +v 0.03125 -0.015625 0 +v 0.046875 0 0 +v 0.03125 0 0 +v 0.015625 0 0 +v 0.140625 -0.125 0 +v 0.15625 -0.125 0 +v 0.15625 -0.109375 0 +v 0.171875 -0.109375 0 +v 0.15625 -0.09375 0 +v 0.171875 -0.078125 0 +v 0.140625 -0.09375 0 +v 0.171875 -0.125 0 +v 0.1875 -0.125 0 +v 0.1875 -0.109375 0 +v 0.203125 -0.109375 0 +v 0.1875 -0.09375 0 +v 0.203125 -0.078125 0 +v 0.171875 -0.09375 0 +v 0.15625 -0.078125 0 +v 0.1875 -0.078125 0 +v 0.1875 -0.0625 0 +v 0.203125 -0.046875 0 +v 0.171875 -0.046875 0 +v 0.171875 -0.0625 0 +v 0.15625 -0.0625 0 +v 0.140625 -0.0625 0 +v 0.203125 -0.125 0 +v 0.21875 -0.125 0 +v 0.21875 -0.109375 0 +v 0.234375 -0.109375 0 +v 0.21875 -0.09375 0 +v 0.234375 -0.078125 0 +v 0.203125 -0.09375 0 +v 0.234375 -0.125 0 +v 0.25 -0.125 0 +v 0.25 -0.109375 0 +v 0.265625 -0.109375 0 +v 0.25 -0.09375 0 +v 0.265625 -0.078125 0 +v 0.234375 -0.09375 0 +v 0.21875 -0.078125 0 +v 0.25 -0.078125 0 +v 0.25 -0.0625 0 +v 0.265625 -0.046875 0 +v 0.234375 -0.046875 0 +v 0.234375 -0.0625 0 +v 0.21875 -0.0625 0 +v 0.203125 -0.0625 0 +v 0.1875 -0.046875 0 +v 0.21875 -0.046875 0 +v 0.21875 -0.03125 0 +v 0.234375 -0.015625 0 +v 0.203125 -0.015625 0 +v 0.203125 -0.03125 0 +v 0.1875 -0.03125 0 +v 0.171875 -0.015625 0 +v 0.25 -0.046875 0 +v 0.25 -0.03125 0 +v 0.265625 -0.015625 0 +v 0.234375 -0.03125 0 +v 0.21875 -0.015625 0 +v 0.25 -0.015625 0 +v 0.25 0 0 +v 0.265625 0.015625 0 +v 0.234375 0.015625 0 +v 0.234375 0 0 +v 0.21875 0 0 +v 0.203125 0.015625 0 +v 0.1875 -0.015625 0 +v 0.203125 0 0 +v 0.1875 0 0 +v 0.171875 0.015625 0 +v 0.15625 -0.046875 0 +v 0.15625 -0.03125 0 +v 0.140625 -0.03125 0 +v 0.171875 -0.03125 0 +v 0.15625 -0.015625 0 +v 0.171875 0 0 +v 0.15625 0 0 +v 0.140625 0 0 +v 0.125 0.015625 0 +v 0.15625 0.015625 0 +v 0.15625 0.03125 0 +v 0.171875 0.046875 0 +v 0.140625 0.046875 0 +v 0.140625 0.03125 0 +v 0.125 0.03125 0 +v 0.109375 0.046875 0 +v 0.1875 0.015625 0 +v 0.1875 0.03125 0 +v 0.203125 0.046875 0 +v 0.171875 0.03125 0 +v 0.15625 0.046875 0 +v 0.1875 0.046875 0 +v 0.1875 0.0625 0 +v 0.203125 0.078125 0 +v 0.171875 0.078125 0 +v 0.171875 0.0625 0 +v 0.15625 0.0625 0 +v 0.140625 0.078125 0 +v 0.125 0.046875 0 +v 0.140625 0.0625 0 +v 0.125 0.0625 0 +v 0.109375 0.078125 0 +v 0.21875 0.015625 0 +v 0.21875 0.03125 0 +v 0.234375 0.046875 0 +v 0.203125 0.03125 0 +v 0.25 0.015625 0 +v 0.25 0.03125 0 +v 0.265625 0.046875 0 +v 0.234375 0.03125 0 +v 0.21875 0.046875 0 +v 0.25 0.046875 0 +v 0.25 0.0625 0 +v 0.265625 0.078125 0 +v 0.234375 0.078125 0 +v 0.234375 0.0625 0 +v 0.21875 0.0625 0 +v 0.203125 0.0625 0 +v 0.1875 0.078125 0 +v 0.21875 0.078125 0 +v 0.21875 0.09375 0 +v 0.234375 0.109375 0 +v 0.203125 0.109375 0 +v 0.203125 0.09375 0 +v 0.1875 0.09375 0 +v 0.171875 0.109375 0 +v 0.25 0.078125 0 +v 0.25 0.09375 0 +v 0.265625 0.109375 0 +v 0.234375 0.09375 0 +v 0.21875 0.109375 0 +v 0.25 0.109375 0 +v 0.25 0.125 0 +v 0.234375 0.125 0 +v 0.21875 0.125 0 +v 0.1875 0.109375 0 +v 0.203125 0.125 0 +v 0.1875 0.125 0 +v 0.125 0.078125 0 +v 0.15625 0.078125 0 +v 0.15625 0.09375 0 +v 0.140625 0.109375 0 +v 0.140625 0.09375 0 +v 0.125 0.09375 0 +v 0.109375 0.109375 0 +v 0.171875 0.09375 0 +v 0.15625 0.109375 0 +v 0.171875 0.125 0 +v 0.15625 0.125 0 +v 0.125 0.109375 0 +v 0.140625 0.125 0 +v 0.125 0.125 0 +v 0.03125 0.015625 0 +v 0.03125 0.03125 0 +v 0.046875 0.046875 0 +v 0.015625 0.03125 0 +v 0.0625 0.015625 0 +v 0.0625 0.03125 0 +v 0.078125 0.046875 0 +v 0.046875 0.03125 0 +v 0.03125 0.046875 0 +v 0.0625 0.046875 0 +v 0.0625 0.0625 0 +v 0.078125 0.078125 0 +v 0.046875 0.078125 0 +v 0.046875 0.0625 0 +v 0.03125 0.0625 0 +v 0.015625 0.0625 0 +v 0.09375 0.015625 0 +v 0.09375 0.03125 0 +v 0.078125 0.03125 0 +v 0.109375 0.03125 0 +v 0.09375 0.046875 0 +v 0.109375 0.0625 0 +v 0.09375 0.0625 0 +v 0.078125 0.0625 0 +v 0.0625 0.078125 0 +v 0.09375 0.078125 0 +v 0.09375 0.09375 0 +v 0.078125 0.109375 0 +v 0.078125 0.09375 0 +v 0.0625 0.09375 0 +v 0.046875 0.109375 0 +v 0.109375 0.09375 0 +v 0.09375 0.109375 0 +v 0.109375 0.125 0 +v 0.09375 0.125 0 +v 0.0625 0.109375 0 +v 0.078125 0.125 0 +v 0.0625 0.125 0 +v 0.03125 0.078125 0 +v 0.03125 0.09375 0 +v 0.015625 0.09375 0 +v 0.046875 0.09375 0 +v 0.03125 0.109375 0 +v 0.046875 0.125 0 +v 0.03125 0.125 0 +v 0.015625 0.125 0 +v 0.265625 -0.125 0 +v 0.281188965 -0.124938965 0 +v 0.281196594 -0.109321594 0 +v 0.296661377 -0.109161377 0 +v 0.281203985 -0.0937042236 0 +v 0.296718597 -0.0779724121 0 +v 0.265625 -0.09375 0 +v 0.296630859 -0.124755859 0 +v 0.311889648 -0.124389648 0 +v 0.311965942 -0.108840942 0 +v 0.327056885 -0.108306885 0 +v 0.312039852 -0.0932922363 0 +v 0.327342987 -0.0773620605 0 +v 0.296690941 -0.0935668945 0 +v 0.281210899 -0.078086853 0 +v 0.312108994 -0.0777435303 0 +v 0.312170982 -0.0621948242 0 +v 0.327571869 -0.0464172363 0 +v 0.296764374 -0.0467834473 0 +v 0.296743393 -0.0623779297 0 +v 0.281217098 -0.0624694824 0 +v 0.265625 -0.0625 0 +v 0.326904297 -0.123779297 0 +v 0.34161377 -0.12286377 0 +v 0.341880798 -0.107505798 0 +v 0.356384277 -0.106384277 0 +v 0.342139482 -0.0921478271 0 +v 0.357185364 -0.0759887695 0 +v 0.327204704 -0.0928344727 0 +v 0.355957031 -0.121582031 0 +v 0.369873047 -0.119873047 0 +v 0.370513916 -0.104888916 0 +v 0.384216309 -0.102966309 0 +v 0.371134758 -0.0899047852 0 +v 0.385932922 -0.0735473633 0 +v 0.356798172 -0.0911865234 0 +v 0.342381477 -0.076789856 0 +v 0.371715546 -0.0749206543 0 +v 0.372236252 -0.0599365234 0 +v 0.387306213 -0.044128418 0 +v 0.357826233 -0.0455932617 0 +v 0.357532501 -0.0607910156 0 +v 0.342598438 -0.0614318848 0 +v 0.327466965 -0.0618896484 0 +v 0.312223434 -0.0466461182 0 +v 0.342782021 -0.0460739136 0 +v 0.34292388 -0.0307159424 0 +v 0.358200073 -0.0151977539 0 +v 0.327705383 -0.0154724121 0 +v 0.327652931 -0.0309448242 0 +v 0.312263966 -0.0310974121 0 +v 0.296791077 -0.0155944824 0 +v 0.372676849 -0.0449523926 0 +v 0.373017311 -0.0299682617 0 +v 0.3881073 -0.0147094727 0 +v 0.358053207 -0.0303955078 0 +v 0.343015671 -0.0153579712 0 +v 0.37323761 -0.0149841309 0 +v 0.373317719 0 0 +v 0.3881073 0.0147094727 0 +v 0.358200073 0.0151977539 0 +v 0.358253479 0 0 +v 0.343049049 0 0 +v 0.327705383 0.0154724121 0 +v 0.312290192 -0.0155487061 0 +v 0.327724457 0 0 +v 0.312299728 0 0 +v 0.296791077 0.0155944824 0 +v 0.281222343 -0.0468521118 0 +v 0.281226397 -0.0312347412 0 +v 0.265625 -0.03125 0 +v 0.296780586 -0.0311889648 0 +v 0.281229019 -0.0156173706 0 +v 0.296794891 0 0 +v 0.281229973 0 0 +v 0.265625 0 0 +v 0.383300781 -0.117675781 0 +v 0.396179199 -0.114929199 0 +v 0.397453308 -0.100578308 0 +v 0.410186768 -0.0976867676 0 +v 0.398686647 -0.0862255096 0 +v 0.413433075 -0.0698852539 0 +v 0.385103226 -0.0882568359 0 +v 0.408447266 -0.111572266 0 +v 0.420043945 -0.107543945 0 +v 0.42237854 -0.09425354 0 +v 0.433990479 -0.0902404785 0 +v 0.424630642 -0.0809440613 0 +v 0.439693451 -0.0650024414 0 +v 0.411868095 -0.0837936401 0 +v 0.399838448 -0.0718688965 0 +v 0.426717758 -0.0675964355 0 +v 0.428557396 -0.0541915894 0 +v 0.444011688 -0.0393066406 0 +v 0.415981293 -0.0419921875 0 +v 0.414823532 -0.0559539795 0 +v 0.400867939 -0.0575065613 0 +v 0.386676788 -0.0588378906 0 +v 0.430908203 -0.102783203 0 +v 0.440979004 -0.0972290039 0 +v 0.445045471 -0.0856704712 0 +v 0.455566406 -0.0805664062 0 +v 0.448926687 -0.0740184784 0 +v 0.465026855 -0.0592041016 0 +v 0.436957359 -0.0776596069 0 +v 0.450195312 -0.0908203125 0 +v 0.458496094 -0.0834960938 0 +v 0.465820312 -0.0751953125 0 +v 0.472167969 -0.0660400391 0 +v 0.460617065 -0.070098877 0 +v 0.452437401 -0.0621795654 0 +v 0.477539062 -0.0561523438 0 +v 0.481933594 -0.0456542969 0 +v 0.468719482 -0.0479125977 0 +v 0.471618652 -0.0362548828 0 +v 0.455453396 -0.0501213074 0 +v 0.442083359 -0.052230835 0 +v 0.430067062 -0.0407104492 0 +v 0.457850456 -0.0378112793 0 +v 0.459599733 -0.0253124237 0 +v 0.474975586 -0.0122070312 0 +v 0.446327209 -0.0131530762 0 +v 0.445439339 -0.0262680054 0 +v 0.431202412 -0.0271720886 0 +v 0.417427063 -0.0140075684 0 +v 0.485351562 -0.0346679688 0 +v 0.487792969 -0.0233154297 0 +v 0.473709106 -0.0243225098 0 +v 0.460672379 -0.0126876831 0 +v 0.489257812 -0.01171875 0 +v 0.489746094 0 0 +v 0.475402832 0 0 +v 0.474975586 0.0122070312 0 +v 0.461039543 0 0 +v 0.446327209 0.0131530762 0 +v 0.431919098 -0.0135955811 0 +v 0.4466362 0 0 +v 0.432172775 0 0 +v 0.417427063 0.0140075684 0 +v 0.401734352 -0.0431365967 0 +v 0.402400732 -0.02876091 0 +v 0.387792587 -0.0294189453 0 +v 0.416863441 -0.0280075073 0 +v 0.402830124 -0.0143814087 0 +v 0.417629242 0 0 +v 0.402985573 0 0 +v 0.388221741 0 0 +v 0.37323761 0.0149841309 0 +v 0.402830124 0.0143814087 0 +v 0.402400732 0.02876091 0 +v 0.415981293 0.0419921875 0 +v 0.387306213 0.044128418 0 +v 0.387792587 0.0294189453 0 +v 0.373017311 0.0299682617 0 +v 0.357826233 0.0455932617 0 +v 0.431919098 0.0135955811 0 +v 0.431202412 0.0271720886 0 +v 0.444011688 0.0393066406 0 +v 0.416863441 0.0280075073 0 +v 0.401734352 0.0431365967 0 +v 0.430067062 0.0407104492 0 +v 0.428557396 0.0541915894 0 +v 0.439693451 0.0650024414 0 +v 0.413433075 0.0698852539 0 +v 0.414823532 0.0559539795 0 +v 0.400867939 0.0575065613 0 +v 0.385932922 0.0735473633 0 +v 0.372676849 0.0449523926 0 +v 0.386676788 0.0588378906 0 +v 0.372236252 0.0599365234 0 +v 0.357185364 0.0759887695 0 +v 0.460672379 0.0126876831 0 +v 0.459599733 0.0253124237 0 +v 0.471618652 0.0362548828 0 +v 0.445439339 0.0262680054 0 +v 0.489257812 0.01171875 0 +v 0.487792969 0.0233154297 0 +v 0.473709106 0.0243225098 0 +v 0.457850456 0.0378112793 0 +v 0.485351562 0.0346679688 0 +v 0.481933594 0.0456542969 0 +v 0.468719482 0.0479125977 0 +v 0.465026855 0.0592041016 0 +v 0.455453396 0.0501213074 0 +v 0.442083359 0.052230835 0 +v 0.426717758 0.0675964355 0 +v 0.452437401 0.0621795654 0 +v 0.448926687 0.0740184784 0 +v 0.455566406 0.0805664062 0 +v 0.433990479 0.0902404785 0 +v 0.436957359 0.0776596069 0 +v 0.424630642 0.0809440613 0 +v 0.410186768 0.0976867676 0 +v 0.477539062 0.0561523438 0 +v 0.472167969 0.0660400391 0 +v 0.460617065 0.070098877 0 +v 0.445045471 0.0856704712 0 +v 0.465820312 0.0751953125 0 +v 0.458496094 0.0834960938 0 +v 0.450195312 0.0908203125 0 +v 0.440979004 0.0972290039 0 +v 0.42237854 0.09425354 0 +v 0.430908203 0.102783203 0 +v 0.420043945 0.107543945 0 +v 0.371715546 0.0749206543 0 +v 0.399838448 0.0718688965 0 +v 0.398686647 0.0862255096 0 +v 0.384216309 0.102966309 0 +v 0.385103226 0.0882568359 0 +v 0.371134758 0.0899047852 0 +v 0.356384277 0.106384277 0 +v 0.411868095 0.0837936401 0 +v 0.397453308 0.100578308 0 +v 0.408447266 0.111572266 0 +v 0.396179199 0.114929199 0 +v 0.370513916 0.104888916 0 +v 0.383300781 0.117675781 0 +v 0.369873047 0.119873047 0 +v 0.281229019 0.0156173706 0 +v 0.281226397 0.0312347412 0 +v 0.296764374 0.0467834473 0 +v 0.265625 0.03125 0 +v 0.312290192 0.0155487061 0 +v 0.312263966 0.0310974121 0 +v 0.327571869 0.0464172363 0 +v 0.296780586 0.0311889648 0 +v 0.281222343 0.0468521118 0 +v 0.312223434 0.0466461182 0 +v 0.312170982 0.0621948242 0 +v 0.327342987 0.0773620605 0 +v 0.296718597 0.0779724121 0 +v 0.296743393 0.0623779297 0 +v 0.281217098 0.0624694824 0 +v 0.265625 0.0625 0 +v 0.343015671 0.0153579712 0 +v 0.34292388 0.0307159424 0 +v 0.327652931 0.0309448242 0 +v 0.358053207 0.0303955078 0 +v 0.342782021 0.0460739136 0 +v 0.357532501 0.0607910156 0 +v 0.342598438 0.0614318848 0 +v 0.327466965 0.0618896484 0 +v 0.312108994 0.0777435303 0 +v 0.342381477 0.076789856 0 +v 0.342139482 0.0921478271 0 +v 0.327056885 0.108306885 0 +v 0.327204704 0.0928344727 0 +v 0.312039852 0.0932922363 0 +v 0.296661377 0.109161377 0 +v 0.356798172 0.0911865234 0 +v 0.341880798 0.107505798 0 +v 0.355957031 0.121582031 0 +v 0.34161377 0.12286377 0 +v 0.311965942 0.108840942 0 +v 0.326904297 0.123779297 0 +v 0.311889648 0.124389648 0 +v 0.281210899 0.078086853 0 +v 0.281203985 0.0937042236 0 +v 0.265625 0.09375 0 +v 0.296690941 0.0935668945 0 +v 0.281196594 0.109321594 0 +v 0.296630859 0.124755859 0 +v 0.281188965 0.124938965 0 +v 0.265625 0.125 0 +s off +f 0/0/0 1/1/1 2/2/2 3/3/3 +f 1/1/1 4/4/4 5/5/5 2/2/2 +f 2/2/2 5/5/5 7/7/7 10/10/10 +f 3/3/3 2/2/2 10/10/10 11/11/11 +f 4/4/4 12/12/12 6/6/6 5/5/5 +f 12/12/12 13/13/13 14/14/14 6/6/6 +f 6/6/6 14/14/14 16/16/16 18/18/18 +f 5/5/5 6/6/6 18/18/18 7/7/7 +f 7/7/7 18/18/18 8/8/8 19/19/19 +f 18/18/18 16/16/16 20/20/20 8/8/8 +f 8/8/8 20/20/20 21/21/21 24/24/24 +f 19/19/19 8/8/8 24/24/24 25/25/25 +f 11/11/11 10/10/10 9/9/9 27/27/27 +f 10/10/10 7/7/7 19/19/19 9/9/9 +f 9/9/9 19/19/19 25/25/25 28/28/28 +f 27/27/27 9/9/9 28/28/28 29/29/29 +f 13/13/13 30/30/30 15/15/15 14/14/14 +f 30/30/30 31/31/31 32/32/32 15/15/15 +f 15/15/15 32/32/32 34/34/34 36/36/36 +f 14/14/14 15/15/15 36/36/36 16/16/16 +f 31/31/31 37/37/37 33/33/33 32/32/32 +f 37/37/37 38/38/38 39/39/39 33/33/33 +f 33/33/33 39/39/39 41/41/41 43/43/43 +f 32/32/32 33/33/33 43/43/43 34/34/34 +f 34/34/34 43/43/43 35/35/35 44/44/44 +f 43/43/43 41/41/41 45/45/45 35/35/35 +f 35/35/35 45/45/45 46/46/46 49/49/49 +f 44/44/44 35/35/35 49/49/49 50/50/50 +f 16/16/16 36/36/36 17/17/17 20/20/20 +f 36/36/36 34/34/34 44/44/44 17/17/17 +f 17/17/17 44/44/44 50/50/50 51/51/51 +f 20/20/20 17/17/17 51/51/51 21/21/21 +f 21/21/21 51/51/51 22/22/22 52/52/52 +f 51/51/51 50/50/50 53/53/53 22/22/22 +f 22/22/22 53/53/53 54/54/54 57/57/57 +f 52/52/52 22/22/22 57/57/57 58/58/58 +f 50/50/50 49/49/49 48/48/48 53/53/53 +f 49/49/49 46/46/46 60/60/60 48/48/48 +f 48/48/48 60/60/60 61/61/61 63/63/63 +f 53/53/53 48/48/48 63/63/63 54/54/54 +f 54/54/54 63/63/63 55/55/55 64/64/64 +f 63/63/63 61/61/61 65/65/65 55/55/55 +f 55/55/55 65/65/65 66/66/66 69/69/69 +f 64/64/64 55/55/55 69/69/69 70/70/70 +f 58/58/58 57/57/57 56/56/56 72/72/72 +f 57/57/57 54/54/54 64/64/64 56/56/56 +f 56/56/56 64/64/64 70/70/70 73/73/73 +f 72/72/72 56/56/56 73/73/73 74/74/74 +f 29/29/29 28/28/28 26/26/26 76/76/76 +f 28/28/28 25/25/25 77/77/77 26/26/26 +f 26/26/26 77/77/77 78/78/78 80/80/80 +f 76/76/76 26/26/26 80/80/80 81/81/81 +f 25/25/25 24/24/24 23/23/23 77/77/77 +f 24/24/24 21/21/21 52/52/52 23/23/23 +f 23/23/23 52/52/52 58/58/58 82/82/82 +f 77/77/77 23/23/23 82/82/82 78/78/78 +f 78/78/78 82/82/82 59/59/59 83/83/83 +f 82/82/82 58/58/58 72/72/72 59/59/59 +f 59/59/59 72/72/72 74/74/74 84/84/84 +f 83/83/83 59/59/59 84/84/84 85/85/85 +f 81/81/81 80/80/80 79/79/79 87/87/87 +f 80/80/80 78/78/78 83/83/83 79/79/79 +f 79/79/79 83/83/83 85/85/85 88/88/88 +f 87/87/87 79/79/79 88/88/88 89/89/89 +f 38/38/38 90/90/90 40/40/40 39/39/39 +f 90/90/90 91/91/91 92/92/92 40/40/40 +f 40/40/40 92/92/92 94/94/94 96/96/96 +f 39/39/39 40/40/40 96/96/96 41/41/41 +f 91/91/91 97/97/97 93/93/93 92/92/92 +f 97/97/97 98/98/98 99/99/99 93/93/93 +f 93/93/93 99/99/99 101/101/101 103/103/103 +f 92/92/92 93/93/93 103/103/103 94/94/94 +f 94/94/94 103/103/103 95/95/95 104/104/104 +f 103/103/103 101/101/101 105/105/105 95/95/95 +f 95/95/95 105/105/105 106/106/106 109/109/109 +f 104/104/104 95/95/95 109/109/109 110/110/110 +f 41/41/41 96/96/96 42/42/42 45/45/45 +f 96/96/96 94/94/94 104/104/104 42/42/42 +f 42/42/42 104/104/104 110/110/110 111/111/111 +f 45/45/45 42/42/42 111/111/111 46/46/46 +f 98/98/98 112/112/112 100/100/100 99/99/99 +f 112/112/112 113/113/113 114/114/114 100/100/100 +f 100/100/100 114/114/114 116/116/116 118/118/118 +f 99/99/99 100/100/100 118/118/118 101/101/101 +f 113/113/113 119/119/119 115/115/115 114/114/114 +f 119/119/119 120/120/120 121/121/121 115/115/115 +f 115/115/115 121/121/121 123/123/123 125/125/125 +f 114/114/114 115/115/115 125/125/125 116/116/116 +f 116/116/116 125/125/125 117/117/117 126/126/126 +f 125/125/125 123/123/123 127/127/127 117/117/117 +f 117/117/117 127/127/127 128/128/128 131/131/131 +f 126/126/126 117/117/117 131/131/131 132/132/132 +f 101/101/101 118/118/118 102/102/102 105/105/105 +f 118/118/118 116/116/116 126/126/126 102/102/102 +f 102/102/102 126/126/126 132/132/132 133/133/133 +f 105/105/105 102/102/102 133/133/133 106/106/106 +f 106/106/106 133/133/133 107/107/107 134/134/134 +f 133/133/133 132/132/132 135/135/135 107/107/107 +f 107/107/107 135/135/135 136/136/136 139/139/139 +f 134/134/134 107/107/107 139/139/139 140/140/140 +f 132/132/132 131/131/131 130/130/130 135/135/135 +f 131/131/131 128/128/128 142/142/142 130/130/130 +f 130/130/130 142/142/142 143/143/143 145/145/145 +f 135/135/135 130/130/130 145/145/145 136/136/136 +f 136/136/136 145/145/145 137/137/137 146/146/146 +f 145/145/145 143/143/143 147/147/147 137/137/137 +f 137/137/137 147/147/147 148/148/148 151/151/151 +f 146/146/146 137/137/137 151/151/151 152/152/152 +f 140/140/140 139/139/139 138/138/138 154/154/154 +f 139/139/139 136/136/136 146/146/146 138/138/138 +f 138/138/138 146/146/146 152/152/152 155/155/155 +f 154/154/154 138/138/138 155/155/155 156/156/156 +f 46/46/46 111/111/111 47/47/47 60/60/60 +f 111/111/111 110/110/110 158/158/158 47/47/47 +f 47/47/47 158/158/158 159/159/159 160/160/160 +f 60/60/60 47/47/47 160/160/160 61/61/61 +f 110/110/110 109/109/109 108/108/108 158/158/158 +f 109/109/109 106/106/106 134/134/134 108/108/108 +f 108/108/108 134/134/134 140/140/140 161/161/161 +f 158/158/158 108/108/108 161/161/161 159/159/159 +f 159/159/159 161/161/161 141/141/141 162/162/162 +f 161/161/161 140/140/140 154/154/154 141/141/141 +f 141/141/141 154/154/154 156/156/156 163/163/163 +f 162/162/162 141/141/141 163/163/163 164/164/164 +f 61/61/61 160/160/160 62/62/62 65/65/65 +f 160/160/160 159/159/159 162/162/162 62/62/62 +f 62/62/62 162/162/162 164/164/164 165/165/165 +f 65/65/65 62/62/62 165/165/165 66/66/66 +f 66/66/66 165/165/165 67/67/67 166/166/166 +f 165/165/165 164/164/164 167/167/167 67/67/67 +f 67/67/67 167/167/167 168/168/168 171/171/171 +f 166/166/166 67/67/67 171/171/171 172/172/172 +f 164/164/164 163/163/163 157/157/157 167/167/167 +f 163/163/163 156/156/156 174/174/174 157/157/157 +f 157/157/157 174/174/174 175/175/175 177/177/177 +f 167/167/167 157/157/157 177/177/177 168/168/168 +f 168/168/168 177/177/177 169/169/169 178/178/178 +f 177/177/177 175/175/175 179/179/179 169/169/169 +f 169/169/169 179/179/179 180/180/180 183/183/183 +f 178/178/178 169/169/169 183/183/183 184/184/184 +f 172/172/172 171/171/171 170/170/170 186/186/186 +f 171/171/171 168/168/168 178/178/178 170/170/170 +f 170/170/170 178/178/178 184/184/184 187/187/187 +f 186/186/186 170/170/170 187/187/187 188/188/188 +f 156/156/156 155/155/155 153/153/153 174/174/174 +f 155/155/155 152/152/152 190/190/190 153/153/153 +f 153/153/153 190/190/190 191/191/191 193/193/193 +f 174/174/174 153/153/153 193/193/193 175/175/175 +f 152/152/152 151/151/151 150/150/150 190/190/190 +f 151/151/151 148/148/148 194/194/194 150/150/150 +f 150/150/150 194/194/194 195/195/195 197/197/197 +f 190/190/190 150/150/150 197/197/197 191/191/191 +f 191/191/191 197/197/197 192/192/192 198/198/198 +f 197/197/197 195/195/195 199/199/199 192/192/192 +f 192/192/192 199/199/199 200/200/200 203/203/203 +f 198/198/198 192/192/192 203/203/203 204/204/204 +f 175/175/175 193/193/193 176/176/176 179/179/179 +f 193/193/193 191/191/191 198/198/198 176/176/176 +f 176/176/176 198/198/198 204/204/204 205/205/205 +f 179/179/179 176/176/176 205/205/205 180/180/180 +f 180/180/180 205/205/205 181/181/181 206/206/206 +f 205/205/205 204/204/204 207/207/207 181/181/181 +f 181/181/181 207/207/207 208/208/208 211/211/211 +f 206/206/206 181/181/181 211/211/211 212/212/212 +f 204/204/204 203/203/203 202/202/202 207/207/207 +f 203/203/203 200/200/200 214/214/214 202/202/202 +f 202/202/202 214/214/214 215/215/215 217/217/217 +f 207/207/207 202/202/202 217/217/217 208/208/208 +f 208/208/208 217/217/217 209/209/209 218/218/218 +f 217/217/217 215/215/215 219/219/219 209/209/209 +f 209/209/209 219/219/219 220/220/220 221/221/221 +f 218/218/218 209/209/209 221/221/221 222/222/222 +f 212/212/212 211/211/211 210/210/210 223/223/223 +f 211/211/211 208/208/208 218/218/218 210/210/210 +f 210/210/210 218/218/218 222/222/222 224/224/224 +f 223/223/223 210/210/210 224/224/224 225/225/225 +f 188/188/188 187/187/187 185/185/185 226/226/226 +f 187/187/187 184/184/184 227/227/227 185/185/185 +f 185/185/185 227/227/227 228/228/228 230/230/230 +f 226/226/226 185/185/185 230/230/230 231/231/231 +f 184/184/184 183/183/183 182/182/182 227/227/227 +f 183/183/183 180/180/180 206/206/206 182/182/182 +f 182/182/182 206/206/206 212/212/212 233/233/233 +f 227/227/227 182/182/182 233/233/233 228/228/228 +f 228/228/228 233/233/233 213/213/213 234/234/234 +f 233/233/233 212/212/212 223/223/223 213/213/213 +f 213/213/213 223/223/223 225/225/225 235/235/235 +f 234/234/234 213/213/213 235/235/235 236/236/236 +f 231/231/231 230/230/230 229/229/229 237/237/237 +f 230/230/230 228/228/228 234/234/234 229/229/229 +f 229/229/229 234/234/234 236/236/236 238/238/238 +f 237/237/237 229/229/229 238/238/238 239/239/239 +f 89/89/89 88/88/88 86/86/86 240/240/240 +f 88/88/88 85/85/85 241/241/241 86/86/86 +f 86/86/86 241/241/241 242/242/242 245/245/245 +f 240/240/240 86/86/86 245/245/245 246/246/246 +f 85/85/85 84/84/84 75/75/75 241/241/241 +f 84/84/84 74/74/74 247/247/247 75/75/75 +f 75/75/75 247/247/247 248/248/248 250/250/250 +f 241/241/241 75/75/75 250/250/250 242/242/242 +f 242/242/242 250/250/250 243/243/243 251/251/251 +f 250/250/250 248/248/248 252/252/252 243/243/243 +f 243/243/243 252/252/252 253/253/253 256/256/256 +f 251/251/251 243/243/243 256/256/256 257/257/257 +f 246/246/246 245/245/245 244/244/244 259/259/259 +f 245/245/245 242/242/242 251/251/251 244/244/244 +f 244/244/244 251/251/251 257/257/257 260/260/260 +f 259/259/259 244/244/244 260/260/260 261/261/261 +f 74/74/74 73/73/73 71/71/71 247/247/247 +f 73/73/73 70/70/70 262/262/262 71/71/71 +f 71/71/71 262/262/262 263/263/263 264/264/264 +f 247/247/247 71/71/71 264/264/264 248/248/248 +f 70/70/70 69/69/69 68/68/68 262/262/262 +f 69/69/69 66/66/66 166/166/166 68/68/68 +f 68/68/68 166/166/166 172/172/172 265/265/265 +f 262/262/262 68/68/68 265/265/265 263/263/263 +f 263/263/263 265/265/265 173/173/173 266/266/266 +f 265/265/265 172/172/172 186/186/186 173/173/173 +f 173/173/173 186/186/186 188/188/188 267/267/267 +f 266/266/266 173/173/173 267/267/267 268/268/268 +f 248/248/248 264/264/264 249/249/249 252/252/252 +f 264/264/264 263/263/263 266/266/266 249/249/249 +f 249/249/249 266/266/266 268/268/268 269/269/269 +f 252/252/252 249/249/249 269/269/269 253/253/253 +f 253/253/253 269/269/269 254/254/254 270/270/270 +f 269/269/269 268/268/268 271/271/271 254/254/254 +f 254/254/254 271/271/271 272/272/272 274/274/274 +f 270/270/270 254/254/254 274/274/274 275/275/275 +f 268/268/268 267/267/267 189/189/189 271/271/271 +f 267/267/267 188/188/188 226/226/226 189/189/189 +f 189/189/189 226/226/226 231/231/231 277/277/277 +f 271/271/271 189/189/189 277/277/277 272/272/272 +f 272/272/272 277/277/277 232/232/232 278/278/278 +f 277/277/277 231/231/231 237/237/237 232/232/232 +f 232/232/232 237/237/237 239/239/239 279/279/279 +f 278/278/278 232/232/232 279/279/279 280/280/280 +f 275/275/275 274/274/274 273/273/273 281/281/281 +f 274/274/274 272/272/272 278/278/278 273/273/273 +f 273/273/273 278/278/278 280/280/280 282/282/282 +f 281/281/281 273/273/273 282/282/282 283/283/283 +f 261/261/261 260/260/260 258/258/258 284/284/284 +f 260/260/260 257/257/257 285/285/285 258/258/258 +f 258/258/258 285/285/285 286/286/286 288/288/288 +f 284/284/284 258/258/258 288/288/288 289/289/289 +f 257/257/257 256/256/256 255/255/255 285/285/285 +f 256/256/256 253/253/253 270/270/270 255/255/255 +f 255/255/255 270/270/270 275/275/275 290/290/290 +f 285/285/285 255/255/255 290/290/290 286/286/286 +f 286/286/286 290/290/290 276/276/276 291/291/291 +f 290/290/290 275/275/275 281/281/281 276/276/276 +f 276/276/276 281/281/281 283/283/283 292/292/292 +f 291/291/291 276/276/276 292/292/292 293/293/293 +f 289/289/289 288/288/288 287/287/287 294/294/294 +f 288/288/288 286/286/286 291/291/291 287/287/287 +f 287/287/287 291/291/291 293/293/293 295/295/295 +f 294/294/294 287/287/287 295/295/295 296/296/296 +f 120/120/120 297/297/297 122/122/122 121/121/121 +f 297/297/297 298/298/298 299/299/299 122/122/122 +f 122/122/122 299/299/299 301/301/301 303/303/303 +f 121/121/121 122/122/122 303/303/303 123/123/123 +f 298/298/298 304/304/304 300/300/300 299/299/299 +f 304/304/304 305/305/305 306/306/306 300/300/300 +f 300/300/300 306/306/306 308/308/308 310/310/310 +f 299/299/299 300/300/300 310/310/310 301/301/301 +f 301/301/301 310/310/310 302/302/302 311/311/311 +f 310/310/310 308/308/308 312/312/312 302/302/302 +f 302/302/302 312/312/312 313/313/313 316/316/316 +f 311/311/311 302/302/302 316/316/316 317/317/317 +f 123/123/123 303/303/303 124/124/124 127/127/127 +f 303/303/303 301/301/301 311/311/311 124/124/124 +f 124/124/124 311/311/311 317/317/317 318/318/318 +f 127/127/127 124/124/124 318/318/318 128/128/128 +f 305/305/305 319/319/319 307/307/307 306/306/306 +f 319/319/319 320/320/320 321/321/321 307/307/307 +f 307/307/307 321/321/321 323/323/323 325/325/325 +f 306/306/306 307/307/307 325/325/325 308/308/308 +f 320/320/320 326/326/326 322/322/322 321/321/321 +f 326/326/326 327/327/327 328/328/328 322/322/322 +f 322/322/322 328/328/328 330/330/330 332/332/332 +f 321/321/321 322/322/322 332/332/332 323/323/323 +f 323/323/323 332/332/332 324/324/324 333/333/333 +f 332/332/332 330/330/330 334/334/334 324/324/324 +f 324/324/324 334/334/334 335/335/335 338/338/338 +f 333/333/333 324/324/324 338/338/338 339/339/339 +f 308/308/308 325/325/325 309/309/309 312/312/312 +f 325/325/325 323/323/323 333/333/333 309/309/309 +f 309/309/309 333/333/333 339/339/339 340/340/340 +f 312/312/312 309/309/309 340/340/340 313/313/313 +f 313/313/313 340/340/340 314/314/314 341/341/341 +f 340/340/340 339/339/339 342/342/342 314/314/314 +f 314/314/314 342/342/342 343/343/343 346/346/346 +f 341/341/341 314/314/314 346/346/346 347/347/347 +f 339/339/339 338/338/338 337/337/337 342/342/342 +f 338/338/338 335/335/335 349/349/349 337/337/337 +f 337/337/337 349/349/349 350/350/350 352/352/352 +f 342/342/342 337/337/337 352/352/352 343/343/343 +f 343/343/343 352/352/352 344/344/344 353/353/353 +f 352/352/352 350/350/350 354/354/354 344/344/344 +f 344/344/344 354/354/354 355/355/355 358/358/358 +f 353/353/353 344/344/344 358/358/358 359/359/359 +f 347/347/347 346/346/346 345/345/345 361/361/361 +f 346/346/346 343/343/343 353/353/353 345/345/345 +f 345/345/345 353/353/353 359/359/359 362/362/362 +f 361/361/361 345/345/345 362/362/362 363/363/363 +f 128/128/128 318/318/318 129/129/129 142/142/142 +f 318/318/318 317/317/317 365/365/365 129/129/129 +f 129/129/129 365/365/365 366/366/366 367/367/367 +f 142/142/142 129/129/129 367/367/367 143/143/143 +f 317/317/317 316/316/316 315/315/315 365/365/365 +f 316/316/316 313/313/313 341/341/341 315/315/315 +f 315/315/315 341/341/341 347/347/347 368/368/368 +f 365/365/365 315/315/315 368/368/368 366/366/366 +f 366/366/366 368/368/368 348/348/348 369/369/369 +f 368/368/368 347/347/347 361/361/361 348/348/348 +f 348/348/348 361/361/361 363/363/363 370/370/370 +f 369/369/369 348/348/348 370/370/370 371/371/371 +f 143/143/143 367/367/367 144/144/144 147/147/147 +f 367/367/367 366/366/366 369/369/369 144/144/144 +f 144/144/144 369/369/369 371/371/371 372/372/372 +f 147/147/147 144/144/144 372/372/372 148/148/148 +f 327/327/327 373/373/373 329/329/329 328/328/328 +f 373/373/373 374/374/374 375/375/375 329/329/329 +f 329/329/329 375/375/375 377/377/377 379/379/379 +f 328/328/328 329/329/329 379/379/379 330/330/330 +f 374/374/374 380/380/380 376/376/376 375/375/375 +f 380/380/380 381/381/381 382/382/382 376/376/376 +f 376/376/376 382/382/382 384/384/384 386/386/386 +f 375/375/375 376/376/376 386/386/386 377/377/377 +f 377/377/377 386/386/386 378/378/378 387/387/387 +f 386/386/386 384/384/384 388/388/388 378/378/378 +f 378/378/378 388/388/388 389/389/389 392/392/392 +f 387/387/387 378/378/378 392/392/392 393/393/393 +f 330/330/330 379/379/379 331/331/331 334/334/334 +f 379/379/379 377/377/377 387/387/387 331/331/331 +f 331/331/331 387/387/387 393/393/393 394/394/394 +f 334/334/334 331/331/331 394/394/394 335/335/335 +f 381/381/381 395/395/395 383/383/383 382/382/382 +f 395/395/395 396/396/396 397/397/397 383/383/383 +f 383/383/383 397/397/397 399/399/399 401/401/401 +f 382/382/382 383/383/383 401/401/401 384/384/384 +f 396/396/396 402/402/402 398/398/398 397/397/397 +f 402/402/402 403/403/403 404/404/404 398/398/398 +f 398/398/398 404/404/404 406/406/406 408/408/408 +f 397/397/397 398/398/398 408/408/408 399/399/399 +f 399/399/399 408/408/408 400/400/400 409/409/409 +f 408/408/408 406/406/406 410/410/410 400/400/400 +f 400/400/400 410/410/410 411/411/411 414/414/414 +f 409/409/409 400/400/400 414/414/414 415/415/415 +f 384/384/384 401/401/401 385/385/385 388/388/388 +f 401/401/401 399/399/399 409/409/409 385/385/385 +f 385/385/385 409/409/409 415/415/415 416/416/416 +f 388/388/388 385/385/385 416/416/416 389/389/389 +f 389/389/389 416/416/416 390/390/390 417/417/417 +f 416/416/416 415/415/415 418/418/418 390/390/390 +f 390/390/390 418/418/418 419/419/419 422/422/422 +f 417/417/417 390/390/390 422/422/422 423/423/423 +f 415/415/415 414/414/414 413/413/413 418/418/418 +f 414/414/414 411/411/411 425/425/425 413/413/413 +f 413/413/413 425/425/425 426/426/426 428/428/428 +f 418/418/418 413/413/413 428/428/428 419/419/419 +f 419/419/419 428/428/428 420/420/420 429/429/429 +f 428/428/428 426/426/426 430/430/430 420/420/420 +f 420/420/420 430/430/430 431/431/431 434/434/434 +f 429/429/429 420/420/420 434/434/434 435/435/435 +f 423/423/423 422/422/422 421/421/421 437/437/437 +f 422/422/422 419/419/419 429/429/429 421/421/421 +f 421/421/421 429/429/429 435/435/435 438/438/438 +f 437/437/437 421/421/421 438/438/438 439/439/439 +f 335/335/335 394/394/394 336/336/336 349/349/349 +f 394/394/394 393/393/393 441/441/441 336/336/336 +f 336/336/336 441/441/441 442/442/442 443/443/443 +f 349/349/349 336/336/336 443/443/443 350/350/350 +f 393/393/393 392/392/392 391/391/391 441/441/441 +f 392/392/392 389/389/389 417/417/417 391/391/391 +f 391/391/391 417/417/417 423/423/423 444/444/444 +f 441/441/441 391/391/391 444/444/444 442/442/442 +f 442/442/442 444/444/444 424/424/424 445/445/445 +f 444/444/444 423/423/423 437/437/437 424/424/424 +f 424/424/424 437/437/437 439/439/439 446/446/446 +f 445/445/445 424/424/424 446/446/446 447/447/447 +f 350/350/350 443/443/443 351/351/351 354/354/354 +f 443/443/443 442/442/442 445/445/445 351/351/351 +f 351/351/351 445/445/445 447/447/447 448/448/448 +f 354/354/354 351/351/351 448/448/448 355/355/355 +f 355/355/355 448/448/448 356/356/356 449/449/449 +f 448/448/448 447/447/447 450/450/450 356/356/356 +f 356/356/356 450/450/450 451/451/451 454/454/454 +f 449/449/449 356/356/356 454/454/454 455/455/455 +f 447/447/447 446/446/446 440/440/440 450/450/450 +f 446/446/446 439/439/439 457/457/457 440/440/440 +f 440/440/440 457/457/457 458/458/458 460/460/460 +f 450/450/450 440/440/440 460/460/460 451/451/451 +f 451/451/451 460/460/460 452/452/452 461/461/461 +f 460/460/460 458/458/458 462/462/462 452/452/452 +f 452/452/452 462/462/462 463/463/463 466/466/466 +f 461/461/461 452/452/452 466/466/466 467/467/467 +f 455/455/455 454/454/454 453/453/453 469/469/469 +f 454/454/454 451/451/451 461/461/461 453/453/453 +f 453/453/453 461/461/461 467/467/467 470/470/470 +f 469/469/469 453/453/453 470/470/470 471/471/471 +f 439/439/439 438/438/438 436/436/436 457/457/457 +f 438/438/438 435/435/435 473/473/473 436/436/436 +f 436/436/436 473/473/473 474/474/474 476/476/476 +f 457/457/457 436/436/436 476/476/476 458/458/458 +f 435/435/435 434/434/434 433/433/433 473/473/473 +f 434/434/434 431/431/431 477/477/477 433/433/433 +f 433/433/433 477/477/477 478/478/478 480/480/480 +f 473/473/473 433/433/433 480/480/480 474/474/474 +f 474/474/474 480/480/480 475/475/475 481/481/481 +f 480/480/480 478/478/478 482/482/482 475/475/475 +f 475/475/475 482/482/482 483/483/483 486/486/486 +f 481/481/481 475/475/475 486/486/486 487/487/487 +f 458/458/458 476/476/476 459/459/459 462/462/462 +f 476/476/476 474/474/474 481/481/481 459/459/459 +f 459/459/459 481/481/481 487/487/487 488/488/488 +f 462/462/462 459/459/459 488/488/488 463/463/463 +f 463/463/463 488/488/488 464/464/464 489/489/489 +f 488/488/488 487/487/487 490/490/490 464/464/464 +f 464/464/464 490/490/490 491/491/491 494/494/494 +f 489/489/489 464/464/464 494/494/494 495/495/495 +f 487/487/487 486/486/486 485/485/485 490/490/490 +f 486/486/486 483/483/483 497/497/497 485/485/485 +f 485/485/485 497/497/497 498/498/498 500/500/500 +f 490/490/490 485/485/485 500/500/500 491/491/491 +f 491/491/491 500/500/500 492/492/492 501/501/501 +f 500/500/500 498/498/498 502/502/502 492/492/492 +f 492/492/492 502/502/502 503/503/503 504/504/504 +f 501/501/501 492/492/492 504/504/504 505/505/505 +f 495/495/495 494/494/494 493/493/493 506/506/506 +f 494/494/494 491/491/491 501/501/501 493/493/493 +f 493/493/493 501/501/501 505/505/505 507/507/507 +f 506/506/506 493/493/493 507/507/507 508/508/508 +f 471/471/471 470/470/470 468/468/468 509/509/509 +f 470/470/470 467/467/467 510/510/510 468/468/468 +f 468/468/468 510/510/510 511/511/511 513/513/513 +f 509/509/509 468/468/468 513/513/513 514/514/514 +f 467/467/467 466/466/466 465/465/465 510/510/510 +f 466/466/466 463/463/463 489/489/489 465/465/465 +f 465/465/465 489/489/489 495/495/495 516/516/516 +f 510/510/510 465/465/465 516/516/516 511/511/511 +f 511/511/511 516/516/516 496/496/496 517/517/517 +f 516/516/516 495/495/495 506/506/506 496/496/496 +f 496/496/496 506/506/506 508/508/508 518/518/518 +f 517/517/517 496/496/496 518/518/518 519/519/519 +f 514/514/514 513/513/513 512/512/512 520/520/520 +f 513/513/513 511/511/511 517/517/517 512/512/512 +f 512/512/512 517/517/517 519/519/519 521/521/521 +f 520/520/520 512/512/512 521/521/521 522/522/522 +f 148/148/148 372/372/372 149/149/149 194/194/194 +f 372/372/372 371/371/371 523/523/523 149/149/149 +f 149/149/149 523/523/523 524/524/524 526/526/526 +f 194/194/194 149/149/149 526/526/526 195/195/195 +f 371/371/371 370/370/370 364/364/364 523/523/523 +f 370/370/370 363/363/363 527/527/527 364/364/364 +f 364/364/364 527/527/527 528/528/528 530/530/530 +f 523/523/523 364/364/364 530/530/530 524/524/524 +f 524/524/524 530/530/530 525/525/525 531/531/531 +f 530/530/530 528/528/528 532/532/532 525/525/525 +f 525/525/525 532/532/532 533/533/533 536/536/536 +f 531/531/531 525/525/525 536/536/536 537/537/537 +f 195/195/195 526/526/526 196/196/196 199/199/199 +f 526/526/526 524/524/524 531/531/531 196/196/196 +f 196/196/196 531/531/531 537/537/537 538/538/538 +f 199/199/199 196/196/196 538/538/538 200/200/200 +f 363/363/363 362/362/362 360/360/360 527/527/527 +f 362/362/362 359/359/359 539/539/539 360/360/360 +f 360/360/360 539/539/539 540/540/540 541/541/541 +f 527/527/527 360/360/360 541/541/541 528/528/528 +f 359/359/359 358/358/358 357/357/357 539/539/539 +f 358/358/358 355/355/355 449/449/449 357/357/357 +f 357/357/357 449/449/449 455/455/455 542/542/542 +f 539/539/539 357/357/357 542/542/542 540/540/540 +f 540/540/540 542/542/542 456/456/456 543/543/543 +f 542/542/542 455/455/455 469/469/469 456/456/456 +f 456/456/456 469/469/469 471/471/471 544/544/544 +f 543/543/543 456/456/456 544/544/544 545/545/545 +f 528/528/528 541/541/541 529/529/529 532/532/532 +f 541/541/541 540/540/540 543/543/543 529/529/529 +f 529/529/529 543/543/543 545/545/545 546/546/546 +f 532/532/532 529/529/529 546/546/546 533/533/533 +f 533/533/533 546/546/546 534/534/534 547/547/547 +f 546/546/546 545/545/545 548/548/548 534/534/534 +f 534/534/534 548/548/548 549/549/549 551/551/551 +f 547/547/547 534/534/534 551/551/551 552/552/552 +f 545/545/545 544/544/544 472/472/472 548/548/548 +f 544/544/544 471/471/471 509/509/509 472/472/472 +f 472/472/472 509/509/509 514/514/514 554/554/554 +f 548/548/548 472/472/472 554/554/554 549/549/549 +f 549/549/549 554/554/554 515/515/515 555/555/555 +f 554/554/554 514/514/514 520/520/520 515/515/515 +f 515/515/515 520/520/520 522/522/522 556/556/556 +f 555/555/555 515/515/515 556/556/556 557/557/557 +f 552/552/552 551/551/551 550/550/550 558/558/558 +f 551/551/551 549/549/549 555/555/555 550/550/550 +f 550/550/550 555/555/555 557/557/557 559/559/559 +f 558/558/558 550/550/550 559/559/559 560/560/560 +f 200/200/200 538/538/538 201/201/201 214/214/214 +f 538/538/538 537/537/537 561/561/561 201/201/201 +f 201/201/201 561/561/561 562/562/562 563/563/563 +f 214/214/214 201/201/201 563/563/563 215/215/215 +f 537/537/537 536/536/536 535/535/535 561/561/561 +f 536/536/536 533/533/533 547/547/547 535/535/535 +f 535/535/535 547/547/547 552/552/552 564/564/564 +f 561/561/561 535/535/535 564/564/564 562/562/562 +f 562/562/562 564/564/564 553/553/553 565/565/565 +f 564/564/564 552/552/552 558/558/558 553/553/553 +f 553/553/553 558/558/558 560/560/560 566/566/566 +f 565/565/565 553/553/553 566/566/566 567/567/567 +f 215/215/215 563/563/563 216/216/216 219/219/219 +f 563/563/563 562/562/562 565/565/565 216/216/216 +f 216/216/216 565/565/565 567/567/567 568/568/568 +f 219/219/219 216/216/216 568/568/568 220/220/220 +f 403/403/403 569/569/569 405/405/405 404/404/404 +f 569/569/569 570/570/570 571/571/571 405/405/405 +f 405/405/405 571/571/571 573/573/573 575/575/575 +f 404/404/404 405/405/405 575/575/575 406/406/406 +f 570/570/570 576/576/576 572/572/572 571/571/571 +f 576/576/576 577/577/577 578/578/578 572/572/572 +f 572/572/572 578/578/578 580/580/580 582/582/582 +f 571/571/571 572/572/572 582/582/582 573/573/573 +f 573/573/573 582/582/582 574/574/574 583/583/583 +f 582/582/582 580/580/580 584/584/584 574/574/574 +f 574/574/574 584/584/584 585/585/585 588/588/588 +f 583/583/583 574/574/574 588/588/588 589/589/589 +f 406/406/406 575/575/575 407/407/407 410/410/410 +f 575/575/575 573/573/573 583/583/583 407/407/407 +f 407/407/407 583/583/583 589/589/589 590/590/590 +f 410/410/410 407/407/407 590/590/590 411/411/411 +f 577/577/577 591/591/591 579/579/579 578/578/578 +f 591/591/591 592/592/592 593/593/593 579/579/579 +f 579/579/579 593/593/593 595/595/595 597/597/597 +f 578/578/578 579/579/579 597/597/597 580/580/580 +f 592/592/592 598/598/598 594/594/594 593/593/593 +f 598/598/598 599/599/599 600/600/600 594/594/594 +f 594/594/594 600/600/600 602/602/602 604/604/604 +f 593/593/593 594/594/594 604/604/604 595/595/595 +f 595/595/595 604/604/604 596/596/596 605/605/605 +f 604/604/604 602/602/602 606/606/606 596/596/596 +f 596/596/596 606/606/606 607/607/607 610/610/610 +f 605/605/605 596/596/596 610/610/610 611/611/611 +f 580/580/580 597/597/597 581/581/581 584/584/584 +f 597/597/597 595/595/595 605/605/605 581/581/581 +f 581/581/581 605/605/605 611/611/611 612/612/612 +f 584/584/584 581/581/581 612/612/612 585/585/585 +f 585/585/585 612/612/612 586/586/586 613/613/613 +f 612/612/612 611/611/611 614/614/614 586/586/586 +f 586/586/586 614/614/614 615/615/615 618/618/618 +f 613/613/613 586/586/586 618/618/618 619/619/619 +f 611/611/611 610/610/610 609/609/609 614/614/614 +f 610/610/610 607/607/607 621/621/621 609/609/609 +f 609/609/609 621/621/621 622/622/622 624/624/624 +f 614/614/614 609/609/609 624/624/624 615/615/615 +f 615/615/615 624/624/624 616/616/616 625/625/625 +f 624/624/624 622/622/622 626/626/626 616/616/616 +f 616/616/616 626/626/626 627/627/627 630/630/630 +f 625/625/625 616/616/616 630/630/630 631/631/631 +f 619/619/619 618/618/618 617/617/617 633/633/633 +f 618/618/618 615/615/615 625/625/625 617/617/617 +f 617/617/617 625/625/625 631/631/631 634/634/634 +f 633/633/633 617/617/617 634/634/634 635/635/635 +f 411/411/411 590/590/590 412/412/412 425/425/425 +f 590/590/590 589/589/589 637/637/637 412/412/412 +f 412/412/412 637/637/637 638/638/638 639/639/639 +f 425/425/425 412/412/412 639/639/639 426/426/426 +f 589/589/589 588/588/588 587/587/587 637/637/637 +f 588/588/588 585/585/585 613/613/613 587/587/587 +f 587/587/587 613/613/613 619/619/619 640/640/640 +f 637/637/637 587/587/587 640/640/640 638/638/638 +f 638/638/638 640/640/640 620/620/620 641/641/641 +f 640/640/640 619/619/619 633/633/633 620/620/620 +f 620/620/620 633/633/633 635/635/635 642/642/642 +f 641/641/641 620/620/620 642/642/642 643/643/643 +f 426/426/426 639/639/639 427/427/427 430/430/430 +f 639/639/639 638/638/638 641/641/641 427/427/427 +f 427/427/427 641/641/641 643/643/643 644/644/644 +f 430/430/430 427/427/427 644/644/644 431/431/431 +f 599/599/599 645/645/645 601/601/601 600/600/600 +f 645/645/645 646/646/646 647/647/647 601/601/601 +f 601/601/601 647/647/647 649/649/649 651/651/651 +f 600/600/600 601/601/601 651/651/651 602/602/602 +f 646/646/646 652/652/652 648/648/648 647/647/647 +f 652/652/652 653/653/653 654/654/654 648/648/648 +f 648/648/648 654/654/654 656/656/656 658/658/658 +f 647/647/647 648/648/648 658/658/658 649/649/649 +f 649/649/649 658/658/658 650/650/650 659/659/659 +f 658/658/658 656/656/656 660/660/660 650/650/650 +f 650/650/650 660/660/660 661/661/661 664/664/664 +f 659/659/659 650/650/650 664/664/664 665/665/665 +f 602/602/602 651/651/651 603/603/603 606/606/606 +f 651/651/651 649/649/649 659/659/659 603/603/603 +f 603/603/603 659/659/659 665/665/665 666/666/666 +f 606/606/606 603/603/603 666/666/666 607/607/607 +f 653/653/653 667/667/667 655/655/655 654/654/654 +f 667/667/667 668/668/668 669/669/669 655/655/655 +f 655/655/655 669/669/669 671/671/671 673/673/673 +f 654/654/654 655/655/655 673/673/673 656/656/656 +f 668/668/668 674/674/674 670/670/670 669/669/669 +f 674/674/674 675/675/675 676/676/676 670/670/670 +f 670/670/670 676/676/676 678/678/678 680/680/680 +f 669/669/669 670/670/670 680/680/680 671/671/671 +f 671/671/671 680/680/680 672/672/672 681/681/681 +f 680/680/680 678/678/678 682/682/682 672/672/672 +f 672/672/672 682/682/682 683/683/683 686/686/686 +f 681/681/681 672/672/672 686/686/686 687/687/687 +f 656/656/656 673/673/673 657/657/657 660/660/660 +f 673/673/673 671/671/671 681/681/681 657/657/657 +f 657/657/657 681/681/681 687/687/687 688/688/688 +f 660/660/660 657/657/657 688/688/688 661/661/661 +f 661/661/661 688/688/688 662/662/662 689/689/689 +f 688/688/688 687/687/687 690/690/690 662/662/662 +f 662/662/662 690/690/690 691/691/691 694/694/694 +f 689/689/689 662/662/662 694/694/694 695/695/695 +f 687/687/687 686/686/686 685/685/685 690/690/690 +f 686/686/686 683/683/683 697/697/697 685/685/685 +f 685/685/685 697/697/697 698/698/698 700/700/700 +f 690/690/690 685/685/685 700/700/700 691/691/691 +f 691/691/691 700/700/700 692/692/692 701/701/701 +f 700/700/700 698/698/698 702/702/702 692/692/692 +f 692/692/692 702/702/702 703/703/703 706/706/706 +f 701/701/701 692/692/692 706/706/706 707/707/707 +f 695/695/695 694/694/694 693/693/693 709/709/709 +f 694/694/694 691/691/691 701/701/701 693/693/693 +f 693/693/693 701/701/701 707/707/707 710/710/710 +f 709/709/709 693/693/693 710/710/710 711/711/711 +f 607/607/607 666/666/666 608/608/608 621/621/621 +f 666/666/666 665/665/665 713/713/713 608/608/608 +f 608/608/608 713/713/713 714/714/714 715/715/715 +f 621/621/621 608/608/608 715/715/715 622/622/622 +f 665/665/665 664/664/664 663/663/663 713/713/713 +f 664/664/664 661/661/661 689/689/689 663/663/663 +f 663/663/663 689/689/689 695/695/695 716/716/716 +f 713/713/713 663/663/663 716/716/716 714/714/714 +f 714/714/714 716/716/716 696/696/696 717/717/717 +f 716/716/716 695/695/695 709/709/709 696/696/696 +f 696/696/696 709/709/709 711/711/711 718/718/718 +f 717/717/717 696/696/696 718/718/718 719/719/719 +f 622/622/622 715/715/715 623/623/623 626/626/626 +f 715/715/715 714/714/714 717/717/717 623/623/623 +f 623/623/623 717/717/717 719/719/719 720/720/720 +f 626/626/626 623/623/623 720/720/720 627/627/627 +f 627/627/627 720/720/720 628/628/628 721/721/721 +f 720/720/720 719/719/719 722/722/722 628/628/628 +f 628/628/628 722/722/722 723/723/723 726/726/726 +f 721/721/721 628/628/628 726/726/726 727/727/727 +f 719/719/719 718/718/718 712/712/712 722/722/722 +f 718/718/718 711/711/711 729/729/729 712/712/712 +f 712/712/712 729/729/729 730/730/730 732/732/732 +f 722/722/722 712/712/712 732/732/732 723/723/723 +f 723/723/723 732/732/732 724/724/724 733/733/733 +f 732/732/732 730/730/730 734/734/734 724/724/724 +f 724/724/724 734/734/734 735/735/735 738/738/738 +f 733/733/733 724/724/724 738/738/738 739/739/739 +f 727/727/727 726/726/726 725/725/725 741/741/741 +f 726/726/726 723/723/723 733/733/733 725/725/725 +f 725/725/725 733/733/733 739/739/739 742/742/742 +f 741/741/741 725/725/725 742/742/742 743/743/743 +f 711/711/711 710/710/710 708/708/708 729/729/729 +f 710/710/710 707/707/707 745/745/745 708/708/708 +f 708/708/708 745/745/745 746/746/746 748/748/748 +f 729/729/729 708/708/708 748/748/748 730/730/730 +f 707/707/707 706/706/706 705/705/705 745/745/745 +f 706/706/706 703/703/703 749/749/749 705/705/705 +f 705/705/705 749/749/749 750/750/750 752/752/752 +f 745/745/745 705/705/705 752/752/752 746/746/746 +f 746/746/746 752/752/752 747/747/747 753/753/753 +f 752/752/752 750/750/750 754/754/754 747/747/747 +f 747/747/747 754/754/754 755/755/755 758/758/758 +f 753/753/753 747/747/747 758/758/758 759/759/759 +f 730/730/730 748/748/748 731/731/731 734/734/734 +f 748/748/748 746/746/746 753/753/753 731/731/731 +f 731/731/731 753/753/753 759/759/759 760/760/760 +f 734/734/734 731/731/731 760/760/760 735/735/735 +f 735/735/735 760/760/760 736/736/736 761/761/761 +f 760/760/760 759/759/759 762/762/762 736/736/736 +f 736/736/736 762/762/762 763/763/763 766/766/766 +f 761/761/761 736/736/736 766/766/766 767/767/767 +f 759/759/759 758/758/758 757/757/757 762/762/762 +f 758/758/758 755/755/755 769/769/769 757/757/757 +f 757/757/757 769/769/769 770/770/770 772/772/772 +f 762/762/762 757/757/757 772/772/772 763/763/763 +f 763/763/763 772/772/772 764/764/764 773/773/773 +f 772/772/772 770/770/770 774/774/774 764/764/764 +f 764/764/764 774/774/774 775/775/775 776/776/776 +f 773/773/773 764/764/764 776/776/776 777/777/777 +f 767/767/767 766/766/766 765/765/765 778/778/778 +f 766/766/766 763/763/763 773/773/773 765/765/765 +f 765/765/765 773/773/773 777/777/777 779/779/779 +f 778/778/778 765/765/765 779/779/779 780/780/780 +f 743/743/743 742/742/742 740/740/740 781/781/781 +f 742/742/742 739/739/739 782/782/782 740/740/740 +f 740/740/740 782/782/782 783/783/783 785/785/785 +f 781/781/781 740/740/740 785/785/785 786/786/786 +f 739/739/739 738/738/738 737/737/737 782/782/782 +f 738/738/738 735/735/735 761/761/761 737/737/737 +f 737/737/737 761/761/761 767/767/767 788/788/788 +f 782/782/782 737/737/737 788/788/788 783/783/783 +f 783/783/783 788/788/788 768/768/768 789/789/789 +f 788/788/788 767/767/767 778/778/778 768/768/768 +f 768/768/768 778/778/778 780/780/780 790/790/790 +f 789/789/789 768/768/768 790/790/790 791/791/791 +f 786/786/786 785/785/785 784/784/784 792/792/792 +f 785/785/785 783/783/783 789/789/789 784/784/784 +f 784/784/784 789/789/789 791/791/791 793/793/793 +f 792/792/792 784/784/784 793/793/793 794/794/794 +f 431/431/431 644/644/644 432/432/432 477/477/477 +f 644/644/644 643/643/643 795/795/795 432/432/432 +f 432/432/432 795/795/795 796/796/796 798/798/798 +f 477/477/477 432/432/432 798/798/798 478/478/478 +f 643/643/643 642/642/642 636/636/636 795/795/795 +f 642/642/642 635/635/635 799/799/799 636/636/636 +f 636/636/636 799/799/799 800/800/800 802/802/802 +f 795/795/795 636/636/636 802/802/802 796/796/796 +f 796/796/796 802/802/802 797/797/797 803/803/803 +f 802/802/802 800/800/800 804/804/804 797/797/797 +f 797/797/797 804/804/804 805/805/805 808/808/808 +f 803/803/803 797/797/797 808/808/808 809/809/809 +f 478/478/478 798/798/798 479/479/479 482/482/482 +f 798/798/798 796/796/796 803/803/803 479/479/479 +f 479/479/479 803/803/803 809/809/809 810/810/810 +f 482/482/482 479/479/479 810/810/810 483/483/483 +f 635/635/635 634/634/634 632/632/632 799/799/799 +f 634/634/634 631/631/631 811/811/811 632/632/632 +f 632/632/632 811/811/811 812/812/812 813/813/813 +f 799/799/799 632/632/632 813/813/813 800/800/800 +f 631/631/631 630/630/630 629/629/629 811/811/811 +f 630/630/630 627/627/627 721/721/721 629/629/629 +f 629/629/629 721/721/721 727/727/727 814/814/814 +f 811/811/811 629/629/629 814/814/814 812/812/812 +f 812/812/812 814/814/814 728/728/728 815/815/815 +f 814/814/814 727/727/727 741/741/741 728/728/728 +f 728/728/728 741/741/741 743/743/743 816/816/816 +f 815/815/815 728/728/728 816/816/816 817/817/817 +f 800/800/800 813/813/813 801/801/801 804/804/804 +f 813/813/813 812/812/812 815/815/815 801/801/801 +f 801/801/801 815/815/815 817/817/817 818/818/818 +f 804/804/804 801/801/801 818/818/818 805/805/805 +f 805/805/805 818/818/818 806/806/806 819/819/819 +f 818/818/818 817/817/817 820/820/820 806/806/806 +f 806/806/806 820/820/820 821/821/821 823/823/823 +f 819/819/819 806/806/806 823/823/823 824/824/824 +f 817/817/817 816/816/816 744/744/744 820/820/820 +f 816/816/816 743/743/743 781/781/781 744/744/744 +f 744/744/744 781/781/781 786/786/786 826/826/826 +f 820/820/820 744/744/744 826/826/826 821/821/821 +f 821/821/821 826/826/826 787/787/787 827/827/827 +f 826/826/826 786/786/786 792/792/792 787/787/787 +f 787/787/787 792/792/792 794/794/794 828/828/828 +f 827/827/827 787/787/787 828/828/828 829/829/829 +f 824/824/824 823/823/823 822/822/822 830/830/830 +f 823/823/823 821/821/821 827/827/827 822/822/822 +f 822/822/822 827/827/827 829/829/829 831/831/831 +f 830/830/830 822/822/822 831/831/831 832/832/832 +f 483/483/483 810/810/810 484/484/484 497/497/497 +f 810/810/810 809/809/809 833/833/833 484/484/484 +f 484/484/484 833/833/833 834/834/834 835/835/835 +f 497/497/497 484/484/484 835/835/835 498/498/498 +f 809/809/809 808/808/808 807/807/807 833/833/833 +f 808/808/808 805/805/805 819/819/819 807/807/807 +f 807/807/807 819/819/819 824/824/824 836/836/836 +f 833/833/833 807/807/807 836/836/836 834/834/834 +f 834/834/834 836/836/836 825/825/825 837/837/837 +f 836/836/836 824/824/824 830/830/830 825/825/825 +f 825/825/825 830/830/830 832/832/832 838/838/838 +f 837/837/837 825/825/825 838/838/838 839/839/839 +f 498/498/498 835/835/835 499/499/499 502/502/502 +f 835/835/835 834/834/834 837/837/837 499/499/499 +f 499/499/499 837/837/837 839/839/839 840/840/840 +f 502/502/502 499/499/499 840/840/840 503/503/503 +f 675/675/675 841/841/841 677/677/677 676/676/676 +f 841/841/841 842/842/842 843/843/843 677/677/677 +f 677/677/677 843/843/843 845/845/845 847/847/847 +f 676/676/676 677/677/677 847/847/847 678/678/678 +f 842/842/842 848/848/848 844/844/844 843/843/843 +f 848/848/848 849/849/849 850/850/850 844/844/844 +f 844/844/844 850/850/850 852/852/852 854/854/854 +f 843/843/843 844/844/844 854/854/854 845/845/845 +f 845/845/845 854/854/854 846/846/846 855/855/855 +f 854/854/854 852/852/852 856/856/856 846/846/846 +f 846/846/846 856/856/856 857/857/857 860/860/860 +f 855/855/855 846/846/846 860/860/860 861/861/861 +f 678/678/678 847/847/847 679/679/679 682/682/682 +f 847/847/847 845/845/845 855/855/855 679/679/679 +f 679/679/679 855/855/855 861/861/861 862/862/862 +f 682/682/682 679/679/679 862/862/862 683/683/683 +f 849/849/849 863/863/863 851/851/851 850/850/850 +f 863/863/863 864/864/864 865/865/865 851/851/851 +f 851/851/851 865/865/865 867/867/867 869/869/869 +f 850/850/850 851/851/851 869/869/869 852/852/852 +f 864/864/864 870/870/870 866/866/866 865/865/865 +f 870/870/870 871/871/871 872/872/872 866/866/866 +f 866/866/866 872/872/872 874/874/874 876/876/876 +f 865/865/865 866/866/866 876/876/876 867/867/867 +f 867/867/867 876/876/876 868/868/868 877/877/877 +f 876/876/876 874/874/874 878/878/878 868/868/868 +f 868/868/868 878/878/878 879/879/879 882/882/882 +f 877/877/877 868/868/868 882/882/882 883/883/883 +f 852/852/852 869/869/869 853/853/853 856/856/856 +f 869/869/869 867/867/867 877/877/877 853/853/853 +f 853/853/853 877/877/877 883/883/883 884/884/884 +f 856/856/856 853/853/853 884/884/884 857/857/857 +f 857/857/857 884/884/884 858/858/858 885/885/885 +f 884/884/884 883/883/883 886/886/886 858/858/858 +f 858/858/858 886/886/886 887/887/887 890/890/890 +f 885/885/885 858/858/858 890/890/890 891/891/891 +f 883/883/883 882/882/882 881/881/881 886/886/886 +f 882/882/882 879/879/879 893/893/893 881/881/881 +f 881/881/881 893/893/893 894/894/894 896/896/896 +f 886/886/886 881/881/881 896/896/896 887/887/887 +f 887/887/887 896/896/896 888/888/888 897/897/897 +f 896/896/896 894/894/894 898/898/898 888/888/888 +f 888/888/888 898/898/898 899/899/899 902/902/902 +f 897/897/897 888/888/888 902/902/902 903/903/903 +f 891/891/891 890/890/890 889/889/889 905/905/905 +f 890/890/890 887/887/887 897/897/897 889/889/889 +f 889/889/889 897/897/897 903/903/903 906/906/906 +f 905/905/905 889/889/889 906/906/906 907/907/907 +f 683/683/683 862/862/862 684/684/684 697/697/697 +f 862/862/862 861/861/861 909/909/909 684/684/684 +f 684/684/684 909/909/909 910/910/910 911/911/911 +f 697/697/697 684/684/684 911/911/911 698/698/698 +f 861/861/861 860/860/860 859/859/859 909/909/909 +f 860/860/860 857/857/857 885/885/885 859/859/859 +f 859/859/859 885/885/885 891/891/891 912/912/912 +f 909/909/909 859/859/859 912/912/912 910/910/910 +f 910/910/910 912/912/912 892/892/892 913/913/913 +f 912/912/912 891/891/891 905/905/905 892/892/892 +f 892/892/892 905/905/905 907/907/907 914/914/914 +f 913/913/913 892/892/892 914/914/914 915/915/915 +f 698/698/698 911/911/911 699/699/699 702/702/702 +f 911/911/911 910/910/910 913/913/913 699/699/699 +f 699/699/699 913/913/913 915/915/915 916/916/916 +f 702/702/702 699/699/699 916/916/916 703/703/703 +f 871/871/871 917/917/917 873/873/873 872/872/872 +f 917/917/917 918/918/918 919/919/919 873/873/873 +f 873/873/873 919/919/919 921/921/921 923/923/923 +f 872/872/872 873/873/873 923/923/923 874/874/874 +f 918/918/918 924/924/924 920/920/920 919/919/919 +f 924/924/924 925/925/925 926/926/926 920/920/920 +f 920/920/920 926/926/926 928/928/928 930/930/930 +f 919/919/919 920/920/920 930/930/930 921/921/921 +f 921/921/921 930/930/930 922/922/922 931/931/931 +f 930/930/930 928/928/928 932/932/932 922/922/922 +f 922/922/922 932/932/932 933/933/933 936/936/936 +f 931/931/931 922/922/922 936/936/936 937/937/937 +f 874/874/874 923/923/923 875/875/875 878/878/878 +f 923/923/923 921/921/921 931/931/931 875/875/875 +f 875/875/875 931/931/931 937/937/937 938/938/938 +f 878/878/878 875/875/875 938/938/938 879/879/879 +f 925/925/925 939/939/939 927/927/927 926/926/926 +f 939/939/939 940/940/940 941/941/941 927/927/927 +f 927/927/927 941/941/941 943/943/943 945/945/945 +f 926/926/926 927/927/927 945/945/945 928/928/928 +f 940/940/940 946/946/946 942/942/942 941/941/941 +f 946/946/946 947/947/947 948/948/948 942/942/942 +f 942/942/942 948/948/948 949/949/949 950/950/950 +f 941/941/941 942/942/942 950/950/950 943/943/943 +f 943/943/943 950/950/950 944/944/944 951/951/951 +f 950/950/950 949/949/949 952/952/952 944/944/944 +f 944/944/944 952/952/952 953/953/953 954/954/954 +f 951/951/951 944/944/944 954/954/954 956/956/956 +f 928/928/928 945/945/945 929/929/929 932/932/932 +f 945/945/945 943/943/943 951/951/951 929/929/929 +f 929/929/929 951/951/951 956/956/956 957/957/957 +f 932/932/932 929/929/929 957/957/957 933/933/933 +f 933/933/933 957/957/957 934/934/934 958/958/958 +f 957/957/957 956/956/956 959/959/959 934/934/934 +f 934/934/934 959/959/959 960/960/960 963/963/963 +f 958/958/958 934/934/934 963/963/963 964/964/964 +f 956/956/956 954/954/954 955/955/955 959/959/959 +f 954/954/954 953/953/953 966/966/966 955/955/955 +f 955/955/955 966/966/966 967/967/967 968/968/968 +f 959/959/959 955/955/955 968/968/968 960/960/960 +f 960/960/960 968/968/968 961/961/961 969/969/969 +f 968/968/968 967/967/967 970/970/970 961/961/961 +f 961/961/961 970/970/970 971/971/971 972/972/972 +f 969/969/969 961/961/961 972/972/972 974/974/974 +f 964/964/964 963/963/963 962/962/962 976/976/976 +f 963/963/963 960/960/960 969/969/969 962/962/962 +f 962/962/962 969/969/969 974/974/974 977/977/977 +f 976/976/976 962/962/962 977/977/977 978/978/978 +f 879/879/879 938/938/938 880/880/880 893/893/893 +f 938/938/938 937/937/937 980/980/980 880/880/880 +f 880/880/880 980/980/980 981/981/981 982/982/982 +f 893/893/893 880/880/880 982/982/982 894/894/894 +f 937/937/937 936/936/936 935/935/935 980/980/980 +f 936/936/936 933/933/933 958/958/958 935/935/935 +f 935/935/935 958/958/958 964/964/964 983/983/983 +f 980/980/980 935/935/935 983/983/983 981/981/981 +f 981/981/981 983/983/983 965/965/965 984/984/984 +f 983/983/983 964/964/964 976/976/976 965/965/965 +f 965/965/965 976/976/976 978/978/978 985/985/985 +f 984/984/984 965/965/965 985/985/985 986/986/986 +f 894/894/894 982/982/982 895/895/895 898/898/898 +f 982/982/982 981/981/981 984/984/984 895/895/895 +f 895/895/895 984/984/984 986/986/986 987/987/987 +f 898/898/898 895/895/895 987/987/987 899/899/899 +f 899/899/899 987/987/987 900/900/900 988/988/988 +f 987/987/987 986/986/986 989/989/989 900/900/900 +f 900/900/900 989/989/989 990/990/990 993/993/993 +f 988/988/988 900/900/900 993/993/993 994/994/994 +f 986/986/986 985/985/985 979/979/979 989/989/989 +f 985/985/985 978/978/978 996/996/996 979/979/979 +f 979/979/979 996/996/996 997/997/997 999/999/999 +f 989/989/989 979/979/979 999/999/999 990/990/990 +f 990/990/990 999/999/999 991/991/991 1000/1000/1000 +f 999/999/999 997/997/997 1001/1001/1001 991/991/991 +f 991/991/991 1001/1001/1001 1002/1002/1002 1005/1005/1005 +f 1000/1000/1000 991/991/991 1005/1005/1005 1006/1006/1006 +f 994/994/994 993/993/993 992/992/992 1008/1008/1008 +f 993/993/993 990/990/990 1000/1000/1000 992/992/992 +f 992/992/992 1000/1000/1000 1006/1006/1006 1009/1009/1009 +f 1008/1008/1008 992/992/992 1009/1009/1009 1010/1010/1010 +f 978/978/978 977/977/977 975/975/975 996/996/996 +f 977/977/977 974/974/974 1012/1012/1012 975/975/975 +f 975/975/975 1012/1012/1012 1013/1013/1013 1015/1015/1015 +f 996/996/996 975/975/975 1015/1015/1015 997/997/997 +f 974/974/974 972/972/972 973/973/973 1012/1012/1012 +f 972/972/972 971/971/971 1016/1016/1016 973/973/973 +f 973/973/973 1016/1016/1016 1017/1017/1017 1018/1018/1018 +f 1012/1012/1012 973/973/973 1018/1018/1018 1013/1013/1013 +f 1013/1013/1013 1018/1018/1018 1014/1014/1014 1019/1019/1019 +f 1018/1018/1018 1017/1017/1017 1020/1020/1020 1014/1014/1014 +f 1014/1014/1014 1020/1020/1020 1021/1021/1021 1022/1022/1022 +f 1019/1019/1019 1014/1014/1014 1022/1022/1022 1024/1024/1024 +f 997/997/997 1015/1015/1015 998/998/998 1001/1001/1001 +f 1015/1015/1015 1013/1013/1013 1019/1019/1019 998/998/998 +f 998/998/998 1019/1019/1019 1024/1024/1024 1025/1025/1025 +f 1001/1001/1001 998/998/998 1025/1025/1025 1002/1002/1002 +f 1002/1002/1002 1025/1025/1025 1003/1003/1003 1026/1026/1026 +f 1025/1025/1025 1024/1024/1024 1027/1027/1027 1003/1003/1003 +f 1003/1003/1003 1027/1027/1027 1028/1028/1028 1031/1031/1031 +f 1026/1026/1026 1003/1003/1003 1031/1031/1031 1032/1032/1032 +f 1024/1024/1024 1022/1022/1022 1023/1023/1023 1027/1027/1027 +f 1022/1022/1022 1021/1021/1021 1034/1034/1034 1023/1023/1023 +f 1023/1023/1023 1034/1034/1034 1035/1035/1035 1036/1036/1036 +f 1027/1027/1027 1023/1023/1023 1036/1036/1036 1028/1028/1028 +f 1028/1028/1028 1036/1036/1036 1029/1029/1029 1037/1037/1037 +f 1036/1036/1036 1035/1035/1035 1038/1038/1038 1029/1029/1029 +f 1029/1029/1029 1038/1038/1038 1039/1039/1039 1040/1040/1040 +f 1037/1037/1037 1029/1029/1029 1040/1040/1040 1041/1041/1041 +f 1032/1032/1032 1031/1031/1031 1030/1030/1030 1042/1042/1042 +f 1031/1031/1031 1028/1028/1028 1037/1037/1037 1030/1030/1030 +f 1030/1030/1030 1037/1037/1037 1041/1041/1041 1043/1043/1043 +f 1042/1042/1042 1030/1030/1030 1043/1043/1043 1044/1044/1044 +f 1010/1010/1010 1009/1009/1009 1007/1007/1007 1045/1045/1045 +f 1009/1009/1009 1006/1006/1006 1046/1046/1046 1007/1007/1007 +f 1007/1007/1007 1046/1046/1046 1047/1047/1047 1049/1049/1049 +f 1045/1045/1045 1007/1007/1007 1049/1049/1049 1050/1050/1050 +f 1006/1006/1006 1005/1005/1005 1004/1004/1004 1046/1046/1046 +f 1005/1005/1005 1002/1002/1002 1026/1026/1026 1004/1004/1004 +f 1004/1004/1004 1026/1026/1026 1032/1032/1032 1052/1052/1052 +f 1046/1046/1046 1004/1004/1004 1052/1052/1052 1047/1047/1047 +f 1047/1047/1047 1052/1052/1052 1033/1033/1033 1053/1053/1053 +f 1052/1052/1052 1032/1032/1032 1042/1042/1042 1033/1033/1033 +f 1033/1033/1033 1042/1042/1042 1044/1044/1044 1054/1054/1054 +f 1053/1053/1053 1033/1033/1033 1054/1054/1054 1055/1055/1055 +f 1050/1050/1050 1049/1049/1049 1048/1048/1048 1056/1056/1056 +f 1049/1049/1049 1047/1047/1047 1053/1053/1053 1048/1048/1048 +f 1048/1048/1048 1053/1053/1053 1055/1055/1055 1057/1057/1057 +f 1056/1056/1056 1048/1048/1048 1057/1057/1057 1058/1058/1058 +f 703/703/703 916/916/916 704/704/704 749/749/749 +f 916/916/916 915/915/915 1059/1059/1059 704/704/704 +f 704/704/704 1059/1059/1059 1060/1060/1060 1062/1062/1062 +f 749/749/749 704/704/704 1062/1062/1062 750/750/750 +f 915/915/915 914/914/914 908/908/908 1059/1059/1059 +f 914/914/914 907/907/907 1063/1063/1063 908/908/908 +f 908/908/908 1063/1063/1063 1064/1064/1064 1066/1066/1066 +f 1059/1059/1059 908/908/908 1066/1066/1066 1060/1060/1060 +f 1060/1060/1060 1066/1066/1066 1061/1061/1061 1067/1067/1067 +f 1066/1066/1066 1064/1064/1064 1068/1068/1068 1061/1061/1061 +f 1061/1061/1061 1068/1068/1068 1069/1069/1069 1072/1072/1072 +f 1067/1067/1067 1061/1061/1061 1072/1072/1072 1073/1073/1073 +f 750/750/750 1062/1062/1062 751/751/751 754/754/754 +f 1062/1062/1062 1060/1060/1060 1067/1067/1067 751/751/751 +f 751/751/751 1067/1067/1067 1073/1073/1073 1074/1074/1074 +f 754/754/754 751/751/751 1074/1074/1074 755/755/755 +f 907/907/907 906/906/906 904/904/904 1063/1063/1063 +f 906/906/906 903/903/903 1075/1075/1075 904/904/904 +f 904/904/904 1075/1075/1075 1076/1076/1076 1077/1077/1077 +f 1063/1063/1063 904/904/904 1077/1077/1077 1064/1064/1064 +f 903/903/903 902/902/902 901/901/901 1075/1075/1075 +f 902/902/902 899/899/899 988/988/988 901/901/901 +f 901/901/901 988/988/988 994/994/994 1078/1078/1078 +f 1075/1075/1075 901/901/901 1078/1078/1078 1076/1076/1076 +f 1076/1076/1076 1078/1078/1078 995/995/995 1079/1079/1079 +f 1078/1078/1078 994/994/994 1008/1008/1008 995/995/995 +f 995/995/995 1008/1008/1008 1010/1010/1010 1080/1080/1080 +f 1079/1079/1079 995/995/995 1080/1080/1080 1081/1081/1081 +f 1064/1064/1064 1077/1077/1077 1065/1065/1065 1068/1068/1068 +f 1077/1077/1077 1076/1076/1076 1079/1079/1079 1065/1065/1065 +f 1065/1065/1065 1079/1079/1079 1081/1081/1081 1082/1082/1082 +f 1068/1068/1068 1065/1065/1065 1082/1082/1082 1069/1069/1069 +f 1069/1069/1069 1082/1082/1082 1070/1070/1070 1083/1083/1083 +f 1082/1082/1082 1081/1081/1081 1084/1084/1084 1070/1070/1070 +f 1070/1070/1070 1084/1084/1084 1085/1085/1085 1087/1087/1087 +f 1083/1083/1083 1070/1070/1070 1087/1087/1087 1088/1088/1088 +f 1081/1081/1081 1080/1080/1080 1011/1011/1011 1084/1084/1084 +f 1080/1080/1080 1010/1010/1010 1045/1045/1045 1011/1011/1011 +f 1011/1011/1011 1045/1045/1045 1050/1050/1050 1090/1090/1090 +f 1084/1084/1084 1011/1011/1011 1090/1090/1090 1085/1085/1085 +f 1085/1085/1085 1090/1090/1090 1051/1051/1051 1091/1091/1091 +f 1090/1090/1090 1050/1050/1050 1056/1056/1056 1051/1051/1051 +f 1051/1051/1051 1056/1056/1056 1058/1058/1058 1092/1092/1092 +f 1091/1091/1091 1051/1051/1051 1092/1092/1092 1093/1093/1093 +f 1088/1088/1088 1087/1087/1087 1086/1086/1086 1094/1094/1094 +f 1087/1087/1087 1085/1085/1085 1091/1091/1091 1086/1086/1086 +f 1086/1086/1086 1091/1091/1091 1093/1093/1093 1095/1095/1095 +f 1094/1094/1094 1086/1086/1086 1095/1095/1095 1096/1096/1096 +f 755/755/755 1074/1074/1074 756/756/756 769/769/769 +f 1074/1074/1074 1073/1073/1073 1097/1097/1097 756/756/756 +f 756/756/756 1097/1097/1097 1098/1098/1098 1099/1099/1099 +f 769/769/769 756/756/756 1099/1099/1099 770/770/770 +f 1073/1073/1073 1072/1072/1072 1071/1071/1071 1097/1097/1097 +f 1072/1072/1072 1069/1069/1069 1083/1083/1083 1071/1071/1071 +f 1071/1071/1071 1083/1083/1083 1088/1088/1088 1100/1100/1100 +f 1097/1097/1097 1071/1071/1071 1100/1100/1100 1098/1098/1098 +f 1098/1098/1098 1100/1100/1100 1089/1089/1089 1101/1101/1101 +f 1100/1100/1100 1088/1088/1088 1094/1094/1094 1089/1089/1089 +f 1089/1089/1089 1094/1094/1094 1096/1096/1096 1102/1102/1102 +f 1101/1101/1101 1089/1089/1089 1102/1102/1102 1103/1103/1103 +f 770/770/770 1099/1099/1099 771/771/771 774/774/774 +f 1099/1099/1099 1098/1098/1098 1101/1101/1101 771/771/771 +f 771/771/771 1101/1101/1101 1103/1103/1103 1104/1104/1104 +f 774/774/774 771/771/771 1104/1104/1104 775/775/775 +; diff --git a/regression/hbr_regression/baseline/catmark_flap2_level4.obj b/regression/hbr_regression/baseline/catmark_flap2_level4.obj new file mode 100644 index 00000000..6d2dc451 --- /dev/null +++ b/regression/hbr_regression/baseline/catmark_flap2_level4.obj @@ -0,0 +1,8356 @@ +# This file uses centimeters as units for non-parametric coordinates. +v -0.458374023 -0.0833740234 0 +v -0.454345703 -0.0871582031 0 +v -0.457519531 -0.0825195312 0 +v -0.462158203 -0.0793457031 0 +v -0.450080872 -0.0907058716 0 +v -0.45280695 -0.0856194496 0 +v -0.447946548 -0.0885715485 0 +v -0.455484837 -0.0804981887 0 +v -0.452538908 -0.0775885582 0 +v -0.463542938 -0.0729751587 0 +v -0.460612297 -0.0778141022 0 +v -0.465698242 -0.075088501 0 +v -0.445587158 -0.0940246582 0 +v -0.440872192 -0.0971221924 0 +v -0.442925453 -0.0913629532 0 +v -0.437730789 -0.0939807892 0 +v -0.444954544 -0.0855910182 0 +v -0.441229999 -0.0818972588 0 +v -0.450274348 -0.083099246 0 +v -0.458066344 -0.07530725 0 +v -0.446935296 -0.0797936916 0 +v -0.448843449 -0.0739582777 0 +v -0.444503725 -0.069715023 0 +v -0.456752002 -0.0663752556 0 +v -0.454708695 -0.0720202923 0 +v -0.460518509 -0.0700270534 0 +v -0.468837738 -0.0628738403 0 +v -0.468994141 -0.0706176758 0 +v -0.466291428 -0.0679969788 0 +v -0.472045898 -0.0659484863 0 +v -0.435943604 -0.100006104 0 +v -0.430809021 -0.102684021 0 +v -0.432364941 -0.0964274406 0 +v -0.426830292 -0.0987052917 0 +v -0.43390584 -0.0901655257 0 +v -0.429489255 -0.0857744217 0 +v -0.439499199 -0.0879472494 0 +v -0.425476074 -0.105163574 0 +v -0.419952393 -0.107452393 0 +v -0.421129227 -0.100816727 0 +v -0.41526413 -0.10276413 0 +v -0.4222956 -0.0941785574 0 +v -0.417266011 -0.0891695023 0 +v -0.428172141 -0.092243433 0 +v -0.435416758 -0.0838929415 0 +v -0.423441112 -0.0875353813 0 +v -0.424555242 -0.0808846951 0 +v -0.419162393 -0.0755548477 0 +v -0.431999803 -0.0728006363 0 +v -0.430769265 -0.0792946815 0 +v -0.436882645 -0.0776043534 0 +v -0.442904472 -0.0758225918 0 +v -0.450654984 -0.0680720806 0 +v -0.438288599 -0.0712944269 0 +v -0.439620405 -0.064958781 0 +v -0.434262991 -0.0597553253 0 +v -0.447416902 -0.0573835373 0 +v -0.446012884 -0.0635701418 0 +v -0.452355087 -0.0621319413 0 +v -0.460409284 -0.054854393 0 +v -0.425627649 -0.0742239952 0 +v -0.426647782 -0.0675507784 0 +v -0.42088294 -0.0619068146 0 +v -0.433168501 -0.0662887096 0 +v -0.440864176 -0.0585930347 0 +v -0.427605271 -0.0608625412 0 +v -0.428489685 -0.0541567802 0 +v -0.422357321 -0.0482120514 0 +v -0.436179876 -0.0466098785 0 +v -0.435270905 -0.053196907 0 +v -0.442005754 -0.0521928072 0 +v -0.449849725 -0.0448675156 0 +v -0.453929245 -0.0561347008 0 +v -0.448700845 -0.0511507988 0 +v -0.455362737 -0.0500771999 0 +v -0.463410497 -0.0430250168 0 +v -0.474853516 -0.0610961914 0 +v -0.46280843 -0.0646380186 0 +v -0.464926958 -0.0591444075 0 +v -0.473304749 -0.052230835 0 +v -0.471177101 -0.0576152802 0 +v -0.477416992 -0.0560760498 0 +v -0.4586564 -0.0606533289 0 +v -0.466865093 -0.0535504818 0 +v -0.461998165 -0.0489783287 0 +v -0.468613654 -0.0478605032 0 +v -0.476905823 -0.0411224365 0 +v -0.479736328 -0.0509033203 0 +v -0.475215912 -0.0467300415 0 +v -0.481811523 -0.0455932617 0 +v -0.414245605 -0.109558105 0 +v -0.408363342 -0.111488342 0 +v -0.409241199 -0.104553699 0 +v -0.403066635 -0.106191635 0 +v -0.410111666 -0.0976180136 0 +v -0.404548705 -0.0920710564 0 +v -0.416273862 -0.0959684849 0 +v -0.402313232 -0.113250732 0 +v -0.396102905 -0.114852905 0 +v -0.396746635 -0.107684135 0 +v -0.390287399 -0.109037399 0 +v -0.39738518 -0.100515068 0 +v -0.391364872 -0.0945067406 0 +v -0.403813839 -0.0991319418 0 +v -0.41096738 -0.0906802416 0 +v -0.398013353 -0.0933454037 0 +v -0.398626059 -0.0861748457 0 +v -0.392390311 -0.0799746513 0 +v -0.405956566 -0.077943325 0 +v -0.405264974 -0.0850083828 0 +v -0.411800951 -0.0837393403 0 +v -0.418231785 -0.0823655128 0 +v -0.38973999 -0.11630249 0 +v -0.383232117 -0.117607117 0 +v -0.383695126 -0.110257626 0 +v -0.376976013 -0.111351013 0 +v -0.384154499 -0.102908105 0 +v -0.377742052 -0.0965042114 0 +v -0.390830457 -0.101772189 0 +v -0.376586914 -0.118774414 0 +v -0.369812012 -0.119812012 0 +v -0.370136261 -0.112323761 0 +v -0.363182068 -0.113182068 0 +v -0.370457947 -0.10483551 0 +v -0.363707781 -0.0980911255 0 +v -0.377362072 -0.103927612 0 +v -0.3846066 -0.0955585241 0 +v -0.370774627 -0.0973472595 0 +v -0.371083617 -0.0898590088 0 +v -0.36420846 -0.0830001831 0 +v -0.378471613 -0.0816574097 0 +v -0.378112912 -0.0890808105 0 +v -0.385047793 -0.0882088542 0 +v -0.391886234 -0.0872409344 0 +v -0.399217963 -0.0790030956 0 +v -0.385474503 -0.0808590651 0 +v -0.385883033 -0.0735091269 0 +v -0.379140377 -0.0668106079 0 +v -0.393329024 -0.0654401779 0 +v -0.392872661 -0.0727077723 0 +v -0.399784088 -0.0718298554 0 +v -0.407240748 -0.0638036728 0 +v -0.371382594 -0.0823707581 0 +v -0.371668816 -0.0748825073 0 +v -0.364667416 -0.0679092407 0 +v -0.378815114 -0.0742340088 0 +v -0.386269778 -0.0661590099 0 +v -0.371939898 -0.0673942566 0 +v -0.372193217 -0.0599060059 0 +v -0.365067959 -0.0528182983 0 +v -0.379724026 -0.0519638062 0 +v -0.379444361 -0.059387207 0 +v -0.386631101 -0.0588086843 0 +v -0.394146323 -0.0509023666 0 +v -0.40031904 -0.0646548271 0 +v -0.393755019 -0.0581717491 0 +v -0.400817811 -0.0574777126 0 +v -0.408351779 -0.0496473312 0 +v -0.412605047 -0.0767942667 0 +v -0.413372219 -0.0698439777 0 +v -0.420049042 -0.0687358379 0 +v -0.406617194 -0.0708752871 0 +v -0.414095074 -0.0628874302 0 +v -0.407821 -0.0567278862 0 +v -0.414766312 -0.0559235811 0 +v -0.421655297 -0.0550661087 0 +v -0.429290414 -0.0474309921 0 +v -0.415378481 -0.0489513874 0 +v -0.415926367 -0.0419718921 0 +v -0.409244955 -0.0354743004 0 +v -0.423528552 -0.0344705582 0 +v -0.422983557 -0.0413463116 0 +v -0.430002213 -0.0406876802 0 +v -0.437680125 -0.033364296 0 +v -0.401275098 -0.050298214 0 +v -0.4016864 -0.0431166291 0 +v -0.394808471 -0.0363612175 0 +v -0.40882808 -0.042562604 0 +v -0.416404575 -0.0349861383 0 +v -0.402047157 -0.0359332561 0 +v -0.402352661 -0.0287483931 0 +v -0.395282686 -0.0218176842 0 +v -0.40988034 -0.0212893486 0 +v -0.409597397 -0.0283830166 0 +v -0.41680789 -0.0279951692 0 +v -0.424353004 -0.0206956863 0 +v -0.430619538 -0.033929348 0 +v -0.423986852 -0.0275864601 0 +v -0.431137025 -0.0271584988 0 +v -0.438722014 -0.0200471878 0 +v -0.386963338 -0.0514581203 0 +v -0.38726297 -0.0441073477 0 +v -0.38019824 -0.0371170044 0 +v -0.394498825 -0.0436321497 0 +v -0.372426271 -0.0524177551 0 +v -0.372636557 -0.0449295044 0 +v -0.3653934 -0.037727356 0 +v -0.379976332 -0.0445404053 0 +v -0.387526393 -0.0367563963 0 +v -0.37282145 -0.0374412537 0 +v -0.372978568 -0.0299530029 0 +v -0.36562705 -0.0226364136 0 +v -0.380538702 -0.0222702026 0 +v -0.38038671 -0.0296936035 0 +v -0.387750059 -0.0294052958 0 +v -0.395071149 -0.0290896893 0 +v -0.4025985 -0.0215623379 0 +v -0.387930334 -0.0220540762 0 +v -0.388063729 -0.0147027671 0 +v -0.380721092 -0.00742340088 0 +v -0.395536184 -0.00727272034 0 +v -0.395439088 -0.0145453215 0 +v -0.402779967 -0.0143753886 0 +v -0.410218 -0.00709724426 0 +v -0.373105168 -0.0224647522 0 +v -0.373198926 -0.0149765015 0 +v -0.36575222 -0.00754547119 0 +v -0.380651176 -0.0148468018 0 +v -0.388146579 -0.00735139847 0 +v -0.37325716 -0.00748825073 0 +v -0.373277426 0 0 +v -0.36575222 0.00754547119 0 +v -0.380721092 0.00742340088 0 +v -0.380745411 0 0 +v -0.388175428 0 0 +v -0.395536184 0.00727272034 0 +v -0.40289247 -0.00718784332 0 +v -0.395569921 0 0 +v -0.402931571 0 0 +v -0.410218 0.00709724426 0 +v -0.431549132 -0.020377636 0 +v -0.417130947 -0.0210000277 0 +v -0.417368561 -0.0140017569 0 +v -0.424787045 -0.00690078735 0 +v -0.424621552 -0.0137999058 0 +v -0.431850523 -0.013589263 0 +v -0.439263821 -0.00668716431 0 +v -0.410088897 -0.0141938925 0 +v -0.417515337 -0.00700139999 0 +v -0.410262704 0 0 +v -0.417566061 0 0 +v -0.424787045 0.00690078735 0 +v -0.432035685 -0.00679588318 0 +v -0.424844027 0 0 +v -0.432099223 0 0 +v -0.439263821 0.00668716431 0 +v -0.483642578 -0.0401611328 0 +v -0.470163614 -0.0420787334 0 +v -0.471513033 -0.0362166464 0 +v -0.465694487 -0.0309252739 0 +v -0.479618073 -0.0296401978 0 +v -0.478373528 -0.0354213715 0 +v -0.485229492 -0.0346221924 0 +v -0.456641018 -0.0439562798 0 +v -0.457760453 -0.0377798676 0 +v -0.451725304 -0.0321745872 0 +v -0.464643538 -0.0370041132 0 +v -0.472660065 -0.0302857161 0 +v -0.458717465 -0.031555891 0 +v -0.459508628 -0.0252922773 0 +v -0.453009665 -0.0193552971 0 +v -0.467239201 -0.018632412 0 +v -0.466560602 -0.0247981548 0 +v -0.473602831 -0.0242974162 0 +v -0.481433868 -0.0178909302 0 +v -0.486572266 -0.0289916992 0 +v -0.480638504 -0.0237922668 0 +v -0.487670898 -0.0232849121 0 +v -0.443031162 -0.0457537174 0 +v -0.443935543 -0.0392806232 0 +v -0.450859308 -0.0385400057 0 +v -0.436984688 -0.0399978161 0 +v -0.444714129 -0.0327783823 0 +v -0.438260972 -0.0267128944 0 +v -0.445362091 -0.0262518525 0 +v -0.45244348 -0.0257775784 0 +v -0.460130215 -0.018996954 0 +v -0.445874542 -0.0197058916 0 +v -0.446246803 -0.0131453574 0 +v -0.453668833 -0.00646018982 0 +v -0.453419507 -0.0129140615 0 +v -0.460578799 -0.0126778483 0 +v -0.468022585 -0.00622367859 0 +v -0.439058036 -0.0133707523 0 +v -0.446474016 -0.00657510757 0 +v -0.439334154 0 0 +v -0.446551323 0 0 +v -0.453668833 0.00646018982 0 +v -0.460850835 -0.00634288788 0 +v -0.453753352 0 0 +v -0.460942626 0 0 +v -0.468022585 0.00622367859 0 +v -0.488525391 -0.0175170898 0 +v -0.474339426 -0.0182632208 0 +v -0.474868 -0.0121946037 0 +v -0.482345581 -0.00598144531 0 +v -0.482003212 -0.0119495392 0 +v -0.489135742 -0.0117034912 0 +v -0.467727423 -0.0124377012 0 +v -0.475186646 -0.00610303879 0 +v -0.468121886 0 0 +v -0.475293458 0 0 +v -0.482345581 0.00598144531 0 +v -0.489501953 -0.005859375 0 +v -0.482460022 0 0 +v -0.489624023 0 0 +v -0.362915039 -0.120727539 0 +v -0.355903625 -0.121528625 0 +v -0.356120586 -0.113933086 0 +v -0.348958969 -0.114583969 0 +v -0.356335878 -0.106337547 0 +v -0.349300683 -0.0993061066 0 +v -0.363447011 -0.105636597 0 +v -0.3487854 -0.1222229 0 +v -0.341567993 -0.122817993 0 +v -0.341704369 -0.115141869 0 +v -0.334363937 -0.115613937 0 +v -0.341839671 -0.107465744 0 +v -0.334570467 -0.100198746 0 +v -0.349131167 -0.106945038 0 +v -0.356547713 -0.0987420082 0 +v -0.341972828 -0.0997896194 0 +v -0.342102855 -0.0921134949 0 +v -0.334767163 -0.0847835541 0 +v -0.349626124 -0.084028244 0 +v -0.349466085 -0.0916671753 0 +v -0.356754482 -0.0911464691 0 +v -0.363962293 -0.0905456543 0 +v -0.334259033 -0.123321533 0 +v -0.32686615 -0.12374115 0 +v -0.326944828 -0.116007328 0 +v -0.319454193 -0.116329193 0 +v -0.32702288 -0.108273506 0 +v -0.319566846 -0.100818634 0 +v -0.334468007 -0.107906342 0 +v -0.319396973 -0.124084473 0 +v -0.311859131 -0.124359131 0 +v -0.311899185 -0.116586685 0 +v -0.304286957 -0.116786957 0 +v -0.311938912 -0.10881424 0 +v -0.304339528 -0.101215363 0 +v -0.319510967 -0.108573914 0 +v -0.327099741 -0.100539684 0 +v -0.311978042 -0.101041794 0 +v -0.312016189 -0.0932693481 0 +v -0.304389596 -0.0856437683 0 +v -0.319674134 -0.085308075 0 +v -0.319621384 -0.0930633545 0 +v -0.327174723 -0.0928058624 0 +v -0.334670424 -0.0924911499 0 +v -0.342228532 -0.0844373703 0 +v -0.327247262 -0.0850720406 0 +v -0.327316701 -0.0773382187 0 +v -0.319772482 -0.0697975159 0 +v -0.334947467 -0.0693683624 0 +v -0.334859759 -0.0770759583 0 +v -0.342348993 -0.0767612457 0 +v -0.349924445 -0.0687503815 0 +v -0.312053144 -0.0854969025 0 +v -0.31208849 -0.0777244568 0 +v -0.304435492 -0.0700721741 0 +v -0.319724649 -0.0775527954 0 +v -0.327382475 -0.0696043968 0 +v -0.312121987 -0.0699520111 0 +v -0.312153339 -0.0621795654 0 +v -0.304475546 -0.0545005798 0 +v -0.319858313 -0.0542869568 0 +v -0.319817185 -0.0620422363 0 +v -0.327443957 -0.061870575 0 +v -0.335104823 -0.0539531708 0 +v -0.342462957 -0.0690851212 0 +v -0.335029423 -0.0616607666 0 +v -0.34256953 -0.0614089966 0 +v -0.350184798 -0.0534725189 0 +v -0.356954515 -0.08355093 0 +v -0.357146055 -0.0759553909 0 +v -0.364444196 -0.0754547119 0 +v -0.349779338 -0.0763893127 0 +v -0.357327431 -0.0683598518 0 +v -0.350060046 -0.0611114502 0 +v -0.357496947 -0.0607643127 0 +v -0.364876032 -0.0603637695 0 +v -0.304260254 -0.124572754 0 +v -0.296607971 -0.124732971 0 +v -0.29662466 -0.11693716 0 +v -0.288919449 -0.117044449 0 +v -0.296641201 -0.10914135 0 +v -0.288938224 -0.101438522 0 +v -0.304313451 -0.10900116 0 +v -0.288909912 -0.124847412 0 +v -0.281173706 -0.124923706 0 +v -0.281178474 -0.117115974 0 +v -0.27340889 -0.11715889 0 +v -0.281183183 -0.109308243 0 +v -0.273412645 -0.101537704 0 +v -0.288928926 -0.109241486 0 +v -0.296657503 -0.101345539 0 +v -0.281187862 -0.101500511 0 +v -0.281192422 -0.0936927795 0 +v -0.273416221 -0.0859165192 0 +v -0.288956106 -0.0858325958 0 +v -0.288947314 -0.0936355591 0 +v -0.296673417 -0.0935497284 0 +v -0.304364979 -0.0934295654 0 +v -0.273406982 -0.124969482 0 +v -0.265617371 -0.124992371 0 +v -0.265617847 -0.117180347 0 +v -0.2578125 -0.1171875 0 +v -0.265618324 -0.109368324 0 +v -0.2578125 -0.1015625 0 +v -0.273410797 -0.109348297 0 +v -0.2578125 -0.125 0 +v -0.25 -0.125 0 +v -0.25 -0.1171875 0 +v -0.2421875 -0.1171875 0 +v -0.25 -0.109375 0 +v -0.2421875 -0.1015625 0 +v -0.2578125 -0.109375 0 +v -0.265618801 -0.101556301 0 +v -0.25 -0.1015625 0 +v -0.25 -0.09375 0 +v -0.2421875 -0.0859375 0 +v -0.2578125 -0.0859375 0 +v -0.2578125 -0.09375 0 +v -0.265619248 -0.093744278 0 +v -0.273414463 -0.0937271118 0 +v -0.281196803 -0.0858850479 0 +v -0.265619695 -0.0859322548 0 +v -0.265620112 -0.0781202316 0 +v -0.2578125 -0.0703125 0 +v -0.273419499 -0.0702953339 0 +v -0.27341789 -0.0781059265 0 +v -0.281201005 -0.0780773163 0 +v -0.288972497 -0.0702266693 0 +v -0.25 -0.0859375 0 +v -0.25 -0.078125 0 +v -0.2421875 -0.0703125 0 +v -0.2578125 -0.078125 0 +v -0.2656205 -0.0703082085 0 +v -0.25 -0.0703125 0 +v -0.25 -0.0625 0 +v -0.2421875 -0.0546875 0 +v -0.2578125 -0.0546875 0 +v -0.2578125 -0.0625 0 +v -0.265620857 -0.0624961853 0 +v -0.27342236 -0.0546741486 0 +v -0.281204998 -0.0702695847 0 +v -0.27342099 -0.0624847412 0 +v -0.281208694 -0.062461853 0 +v -0.288986802 -0.0546207428 0 +v -0.296688795 -0.0857539177 0 +v -0.296703517 -0.077958107 0 +v -0.30441317 -0.0778579712 0 +v -0.28896451 -0.0780296326 0 +v -0.296717495 -0.0701622963 0 +v -0.288979948 -0.0624237061 0 +v -0.296730518 -0.0623664856 0 +v -0.304456353 -0.062286377 0 +v -0.312182069 -0.0544071198 0 +v -0.296742529 -0.0545706749 0 +v -0.296753377 -0.0467748642 0 +v -0.288998425 -0.0390148163 0 +v -0.30450809 -0.0389289856 0 +v -0.304492861 -0.0467147827 0 +v -0.312208056 -0.0466346741 0 +v -0.31992805 -0.0387763977 0 +v -0.281212151 -0.0546541214 0 +v -0.28121525 -0.0468463898 0 +v -0.273424685 -0.0390529633 0 +v -0.288993001 -0.0468177795 0 +v -0.296762884 -0.0389790535 0 +v -0.281217963 -0.0390386581 0 +v -0.281220257 -0.0312309265 0 +v -0.273426354 -0.023431778 0 +v -0.28900677 -0.0234088898 0 +v -0.289003044 -0.031211853 0 +v -0.29677096 -0.0311832428 0 +v -0.304531455 -0.0233573914 0 +v -0.312230885 -0.0388622284 0 +v -0.304521024 -0.0311431885 0 +v -0.312250316 -0.0310897827 0 +v -0.319978118 -0.0232658386 0 +v -0.265621215 -0.0546841621 0 +v -0.265621513 -0.046872139 0 +v -0.2578125 -0.0390625 0 +v -0.273423612 -0.0468635559 0 +v -0.25 -0.0546875 0 +v -0.25 -0.046875 0 +v -0.2421875 -0.0390625 0 +v -0.2578125 -0.046875 0 +v -0.265621781 -0.0390601158 0 +v -0.25 -0.0390625 0 +v -0.25 -0.03125 0 +v -0.2421875 -0.0234375 0 +v -0.2578125 -0.0234375 0 +v -0.2578125 -0.03125 0 +v -0.26562202 -0.0312480927 0 +v -0.273425609 -0.0312423706 0 +v -0.281222135 -0.0234231949 0 +v -0.265622199 -0.0234360695 0 +v -0.265622348 -0.0156240463 0 +v -0.2578125 -0.0078125 0 +v -0.273427248 -0.00781059265 0 +v -0.27342689 -0.0156211853 0 +v -0.281223506 -0.0156154633 0 +v -0.28901124 -0.00780296326 0 +v -0.25 -0.0234375 0 +v -0.25 -0.015625 0 +v -0.2421875 -0.0078125 0 +v -0.2578125 -0.015625 0 +v -0.265622437 -0.00781202316 0 +v -0.25 -0.0078125 0 +v -0.25 0 0 +v -0.2421875 0.0078125 0 +v -0.2578125 0.0078125 0 +v -0.2578125 0 0 +v -0.265622467 0 0 +v -0.273427248 0.00781059265 0 +v -0.28122437 -0.00780773163 0 +v -0.273427367 0 0 +v -0.281224668 0 0 +v -0.28901124 0.00780296326 0 +v -0.312265933 -0.023317337 0 +v -0.296777487 -0.0233874321 0 +v -0.296782285 -0.0155916214 0 +v -0.304543972 -0.00778579712 0 +v -0.304539174 -0.0155715942 0 +v -0.312277526 -0.0155448914 0 +v -0.32000494 -0.00775527954 0 +v -0.289009511 -0.0156059265 0 +v -0.296785295 -0.0077958107 0 +v -0.289011836 0 0 +v -0.296786338 0 0 +v -0.304543972 0.00778579712 0 +v -0.312284708 -0.00777244568 0 +v -0.304545641 0 0 +v -0.312287211 0 0 +v -0.32000494 0.00775527954 0 +v -0.357652873 -0.0531687737 0 +v -0.35779357 -0.0455732346 0 +v -0.350396335 -0.0381946564 0 +v -0.36524111 -0.0452728271 0 +v -0.34266752 -0.053732872 0 +v -0.342755944 -0.0460567474 0 +v -0.335232675 -0.0385379791 0 +v -0.350297332 -0.0458335876 0 +v -0.357917309 -0.0379776955 0 +v -0.342833757 -0.0383806229 0 +v -0.34289977 -0.0307044983 0 +v -0.335324466 -0.0231227875 0 +v -0.350548208 -0.0229167938 0 +v -0.350480437 -0.0305557251 0 +v -0.358022392 -0.0303821564 0 +v -0.365522742 -0.0301818848 0 +v -0.327500492 -0.0541367531 0 +v -0.327551544 -0.0464029312 0 +v -0.335172832 -0.046245575 0 +v -0.319895416 -0.0465316772 0 +v -0.327596366 -0.0386691093 0 +v -0.319955766 -0.0310211182 0 +v -0.327634484 -0.0309352875 0 +v -0.335283518 -0.0308303833 0 +v -0.342953086 -0.0230283737 0 +v -0.32766521 -0.0232014656 0 +v -0.327687979 -0.0154676437 0 +v -0.33537364 -0.00770759583 0 +v -0.335354805 -0.0154151917 0 +v -0.342992514 -0.0153522491 0 +v -0.350629568 -0.00763893127 0 +v -0.319994658 -0.0155105591 0 +v -0.327702105 -0.00773382187 0 +v -0.320008516 0 0 +v -0.327707052 0 0 +v -0.33537364 0.00770759583 0 +v -0.343016982 -0.00767612457 0 +v -0.335380197 0 0 +v -0.343025565 0 0 +v -0.350629568 0.00763893127 0 +v -0.35810715 -0.0227866173 0 +v -0.358169854 -0.0151910782 0 +v -0.365704238 -0.0150909424 0 +v -0.350598395 -0.0152778625 0 +v -0.358208835 -0.00759553909 0 +v -0.350640416 0 0 +v -0.358222425 0 0 +v -0.365768909 0 0 +v -0.37325716 0.00748825073 0 +v -0.358208835 0.00759553909 0 +v -0.358169854 0.0151910782 0 +v -0.350548208 0.0229167938 0 +v -0.36562705 0.0226364136 0 +v -0.365704238 0.0150909424 0 +v -0.373198926 0.0149765015 0 +v -0.380538702 0.0222702026 0 +v -0.343016982 0.00767612457 0 +v -0.342992514 0.0153522491 0 +v -0.335324466 0.0231227875 0 +v -0.350598395 0.0152778625 0 +v -0.35810715 0.0227866173 0 +v -0.342953086 0.0230283737 0 +v -0.34289977 0.0307044983 0 +v -0.335232675 0.0385379791 0 +v -0.350396335 0.0381946564 0 +v -0.350480437 0.0305557251 0 +v -0.358022392 0.0303821564 0 +v -0.3653934 0.037727356 0 +v -0.373105168 0.0224647522 0 +v -0.365522742 0.0301818848 0 +v -0.372978568 0.0299530029 0 +v -0.38019824 0.0371170044 0 +v -0.327702105 0.00773382187 0 +v -0.327687979 0.0154676437 0 +v -0.319978118 0.0232658386 0 +v -0.335354805 0.0154151917 0 +v -0.312284708 0.00777244568 0 +v -0.312277526 0.0155448914 0 +v -0.304531455 0.0233573914 0 +v -0.319994658 0.0155105591 0 +v -0.32766521 0.0232014656 0 +v -0.312265933 0.023317337 0 +v -0.312250316 0.0310897827 0 +v -0.30450809 0.0389289856 0 +v -0.31992805 0.0387763977 0 +v -0.319955766 0.0310211182 0 +v -0.327634484 0.0309352875 0 +v -0.335283518 0.0308303833 0 +v -0.342833757 0.0383806229 0 +v -0.327596366 0.0386691093 0 +v -0.327551544 0.0464029312 0 +v -0.319858313 0.0542869568 0 +v -0.335104823 0.0539531708 0 +v -0.335172862 0.046245575 0 +v -0.342755944 0.0460567474 0 +v -0.350184798 0.0534725189 0 +v -0.312230885 0.0388622284 0 +v -0.312208056 0.0466346741 0 +v -0.304475546 0.0545005798 0 +v -0.319895416 0.0465316772 0 +v -0.327500492 0.0541367531 0 +v -0.312182069 0.0544071198 0 +v -0.312153339 0.0621795654 0 +v -0.304435492 0.0700721741 0 +v -0.319772482 0.0697975159 0 +v -0.319817185 0.0620422363 0 +v -0.327443957 0.061870575 0 +v -0.334947467 0.0693683624 0 +v -0.34266752 0.053732872 0 +v -0.335029423 0.0616607666 0 +v -0.34256953 0.0614089966 0 +v -0.349924445 0.0687503815 0 +v -0.37282145 0.0374412537 0 +v -0.357917309 0.0379776955 0 +v -0.35779357 0.0455732346 0 +v -0.365067959 0.0528182983 0 +v -0.36524111 0.0452728271 0 +v -0.372636557 0.0449295044 0 +v -0.379724026 0.0519638062 0 +v -0.350297362 0.0458335876 0 +v -0.357652873 0.0531687737 0 +v -0.350060046 0.0611114502 0 +v -0.357496947 0.0607643127 0 +v -0.364667416 0.0679092407 0 +v -0.372426271 0.0524177551 0 +v -0.364876032 0.0603637695 0 +v -0.372193217 0.0599060059 0 +v -0.379140377 0.0668106079 0 +v -0.296785295 0.0077958107 0 +v -0.296782315 0.0155916214 0 +v -0.28900677 0.0234088898 0 +v -0.304539174 0.0155715942 0 +v -0.28122437 0.00780773163 0 +v -0.281223506 0.0156154633 0 +v -0.273426354 0.023431778 0 +v -0.289009511 0.0156059265 0 +v -0.296777487 0.0233874321 0 +v -0.281222135 0.0234231949 0 +v -0.281220287 0.0312309265 0 +v -0.273424685 0.0390529633 0 +v -0.288998425 0.0390148163 0 +v -0.289003044 0.031211853 0 +v -0.29677096 0.0311832428 0 +v -0.304521024 0.0311431885 0 +v -0.265622437 0.00781202316 0 +v -0.265622348 0.0156240463 0 +v -0.2578125 0.0234375 0 +v -0.27342689 0.0156211853 0 +v -0.25 0.0078125 0 +v -0.25 0.015625 0 +v -0.2421875 0.0234375 0 +v -0.2578125 0.015625 0 +v -0.265622199 0.0234360695 0 +v -0.25 0.0234375 0 +v -0.25 0.03125 0 +v -0.2421875 0.0390625 0 +v -0.2578125 0.0390625 0 +v -0.2578125 0.03125 0 +v -0.26562202 0.0312480927 0 +v -0.273425609 0.0312423706 0 +v -0.281217963 0.0390386581 0 +v -0.265621781 0.0390601158 0 +v -0.265621513 0.046872139 0 +v -0.2578125 0.0546875 0 +v -0.27342236 0.0546741486 0 +v -0.273423612 0.0468635559 0 +v -0.28121525 0.0468463898 0 +v -0.288986802 0.0546207428 0 +v -0.25 0.0390625 0 +v -0.25 0.046875 0 +v -0.2421875 0.0546875 0 +v -0.2578125 0.046875 0 +v -0.265621215 0.0546841621 0 +v -0.25 0.0546875 0 +v -0.25 0.0625 0 +v -0.2421875 0.0703125 0 +v -0.2578125 0.0703125 0 +v -0.2578125 0.0625 0 +v -0.265620857 0.0624961853 0 +v -0.273419499 0.0702953339 0 +v -0.281212151 0.0546541214 0 +v -0.27342099 0.0624847412 0 +v -0.281208694 0.062461853 0 +v -0.288972497 0.0702266693 0 +v -0.296762884 0.0389790535 0 +v -0.296753347 0.0467748642 0 +v -0.304492861 0.0467147827 0 +v -0.288993001 0.0468177795 0 +v -0.296742529 0.0545706749 0 +v -0.288979948 0.0624237061 0 +v -0.296730518 0.0623664856 0 +v -0.304456353 0.062286377 0 +v -0.312121987 0.0699520111 0 +v -0.296717495 0.0701622963 0 +v -0.296703547 0.077958107 0 +v -0.288956106 0.0858325958 0 +v -0.304389596 0.0856437683 0 +v -0.30441317 0.0778579712 0 +v -0.31208849 0.0777244568 0 +v -0.319674134 0.085308075 0 +v -0.281204998 0.0702695847 0 +v -0.281201005 0.0780773163 0 +v -0.273416221 0.0859165192 0 +v -0.28896451 0.0780296326 0 +v -0.296688795 0.0857539177 0 +v -0.281196803 0.0858850479 0 +v -0.281192392 0.0936927795 0 +v -0.273412645 0.101537704 0 +v -0.288938224 0.101438522 0 +v -0.288947314 0.0936355591 0 +v -0.296673417 0.0935497284 0 +v -0.304339528 0.101215363 0 +v -0.312053144 0.0854969025 0 +v -0.304364979 0.0934295654 0 +v -0.312016189 0.0932693481 0 +v -0.319566846 0.100818634 0 +v -0.2656205 0.0703082085 0 +v -0.265620083 0.0781202316 0 +v -0.2578125 0.0859375 0 +v -0.27341789 0.0781059265 0 +v -0.25 0.0703125 0 +v -0.25 0.078125 0 +v -0.2421875 0.0859375 0 +v -0.2578125 0.078125 0 +v -0.265619695 0.0859322548 0 +v -0.25 0.0859375 0 +v -0.25 0.09375 0 +v -0.2421875 0.1015625 0 +v -0.2578125 0.1015625 0 +v -0.2578125 0.09375 0 +v -0.265619248 0.093744278 0 +v -0.273414463 0.0937271118 0 +v -0.281187862 0.101500511 0 +v -0.265618801 0.101556301 0 +v -0.265618324 0.109368324 0 +v -0.2578125 0.1171875 0 +v -0.27340889 0.11715889 0 +v -0.273410797 0.109348297 0 +v -0.281183213 0.109308243 0 +v -0.288919449 0.117044449 0 +v -0.25 0.1015625 0 +v -0.25 0.109375 0 +v -0.2421875 0.1171875 0 +v -0.2578125 0.109375 0 +v -0.265617847 0.117180347 0 +v -0.25 0.1171875 0 +v -0.25 0.125 0 +v -0.2578125 0.125 0 +v -0.265617371 0.124992371 0 +v -0.281178474 0.117115974 0 +v -0.273406982 0.124969482 0 +v -0.281173706 0.124923706 0 +v -0.311978042 0.101041794 0 +v -0.296657503 0.101345539 0 +v -0.296641201 0.10914135 0 +v -0.304286957 0.116786957 0 +v -0.304313451 0.10900116 0 +v -0.311938912 0.10881424 0 +v -0.319454193 0.116329193 0 +v -0.288928926 0.109241486 0 +v -0.29662466 0.11693716 0 +v -0.288909912 0.124847412 0 +v -0.296607971 0.124732971 0 +v -0.311899185 0.116586685 0 +v -0.304260254 0.124572754 0 +v -0.311859131 0.124359131 0 +v -0.371939898 0.0673942566 0 +v -0.357327431 0.0683598518 0 +v -0.357146084 0.0759553909 0 +v -0.349626124 0.084028244 0 +v -0.36420846 0.0830001831 0 +v -0.364444196 0.0754547119 0 +v -0.371668845 0.0748825073 0 +v -0.378471613 0.0816574097 0 +v -0.342462957 0.0690851212 0 +v -0.342348993 0.0767612457 0 +v -0.334767163 0.0847835541 0 +v -0.349779367 0.0763893127 0 +v -0.356954515 0.08355093 0 +v -0.342228532 0.0844373703 0 +v -0.342102855 0.0921134949 0 +v -0.334570467 0.100198746 0 +v -0.349300683 0.0993061066 0 +v -0.349466085 0.0916671753 0 +v -0.356754482 0.0911464691 0 +v -0.363707781 0.0980911255 0 +v -0.371382594 0.0823707581 0 +v -0.363962293 0.0905456543 0 +v -0.371083617 0.0898590088 0 +v -0.377742052 0.0965042114 0 +v -0.327382475 0.0696043968 0 +v -0.327316731 0.0773382187 0 +v -0.334859788 0.0770759583 0 +v -0.319724649 0.0775527954 0 +v -0.327247262 0.0850720406 0 +v -0.319621384 0.0930633545 0 +v -0.327174723 0.0928058624 0 +v -0.334670424 0.0924911499 0 +v -0.341972828 0.0997896194 0 +v -0.327099741 0.100539684 0 +v -0.32702288 0.108273506 0 +v -0.334363937 0.115613937 0 +v -0.334468007 0.107906342 0 +v -0.341839671 0.107465744 0 +v -0.348958969 0.114583969 0 +v -0.319510967 0.108573914 0 +v -0.326944828 0.116007328 0 +v -0.319396973 0.124084473 0 +v -0.32686615 0.12374115 0 +v -0.341704369 0.115141869 0 +v -0.334259033 0.123321533 0 +v -0.341567993 0.122817993 0 +v -0.370774627 0.0973472595 0 +v -0.356547713 0.0987420082 0 +v -0.356335849 0.106337547 0 +v -0.363182068 0.113182068 0 +v -0.363447011 0.105636597 0 +v -0.370457947 0.10483551 0 +v -0.376976013 0.111351013 0 +v -0.349131167 0.106945038 0 +v -0.356120586 0.113933086 0 +v -0.3487854 0.1222229 0 +v -0.355903625 0.121528625 0 +v -0.370136261 0.112323761 0 +v -0.362915039 0.120727539 0 +v -0.369812012 0.119812012 0 +v -0.489501953 0.005859375 0 +v -0.475186646 0.00610303879 0 +v -0.474868 0.0121946037 0 +v -0.467239201 0.018632412 0 +v -0.481433868 0.0178909302 0 +v -0.482003212 0.0119495392 0 +v -0.489135742 0.0117034912 0 +v -0.460850835 0.00634288788 0 +v -0.460578799 0.0126778483 0 +v -0.453009665 0.0193552971 0 +v -0.467727423 0.0124377012 0 +v -0.474339426 0.0182632208 0 +v -0.460130215 0.018996954 0 +v -0.459508628 0.0252922773 0 +v -0.451725304 0.0321745872 0 +v -0.465694487 0.0309252739 0 +v -0.466560602 0.0247981548 0 +v -0.473602831 0.0242974162 0 +v -0.479618073 0.0296401978 0 +v -0.488525391 0.0175170898 0 +v -0.480638504 0.0237922668 0 +v -0.487670898 0.0232849121 0 +v -0.446474016 0.00657510757 0 +v -0.446246803 0.0131453574 0 +v -0.438722014 0.0200471878 0 +v -0.453419507 0.0129140615 0 +v -0.432035685 0.00679588318 0 +v -0.431850523 0.013589263 0 +v -0.424353004 0.0206956863 0 +v -0.439058036 0.0133707523 0 +v -0.445874572 0.0197058916 0 +v -0.431549132 0.020377636 0 +v -0.431137025 0.0271584988 0 +v -0.423528552 0.0344705582 0 +v -0.437680125 0.033364296 0 +v -0.438260972 0.0267128944 0 +v -0.445362091 0.0262518525 0 +v -0.45244348 0.0257775784 0 +v -0.458717465 0.031555891 0 +v -0.444714099 0.0327783823 0 +v -0.443935543 0.0392806232 0 +v -0.436179876 0.0466098785 0 +v -0.449849725 0.0448675156 0 +v -0.450859278 0.0385400057 0 +v -0.457760423 0.0377798676 0 +v -0.463410497 0.0430250168 0 +v -0.430619538 0.033929348 0 +v -0.430002213 0.0406876802 0 +v -0.422357321 0.0482120514 0 +v -0.436984688 0.0399978161 0 +v -0.443031162 0.0457537174 0 +v -0.429290414 0.0474309921 0 +v -0.428489685 0.0541567802 0 +v -0.42088294 0.0619068146 0 +v -0.434262991 0.0597553253 0 +v -0.435270905 0.053196907 0 +v -0.442005754 0.0521928072 0 +v -0.447416902 0.0573835373 0 +v -0.456641018 0.0439562798 0 +v -0.448700845 0.0511507988 0 +v -0.455362737 0.0500771999 0 +v -0.460409284 0.054854393 0 +v -0.486572266 0.0289916992 0 +v -0.472660065 0.0302857161 0 +v -0.471513033 0.0362166464 0 +v -0.476905823 0.0411224365 0 +v -0.478373528 0.0354213715 0 +v -0.485229492 0.0346221924 0 +v -0.464643508 0.0370041132 0 +v -0.470163614 0.0420787334 0 +v -0.461998165 0.0489783287 0 +v -0.468613654 0.0478605032 0 +v -0.473304749 0.052230835 0 +v -0.483642578 0.0401611328 0 +v -0.475215912 0.0467300415 0 +v -0.481811523 0.0455932617 0 +v -0.417515337 0.00700139999 0 +v -0.417368531 0.0140017569 0 +v -0.40988034 0.0212893486 0 +v -0.424621552 0.0137999058 0 +v -0.40289247 0.00718784332 0 +v -0.402779967 0.0143753886 0 +v -0.395282686 0.0218176842 0 +v -0.410088897 0.0141938925 0 +v -0.417130977 0.0210000277 0 +v -0.4025985 0.0215623379 0 +v -0.402352661 0.0287483931 0 +v -0.394808471 0.0363612175 0 +v -0.409244955 0.0354743004 0 +v -0.409597397 0.0283830166 0 +v -0.41680789 0.0279951692 0 +v -0.423986852 0.0275864601 0 +v -0.388146579 0.00735139847 0 +v -0.388063729 0.0147027671 0 +v -0.395439088 0.0145453215 0 +v -0.380651176 0.0148468018 0 +v -0.387930334 0.0220540762 0 +v -0.38038671 0.0296936035 0 +v -0.387750059 0.0294052958 0 +v -0.395071149 0.0290896893 0 +v -0.402047157 0.0359332561 0 +v -0.387526393 0.0367563963 0 +v -0.38726294 0.0441073477 0 +v -0.394146323 0.0509023666 0 +v -0.394498855 0.0436321497 0 +v -0.40168643 0.0431166291 0 +v -0.408351779 0.0496473312 0 +v -0.379976332 0.0445404053 0 +v -0.386963338 0.0514581203 0 +v -0.379444361 0.059387207 0 +v -0.386631101 0.0588086843 0 +v -0.393329024 0.0654401779 0 +v -0.401275098 0.050298214 0 +v -0.393755019 0.0581717491 0 +v -0.400817811 0.0574777126 0 +v -0.407240748 0.0638036728 0 +v -0.416404545 0.0349861383 0 +v -0.415926337 0.0419718921 0 +v -0.422983557 0.0413463116 0 +v -0.40882811 0.042562604 0 +v -0.415378481 0.0489513874 0 +v -0.407821 0.0567278862 0 +v -0.414766312 0.0559235811 0 +v -0.421655297 0.0550661087 0 +v -0.427605271 0.0608625412 0 +v -0.414095074 0.0628874302 0 +v -0.413372219 0.0698439777 0 +v -0.405956566 0.077943325 0 +v -0.419162393 0.0755548477 0 +v -0.420049042 0.0687358379 0 +v -0.426647782 0.0675507784 0 +v -0.431999803 0.0728006363 0 +v -0.40031904 0.0646548271 0 +v -0.399784088 0.0718298554 0 +v -0.392390311 0.0799746513 0 +v -0.406617224 0.0708752871 0 +v -0.412605017 0.0767942667 0 +v -0.399217963 0.0790030956 0 +v -0.398626059 0.0861748457 0 +v -0.391364872 0.0945067406 0 +v -0.404548705 0.0920710564 0 +v -0.405264974 0.0850083828 0 +v -0.411800951 0.0837393403 0 +v -0.417266011 0.0891695023 0 +v -0.425627649 0.0742239952 0 +v -0.418231785 0.0823655128 0 +v -0.424555242 0.0808846951 0 +v -0.429489255 0.0857744217 0 +v -0.386269778 0.0661590099 0 +v -0.385883033 0.0735091269 0 +v -0.392872691 0.0727077723 0 +v -0.378815114 0.0742340088 0 +v -0.385474503 0.0808590651 0 +v -0.378112912 0.0890808105 0 +v -0.385047793 0.0882088542 0 +v -0.391886234 0.0872409344 0 +v -0.398013353 0.0933454037 0 +v -0.3846066 0.0955585241 0 +v -0.384154499 0.102908105 0 +v -0.390287399 0.109037399 0 +v -0.390830457 0.101772189 0 +v -0.39738518 0.100515068 0 +v -0.403066635 0.106191635 0 +v -0.377362072 0.103927612 0 +v -0.383695126 0.110257626 0 +v -0.376586914 0.118774414 0 +v -0.383232117 0.117607117 0 +v -0.396746635 0.107684135 0 +v -0.38973999 0.11630249 0 +v -0.396102905 0.114852905 0 +v -0.423441112 0.0875353813 0 +v -0.41096741 0.0906802416 0 +v -0.410111666 0.0976180136 0 +v -0.41526413 0.10276413 0 +v -0.416273862 0.0959684849 0 +v -0.4222956 0.0941785574 0 +v -0.426830292 0.0987052917 0 +v -0.403813839 0.0991319418 0 +v -0.409241199 0.104553699 0 +v -0.402313232 0.113250732 0 +v -0.408363342 0.111488342 0 +v -0.421129227 0.100816727 0 +v -0.414245605 0.109558105 0 +v -0.419952393 0.107452393 0 +v -0.479736328 0.0509033203 0 +v -0.466865093 0.0535504818 0 +v -0.464926958 0.0591444075 0 +v -0.456752002 0.0663752556 0 +v -0.468837738 0.0628738403 0 +v -0.471177101 0.0576152802 0 +v -0.477416992 0.0560760498 0 +v -0.453929245 0.0561347008 0 +v -0.452355057 0.0621319413 0 +v -0.444503725 0.069715023 0 +v -0.458656371 0.0606533289 0 +v -0.46280843 0.0646380186 0 +v -0.450654984 0.0680720806 0 +v -0.448843449 0.0739582777 0 +v -0.441229999 0.0818972588 0 +v -0.452538908 0.0775885582 0 +v -0.454708695 0.0720202923 0 +v -0.460518509 0.0700270534 0 +v -0.463542938 0.0729751587 0 +v -0.474853516 0.0610961914 0 +v -0.466291428 0.0679969788 0 +v -0.472045898 0.0659484863 0 +v -0.440864176 0.0585930347 0 +v -0.439620405 0.064958781 0 +v -0.446012855 0.0635701418 0 +v -0.433168501 0.0662887096 0 +v -0.438288569 0.0712944269 0 +v -0.430769265 0.0792946815 0 +v -0.436882645 0.0776043534 0 +v -0.442904472 0.0758225918 0 +v -0.446935296 0.0797936916 0 +v -0.435416788 0.0838929415 0 +v -0.43390584 0.0901655257 0 +v -0.437730789 0.0939807892 0 +v -0.439499199 0.0879472494 0 +v -0.444954544 0.0855910182 0 +v -0.447946548 0.0885715485 0 +v -0.428172141 0.092243433 0 +v -0.432364941 0.0964274406 0 +v -0.425476074 0.105163574 0 +v -0.430809021 0.102684021 0 +v -0.442925453 0.0913629532 0 +v -0.435943604 0.100006104 0 +v -0.440872192 0.0971221924 0 +v -0.468994141 0.0706176758 0 +v -0.458066344 0.07530725 0 +v -0.455484837 0.0804981887 0 +v -0.457519531 0.0825195312 0 +v -0.460612297 0.0778141022 0 +v -0.465698242 0.075088501 0 +v -0.450274348 0.083099246 0 +v -0.45280695 0.0856194496 0 +v -0.445587158 0.0940246582 0 +v -0.450080872 0.0907058716 0 +v -0.462158203 0.0793457031 0 +v -0.454345703 0.0871582031 0 +v -0.458374023 0.0833740234 0 +v -0.2421875 -0.125 0 +v -0.234375 -0.125 0 +v -0.234375 -0.1171875 0 +v -0.2265625 -0.1171875 0 +v -0.234375 -0.109375 0 +v -0.2265625 -0.1015625 0 +v -0.2421875 -0.109375 0 +v -0.2265625 -0.125 0 +v -0.21875 -0.125 0 +v -0.21875 -0.1171875 0 +v -0.2109375 -0.1171875 0 +v -0.21875 -0.109375 0 +v -0.2109375 -0.1015625 0 +v -0.2265625 -0.109375 0 +v -0.234375 -0.1015625 0 +v -0.21875 -0.1015625 0 +v -0.21875 -0.09375 0 +v -0.2109375 -0.0859375 0 +v -0.2265625 -0.0859375 0 +v -0.2265625 -0.09375 0 +v -0.234375 -0.09375 0 +v -0.2421875 -0.09375 0 +v -0.2109375 -0.125 0 +v -0.203125 -0.125 0 +v -0.203125 -0.1171875 0 +v -0.1953125 -0.1171875 0 +v -0.203125 -0.109375 0 +v -0.1953125 -0.1015625 0 +v -0.2109375 -0.109375 0 +v -0.1953125 -0.125 0 +v -0.1875 -0.125 0 +v -0.1875 -0.1171875 0 +v -0.1796875 -0.1171875 0 +v -0.1875 -0.109375 0 +v -0.1796875 -0.1015625 0 +v -0.1953125 -0.109375 0 +v -0.203125 -0.1015625 0 +v -0.1875 -0.1015625 0 +v -0.1875 -0.09375 0 +v -0.1796875 -0.0859375 0 +v -0.1953125 -0.0859375 0 +v -0.1953125 -0.09375 0 +v -0.203125 -0.09375 0 +v -0.2109375 -0.09375 0 +v -0.21875 -0.0859375 0 +v -0.203125 -0.0859375 0 +v -0.203125 -0.078125 0 +v -0.1953125 -0.0703125 0 +v -0.2109375 -0.0703125 0 +v -0.2109375 -0.078125 0 +v -0.21875 -0.078125 0 +v -0.2265625 -0.0703125 0 +v -0.1875 -0.0859375 0 +v -0.1875 -0.078125 0 +v -0.1796875 -0.0703125 0 +v -0.1953125 -0.078125 0 +v -0.203125 -0.0703125 0 +v -0.1875 -0.0703125 0 +v -0.1875 -0.0625 0 +v -0.1796875 -0.0546875 0 +v -0.1953125 -0.0546875 0 +v -0.1953125 -0.0625 0 +v -0.203125 -0.0625 0 +v -0.2109375 -0.0546875 0 +v -0.21875 -0.0703125 0 +v -0.2109375 -0.0625 0 +v -0.21875 -0.0625 0 +v -0.2265625 -0.0546875 0 +v -0.234375 -0.0859375 0 +v -0.234375 -0.078125 0 +v -0.2421875 -0.078125 0 +v -0.2265625 -0.078125 0 +v -0.234375 -0.0703125 0 +v -0.2265625 -0.0625 0 +v -0.234375 -0.0625 0 +v -0.2421875 -0.0625 0 +v -0.1796875 -0.125 0 +v -0.171875 -0.125 0 +v -0.171875 -0.1171875 0 +v -0.1640625 -0.1171875 0 +v -0.171875 -0.109375 0 +v -0.1640625 -0.1015625 0 +v -0.1796875 -0.109375 0 +v -0.1640625 -0.125 0 +v -0.15625 -0.125 0 +v -0.15625 -0.1171875 0 +v -0.1484375 -0.1171875 0 +v -0.15625 -0.109375 0 +v -0.1484375 -0.1015625 0 +v -0.1640625 -0.109375 0 +v -0.171875 -0.1015625 0 +v -0.15625 -0.1015625 0 +v -0.15625 -0.09375 0 +v -0.1484375 -0.0859375 0 +v -0.1640625 -0.0859375 0 +v -0.1640625 -0.09375 0 +v -0.171875 -0.09375 0 +v -0.1796875 -0.09375 0 +v -0.1484375 -0.125 0 +v -0.140625 -0.125 0 +v -0.140625 -0.1171875 0 +v -0.1328125 -0.1171875 0 +v -0.140625 -0.109375 0 +v -0.1328125 -0.1015625 0 +v -0.1484375 -0.109375 0 +v -0.1328125 -0.125 0 +v -0.125 -0.125 0 +v -0.125 -0.1171875 0 +v -0.1171875 -0.1171875 0 +v -0.125 -0.109375 0 +v -0.1171875 -0.1015625 0 +v -0.1328125 -0.109375 0 +v -0.140625 -0.1015625 0 +v -0.125 -0.1015625 0 +v -0.125 -0.09375 0 +v -0.1171875 -0.0859375 0 +v -0.1328125 -0.0859375 0 +v -0.1328125 -0.09375 0 +v -0.140625 -0.09375 0 +v -0.1484375 -0.09375 0 +v -0.15625 -0.0859375 0 +v -0.140625 -0.0859375 0 +v -0.140625 -0.078125 0 +v -0.1328125 -0.0703125 0 +v -0.1484375 -0.0703125 0 +v -0.1484375 -0.078125 0 +v -0.15625 -0.078125 0 +v -0.1640625 -0.0703125 0 +v -0.125 -0.0859375 0 +v -0.125 -0.078125 0 +v -0.1171875 -0.0703125 0 +v -0.1328125 -0.078125 0 +v -0.140625 -0.0703125 0 +v -0.125 -0.0703125 0 +v -0.125 -0.0625 0 +v -0.1171875 -0.0546875 0 +v -0.1328125 -0.0546875 0 +v -0.1328125 -0.0625 0 +v -0.140625 -0.0625 0 +v -0.1484375 -0.0546875 0 +v -0.15625 -0.0703125 0 +v -0.1484375 -0.0625 0 +v -0.15625 -0.0625 0 +v -0.1640625 -0.0546875 0 +v -0.171875 -0.0859375 0 +v -0.171875 -0.078125 0 +v -0.1796875 -0.078125 0 +v -0.1640625 -0.078125 0 +v -0.171875 -0.0703125 0 +v -0.1640625 -0.0625 0 +v -0.171875 -0.0625 0 +v -0.1796875 -0.0625 0 +v -0.1875 -0.0546875 0 +v -0.171875 -0.0546875 0 +v -0.171875 -0.046875 0 +v -0.1640625 -0.0390625 0 +v -0.1796875 -0.0390625 0 +v -0.1796875 -0.046875 0 +v -0.1875 -0.046875 0 +v -0.1953125 -0.0390625 0 +v -0.15625 -0.0546875 0 +v -0.15625 -0.046875 0 +v -0.1484375 -0.0390625 0 +v -0.1640625 -0.046875 0 +v -0.171875 -0.0390625 0 +v -0.15625 -0.0390625 0 +v -0.15625 -0.03125 0 +v -0.1484375 -0.0234375 0 +v -0.1640625 -0.0234375 0 +v -0.1640625 -0.03125 0 +v -0.171875 -0.03125 0 +v -0.1796875 -0.0234375 0 +v -0.1875 -0.0390625 0 +v -0.1796875 -0.03125 0 +v -0.1875 -0.03125 0 +v -0.1953125 -0.0234375 0 +v -0.140625 -0.0546875 0 +v -0.140625 -0.046875 0 +v -0.1328125 -0.0390625 0 +v -0.1484375 -0.046875 0 +v -0.125 -0.0546875 0 +v -0.125 -0.046875 0 +v -0.1171875 -0.0390625 0 +v -0.1328125 -0.046875 0 +v -0.140625 -0.0390625 0 +v -0.125 -0.0390625 0 +v -0.125 -0.03125 0 +v -0.1171875 -0.0234375 0 +v -0.1328125 -0.0234375 0 +v -0.1328125 -0.03125 0 +v -0.140625 -0.03125 0 +v -0.1484375 -0.03125 0 +v -0.15625 -0.0234375 0 +v -0.140625 -0.0234375 0 +v -0.140625 -0.015625 0 +v -0.1328125 -0.0078125 0 +v -0.1484375 -0.0078125 0 +v -0.1484375 -0.015625 0 +v -0.15625 -0.015625 0 +v -0.1640625 -0.0078125 0 +v -0.125 -0.0234375 0 +v -0.125 -0.015625 0 +v -0.1171875 -0.0078125 0 +v -0.1328125 -0.015625 0 +v -0.140625 -0.0078125 0 +v -0.125 -0.0078125 0 +v -0.125 0 0 +v -0.1171875 0.0078125 0 +v -0.1328125 0.0078125 0 +v -0.1328125 0 0 +v -0.140625 0 0 +v -0.1484375 0.0078125 0 +v -0.15625 -0.0078125 0 +v -0.1484375 0 0 +v -0.15625 0 0 +v -0.1640625 0.0078125 0 +v -0.1875 -0.0234375 0 +v -0.171875 -0.0234375 0 +v -0.171875 -0.015625 0 +v -0.1796875 -0.0078125 0 +v -0.1796875 -0.015625 0 +v -0.1875 -0.015625 0 +v -0.1953125 -0.0078125 0 +v -0.1640625 -0.015625 0 +v -0.171875 -0.0078125 0 +v -0.1640625 0 0 +v -0.171875 0 0 +v -0.1796875 0.0078125 0 +v -0.1875 -0.0078125 0 +v -0.1796875 0 0 +v -0.1875 0 0 +v -0.1953125 0.0078125 0 +v -0.234375 -0.0546875 0 +v -0.234375 -0.046875 0 +v -0.2265625 -0.0390625 0 +v -0.2421875 -0.046875 0 +v -0.21875 -0.0546875 0 +v -0.21875 -0.046875 0 +v -0.2109375 -0.0390625 0 +v -0.2265625 -0.046875 0 +v -0.234375 -0.0390625 0 +v -0.21875 -0.0390625 0 +v -0.21875 -0.03125 0 +v -0.2109375 -0.0234375 0 +v -0.2265625 -0.0234375 0 +v -0.2265625 -0.03125 0 +v -0.234375 -0.03125 0 +v -0.2421875 -0.03125 0 +v -0.203125 -0.0546875 0 +v -0.203125 -0.046875 0 +v -0.2109375 -0.046875 0 +v -0.1953125 -0.046875 0 +v -0.203125 -0.0390625 0 +v -0.1953125 -0.03125 0 +v -0.203125 -0.03125 0 +v -0.2109375 -0.03125 0 +v -0.21875 -0.0234375 0 +v -0.203125 -0.0234375 0 +v -0.203125 -0.015625 0 +v -0.2109375 -0.0078125 0 +v -0.2109375 -0.015625 0 +v -0.21875 -0.015625 0 +v -0.2265625 -0.0078125 0 +v -0.1953125 -0.015625 0 +v -0.203125 -0.0078125 0 +v -0.1953125 0 0 +v -0.203125 0 0 +v -0.2109375 0.0078125 0 +v -0.21875 -0.0078125 0 +v -0.2109375 0 0 +v -0.21875 0 0 +v -0.2265625 0.0078125 0 +v -0.234375 -0.0234375 0 +v -0.234375 -0.015625 0 +v -0.2421875 -0.015625 0 +v -0.2265625 -0.015625 0 +v -0.234375 -0.0078125 0 +v -0.2265625 0 0 +v -0.234375 0 0 +v -0.2421875 0 0 +v -0.1171875 -0.125 0 +v -0.109375 -0.125 0 +v -0.109375 -0.1171875 0 +v -0.1015625 -0.1171875 0 +v -0.109375 -0.109375 0 +v -0.1015625 -0.1015625 0 +v -0.1171875 -0.109375 0 +v -0.1015625 -0.125 0 +v -0.09375 -0.125 0 +v -0.09375 -0.1171875 0 +v -0.0859375 -0.1171875 0 +v -0.09375 -0.109375 0 +v -0.0859375 -0.1015625 0 +v -0.1015625 -0.109375 0 +v -0.109375 -0.1015625 0 +v -0.09375 -0.1015625 0 +v -0.09375 -0.09375 0 +v -0.0859375 -0.0859375 0 +v -0.1015625 -0.0859375 0 +v -0.1015625 -0.09375 0 +v -0.109375 -0.09375 0 +v -0.1171875 -0.09375 0 +v -0.0859375 -0.125 0 +v -0.078125 -0.125 0 +v -0.078125 -0.1171875 0 +v -0.0703125 -0.1171875 0 +v -0.078125 -0.109375 0 +v -0.0703125 -0.1015625 0 +v -0.0859375 -0.109375 0 +v -0.0703125 -0.125 0 +v -0.0625 -0.125 0 +v -0.0625 -0.1171875 0 +v -0.0546875 -0.1171875 0 +v -0.0625 -0.109375 0 +v -0.0546875 -0.1015625 0 +v -0.0703125 -0.109375 0 +v -0.078125 -0.1015625 0 +v -0.0625 -0.1015625 0 +v -0.0625 -0.09375 0 +v -0.0546875 -0.0859375 0 +v -0.0703125 -0.0859375 0 +v -0.0703125 -0.09375 0 +v -0.078125 -0.09375 0 +v -0.0859375 -0.09375 0 +v -0.09375 -0.0859375 0 +v -0.078125 -0.0859375 0 +v -0.078125 -0.078125 0 +v -0.0703125 -0.0703125 0 +v -0.0859375 -0.0703125 0 +v -0.0859375 -0.078125 0 +v -0.09375 -0.078125 0 +v -0.1015625 -0.0703125 0 +v -0.0625 -0.0859375 0 +v -0.0625 -0.078125 0 +v -0.0546875 -0.0703125 0 +v -0.0703125 -0.078125 0 +v -0.078125 -0.0703125 0 +v -0.0625 -0.0703125 0 +v -0.0625 -0.0625 0 +v -0.0546875 -0.0546875 0 +v -0.0703125 -0.0546875 0 +v -0.0703125 -0.0625 0 +v -0.078125 -0.0625 0 +v -0.0859375 -0.0546875 0 +v -0.09375 -0.0703125 0 +v -0.0859375 -0.0625 0 +v -0.09375 -0.0625 0 +v -0.1015625 -0.0546875 0 +v -0.109375 -0.0859375 0 +v -0.109375 -0.078125 0 +v -0.1171875 -0.078125 0 +v -0.1015625 -0.078125 0 +v -0.109375 -0.0703125 0 +v -0.1015625 -0.0625 0 +v -0.109375 -0.0625 0 +v -0.1171875 -0.0625 0 +v -0.0546875 -0.125 0 +v -0.046875 -0.125 0 +v -0.046875 -0.1171875 0 +v -0.0390625 -0.1171875 0 +v -0.046875 -0.109375 0 +v -0.0390625 -0.1015625 0 +v -0.0546875 -0.109375 0 +v -0.0390625 -0.125 0 +v -0.03125 -0.125 0 +v -0.03125 -0.1171875 0 +v -0.0234375 -0.1171875 0 +v -0.03125 -0.109375 0 +v -0.0234375 -0.1015625 0 +v -0.0390625 -0.109375 0 +v -0.046875 -0.1015625 0 +v -0.03125 -0.1015625 0 +v -0.03125 -0.09375 0 +v -0.0234375 -0.0859375 0 +v -0.0390625 -0.0859375 0 +v -0.0390625 -0.09375 0 +v -0.046875 -0.09375 0 +v -0.0546875 -0.09375 0 +v -0.0234375 -0.125 0 +v -0.015625 -0.125 0 +v -0.015625 -0.1171875 0 +v -0.0078125 -0.1171875 0 +v -0.015625 -0.109375 0 +v -0.0078125 -0.1015625 0 +v -0.0234375 -0.109375 0 +v -0.0078125 -0.125 0 +v 0 -0.125 0 +v 0 -0.1171875 0 +v 0.0078125 -0.1171875 0 +v 0 -0.109375 0 +v 0.0078125 -0.1015625 0 +v -0.0078125 -0.109375 0 +v -0.015625 -0.1015625 0 +v 0 -0.1015625 0 +v 0 -0.09375 0 +v 0.0078125 -0.0859375 0 +v -0.0078125 -0.0859375 0 +v -0.0078125 -0.09375 0 +v -0.015625 -0.09375 0 +v -0.0234375 -0.09375 0 +v -0.03125 -0.0859375 0 +v -0.015625 -0.0859375 0 +v -0.015625 -0.078125 0 +v -0.0078125 -0.0703125 0 +v -0.0234375 -0.0703125 0 +v -0.0234375 -0.078125 0 +v -0.03125 -0.078125 0 +v -0.0390625 -0.0703125 0 +v 0 -0.0859375 0 +v 0 -0.078125 0 +v 0.0078125 -0.0703125 0 +v -0.0078125 -0.078125 0 +v -0.015625 -0.0703125 0 +v 0 -0.0703125 0 +v 0 -0.0625 0 +v 0.0078125 -0.0546875 0 +v -0.0078125 -0.0546875 0 +v -0.0078125 -0.0625 0 +v -0.015625 -0.0625 0 +v -0.0234375 -0.0546875 0 +v -0.03125 -0.0703125 0 +v -0.0234375 -0.0625 0 +v -0.03125 -0.0625 0 +v -0.0390625 -0.0546875 0 +v -0.046875 -0.0859375 0 +v -0.046875 -0.078125 0 +v -0.0546875 -0.078125 0 +v -0.0390625 -0.078125 0 +v -0.046875 -0.0703125 0 +v -0.0390625 -0.0625 0 +v -0.046875 -0.0625 0 +v -0.0546875 -0.0625 0 +v -0.0625 -0.0546875 0 +v -0.046875 -0.0546875 0 +v -0.046875 -0.046875 0 +v -0.0390625 -0.0390625 0 +v -0.0546875 -0.0390625 0 +v -0.0546875 -0.046875 0 +v -0.0625 -0.046875 0 +v -0.0703125 -0.0390625 0 +v -0.03125 -0.0546875 0 +v -0.03125 -0.046875 0 +v -0.0234375 -0.0390625 0 +v -0.0390625 -0.046875 0 +v -0.046875 -0.0390625 0 +v -0.03125 -0.0390625 0 +v -0.03125 -0.03125 0 +v -0.0234375 -0.0234375 0 +v -0.0390625 -0.0234375 0 +v -0.0390625 -0.03125 0 +v -0.046875 -0.03125 0 +v -0.0546875 -0.0234375 0 +v -0.0625 -0.0390625 0 +v -0.0546875 -0.03125 0 +v -0.0625 -0.03125 0 +v -0.0703125 -0.0234375 0 +v -0.015625 -0.0546875 0 +v -0.015625 -0.046875 0 +v -0.0078125 -0.0390625 0 +v -0.0234375 -0.046875 0 +v 0 -0.0546875 0 +v 0 -0.046875 0 +v 0.0078125 -0.0390625 0 +v -0.0078125 -0.046875 0 +v -0.015625 -0.0390625 0 +v 0 -0.0390625 0 +v 0 -0.03125 0 +v 0.0078125 -0.0234375 0 +v -0.0078125 -0.0234375 0 +v -0.0078125 -0.03125 0 +v -0.015625 -0.03125 0 +v -0.0234375 -0.03125 0 +v -0.03125 -0.0234375 0 +v -0.015625 -0.0234375 0 +v -0.015625 -0.015625 0 +v -0.0078125 -0.0078125 0 +v -0.0234375 -0.0078125 0 +v -0.0234375 -0.015625 0 +v -0.03125 -0.015625 0 +v -0.0390625 -0.0078125 0 +v 0 -0.0234375 0 +v 0 -0.015625 0 +v 0.0078125 -0.0078125 0 +v -0.0078125 -0.015625 0 +v -0.015625 -0.0078125 0 +v 0 -0.0078125 0 +v 0 0 0 +v 0.0078125 0.0078125 0 +v -0.0078125 0.0078125 0 +v -0.0078125 0 0 +v -0.015625 0 0 +v -0.0234375 0.0078125 0 +v -0.03125 -0.0078125 0 +v -0.0234375 0 0 +v -0.03125 0 0 +v -0.0390625 0.0078125 0 +v -0.0625 -0.0234375 0 +v -0.046875 -0.0234375 0 +v -0.046875 -0.015625 0 +v -0.0546875 -0.0078125 0 +v -0.0546875 -0.015625 0 +v -0.0625 -0.015625 0 +v -0.0703125 -0.0078125 0 +v -0.0390625 -0.015625 0 +v -0.046875 -0.0078125 0 +v -0.0390625 0 0 +v -0.046875 0 0 +v -0.0546875 0.0078125 0 +v -0.0625 -0.0078125 0 +v -0.0546875 0 0 +v -0.0625 0 0 +v -0.0703125 0.0078125 0 +v -0.109375 -0.0546875 0 +v -0.109375 -0.046875 0 +v -0.1015625 -0.0390625 0 +v -0.1171875 -0.046875 0 +v -0.09375 -0.0546875 0 +v -0.09375 -0.046875 0 +v -0.0859375 -0.0390625 0 +v -0.1015625 -0.046875 0 +v -0.109375 -0.0390625 0 +v -0.09375 -0.0390625 0 +v -0.09375 -0.03125 0 +v -0.0859375 -0.0234375 0 +v -0.1015625 -0.0234375 0 +v -0.1015625 -0.03125 0 +v -0.109375 -0.03125 0 +v -0.1171875 -0.03125 0 +v -0.078125 -0.0546875 0 +v -0.078125 -0.046875 0 +v -0.0859375 -0.046875 0 +v -0.0703125 -0.046875 0 +v -0.078125 -0.0390625 0 +v -0.0703125 -0.03125 0 +v -0.078125 -0.03125 0 +v -0.0859375 -0.03125 0 +v -0.09375 -0.0234375 0 +v -0.078125 -0.0234375 0 +v -0.078125 -0.015625 0 +v -0.0859375 -0.0078125 0 +v -0.0859375 -0.015625 0 +v -0.09375 -0.015625 0 +v -0.1015625 -0.0078125 0 +v -0.0703125 -0.015625 0 +v -0.078125 -0.0078125 0 +v -0.0703125 0 0 +v -0.078125 0 0 +v -0.0859375 0.0078125 0 +v -0.09375 -0.0078125 0 +v -0.0859375 0 0 +v -0.09375 0 0 +v -0.1015625 0.0078125 0 +v -0.109375 -0.0234375 0 +v -0.109375 -0.015625 0 +v -0.1171875 -0.015625 0 +v -0.1015625 -0.015625 0 +v -0.109375 -0.0078125 0 +v -0.1015625 0 0 +v -0.109375 0 0 +v -0.1171875 0 0 +v -0.125 0.0078125 0 +v -0.109375 0.0078125 0 +v -0.109375 0.015625 0 +v -0.1015625 0.0234375 0 +v -0.1171875 0.0234375 0 +v -0.1171875 0.015625 0 +v -0.125 0.015625 0 +v -0.1328125 0.0234375 0 +v -0.09375 0.0078125 0 +v -0.09375 0.015625 0 +v -0.0859375 0.0234375 0 +v -0.1015625 0.015625 0 +v -0.109375 0.0234375 0 +v -0.09375 0.0234375 0 +v -0.09375 0.03125 0 +v -0.0859375 0.0390625 0 +v -0.1015625 0.0390625 0 +v -0.1015625 0.03125 0 +v -0.109375 0.03125 0 +v -0.1171875 0.0390625 0 +v -0.125 0.0234375 0 +v -0.1171875 0.03125 0 +v -0.125 0.03125 0 +v -0.1328125 0.0390625 0 +v -0.078125 0.0078125 0 +v -0.078125 0.015625 0 +v -0.0703125 0.0234375 0 +v -0.0859375 0.015625 0 +v -0.0625 0.0078125 0 +v -0.0625 0.015625 0 +v -0.0546875 0.0234375 0 +v -0.0703125 0.015625 0 +v -0.078125 0.0234375 0 +v -0.0625 0.0234375 0 +v -0.0625 0.03125 0 +v -0.0546875 0.0390625 0 +v -0.0703125 0.0390625 0 +v -0.0703125 0.03125 0 +v -0.078125 0.03125 0 +v -0.0859375 0.03125 0 +v -0.09375 0.0390625 0 +v -0.078125 0.0390625 0 +v -0.078125 0.046875 0 +v -0.0703125 0.0546875 0 +v -0.0859375 0.0546875 0 +v -0.0859375 0.046875 0 +v -0.09375 0.046875 0 +v -0.1015625 0.0546875 0 +v -0.0625 0.0390625 0 +v -0.0625 0.046875 0 +v -0.0546875 0.0546875 0 +v -0.0703125 0.046875 0 +v -0.078125 0.0546875 0 +v -0.0625 0.0546875 0 +v -0.0625 0.0625 0 +v -0.0546875 0.0703125 0 +v -0.0703125 0.0703125 0 +v -0.0703125 0.0625 0 +v -0.078125 0.0625 0 +v -0.0859375 0.0703125 0 +v -0.09375 0.0546875 0 +v -0.0859375 0.0625 0 +v -0.09375 0.0625 0 +v -0.1015625 0.0703125 0 +v -0.125 0.0390625 0 +v -0.109375 0.0390625 0 +v -0.109375 0.046875 0 +v -0.1171875 0.0546875 0 +v -0.1171875 0.046875 0 +v -0.125 0.046875 0 +v -0.1328125 0.0546875 0 +v -0.1015625 0.046875 0 +v -0.109375 0.0546875 0 +v -0.1015625 0.0625 0 +v -0.109375 0.0625 0 +v -0.1171875 0.0703125 0 +v -0.125 0.0546875 0 +v -0.1171875 0.0625 0 +v -0.125 0.0625 0 +v -0.1328125 0.0703125 0 +v -0.046875 0.0078125 0 +v -0.046875 0.015625 0 +v -0.0390625 0.0234375 0 +v -0.0546875 0.015625 0 +v -0.03125 0.0078125 0 +v -0.03125 0.015625 0 +v -0.0234375 0.0234375 0 +v -0.0390625 0.015625 0 +v -0.046875 0.0234375 0 +v -0.03125 0.0234375 0 +v -0.03125 0.03125 0 +v -0.0234375 0.0390625 0 +v -0.0390625 0.0390625 0 +v -0.0390625 0.03125 0 +v -0.046875 0.03125 0 +v -0.0546875 0.03125 0 +v -0.015625 0.0078125 0 +v -0.015625 0.015625 0 +v -0.0078125 0.0234375 0 +v -0.0234375 0.015625 0 +v 0 0.0078125 0 +v 0 0.015625 0 +v 0.0078125 0.0234375 0 +v -0.0078125 0.015625 0 +v -0.015625 0.0234375 0 +v 0 0.0234375 0 +v 0 0.03125 0 +v 0.0078125 0.0390625 0 +v -0.0078125 0.0390625 0 +v -0.0078125 0.03125 0 +v -0.015625 0.03125 0 +v -0.0234375 0.03125 0 +v -0.03125 0.0390625 0 +v -0.015625 0.0390625 0 +v -0.015625 0.046875 0 +v -0.0078125 0.0546875 0 +v -0.0234375 0.0546875 0 +v -0.0234375 0.046875 0 +v -0.03125 0.046875 0 +v -0.0390625 0.0546875 0 +v 0 0.0390625 0 +v 0 0.046875 0 +v 0.0078125 0.0546875 0 +v -0.0078125 0.046875 0 +v -0.015625 0.0546875 0 +v 0 0.0546875 0 +v 0 0.0625 0 +v 0.0078125 0.0703125 0 +v -0.0078125 0.0703125 0 +v -0.0078125 0.0625 0 +v -0.015625 0.0625 0 +v -0.0234375 0.0703125 0 +v -0.03125 0.0546875 0 +v -0.0234375 0.0625 0 +v -0.03125 0.0625 0 +v -0.0390625 0.0703125 0 +v -0.046875 0.0390625 0 +v -0.046875 0.046875 0 +v -0.0546875 0.046875 0 +v -0.0390625 0.046875 0 +v -0.046875 0.0546875 0 +v -0.0390625 0.0625 0 +v -0.046875 0.0625 0 +v -0.0546875 0.0625 0 +v -0.0625 0.0703125 0 +v -0.046875 0.0703125 0 +v -0.046875 0.078125 0 +v -0.0390625 0.0859375 0 +v -0.0546875 0.0859375 0 +v -0.0546875 0.078125 0 +v -0.0625 0.078125 0 +v -0.0703125 0.0859375 0 +v -0.03125 0.0703125 0 +v -0.03125 0.078125 0 +v -0.0234375 0.0859375 0 +v -0.0390625 0.078125 0 +v -0.046875 0.0859375 0 +v -0.03125 0.0859375 0 +v -0.03125 0.09375 0 +v -0.0234375 0.1015625 0 +v -0.0390625 0.1015625 0 +v -0.0390625 0.09375 0 +v -0.046875 0.09375 0 +v -0.0546875 0.1015625 0 +v -0.0625 0.0859375 0 +v -0.0546875 0.09375 0 +v -0.0625 0.09375 0 +v -0.0703125 0.1015625 0 +v -0.015625 0.0703125 0 +v -0.015625 0.078125 0 +v -0.0078125 0.0859375 0 +v -0.0234375 0.078125 0 +v 0 0.0703125 0 +v 0 0.078125 0 +v 0.0078125 0.0859375 0 +v -0.0078125 0.078125 0 +v -0.015625 0.0859375 0 +v 0 0.0859375 0 +v 0 0.09375 0 +v 0.0078125 0.1015625 0 +v -0.0078125 0.1015625 0 +v -0.0078125 0.09375 0 +v -0.015625 0.09375 0 +v -0.0234375 0.09375 0 +v -0.03125 0.1015625 0 +v -0.015625 0.1015625 0 +v -0.015625 0.109375 0 +v -0.0078125 0.1171875 0 +v -0.0234375 0.1171875 0 +v -0.0234375 0.109375 0 +v -0.03125 0.109375 0 +v -0.0390625 0.1171875 0 +v 0 0.1015625 0 +v 0 0.109375 0 +v 0.0078125 0.1171875 0 +v -0.0078125 0.109375 0 +v -0.015625 0.1171875 0 +v 0 0.1171875 0 +v 0 0.125 0 +v -0.0078125 0.125 0 +v -0.015625 0.125 0 +v -0.03125 0.1171875 0 +v -0.0234375 0.125 0 +v -0.03125 0.125 0 +v -0.0625 0.1015625 0 +v -0.046875 0.1015625 0 +v -0.046875 0.109375 0 +v -0.0546875 0.1171875 0 +v -0.0546875 0.109375 0 +v -0.0625 0.109375 0 +v -0.0703125 0.1171875 0 +v -0.0390625 0.109375 0 +v -0.046875 0.1171875 0 +v -0.0390625 0.125 0 +v -0.046875 0.125 0 +v -0.0625 0.1171875 0 +v -0.0546875 0.125 0 +v -0.0625 0.125 0 +v -0.125 0.0703125 0 +v -0.109375 0.0703125 0 +v -0.109375 0.078125 0 +v -0.1015625 0.0859375 0 +v -0.1171875 0.0859375 0 +v -0.1171875 0.078125 0 +v -0.125 0.078125 0 +v -0.1328125 0.0859375 0 +v -0.09375 0.0703125 0 +v -0.09375 0.078125 0 +v -0.0859375 0.0859375 0 +v -0.1015625 0.078125 0 +v -0.109375 0.0859375 0 +v -0.09375 0.0859375 0 +v -0.09375 0.09375 0 +v -0.0859375 0.1015625 0 +v -0.1015625 0.1015625 0 +v -0.1015625 0.09375 0 +v -0.109375 0.09375 0 +v -0.1171875 0.1015625 0 +v -0.125 0.0859375 0 +v -0.1171875 0.09375 0 +v -0.125 0.09375 0 +v -0.1328125 0.1015625 0 +v -0.078125 0.0703125 0 +v -0.078125 0.078125 0 +v -0.0859375 0.078125 0 +v -0.0703125 0.078125 0 +v -0.078125 0.0859375 0 +v -0.0703125 0.09375 0 +v -0.078125 0.09375 0 +v -0.0859375 0.09375 0 +v -0.09375 0.1015625 0 +v -0.078125 0.1015625 0 +v -0.078125 0.109375 0 +v -0.0859375 0.1171875 0 +v -0.0859375 0.109375 0 +v -0.09375 0.109375 0 +v -0.1015625 0.1171875 0 +v -0.0703125 0.109375 0 +v -0.078125 0.1171875 0 +v -0.0703125 0.125 0 +v -0.078125 0.125 0 +v -0.09375 0.1171875 0 +v -0.0859375 0.125 0 +v -0.09375 0.125 0 +v -0.125 0.1015625 0 +v -0.109375 0.1015625 0 +v -0.109375 0.109375 0 +v -0.1171875 0.1171875 0 +v -0.1171875 0.109375 0 +v -0.125 0.109375 0 +v -0.1328125 0.1171875 0 +v -0.1015625 0.109375 0 +v -0.109375 0.1171875 0 +v -0.1015625 0.125 0 +v -0.109375 0.125 0 +v -0.125 0.1171875 0 +v -0.1171875 0.125 0 +v -0.125 0.125 0 +v -0.234375 0.0078125 0 +v -0.234375 0.015625 0 +v -0.2265625 0.0234375 0 +v -0.2421875 0.015625 0 +v -0.21875 0.0078125 0 +v -0.21875 0.015625 0 +v -0.2109375 0.0234375 0 +v -0.2265625 0.015625 0 +v -0.234375 0.0234375 0 +v -0.21875 0.0234375 0 +v -0.21875 0.03125 0 +v -0.2109375 0.0390625 0 +v -0.2265625 0.0390625 0 +v -0.2265625 0.03125 0 +v -0.234375 0.03125 0 +v -0.2421875 0.03125 0 +v -0.203125 0.0078125 0 +v -0.203125 0.015625 0 +v -0.1953125 0.0234375 0 +v -0.2109375 0.015625 0 +v -0.1875 0.0078125 0 +v -0.1875 0.015625 0 +v -0.1796875 0.0234375 0 +v -0.1953125 0.015625 0 +v -0.203125 0.0234375 0 +v -0.1875 0.0234375 0 +v -0.1875 0.03125 0 +v -0.1796875 0.0390625 0 +v -0.1953125 0.0390625 0 +v -0.1953125 0.03125 0 +v -0.203125 0.03125 0 +v -0.2109375 0.03125 0 +v -0.21875 0.0390625 0 +v -0.203125 0.0390625 0 +v -0.203125 0.046875 0 +v -0.1953125 0.0546875 0 +v -0.2109375 0.0546875 0 +v -0.2109375 0.046875 0 +v -0.21875 0.046875 0 +v -0.2265625 0.0546875 0 +v -0.1875 0.0390625 0 +v -0.1875 0.046875 0 +v -0.1796875 0.0546875 0 +v -0.1953125 0.046875 0 +v -0.203125 0.0546875 0 +v -0.1875 0.0546875 0 +v -0.1875 0.0625 0 +v -0.1796875 0.0703125 0 +v -0.1953125 0.0703125 0 +v -0.1953125 0.0625 0 +v -0.203125 0.0625 0 +v -0.2109375 0.0703125 0 +v -0.21875 0.0546875 0 +v -0.2109375 0.0625 0 +v -0.21875 0.0625 0 +v -0.2265625 0.0703125 0 +v -0.234375 0.0390625 0 +v -0.234375 0.046875 0 +v -0.2421875 0.046875 0 +v -0.2265625 0.046875 0 +v -0.234375 0.0546875 0 +v -0.2265625 0.0625 0 +v -0.234375 0.0625 0 +v -0.2421875 0.0625 0 +v -0.171875 0.0078125 0 +v -0.171875 0.015625 0 +v -0.1640625 0.0234375 0 +v -0.1796875 0.015625 0 +v -0.15625 0.0078125 0 +v -0.15625 0.015625 0 +v -0.1484375 0.0234375 0 +v -0.1640625 0.015625 0 +v -0.171875 0.0234375 0 +v -0.15625 0.0234375 0 +v -0.15625 0.03125 0 +v -0.1484375 0.0390625 0 +v -0.1640625 0.0390625 0 +v -0.1640625 0.03125 0 +v -0.171875 0.03125 0 +v -0.1796875 0.03125 0 +v -0.140625 0.0078125 0 +v -0.140625 0.015625 0 +v -0.1484375 0.015625 0 +v -0.1328125 0.015625 0 +v -0.140625 0.0234375 0 +v -0.1328125 0.03125 0 +v -0.140625 0.03125 0 +v -0.1484375 0.03125 0 +v -0.15625 0.0390625 0 +v -0.140625 0.0390625 0 +v -0.140625 0.046875 0 +v -0.1484375 0.0546875 0 +v -0.1484375 0.046875 0 +v -0.15625 0.046875 0 +v -0.1640625 0.0546875 0 +v -0.1328125 0.046875 0 +v -0.140625 0.0546875 0 +v -0.1328125 0.0625 0 +v -0.140625 0.0625 0 +v -0.1484375 0.0703125 0 +v -0.15625 0.0546875 0 +v -0.1484375 0.0625 0 +v -0.15625 0.0625 0 +v -0.1640625 0.0703125 0 +v -0.171875 0.0390625 0 +v -0.171875 0.046875 0 +v -0.1796875 0.046875 0 +v -0.1640625 0.046875 0 +v -0.171875 0.0546875 0 +v -0.1640625 0.0625 0 +v -0.171875 0.0625 0 +v -0.1796875 0.0625 0 +v -0.1875 0.0703125 0 +v -0.171875 0.0703125 0 +v -0.171875 0.078125 0 +v -0.1640625 0.0859375 0 +v -0.1796875 0.0859375 0 +v -0.1796875 0.078125 0 +v -0.1875 0.078125 0 +v -0.1953125 0.0859375 0 +v -0.15625 0.0703125 0 +v -0.15625 0.078125 0 +v -0.1484375 0.0859375 0 +v -0.1640625 0.078125 0 +v -0.171875 0.0859375 0 +v -0.15625 0.0859375 0 +v -0.15625 0.09375 0 +v -0.1484375 0.1015625 0 +v -0.1640625 0.1015625 0 +v -0.1640625 0.09375 0 +v -0.171875 0.09375 0 +v -0.1796875 0.1015625 0 +v -0.1875 0.0859375 0 +v -0.1796875 0.09375 0 +v -0.1875 0.09375 0 +v -0.1953125 0.1015625 0 +v -0.140625 0.0703125 0 +v -0.140625 0.078125 0 +v -0.1484375 0.078125 0 +v -0.1328125 0.078125 0 +v -0.140625 0.0859375 0 +v -0.1328125 0.09375 0 +v -0.140625 0.09375 0 +v -0.1484375 0.09375 0 +v -0.15625 0.1015625 0 +v -0.140625 0.1015625 0 +v -0.140625 0.109375 0 +v -0.1484375 0.1171875 0 +v -0.1484375 0.109375 0 +v -0.15625 0.109375 0 +v -0.1640625 0.1171875 0 +v -0.1328125 0.109375 0 +v -0.140625 0.1171875 0 +v -0.1328125 0.125 0 +v -0.140625 0.125 0 +v -0.15625 0.1171875 0 +v -0.1484375 0.125 0 +v -0.15625 0.125 0 +v -0.1875 0.1015625 0 +v -0.171875 0.1015625 0 +v -0.171875 0.109375 0 +v -0.1796875 0.1171875 0 +v -0.1796875 0.109375 0 +v -0.1875 0.109375 0 +v -0.1953125 0.1171875 0 +v -0.1640625 0.109375 0 +v -0.171875 0.1171875 0 +v -0.1640625 0.125 0 +v -0.171875 0.125 0 +v -0.1875 0.1171875 0 +v -0.1796875 0.125 0 +v -0.1875 0.125 0 +v -0.234375 0.0703125 0 +v -0.234375 0.078125 0 +v -0.2265625 0.0859375 0 +v -0.2421875 0.078125 0 +v -0.21875 0.0703125 0 +v -0.21875 0.078125 0 +v -0.2109375 0.0859375 0 +v -0.2265625 0.078125 0 +v -0.234375 0.0859375 0 +v -0.21875 0.0859375 0 +v -0.21875 0.09375 0 +v -0.2109375 0.1015625 0 +v -0.2265625 0.1015625 0 +v -0.2265625 0.09375 0 +v -0.234375 0.09375 0 +v -0.2421875 0.09375 0 +v -0.203125 0.0703125 0 +v -0.203125 0.078125 0 +v -0.2109375 0.078125 0 +v -0.1953125 0.078125 0 +v -0.203125 0.0859375 0 +v -0.1953125 0.09375 0 +v -0.203125 0.09375 0 +v -0.2109375 0.09375 0 +v -0.21875 0.1015625 0 +v -0.203125 0.1015625 0 +v -0.203125 0.109375 0 +v -0.2109375 0.1171875 0 +v -0.2109375 0.109375 0 +v -0.21875 0.109375 0 +v -0.2265625 0.1171875 0 +v -0.1953125 0.109375 0 +v -0.203125 0.1171875 0 +v -0.1953125 0.125 0 +v -0.203125 0.125 0 +v -0.21875 0.1171875 0 +v -0.2109375 0.125 0 +v -0.21875 0.125 0 +v -0.234375 0.1015625 0 +v -0.234375 0.109375 0 +v -0.2421875 0.109375 0 +v -0.2265625 0.109375 0 +v -0.234375 0.1171875 0 +v -0.2265625 0.125 0 +v -0.234375 0.125 0 +v -0.2421875 0.125 0 +v 0.0078125 -0.125 0 +v 0.015625 -0.125 0 +v 0.015625 -0.1171875 0 +v 0.0234375 -0.1171875 0 +v 0.015625 -0.109375 0 +v 0.0234375 -0.1015625 0 +v 0.0078125 -0.109375 0 +v 0.0234375 -0.125 0 +v 0.03125 -0.125 0 +v 0.03125 -0.1171875 0 +v 0.0390625 -0.1171875 0 +v 0.03125 -0.109375 0 +v 0.0390625 -0.1015625 0 +v 0.0234375 -0.109375 0 +v 0.015625 -0.1015625 0 +v 0.03125 -0.1015625 0 +v 0.03125 -0.09375 0 +v 0.0390625 -0.0859375 0 +v 0.0234375 -0.0859375 0 +v 0.0234375 -0.09375 0 +v 0.015625 -0.09375 0 +v 0.0078125 -0.09375 0 +v 0.0390625 -0.125 0 +v 0.046875 -0.125 0 +v 0.046875 -0.1171875 0 +v 0.0546875 -0.1171875 0 +v 0.046875 -0.109375 0 +v 0.0546875 -0.1015625 0 +v 0.0390625 -0.109375 0 +v 0.0546875 -0.125 0 +v 0.0625 -0.125 0 +v 0.0625 -0.1171875 0 +v 0.0703125 -0.1171875 0 +v 0.0625 -0.109375 0 +v 0.0703125 -0.1015625 0 +v 0.0546875 -0.109375 0 +v 0.046875 -0.1015625 0 +v 0.0625 -0.1015625 0 +v 0.0625 -0.09375 0 +v 0.0703125 -0.0859375 0 +v 0.0546875 -0.0859375 0 +v 0.0546875 -0.09375 0 +v 0.046875 -0.09375 0 +v 0.0390625 -0.09375 0 +v 0.03125 -0.0859375 0 +v 0.046875 -0.0859375 0 +v 0.046875 -0.078125 0 +v 0.0546875 -0.0703125 0 +v 0.0390625 -0.0703125 0 +v 0.0390625 -0.078125 0 +v 0.03125 -0.078125 0 +v 0.0234375 -0.0703125 0 +v 0.0625 -0.0859375 0 +v 0.0625 -0.078125 0 +v 0.0703125 -0.0703125 0 +v 0.0546875 -0.078125 0 +v 0.046875 -0.0703125 0 +v 0.0625 -0.0703125 0 +v 0.0625 -0.0625 0 +v 0.0703125 -0.0546875 0 +v 0.0546875 -0.0546875 0 +v 0.0546875 -0.0625 0 +v 0.046875 -0.0625 0 +v 0.0390625 -0.0546875 0 +v 0.03125 -0.0703125 0 +v 0.0390625 -0.0625 0 +v 0.03125 -0.0625 0 +v 0.0234375 -0.0546875 0 +v 0.015625 -0.0859375 0 +v 0.015625 -0.078125 0 +v 0.0078125 -0.078125 0 +v 0.0234375 -0.078125 0 +v 0.015625 -0.0703125 0 +v 0.0234375 -0.0625 0 +v 0.015625 -0.0625 0 +v 0.0078125 -0.0625 0 +v 0.0703125 -0.125 0 +v 0.078125 -0.125 0 +v 0.078125 -0.1171875 0 +v 0.0859375 -0.1171875 0 +v 0.078125 -0.109375 0 +v 0.0859375 -0.1015625 0 +v 0.0703125 -0.109375 0 +v 0.0859375 -0.125 0 +v 0.09375 -0.125 0 +v 0.09375 -0.1171875 0 +v 0.1015625 -0.1171875 0 +v 0.09375 -0.109375 0 +v 0.1015625 -0.1015625 0 +v 0.0859375 -0.109375 0 +v 0.078125 -0.1015625 0 +v 0.09375 -0.1015625 0 +v 0.09375 -0.09375 0 +v 0.1015625 -0.0859375 0 +v 0.0859375 -0.0859375 0 +v 0.0859375 -0.09375 0 +v 0.078125 -0.09375 0 +v 0.0703125 -0.09375 0 +v 0.1015625 -0.125 0 +v 0.109375 -0.125 0 +v 0.109375 -0.1171875 0 +v 0.1171875 -0.1171875 0 +v 0.109375 -0.109375 0 +v 0.1171875 -0.1015625 0 +v 0.1015625 -0.109375 0 +v 0.1171875 -0.125 0 +v 0.125 -0.125 0 +v 0.125 -0.1171875 0 +v 0.1328125 -0.1171875 0 +v 0.125 -0.109375 0 +v 0.1328125 -0.1015625 0 +v 0.1171875 -0.109375 0 +v 0.109375 -0.1015625 0 +v 0.125 -0.1015625 0 +v 0.125 -0.09375 0 +v 0.1328125 -0.0859375 0 +v 0.1171875 -0.0859375 0 +v 0.1171875 -0.09375 0 +v 0.109375 -0.09375 0 +v 0.1015625 -0.09375 0 +v 0.09375 -0.0859375 0 +v 0.109375 -0.0859375 0 +v 0.109375 -0.078125 0 +v 0.1171875 -0.0703125 0 +v 0.1015625 -0.0703125 0 +v 0.1015625 -0.078125 0 +v 0.09375 -0.078125 0 +v 0.0859375 -0.0703125 0 +v 0.125 -0.0859375 0 +v 0.125 -0.078125 0 +v 0.1328125 -0.0703125 0 +v 0.1171875 -0.078125 0 +v 0.109375 -0.0703125 0 +v 0.125 -0.0703125 0 +v 0.125 -0.0625 0 +v 0.1328125 -0.0546875 0 +v 0.1171875 -0.0546875 0 +v 0.1171875 -0.0625 0 +v 0.109375 -0.0625 0 +v 0.1015625 -0.0546875 0 +v 0.09375 -0.0703125 0 +v 0.1015625 -0.0625 0 +v 0.09375 -0.0625 0 +v 0.0859375 -0.0546875 0 +v 0.078125 -0.0859375 0 +v 0.078125 -0.078125 0 +v 0.0703125 -0.078125 0 +v 0.0859375 -0.078125 0 +v 0.078125 -0.0703125 0 +v 0.0859375 -0.0625 0 +v 0.078125 -0.0625 0 +v 0.0703125 -0.0625 0 +v 0.0625 -0.0546875 0 +v 0.078125 -0.0546875 0 +v 0.078125 -0.046875 0 +v 0.0859375 -0.0390625 0 +v 0.0703125 -0.0390625 0 +v 0.0703125 -0.046875 0 +v 0.0625 -0.046875 0 +v 0.0546875 -0.0390625 0 +v 0.09375 -0.0546875 0 +v 0.09375 -0.046875 0 +v 0.1015625 -0.0390625 0 +v 0.0859375 -0.046875 0 +v 0.078125 -0.0390625 0 +v 0.09375 -0.0390625 0 +v 0.09375 -0.03125 0 +v 0.1015625 -0.0234375 0 +v 0.0859375 -0.0234375 0 +v 0.0859375 -0.03125 0 +v 0.078125 -0.03125 0 +v 0.0703125 -0.0234375 0 +v 0.0625 -0.0390625 0 +v 0.0703125 -0.03125 0 +v 0.0625 -0.03125 0 +v 0.0546875 -0.0234375 0 +v 0.109375 -0.0546875 0 +v 0.109375 -0.046875 0 +v 0.1171875 -0.0390625 0 +v 0.1015625 -0.046875 0 +v 0.125 -0.0546875 0 +v 0.125 -0.046875 0 +v 0.1328125 -0.0390625 0 +v 0.1171875 -0.046875 0 +v 0.109375 -0.0390625 0 +v 0.125 -0.0390625 0 +v 0.125 -0.03125 0 +v 0.1328125 -0.0234375 0 +v 0.1171875 -0.0234375 0 +v 0.1171875 -0.03125 0 +v 0.109375 -0.03125 0 +v 0.1015625 -0.03125 0 +v 0.09375 -0.0234375 0 +v 0.109375 -0.0234375 0 +v 0.109375 -0.015625 0 +v 0.1171875 -0.0078125 0 +v 0.1015625 -0.0078125 0 +v 0.1015625 -0.015625 0 +v 0.09375 -0.015625 0 +v 0.0859375 -0.0078125 0 +v 0.125 -0.0234375 0 +v 0.125 -0.015625 0 +v 0.1328125 -0.0078125 0 +v 0.1171875 -0.015625 0 +v 0.109375 -0.0078125 0 +v 0.125 -0.0078125 0 +v 0.125 0 0 +v 0.1328125 0.0078125 0 +v 0.1171875 0.0078125 0 +v 0.1171875 0 0 +v 0.109375 0 0 +v 0.1015625 0.0078125 0 +v 0.09375 -0.0078125 0 +v 0.1015625 0 0 +v 0.09375 0 0 +v 0.0859375 0.0078125 0 +v 0.0625 -0.0234375 0 +v 0.078125 -0.0234375 0 +v 0.078125 -0.015625 0 +v 0.0703125 -0.0078125 0 +v 0.0703125 -0.015625 0 +v 0.0625 -0.015625 0 +v 0.0546875 -0.0078125 0 +v 0.0859375 -0.015625 0 +v 0.078125 -0.0078125 0 +v 0.0859375 0 0 +v 0.078125 0 0 +v 0.0703125 0.0078125 0 +v 0.0625 -0.0078125 0 +v 0.0703125 0 0 +v 0.0625 0 0 +v 0.0546875 0.0078125 0 +v 0.015625 -0.0546875 0 +v 0.015625 -0.046875 0 +v 0.0234375 -0.0390625 0 +v 0.0078125 -0.046875 0 +v 0.03125 -0.0546875 0 +v 0.03125 -0.046875 0 +v 0.0390625 -0.0390625 0 +v 0.0234375 -0.046875 0 +v 0.015625 -0.0390625 0 +v 0.03125 -0.0390625 0 +v 0.03125 -0.03125 0 +v 0.0390625 -0.0234375 0 +v 0.0234375 -0.0234375 0 +v 0.0234375 -0.03125 0 +v 0.015625 -0.03125 0 +v 0.0078125 -0.03125 0 +v 0.046875 -0.0546875 0 +v 0.046875 -0.046875 0 +v 0.0390625 -0.046875 0 +v 0.0546875 -0.046875 0 +v 0.046875 -0.0390625 0 +v 0.0546875 -0.03125 0 +v 0.046875 -0.03125 0 +v 0.0390625 -0.03125 0 +v 0.03125 -0.0234375 0 +v 0.046875 -0.0234375 0 +v 0.046875 -0.015625 0 +v 0.0390625 -0.0078125 0 +v 0.0390625 -0.015625 0 +v 0.03125 -0.015625 0 +v 0.0234375 -0.0078125 0 +v 0.0546875 -0.015625 0 +v 0.046875 -0.0078125 0 +v 0.0546875 0 0 +v 0.046875 0 0 +v 0.0390625 0.0078125 0 +v 0.03125 -0.0078125 0 +v 0.0390625 0 0 +v 0.03125 0 0 +v 0.0234375 0.0078125 0 +v 0.015625 -0.0234375 0 +v 0.015625 -0.015625 0 +v 0.0078125 -0.015625 0 +v 0.0234375 -0.015625 0 +v 0.015625 -0.0078125 0 +v 0.0234375 0 0 +v 0.015625 0 0 +v 0.0078125 0 0 +v 0.1328125 -0.125 0 +v 0.140625 -0.125 0 +v 0.140625 -0.1171875 0 +v 0.1484375 -0.1171875 0 +v 0.140625 -0.109375 0 +v 0.1484375 -0.1015625 0 +v 0.1328125 -0.109375 0 +v 0.1484375 -0.125 0 +v 0.15625 -0.125 0 +v 0.15625 -0.1171875 0 +v 0.1640625 -0.1171875 0 +v 0.15625 -0.109375 0 +v 0.1640625 -0.1015625 0 +v 0.1484375 -0.109375 0 +v 0.140625 -0.1015625 0 +v 0.15625 -0.1015625 0 +v 0.15625 -0.09375 0 +v 0.1640625 -0.0859375 0 +v 0.1484375 -0.0859375 0 +v 0.1484375 -0.09375 0 +v 0.140625 -0.09375 0 +v 0.1328125 -0.09375 0 +v 0.1640625 -0.125 0 +v 0.171875 -0.125 0 +v 0.171875 -0.1171875 0 +v 0.1796875 -0.1171875 0 +v 0.171875 -0.109375 0 +v 0.1796875 -0.1015625 0 +v 0.1640625 -0.109375 0 +v 0.1796875 -0.125 0 +v 0.1875 -0.125 0 +v 0.1875 -0.1171875 0 +v 0.1953125 -0.1171875 0 +v 0.1875 -0.109375 0 +v 0.1953125 -0.1015625 0 +v 0.1796875 -0.109375 0 +v 0.171875 -0.1015625 0 +v 0.1875 -0.1015625 0 +v 0.1875 -0.09375 0 +v 0.1953125 -0.0859375 0 +v 0.1796875 -0.0859375 0 +v 0.1796875 -0.09375 0 +v 0.171875 -0.09375 0 +v 0.1640625 -0.09375 0 +v 0.15625 -0.0859375 0 +v 0.171875 -0.0859375 0 +v 0.171875 -0.078125 0 +v 0.1796875 -0.0703125 0 +v 0.1640625 -0.0703125 0 +v 0.1640625 -0.078125 0 +v 0.15625 -0.078125 0 +v 0.1484375 -0.0703125 0 +v 0.1875 -0.0859375 0 +v 0.1875 -0.078125 0 +v 0.1953125 -0.0703125 0 +v 0.1796875 -0.078125 0 +v 0.171875 -0.0703125 0 +v 0.1875 -0.0703125 0 +v 0.1875 -0.0625 0 +v 0.1953125 -0.0546875 0 +v 0.1796875 -0.0546875 0 +v 0.1796875 -0.0625 0 +v 0.171875 -0.0625 0 +v 0.1640625 -0.0546875 0 +v 0.15625 -0.0703125 0 +v 0.1640625 -0.0625 0 +v 0.15625 -0.0625 0 +v 0.1484375 -0.0546875 0 +v 0.140625 -0.0859375 0 +v 0.140625 -0.078125 0 +v 0.1328125 -0.078125 0 +v 0.1484375 -0.078125 0 +v 0.140625 -0.0703125 0 +v 0.1484375 -0.0625 0 +v 0.140625 -0.0625 0 +v 0.1328125 -0.0625 0 +v 0.1953125 -0.125 0 +v 0.203125 -0.125 0 +v 0.203125 -0.1171875 0 +v 0.2109375 -0.1171875 0 +v 0.203125 -0.109375 0 +v 0.2109375 -0.1015625 0 +v 0.1953125 -0.109375 0 +v 0.2109375 -0.125 0 +v 0.21875 -0.125 0 +v 0.21875 -0.1171875 0 +v 0.2265625 -0.1171875 0 +v 0.21875 -0.109375 0 +v 0.2265625 -0.1015625 0 +v 0.2109375 -0.109375 0 +v 0.203125 -0.1015625 0 +v 0.21875 -0.1015625 0 +v 0.21875 -0.09375 0 +v 0.2265625 -0.0859375 0 +v 0.2109375 -0.0859375 0 +v 0.2109375 -0.09375 0 +v 0.203125 -0.09375 0 +v 0.1953125 -0.09375 0 +v 0.2265625 -0.125 0 +v 0.234375 -0.125 0 +v 0.234375 -0.1171875 0 +v 0.2421875 -0.1171875 0 +v 0.234375 -0.109375 0 +v 0.2421875 -0.1015625 0 +v 0.2265625 -0.109375 0 +v 0.2421875 -0.125 0 +v 0.25 -0.125 0 +v 0.25 -0.1171875 0 +v 0.2578125 -0.1171875 0 +v 0.25 -0.109375 0 +v 0.2578125 -0.1015625 0 +v 0.2421875 -0.109375 0 +v 0.234375 -0.1015625 0 +v 0.25 -0.1015625 0 +v 0.25 -0.09375 0 +v 0.2578125 -0.0859375 0 +v 0.2421875 -0.0859375 0 +v 0.2421875 -0.09375 0 +v 0.234375 -0.09375 0 +v 0.2265625 -0.09375 0 +v 0.21875 -0.0859375 0 +v 0.234375 -0.0859375 0 +v 0.234375 -0.078125 0 +v 0.2421875 -0.0703125 0 +v 0.2265625 -0.0703125 0 +v 0.2265625 -0.078125 0 +v 0.21875 -0.078125 0 +v 0.2109375 -0.0703125 0 +v 0.25 -0.0859375 0 +v 0.25 -0.078125 0 +v 0.2578125 -0.0703125 0 +v 0.2421875 -0.078125 0 +v 0.234375 -0.0703125 0 +v 0.25 -0.0703125 0 +v 0.25 -0.0625 0 +v 0.2578125 -0.0546875 0 +v 0.2421875 -0.0546875 0 +v 0.2421875 -0.0625 0 +v 0.234375 -0.0625 0 +v 0.2265625 -0.0546875 0 +v 0.21875 -0.0703125 0 +v 0.2265625 -0.0625 0 +v 0.21875 -0.0625 0 +v 0.2109375 -0.0546875 0 +v 0.203125 -0.0859375 0 +v 0.203125 -0.078125 0 +v 0.1953125 -0.078125 0 +v 0.2109375 -0.078125 0 +v 0.203125 -0.0703125 0 +v 0.2109375 -0.0625 0 +v 0.203125 -0.0625 0 +v 0.1953125 -0.0625 0 +v 0.1875 -0.0546875 0 +v 0.203125 -0.0546875 0 +v 0.203125 -0.046875 0 +v 0.2109375 -0.0390625 0 +v 0.1953125 -0.0390625 0 +v 0.1953125 -0.046875 0 +v 0.1875 -0.046875 0 +v 0.1796875 -0.0390625 0 +v 0.21875 -0.0546875 0 +v 0.21875 -0.046875 0 +v 0.2265625 -0.0390625 0 +v 0.2109375 -0.046875 0 +v 0.203125 -0.0390625 0 +v 0.21875 -0.0390625 0 +v 0.21875 -0.03125 0 +v 0.2265625 -0.0234375 0 +v 0.2109375 -0.0234375 0 +v 0.2109375 -0.03125 0 +v 0.203125 -0.03125 0 +v 0.1953125 -0.0234375 0 +v 0.1875 -0.0390625 0 +v 0.1953125 -0.03125 0 +v 0.1875 -0.03125 0 +v 0.1796875 -0.0234375 0 +v 0.234375 -0.0546875 0 +v 0.234375 -0.046875 0 +v 0.2421875 -0.0390625 0 +v 0.2265625 -0.046875 0 +v 0.25 -0.0546875 0 +v 0.25 -0.046875 0 +v 0.2578125 -0.0390625 0 +v 0.2421875 -0.046875 0 +v 0.234375 -0.0390625 0 +v 0.25 -0.0390625 0 +v 0.25 -0.03125 0 +v 0.2578125 -0.0234375 0 +v 0.2421875 -0.0234375 0 +v 0.2421875 -0.03125 0 +v 0.234375 -0.03125 0 +v 0.2265625 -0.03125 0 +v 0.21875 -0.0234375 0 +v 0.234375 -0.0234375 0 +v 0.234375 -0.015625 0 +v 0.2421875 -0.0078125 0 +v 0.2265625 -0.0078125 0 +v 0.2265625 -0.015625 0 +v 0.21875 -0.015625 0 +v 0.2109375 -0.0078125 0 +v 0.25 -0.0234375 0 +v 0.25 -0.015625 0 +v 0.2578125 -0.0078125 0 +v 0.2421875 -0.015625 0 +v 0.234375 -0.0078125 0 +v 0.25 -0.0078125 0 +v 0.25 0 0 +v 0.2578125 0.0078125 0 +v 0.2421875 0.0078125 0 +v 0.2421875 0 0 +v 0.234375 0 0 +v 0.2265625 0.0078125 0 +v 0.21875 -0.0078125 0 +v 0.2265625 0 0 +v 0.21875 0 0 +v 0.2109375 0.0078125 0 +v 0.1875 -0.0234375 0 +v 0.203125 -0.0234375 0 +v 0.203125 -0.015625 0 +v 0.1953125 -0.0078125 0 +v 0.1953125 -0.015625 0 +v 0.1875 -0.015625 0 +v 0.1796875 -0.0078125 0 +v 0.2109375 -0.015625 0 +v 0.203125 -0.0078125 0 +v 0.2109375 0 0 +v 0.203125 0 0 +v 0.1953125 0.0078125 0 +v 0.1875 -0.0078125 0 +v 0.1953125 0 0 +v 0.1875 0 0 +v 0.1796875 0.0078125 0 +v 0.140625 -0.0546875 0 +v 0.140625 -0.046875 0 +v 0.1484375 -0.0390625 0 +v 0.1328125 -0.046875 0 +v 0.15625 -0.0546875 0 +v 0.15625 -0.046875 0 +v 0.1640625 -0.0390625 0 +v 0.1484375 -0.046875 0 +v 0.140625 -0.0390625 0 +v 0.15625 -0.0390625 0 +v 0.15625 -0.03125 0 +v 0.1640625 -0.0234375 0 +v 0.1484375 -0.0234375 0 +v 0.1484375 -0.03125 0 +v 0.140625 -0.03125 0 +v 0.1328125 -0.03125 0 +v 0.171875 -0.0546875 0 +v 0.171875 -0.046875 0 +v 0.1640625 -0.046875 0 +v 0.1796875 -0.046875 0 +v 0.171875 -0.0390625 0 +v 0.1796875 -0.03125 0 +v 0.171875 -0.03125 0 +v 0.1640625 -0.03125 0 +v 0.15625 -0.0234375 0 +v 0.171875 -0.0234375 0 +v 0.171875 -0.015625 0 +v 0.1640625 -0.0078125 0 +v 0.1640625 -0.015625 0 +v 0.15625 -0.015625 0 +v 0.1484375 -0.0078125 0 +v 0.1796875 -0.015625 0 +v 0.171875 -0.0078125 0 +v 0.1796875 0 0 +v 0.171875 0 0 +v 0.1640625 0.0078125 0 +v 0.15625 -0.0078125 0 +v 0.1640625 0 0 +v 0.15625 0 0 +v 0.1484375 0.0078125 0 +v 0.140625 -0.0234375 0 +v 0.140625 -0.015625 0 +v 0.1328125 -0.015625 0 +v 0.1484375 -0.015625 0 +v 0.140625 -0.0078125 0 +v 0.1484375 0 0 +v 0.140625 0 0 +v 0.1328125 0 0 +v 0.125 0.0078125 0 +v 0.140625 0.0078125 0 +v 0.140625 0.015625 0 +v 0.1484375 0.0234375 0 +v 0.1328125 0.0234375 0 +v 0.1328125 0.015625 0 +v 0.125 0.015625 0 +v 0.1171875 0.0234375 0 +v 0.15625 0.0078125 0 +v 0.15625 0.015625 0 +v 0.1640625 0.0234375 0 +v 0.1484375 0.015625 0 +v 0.140625 0.0234375 0 +v 0.15625 0.0234375 0 +v 0.15625 0.03125 0 +v 0.1640625 0.0390625 0 +v 0.1484375 0.0390625 0 +v 0.1484375 0.03125 0 +v 0.140625 0.03125 0 +v 0.1328125 0.0390625 0 +v 0.125 0.0234375 0 +v 0.1328125 0.03125 0 +v 0.125 0.03125 0 +v 0.1171875 0.0390625 0 +v 0.171875 0.0078125 0 +v 0.171875 0.015625 0 +v 0.1796875 0.0234375 0 +v 0.1640625 0.015625 0 +v 0.1875 0.0078125 0 +v 0.1875 0.015625 0 +v 0.1953125 0.0234375 0 +v 0.1796875 0.015625 0 +v 0.171875 0.0234375 0 +v 0.1875 0.0234375 0 +v 0.1875 0.03125 0 +v 0.1953125 0.0390625 0 +v 0.1796875 0.0390625 0 +v 0.1796875 0.03125 0 +v 0.171875 0.03125 0 +v 0.1640625 0.03125 0 +v 0.15625 0.0390625 0 +v 0.171875 0.0390625 0 +v 0.171875 0.046875 0 +v 0.1796875 0.0546875 0 +v 0.1640625 0.0546875 0 +v 0.1640625 0.046875 0 +v 0.15625 0.046875 0 +v 0.1484375 0.0546875 0 +v 0.1875 0.0390625 0 +v 0.1875 0.046875 0 +v 0.1953125 0.0546875 0 +v 0.1796875 0.046875 0 +v 0.171875 0.0546875 0 +v 0.1875 0.0546875 0 +v 0.1875 0.0625 0 +v 0.1953125 0.0703125 0 +v 0.1796875 0.0703125 0 +v 0.1796875 0.0625 0 +v 0.171875 0.0625 0 +v 0.1640625 0.0703125 0 +v 0.15625 0.0546875 0 +v 0.1640625 0.0625 0 +v 0.15625 0.0625 0 +v 0.1484375 0.0703125 0 +v 0.125 0.0390625 0 +v 0.140625 0.0390625 0 +v 0.140625 0.046875 0 +v 0.1328125 0.0546875 0 +v 0.1328125 0.046875 0 +v 0.125 0.046875 0 +v 0.1171875 0.0546875 0 +v 0.1484375 0.046875 0 +v 0.140625 0.0546875 0 +v 0.1484375 0.0625 0 +v 0.140625 0.0625 0 +v 0.1328125 0.0703125 0 +v 0.125 0.0546875 0 +v 0.1328125 0.0625 0 +v 0.125 0.0625 0 +v 0.1171875 0.0703125 0 +v 0.203125 0.0078125 0 +v 0.203125 0.015625 0 +v 0.2109375 0.0234375 0 +v 0.1953125 0.015625 0 +v 0.21875 0.0078125 0 +v 0.21875 0.015625 0 +v 0.2265625 0.0234375 0 +v 0.2109375 0.015625 0 +v 0.203125 0.0234375 0 +v 0.21875 0.0234375 0 +v 0.21875 0.03125 0 +v 0.2265625 0.0390625 0 +v 0.2109375 0.0390625 0 +v 0.2109375 0.03125 0 +v 0.203125 0.03125 0 +v 0.1953125 0.03125 0 +v 0.234375 0.0078125 0 +v 0.234375 0.015625 0 +v 0.2421875 0.0234375 0 +v 0.2265625 0.015625 0 +v 0.25 0.0078125 0 +v 0.25 0.015625 0 +v 0.2578125 0.0234375 0 +v 0.2421875 0.015625 0 +v 0.234375 0.0234375 0 +v 0.25 0.0234375 0 +v 0.25 0.03125 0 +v 0.2578125 0.0390625 0 +v 0.2421875 0.0390625 0 +v 0.2421875 0.03125 0 +v 0.234375 0.03125 0 +v 0.2265625 0.03125 0 +v 0.21875 0.0390625 0 +v 0.234375 0.0390625 0 +v 0.234375 0.046875 0 +v 0.2421875 0.0546875 0 +v 0.2265625 0.0546875 0 +v 0.2265625 0.046875 0 +v 0.21875 0.046875 0 +v 0.2109375 0.0546875 0 +v 0.25 0.0390625 0 +v 0.25 0.046875 0 +v 0.2578125 0.0546875 0 +v 0.2421875 0.046875 0 +v 0.234375 0.0546875 0 +v 0.25 0.0546875 0 +v 0.25 0.0625 0 +v 0.2578125 0.0703125 0 +v 0.2421875 0.0703125 0 +v 0.2421875 0.0625 0 +v 0.234375 0.0625 0 +v 0.2265625 0.0703125 0 +v 0.21875 0.0546875 0 +v 0.2265625 0.0625 0 +v 0.21875 0.0625 0 +v 0.2109375 0.0703125 0 +v 0.203125 0.0390625 0 +v 0.203125 0.046875 0 +v 0.1953125 0.046875 0 +v 0.2109375 0.046875 0 +v 0.203125 0.0546875 0 +v 0.2109375 0.0625 0 +v 0.203125 0.0625 0 +v 0.1953125 0.0625 0 +v 0.1875 0.0703125 0 +v 0.203125 0.0703125 0 +v 0.203125 0.078125 0 +v 0.2109375 0.0859375 0 +v 0.1953125 0.0859375 0 +v 0.1953125 0.078125 0 +v 0.1875 0.078125 0 +v 0.1796875 0.0859375 0 +v 0.21875 0.0703125 0 +v 0.21875 0.078125 0 +v 0.2265625 0.0859375 0 +v 0.2109375 0.078125 0 +v 0.203125 0.0859375 0 +v 0.21875 0.0859375 0 +v 0.21875 0.09375 0 +v 0.2265625 0.1015625 0 +v 0.2109375 0.1015625 0 +v 0.2109375 0.09375 0 +v 0.203125 0.09375 0 +v 0.1953125 0.1015625 0 +v 0.1875 0.0859375 0 +v 0.1953125 0.09375 0 +v 0.1875 0.09375 0 +v 0.1796875 0.1015625 0 +v 0.234375 0.0703125 0 +v 0.234375 0.078125 0 +v 0.2421875 0.0859375 0 +v 0.2265625 0.078125 0 +v 0.25 0.0703125 0 +v 0.25 0.078125 0 +v 0.2578125 0.0859375 0 +v 0.2421875 0.078125 0 +v 0.234375 0.0859375 0 +v 0.25 0.0859375 0 +v 0.25 0.09375 0 +v 0.2578125 0.1015625 0 +v 0.2421875 0.1015625 0 +v 0.2421875 0.09375 0 +v 0.234375 0.09375 0 +v 0.2265625 0.09375 0 +v 0.21875 0.1015625 0 +v 0.234375 0.1015625 0 +v 0.234375 0.109375 0 +v 0.2421875 0.1171875 0 +v 0.2265625 0.1171875 0 +v 0.2265625 0.109375 0 +v 0.21875 0.109375 0 +v 0.2109375 0.1171875 0 +v 0.25 0.1015625 0 +v 0.25 0.109375 0 +v 0.2578125 0.1171875 0 +v 0.2421875 0.109375 0 +v 0.234375 0.1171875 0 +v 0.25 0.1171875 0 +v 0.25 0.125 0 +v 0.2421875 0.125 0 +v 0.234375 0.125 0 +v 0.21875 0.1171875 0 +v 0.2265625 0.125 0 +v 0.21875 0.125 0 +v 0.1875 0.1015625 0 +v 0.203125 0.1015625 0 +v 0.203125 0.109375 0 +v 0.1953125 0.1171875 0 +v 0.1953125 0.109375 0 +v 0.1875 0.109375 0 +v 0.1796875 0.1171875 0 +v 0.2109375 0.109375 0 +v 0.203125 0.1171875 0 +v 0.2109375 0.125 0 +v 0.203125 0.125 0 +v 0.1875 0.1171875 0 +v 0.1953125 0.125 0 +v 0.1875 0.125 0 +v 0.125 0.0703125 0 +v 0.140625 0.0703125 0 +v 0.140625 0.078125 0 +v 0.1484375 0.0859375 0 +v 0.1328125 0.0859375 0 +v 0.1328125 0.078125 0 +v 0.125 0.078125 0 +v 0.1171875 0.0859375 0 +v 0.15625 0.0703125 0 +v 0.15625 0.078125 0 +v 0.1640625 0.0859375 0 +v 0.1484375 0.078125 0 +v 0.140625 0.0859375 0 +v 0.15625 0.0859375 0 +v 0.15625 0.09375 0 +v 0.1640625 0.1015625 0 +v 0.1484375 0.1015625 0 +v 0.1484375 0.09375 0 +v 0.140625 0.09375 0 +v 0.1328125 0.1015625 0 +v 0.125 0.0859375 0 +v 0.1328125 0.09375 0 +v 0.125 0.09375 0 +v 0.1171875 0.1015625 0 +v 0.171875 0.0703125 0 +v 0.171875 0.078125 0 +v 0.1640625 0.078125 0 +v 0.1796875 0.078125 0 +v 0.171875 0.0859375 0 +v 0.1796875 0.09375 0 +v 0.171875 0.09375 0 +v 0.1640625 0.09375 0 +v 0.15625 0.1015625 0 +v 0.171875 0.1015625 0 +v 0.171875 0.109375 0 +v 0.1640625 0.1171875 0 +v 0.1640625 0.109375 0 +v 0.15625 0.109375 0 +v 0.1484375 0.1171875 0 +v 0.1796875 0.109375 0 +v 0.171875 0.1171875 0 +v 0.1796875 0.125 0 +v 0.171875 0.125 0 +v 0.15625 0.1171875 0 +v 0.1640625 0.125 0 +v 0.15625 0.125 0 +v 0.125 0.1015625 0 +v 0.140625 0.1015625 0 +v 0.140625 0.109375 0 +v 0.1328125 0.1171875 0 +v 0.1328125 0.109375 0 +v 0.125 0.109375 0 +v 0.1171875 0.1171875 0 +v 0.1484375 0.109375 0 +v 0.140625 0.1171875 0 +v 0.1484375 0.125 0 +v 0.140625 0.125 0 +v 0.125 0.1171875 0 +v 0.1328125 0.125 0 +v 0.125 0.125 0 +v 0.015625 0.0078125 0 +v 0.015625 0.015625 0 +v 0.0234375 0.0234375 0 +v 0.0078125 0.015625 0 +v 0.03125 0.0078125 0 +v 0.03125 0.015625 0 +v 0.0390625 0.0234375 0 +v 0.0234375 0.015625 0 +v 0.015625 0.0234375 0 +v 0.03125 0.0234375 0 +v 0.03125 0.03125 0 +v 0.0390625 0.0390625 0 +v 0.0234375 0.0390625 0 +v 0.0234375 0.03125 0 +v 0.015625 0.03125 0 +v 0.0078125 0.03125 0 +v 0.046875 0.0078125 0 +v 0.046875 0.015625 0 +v 0.0546875 0.0234375 0 +v 0.0390625 0.015625 0 +v 0.0625 0.0078125 0 +v 0.0625 0.015625 0 +v 0.0703125 0.0234375 0 +v 0.0546875 0.015625 0 +v 0.046875 0.0234375 0 +v 0.0625 0.0234375 0 +v 0.0625 0.03125 0 +v 0.0703125 0.0390625 0 +v 0.0546875 0.0390625 0 +v 0.0546875 0.03125 0 +v 0.046875 0.03125 0 +v 0.0390625 0.03125 0 +v 0.03125 0.0390625 0 +v 0.046875 0.0390625 0 +v 0.046875 0.046875 0 +v 0.0546875 0.0546875 0 +v 0.0390625 0.0546875 0 +v 0.0390625 0.046875 0 +v 0.03125 0.046875 0 +v 0.0234375 0.0546875 0 +v 0.0625 0.0390625 0 +v 0.0625 0.046875 0 +v 0.0703125 0.0546875 0 +v 0.0546875 0.046875 0 +v 0.046875 0.0546875 0 +v 0.0625 0.0546875 0 +v 0.0625 0.0625 0 +v 0.0703125 0.0703125 0 +v 0.0546875 0.0703125 0 +v 0.0546875 0.0625 0 +v 0.046875 0.0625 0 +v 0.0390625 0.0703125 0 +v 0.03125 0.0546875 0 +v 0.0390625 0.0625 0 +v 0.03125 0.0625 0 +v 0.0234375 0.0703125 0 +v 0.015625 0.0390625 0 +v 0.015625 0.046875 0 +v 0.0078125 0.046875 0 +v 0.0234375 0.046875 0 +v 0.015625 0.0546875 0 +v 0.0234375 0.0625 0 +v 0.015625 0.0625 0 +v 0.0078125 0.0625 0 +v 0.078125 0.0078125 0 +v 0.078125 0.015625 0 +v 0.0859375 0.0234375 0 +v 0.0703125 0.015625 0 +v 0.09375 0.0078125 0 +v 0.09375 0.015625 0 +v 0.1015625 0.0234375 0 +v 0.0859375 0.015625 0 +v 0.078125 0.0234375 0 +v 0.09375 0.0234375 0 +v 0.09375 0.03125 0 +v 0.1015625 0.0390625 0 +v 0.0859375 0.0390625 0 +v 0.0859375 0.03125 0 +v 0.078125 0.03125 0 +v 0.0703125 0.03125 0 +v 0.109375 0.0078125 0 +v 0.109375 0.015625 0 +v 0.1015625 0.015625 0 +v 0.1171875 0.015625 0 +v 0.109375 0.0234375 0 +v 0.1171875 0.03125 0 +v 0.109375 0.03125 0 +v 0.1015625 0.03125 0 +v 0.09375 0.0390625 0 +v 0.109375 0.0390625 0 +v 0.109375 0.046875 0 +v 0.1015625 0.0546875 0 +v 0.1015625 0.046875 0 +v 0.09375 0.046875 0 +v 0.0859375 0.0546875 0 +v 0.1171875 0.046875 0 +v 0.109375 0.0546875 0 +v 0.1171875 0.0625 0 +v 0.109375 0.0625 0 +v 0.1015625 0.0703125 0 +v 0.09375 0.0546875 0 +v 0.1015625 0.0625 0 +v 0.09375 0.0625 0 +v 0.0859375 0.0703125 0 +v 0.078125 0.0390625 0 +v 0.078125 0.046875 0 +v 0.0703125 0.046875 0 +v 0.0859375 0.046875 0 +v 0.078125 0.0546875 0 +v 0.0859375 0.0625 0 +v 0.078125 0.0625 0 +v 0.0703125 0.0625 0 +v 0.0625 0.0703125 0 +v 0.078125 0.0703125 0 +v 0.078125 0.078125 0 +v 0.0859375 0.0859375 0 +v 0.0703125 0.0859375 0 +v 0.0703125 0.078125 0 +v 0.0625 0.078125 0 +v 0.0546875 0.0859375 0 +v 0.09375 0.0703125 0 +v 0.09375 0.078125 0 +v 0.1015625 0.0859375 0 +v 0.0859375 0.078125 0 +v 0.078125 0.0859375 0 +v 0.09375 0.0859375 0 +v 0.09375 0.09375 0 +v 0.1015625 0.1015625 0 +v 0.0859375 0.1015625 0 +v 0.0859375 0.09375 0 +v 0.078125 0.09375 0 +v 0.0703125 0.1015625 0 +v 0.0625 0.0859375 0 +v 0.0703125 0.09375 0 +v 0.0625 0.09375 0 +v 0.0546875 0.1015625 0 +v 0.109375 0.0703125 0 +v 0.109375 0.078125 0 +v 0.1015625 0.078125 0 +v 0.1171875 0.078125 0 +v 0.109375 0.0859375 0 +v 0.1171875 0.09375 0 +v 0.109375 0.09375 0 +v 0.1015625 0.09375 0 +v 0.09375 0.1015625 0 +v 0.109375 0.1015625 0 +v 0.109375 0.109375 0 +v 0.1015625 0.1171875 0 +v 0.1015625 0.109375 0 +v 0.09375 0.109375 0 +v 0.0859375 0.1171875 0 +v 0.1171875 0.109375 0 +v 0.109375 0.1171875 0 +v 0.1171875 0.125 0 +v 0.109375 0.125 0 +v 0.09375 0.1171875 0 +v 0.1015625 0.125 0 +v 0.09375 0.125 0 +v 0.0625 0.1015625 0 +v 0.078125 0.1015625 0 +v 0.078125 0.109375 0 +v 0.0703125 0.1171875 0 +v 0.0703125 0.109375 0 +v 0.0625 0.109375 0 +v 0.0546875 0.1171875 0 +v 0.0859375 0.109375 0 +v 0.078125 0.1171875 0 +v 0.0859375 0.125 0 +v 0.078125 0.125 0 +v 0.0625 0.1171875 0 +v 0.0703125 0.125 0 +v 0.0625 0.125 0 +v 0.015625 0.0703125 0 +v 0.015625 0.078125 0 +v 0.0234375 0.0859375 0 +v 0.0078125 0.078125 0 +v 0.03125 0.0703125 0 +v 0.03125 0.078125 0 +v 0.0390625 0.0859375 0 +v 0.0234375 0.078125 0 +v 0.015625 0.0859375 0 +v 0.03125 0.0859375 0 +v 0.03125 0.09375 0 +v 0.0390625 0.1015625 0 +v 0.0234375 0.1015625 0 +v 0.0234375 0.09375 0 +v 0.015625 0.09375 0 +v 0.0078125 0.09375 0 +v 0.046875 0.0703125 0 +v 0.046875 0.078125 0 +v 0.0390625 0.078125 0 +v 0.0546875 0.078125 0 +v 0.046875 0.0859375 0 +v 0.0546875 0.09375 0 +v 0.046875 0.09375 0 +v 0.0390625 0.09375 0 +v 0.03125 0.1015625 0 +v 0.046875 0.1015625 0 +v 0.046875 0.109375 0 +v 0.0390625 0.1171875 0 +v 0.0390625 0.109375 0 +v 0.03125 0.109375 0 +v 0.0234375 0.1171875 0 +v 0.0546875 0.109375 0 +v 0.046875 0.1171875 0 +v 0.0546875 0.125 0 +v 0.046875 0.125 0 +v 0.03125 0.1171875 0 +v 0.0390625 0.125 0 +v 0.03125 0.125 0 +v 0.015625 0.1015625 0 +v 0.015625 0.109375 0 +v 0.0078125 0.109375 0 +v 0.0234375 0.109375 0 +v 0.015625 0.1171875 0 +v 0.0234375 0.125 0 +v 0.015625 0.125 0 +v 0.0078125 0.125 0 +v 0.2578125 -0.125 0 +v 0.265617371 -0.124992371 0 +v 0.265617847 -0.117180347 0 +v 0.27340889 -0.11715889 0 +v 0.265618324 -0.109368324 0 +v 0.273412645 -0.101537704 0 +v 0.2578125 -0.109375 0 +v 0.273406982 -0.124969482 0 +v 0.281173706 -0.124923706 0 +v 0.281178474 -0.117115974 0 +v 0.288919449 -0.117044449 0 +v 0.281183213 -0.109308243 0 +v 0.288938224 -0.101438522 0 +v 0.273410797 -0.109348297 0 +v 0.265618801 -0.101556301 0 +v 0.281187862 -0.101500511 0 +v 0.281192392 -0.0936927795 0 +v 0.288956106 -0.0858325958 0 +v 0.273416221 -0.0859165192 0 +v 0.273414463 -0.0937271118 0 +v 0.265619248 -0.093744278 0 +v 0.2578125 -0.09375 0 +v 0.288909912 -0.124847412 0 +v 0.296607971 -0.124732971 0 +v 0.29662466 -0.11693716 0 +v 0.304286957 -0.116786957 0 +v 0.296641201 -0.10914135 0 +v 0.304339528 -0.101215363 0 +v 0.288928926 -0.109241486 0 +v 0.304260254 -0.124572754 0 +v 0.311859131 -0.124359131 0 +v 0.311899185 -0.116586685 0 +v 0.319454193 -0.116329193 0 +v 0.311938912 -0.10881424 0 +v 0.319566846 -0.100818634 0 +v 0.304313451 -0.10900116 0 +v 0.296657503 -0.101345539 0 +v 0.311978042 -0.101041794 0 +v 0.312016189 -0.0932693481 0 +v 0.319674134 -0.085308075 0 +v 0.304389596 -0.0856437683 0 +v 0.304364979 -0.0934295654 0 +v 0.296673417 -0.0935497284 0 +v 0.288947314 -0.0936355591 0 +v 0.281196803 -0.0858850479 0 +v 0.296688795 -0.0857539177 0 +v 0.296703547 -0.077958107 0 +v 0.304435492 -0.0700721741 0 +v 0.288972497 -0.0702266693 0 +v 0.28896451 -0.0780296326 0 +v 0.281201005 -0.0780773163 0 +v 0.273419499 -0.0702953339 0 +v 0.312053144 -0.0854969025 0 +v 0.31208849 -0.0777244568 0 +v 0.319772482 -0.0697975159 0 +v 0.30441317 -0.0778579712 0 +v 0.296717495 -0.0701622963 0 +v 0.312121987 -0.0699520111 0 +v 0.312153339 -0.0621795654 0 +v 0.319858313 -0.0542869568 0 +v 0.304475546 -0.0545005798 0 +v 0.304456353 -0.062286377 0 +v 0.296730518 -0.0623664856 0 +v 0.288986802 -0.0546207428 0 +v 0.281204998 -0.0702695847 0 +v 0.288979948 -0.0624237061 0 +v 0.281208694 -0.062461853 0 +v 0.27342236 -0.0546741486 0 +v 0.265619695 -0.0859322548 0 +v 0.265620112 -0.0781202316 0 +v 0.2578125 -0.078125 0 +v 0.27341789 -0.0781059265 0 +v 0.2656205 -0.0703082085 0 +v 0.27342099 -0.0624847412 0 +v 0.265620857 -0.0624961853 0 +v 0.2578125 -0.0625 0 +v 0.319396973 -0.124084473 0 +v 0.32686615 -0.12374115 0 +v 0.326944828 -0.116007328 0 +v 0.334363937 -0.115613937 0 +v 0.32702288 -0.108273506 0 +v 0.334570467 -0.100198746 0 +v 0.319510967 -0.108573914 0 +v 0.334259033 -0.123321533 0 +v 0.341567993 -0.122817993 0 +v 0.341704369 -0.115141869 0 +v 0.348958969 -0.114583969 0 +v 0.341839671 -0.107465744 0 +v 0.349300683 -0.0993061066 0 +v 0.334468007 -0.107906342 0 +v 0.327099741 -0.100539684 0 +v 0.341972828 -0.0997896194 0 +v 0.342102855 -0.0921134949 0 +v 0.349626124 -0.084028244 0 +v 0.334767163 -0.0847835541 0 +v 0.334670424 -0.0924911499 0 +v 0.327174723 -0.0928058624 0 +v 0.319621384 -0.0930633545 0 +v 0.3487854 -0.1222229 0 +v 0.355903625 -0.121528625 0 +v 0.356120586 -0.113933086 0 +v 0.363182068 -0.113182068 0 +v 0.356335849 -0.106337547 0 +v 0.363707781 -0.0980911255 0 +v 0.349131167 -0.106945038 0 +v 0.362915039 -0.120727539 0 +v 0.369812012 -0.119812012 0 +v 0.370136261 -0.112323761 0 +v 0.376976013 -0.111351013 0 +v 0.370457947 -0.10483551 0 +v 0.377742052 -0.0965042114 0 +v 0.363447011 -0.105636597 0 +v 0.356547713 -0.0987420082 0 +v 0.370774627 -0.0973472595 0 +v 0.371083617 -0.0898590088 0 +v 0.378471613 -0.0816574097 0 +v 0.36420846 -0.0830001831 0 +v 0.363962293 -0.0905456543 0 +v 0.356754482 -0.0911464691 0 +v 0.349466085 -0.0916671753 0 +v 0.342228532 -0.0844373703 0 +v 0.356954515 -0.08355093 0 +v 0.357146084 -0.0759553909 0 +v 0.364667416 -0.0679092407 0 +v 0.349924445 -0.0687503815 0 +v 0.349779338 -0.0763893127 0 +v 0.342348993 -0.0767612457 0 +v 0.334947467 -0.0693683624 0 +v 0.371382594 -0.0823707581 0 +v 0.371668816 -0.0748825073 0 +v 0.379140377 -0.0668106079 0 +v 0.364444196 -0.0754547119 0 +v 0.357327431 -0.0683598518 0 +v 0.371939898 -0.0673942566 0 +v 0.372193217 -0.0599060059 0 +v 0.379724026 -0.0519638062 0 +v 0.365067959 -0.0528182983 0 +v 0.364876032 -0.0603637695 0 +v 0.357496947 -0.0607643127 0 +v 0.350184798 -0.0534725189 0 +v 0.342462957 -0.0690851212 0 +v 0.350060046 -0.0611114502 0 +v 0.34256953 -0.0614089966 0 +v 0.335104823 -0.0539531708 0 +v 0.327247262 -0.0850720406 0 +v 0.327316701 -0.0773382187 0 +v 0.319724649 -0.0775527954 0 +v 0.334859759 -0.0770759583 0 +v 0.327382475 -0.0696043968 0 +v 0.335029423 -0.0616607666 0 +v 0.327443957 -0.061870575 0 +v 0.319817185 -0.0620422363 0 +v 0.312182069 -0.0544071198 0 +v 0.327500492 -0.0541367531 0 +v 0.327551544 -0.0464029312 0 +v 0.335232675 -0.0385379791 0 +v 0.31992805 -0.0387763977 0 +v 0.319895416 -0.0465316772 0 +v 0.312208056 -0.0466346741 0 +v 0.30450809 -0.0389289856 0 +v 0.34266752 -0.053732872 0 +v 0.342755944 -0.0460567474 0 +v 0.350396335 -0.0381946564 0 +v 0.335172832 -0.046245575 0 +v 0.327596366 -0.0386691093 0 +v 0.342833757 -0.0383806229 0 +v 0.34289977 -0.0307044983 0 +v 0.350548208 -0.0229167938 0 +v 0.335324466 -0.0231227875 0 +v 0.335283518 -0.0308303833 0 +v 0.327634484 -0.0309352875 0 +v 0.319978118 -0.0232658386 0 +v 0.312230885 -0.0388622284 0 +v 0.319955766 -0.0310211182 0 +v 0.312250316 -0.0310897827 0 +v 0.304531455 -0.0233573914 0 +v 0.357652873 -0.0531687737 0 +v 0.35779357 -0.0455732346 0 +v 0.3653934 -0.037727356 0 +v 0.350297332 -0.0458335876 0 +v 0.372426271 -0.0524177551 0 +v 0.372636557 -0.0449295044 0 +v 0.38019824 -0.0371170044 0 +v 0.36524111 -0.0452728271 0 +v 0.357917309 -0.0379776955 0 +v 0.37282145 -0.0374412537 0 +v 0.372978568 -0.0299530029 0 +v 0.380538702 -0.0222702026 0 +v 0.36562705 -0.0226364136 0 +v 0.365522742 -0.0301818848 0 +v 0.358022422 -0.0303821564 0 +v 0.350480437 -0.0305557251 0 +v 0.342953086 -0.0230283737 0 +v 0.35810715 -0.0227866173 0 +v 0.358169854 -0.0151910782 0 +v 0.36575222 -0.00754547119 0 +v 0.350629568 -0.00763893127 0 +v 0.350598395 -0.0152778625 0 +v 0.342992485 -0.0153522491 0 +v 0.33537364 -0.00770759583 0 +v 0.373105168 -0.0224647522 0 +v 0.373198926 -0.0149765015 0 +v 0.380721092 -0.00742340088 0 +v 0.365704238 -0.0150909424 0 +v 0.358208835 -0.00759553909 0 +v 0.37325716 -0.00748825073 0 +v 0.373277426 0 0 +v 0.380721092 0.00742340088 0 +v 0.36575222 0.00754547119 0 +v 0.365768909 0 0 +v 0.358222425 0 0 +v 0.350629568 0.00763893127 0 +v 0.343016982 -0.00767612457 0 +v 0.350640416 0 0 +v 0.343025565 0 0 +v 0.33537364 0.00770759583 0 +v 0.312265933 -0.023317337 0 +v 0.32766521 -0.0232014656 0 +v 0.327687949 -0.0154676437 0 +v 0.32000494 -0.00775527954 0 +v 0.319994658 -0.0155105591 0 +v 0.312277526 -0.0155448914 0 +v 0.304543972 -0.00778579712 0 +v 0.335354805 -0.0154151917 0 +v 0.327702105 -0.00773382187 0 +v 0.335380197 0 0 +v 0.327707052 0 0 +v 0.32000494 0.00775527954 0 +v 0.312284708 -0.00777244568 0 +v 0.320008516 0 0 +v 0.312287211 0 0 +v 0.304543972 0.00778579712 0 +v 0.265621215 -0.0546841621 0 +v 0.265621513 -0.046872139 0 +v 0.273424685 -0.0390529633 0 +v 0.2578125 -0.046875 0 +v 0.281212151 -0.0546541214 0 +v 0.28121525 -0.0468463898 0 +v 0.288998425 -0.0390148163 0 +v 0.273423612 -0.0468635559 0 +v 0.265621781 -0.0390601158 0 +v 0.281217963 -0.0390386581 0 +v 0.281220287 -0.0312309265 0 +v 0.28900677 -0.0234088898 0 +v 0.273426354 -0.023431778 0 +v 0.273425609 -0.0312423706 0 +v 0.26562202 -0.0312480927 0 +v 0.2578125 -0.03125 0 +v 0.296742529 -0.0545706749 0 +v 0.296753347 -0.0467748642 0 +v 0.288993001 -0.0468177795 0 +v 0.304492861 -0.0467147827 0 +v 0.296762884 -0.0389790535 0 +v 0.304521024 -0.0311431885 0 +v 0.29677096 -0.0311832428 0 +v 0.289003044 -0.031211853 0 +v 0.281222135 -0.0234231949 0 +v 0.296777487 -0.0233874321 0 +v 0.296782315 -0.0155916214 0 +v 0.28901124 -0.00780296326 0 +v 0.289009511 -0.0156059265 0 +v 0.281223506 -0.0156154633 0 +v 0.273427248 -0.00781059265 0 +v 0.304539174 -0.0155715942 0 +v 0.296785295 -0.0077958107 0 +v 0.304545641 0 0 +v 0.296786308 0 0 +v 0.28901124 0.00780296326 0 +v 0.28122437 -0.00780773163 0 +v 0.289011836 0 0 +v 0.281224668 0 0 +v 0.273427248 0.00781059265 0 +v 0.265622199 -0.0234360695 0 +v 0.265622348 -0.0156240463 0 +v 0.2578125 -0.015625 0 +v 0.27342689 -0.0156211853 0 +v 0.265622437 -0.00781202316 0 +v 0.273427367 0 0 +v 0.265622467 0 0 +v 0.2578125 0 0 +v 0.376586914 -0.118774414 0 +v 0.383232117 -0.117607117 0 +v 0.383695126 -0.110257626 0 +v 0.390287399 -0.109037399 0 +v 0.384154499 -0.102908105 0 +v 0.391364872 -0.0945067406 0 +v 0.377362072 -0.103927612 0 +v 0.38973999 -0.11630249 0 +v 0.396102905 -0.114852905 0 +v 0.396746635 -0.107684135 0 +v 0.403066635 -0.106191635 0 +v 0.39738518 -0.100515068 0 +v 0.404548705 -0.0920710564 0 +v 0.390830457 -0.101772189 0 +v 0.3846066 -0.0955585241 0 +v 0.398013353 -0.0933454037 0 +v 0.398626059 -0.0861748457 0 +v 0.405956566 -0.077943325 0 +v 0.392390311 -0.0799746513 0 +v 0.391886234 -0.0872409344 0 +v 0.385047793 -0.0882088542 0 +v 0.378112912 -0.0890808105 0 +v 0.402313232 -0.113250732 0 +v 0.408363342 -0.111488342 0 +v 0.409241199 -0.104553699 0 +v 0.41526413 -0.10276413 0 +v 0.410111666 -0.0976180136 0 +v 0.417266011 -0.0891695023 0 +v 0.403813839 -0.0991319418 0 +v 0.414245605 -0.109558105 0 +v 0.419952393 -0.107452393 0 +v 0.421129227 -0.100816727 0 +v 0.426830292 -0.0987052917 0 +v 0.4222956 -0.0941785574 0 +v 0.429489255 -0.0857744217 0 +v 0.416273862 -0.0959684849 0 +v 0.41096741 -0.0906802416 0 +v 0.423441112 -0.0875353813 0 +v 0.424555242 -0.0808846951 0 +v 0.431999803 -0.0728006363 0 +v 0.419162393 -0.0755548477 0 +v 0.418231785 -0.0823655128 0 +v 0.411800981 -0.0837393403 0 +v 0.405264974 -0.0850083828 0 +v 0.399217963 -0.0790030956 0 +v 0.412605017 -0.0767942667 0 +v 0.413372219 -0.0698439777 0 +v 0.42088294 -0.0619068146 0 +v 0.407240748 -0.0638036728 0 +v 0.406617194 -0.0708752871 0 +v 0.399784058 -0.0718298554 0 +v 0.393329024 -0.0654401779 0 +v 0.425627649 -0.0742239952 0 +v 0.426647782 -0.0675507784 0 +v 0.434262991 -0.0597553253 0 +v 0.420049042 -0.0687358379 0 +v 0.414095074 -0.0628874302 0 +v 0.427605271 -0.0608625412 0 +v 0.428489685 -0.0541567802 0 +v 0.436179876 -0.0466098785 0 +v 0.422357321 -0.0482120514 0 +v 0.421655297 -0.0550661087 0 +v 0.414766312 -0.0559235811 0 +v 0.408351779 -0.0496473312 0 +v 0.40031904 -0.0646548271 0 +v 0.407821 -0.0567278862 0 +v 0.400817811 -0.0574777126 0 +v 0.394146323 -0.0509023666 0 +v 0.385474503 -0.0808590651 0 +v 0.385883033 -0.0735091269 0 +v 0.378815114 -0.0742340088 0 +v 0.392872661 -0.0727077723 0 +v 0.386269778 -0.0661590099 0 +v 0.393755019 -0.0581717491 0 +v 0.386631101 -0.0588086843 0 +v 0.379444361 -0.059387207 0 +v 0.425476074 -0.105163574 0 +v 0.430809021 -0.102684021 0 +v 0.432364941 -0.0964274406 0 +v 0.437730789 -0.0939807892 0 +v 0.43390584 -0.0901655257 0 +v 0.441229999 -0.0818972588 0 +v 0.428172141 -0.092243433 0 +v 0.435943604 -0.100006104 0 +v 0.440872192 -0.0971221924 0 +v 0.442925453 -0.0913629532 0 +v 0.447946548 -0.0885715485 0 +v 0.444954544 -0.0855910182 0 +v 0.452538908 -0.0775885582 0 +v 0.439499199 -0.0879472494 0 +v 0.435416788 -0.0838929415 0 +v 0.446935296 -0.0797936916 0 +v 0.448843449 -0.0739582777 0 +v 0.456752002 -0.0663752556 0 +v 0.444503725 -0.069715023 0 +v 0.442904472 -0.0758225918 0 +v 0.436882675 -0.0776043534 0 +v 0.430769265 -0.0792946815 0 +v 0.445587158 -0.0940246582 0 +v 0.450080872 -0.0907058716 0 +v 0.45280695 -0.0856194496 0 +v 0.457519531 -0.0825195312 0 +v 0.455484837 -0.0804981887 0 +v 0.463542938 -0.0729751587 0 +v 0.450274348 -0.083099246 0 +v 0.454345703 -0.0871582031 0 +v 0.458374023 -0.0833740234 0 +v 0.462158203 -0.0793457031 0 +v 0.465698242 -0.075088501 0 +v 0.460612297 -0.0778141022 0 +v 0.458066344 -0.07530725 0 +v 0.468994141 -0.0706176758 0 +v 0.472045898 -0.0659484863 0 +v 0.466291428 -0.0679969788 0 +v 0.468837738 -0.0628738403 0 +v 0.460518509 -0.0700270534 0 +v 0.454708695 -0.0720202923 0 +v 0.450654984 -0.0680720806 0 +v 0.46280843 -0.0646380186 0 +v 0.464926958 -0.0591444075 0 +v 0.473304749 -0.052230835 0 +v 0.460409284 -0.054854393 0 +v 0.4586564 -0.0606533289 0 +v 0.452355087 -0.0621319413 0 +v 0.447416902 -0.0573835373 0 +v 0.474853516 -0.0610961914 0 +v 0.477416992 -0.0560760498 0 +v 0.471177101 -0.0576152802 0 +v 0.466865093 -0.0535504818 0 +v 0.479736328 -0.0509033203 0 +v 0.481811523 -0.0455932617 0 +v 0.475215912 -0.0467300415 0 +v 0.476905823 -0.0411224365 0 +v 0.468613654 -0.0478605032 0 +v 0.463410497 -0.0430250168 0 +v 0.453929245 -0.0561347008 0 +v 0.461998165 -0.0489783287 0 +v 0.455362737 -0.0500771999 0 +v 0.449849725 -0.0448675156 0 +v 0.438288569 -0.0712944269 0 +v 0.439620435 -0.064958781 0 +v 0.433168501 -0.0662887096 0 +v 0.446012884 -0.0635701418 0 +v 0.440864176 -0.0585930347 0 +v 0.448700845 -0.0511507988 0 +v 0.442005754 -0.0521928072 0 +v 0.435270905 -0.053196907 0 +v 0.429290414 -0.0474309921 0 +v 0.443031162 -0.0457537174 0 +v 0.443935573 -0.0392806232 0 +v 0.451725304 -0.0321745872 0 +v 0.437680125 -0.033364296 0 +v 0.436984688 -0.0399978161 0 +v 0.430002213 -0.0406876802 0 +v 0.423528552 -0.0344705582 0 +v 0.456641018 -0.0439562798 0 +v 0.457760453 -0.0377798676 0 +v 0.465694487 -0.0309252739 0 +v 0.450859308 -0.0385400057 0 +v 0.444714099 -0.0327783823 0 +v 0.458717465 -0.031555891 0 +v 0.459508628 -0.0252922773 0 +v 0.467239201 -0.018632412 0 +v 0.453009665 -0.0193552971 0 +v 0.45244348 -0.0257775784 0 +v 0.445362061 -0.0262518525 0 +v 0.438722014 -0.0200471878 0 +v 0.430619538 -0.033929348 0 +v 0.438260972 -0.0267128944 0 +v 0.431137025 -0.0271584988 0 +v 0.424353004 -0.0206956863 0 +v 0.470163614 -0.0420787334 0 +v 0.471513033 -0.0362166464 0 +v 0.479618073 -0.0296401978 0 +v 0.464643538 -0.0370041132 0 +v 0.483642578 -0.0401611328 0 +v 0.485229492 -0.0346221924 0 +v 0.478373528 -0.0354213715 0 +v 0.472660065 -0.0302857161 0 +v 0.486572266 -0.0289916992 0 +v 0.487670898 -0.0232849121 0 +v 0.480638504 -0.0237922668 0 +v 0.481433868 -0.0178909302 0 +v 0.473602831 -0.0242974162 0 +v 0.466560602 -0.0247981548 0 +v 0.460130215 -0.018996954 0 +v 0.474339426 -0.0182632208 0 +v 0.474868 -0.0121946037 0 +v 0.482345581 -0.00598144531 0 +v 0.468022585 -0.00622367859 0 +v 0.467727423 -0.0124377012 0 +v 0.460578799 -0.0126778483 0 +v 0.453668833 -0.00646018982 0 +v 0.488525391 -0.0175170898 0 +v 0.489135742 -0.0117034912 0 +v 0.482003212 -0.0119495392 0 +v 0.475186646 -0.00610303879 0 +v 0.489501953 -0.005859375 0 +v 0.489624023 0 0 +v 0.482460022 0 0 +v 0.482345581 0.00598144531 0 +v 0.475293458 0 0 +v 0.468022585 0.00622367859 0 +v 0.460850835 -0.00634288788 0 +v 0.468121886 0 0 +v 0.460942626 0 0 +v 0.453668833 0.00646018982 0 +v 0.431549132 -0.020377636 0 +v 0.445874572 -0.0197058916 0 +v 0.446246833 -0.0131453574 0 +v 0.439263821 -0.00668716431 0 +v 0.439058036 -0.0133707523 0 +v 0.431850523 -0.013589263 0 +v 0.424787045 -0.00690078735 0 +v 0.453419507 -0.0129140615 0 +v 0.446474016 -0.00657510757 0 +v 0.453753352 0 0 +v 0.446551323 0 0 +v 0.439263821 0.00668716431 0 +v 0.432035685 -0.00679588318 0 +v 0.439334154 0 0 +v 0.432099223 0 0 +v 0.424787045 0.00690078735 0 +v 0.386963338 -0.0514581203 0 +v 0.38726294 -0.0441073477 0 +v 0.394808471 -0.0363612175 0 +v 0.379976332 -0.0445404053 0 +v 0.401275098 -0.050298214 0 +v 0.4016864 -0.0431166291 0 +v 0.409244955 -0.0354743004 0 +v 0.394498825 -0.0436321497 0 +v 0.387526393 -0.0367563963 0 +v 0.402047157 -0.0359332561 0 +v 0.402352661 -0.0287483931 0 +v 0.40988034 -0.0212893486 0 +v 0.395282686 -0.0218176842 0 +v 0.395071149 -0.0290896893 0 +v 0.38775003 -0.0294052958 0 +v 0.38038671 -0.0296936035 0 +v 0.415378481 -0.0489513874 0 +v 0.415926367 -0.0419718921 0 +v 0.40882808 -0.042562604 0 +v 0.422983557 -0.0413463116 0 +v 0.416404545 -0.0349861383 0 +v 0.423986852 -0.0275864601 0 +v 0.41680786 -0.0279951692 0 +v 0.409597397 -0.0283830166 0 +v 0.4025985 -0.0215623379 0 +v 0.417130977 -0.0210000277 0 +v 0.417368531 -0.0140017569 0 +v 0.410218 -0.00709724426 0 +v 0.410088897 -0.0141938925 0 +v 0.402779937 -0.0143753886 0 +v 0.395536184 -0.00727272034 0 +v 0.424621552 -0.0137999058 0 +v 0.417515337 -0.00700139999 0 +v 0.424844027 0 0 +v 0.417566061 0 0 +v 0.410218 0.00709724426 0 +v 0.40289247 -0.00718784332 0 +v 0.410262704 0 0 +v 0.402931571 0 0 +v 0.395536184 0.00727272034 0 +v 0.387930334 -0.0220540762 0 +v 0.388063729 -0.0147027671 0 +v 0.380651176 -0.0148468018 0 +v 0.395439088 -0.0145453215 0 +v 0.388146579 -0.00735139847 0 +v 0.395569921 0 0 +v 0.388175428 0 0 +v 0.380745411 0 0 +v 0.37325716 0.00748825073 0 +v 0.388146579 0.00735139847 0 +v 0.388063729 0.0147027671 0 +v 0.395282686 0.0218176842 0 +v 0.380538702 0.0222702026 0 +v 0.380651176 0.0148468018 0 +v 0.373198926 0.0149765015 0 +v 0.36562705 0.0226364136 0 +v 0.40289247 0.00718784332 0 +v 0.402779967 0.0143753886 0 +v 0.40988034 0.0212893486 0 +v 0.395439088 0.0145453215 0 +v 0.387930334 0.0220540762 0 +v 0.4025985 0.0215623379 0 +v 0.402352661 0.0287483931 0 +v 0.409244955 0.0354743004 0 +v 0.394808471 0.0363612175 0 +v 0.395071149 0.0290896893 0 +v 0.38775003 0.0294052958 0 +v 0.38019824 0.0371170044 0 +v 0.373105168 0.0224647522 0 +v 0.38038671 0.0296936035 0 +v 0.372978568 0.0299530029 0 +v 0.3653934 0.037727356 0 +v 0.417515337 0.00700139999 0 +v 0.417368561 0.0140017569 0 +v 0.424353004 0.0206956863 0 +v 0.410088897 0.0141938925 0 +v 0.432035685 0.00679588318 0 +v 0.431850523 0.013589263 0 +v 0.438722014 0.0200471878 0 +v 0.424621552 0.0137999058 0 +v 0.417130947 0.0210000277 0 +v 0.431549132 0.020377636 0 +v 0.431137025 0.0271584988 0 +v 0.437680125 0.033364296 0 +v 0.423528552 0.0344705582 0 +v 0.423986852 0.0275864601 0 +v 0.41680786 0.0279951692 0 +v 0.409597397 0.0283830166 0 +v 0.402047157 0.0359332561 0 +v 0.416404575 0.0349861383 0 +v 0.415926337 0.0419718921 0 +v 0.422357321 0.0482120514 0 +v 0.408351779 0.0496473312 0 +v 0.40882811 0.042562604 0 +v 0.40168643 0.0431166291 0 +v 0.394146323 0.0509023666 0 +v 0.430619538 0.033929348 0 +v 0.430002213 0.0406876802 0 +v 0.436179876 0.0466098785 0 +v 0.422983557 0.0413463116 0 +v 0.415378481 0.0489513874 0 +v 0.429290414 0.0474309921 0 +v 0.428489685 0.0541567802 0 +v 0.434262991 0.0597553253 0 +v 0.42088294 0.0619068146 0 +v 0.421655297 0.0550661087 0 +v 0.414766312 0.0559235811 0 +v 0.407240748 0.0638036728 0 +v 0.401275098 0.050298214 0 +v 0.407821 0.0567278862 0 +v 0.400817811 0.0574777126 0 +v 0.393329024 0.0654401779 0 +v 0.37282145 0.0374412537 0 +v 0.387526393 0.0367563963 0 +v 0.38726297 0.0441073477 0 +v 0.379724026 0.0519638062 0 +v 0.379976332 0.0445404053 0 +v 0.372636557 0.0449295044 0 +v 0.365067959 0.0528182983 0 +v 0.394498855 0.0436321497 0 +v 0.386963338 0.0514581203 0 +v 0.393755019 0.0581717491 0 +v 0.386631101 0.0588086843 0 +v 0.379140377 0.0668106079 0 +v 0.372426271 0.0524177551 0 +v 0.379444361 0.059387207 0 +v 0.372193217 0.0599060059 0 +v 0.364667416 0.0679092407 0 +v 0.446474016 0.00657510757 0 +v 0.446246833 0.0131453574 0 +v 0.453009665 0.0193552971 0 +v 0.439058036 0.0133707523 0 +v 0.460850835 0.00634288788 0 +v 0.460578799 0.0126778483 0 +v 0.467239201 0.018632412 0 +v 0.453419507 0.0129140615 0 +v 0.445874542 0.0197058916 0 +v 0.460130215 0.018996954 0 +v 0.459508628 0.0252922773 0 +v 0.465694487 0.0309252739 0 +v 0.451725304 0.0321745872 0 +v 0.45244348 0.0257775784 0 +v 0.445362061 0.0262518525 0 +v 0.438260972 0.0267128944 0 +v 0.475186646 0.00610303879 0 +v 0.474868 0.0121946037 0 +v 0.481433868 0.0178909302 0 +v 0.467727423 0.0124377012 0 +v 0.489501953 0.005859375 0 +v 0.489135742 0.0117034912 0 +v 0.482003212 0.0119495392 0 +v 0.474339426 0.0182632208 0 +v 0.488525391 0.0175170898 0 +v 0.487670898 0.0232849121 0 +v 0.480638504 0.0237922668 0 +v 0.479618073 0.0296401978 0 +v 0.473602831 0.0242974162 0 +v 0.466560602 0.0247981548 0 +v 0.458717465 0.031555891 0 +v 0.472660065 0.0302857161 0 +v 0.471513033 0.0362166464 0 +v 0.476905823 0.0411224365 0 +v 0.463410497 0.0430250168 0 +v 0.464643508 0.0370041132 0 +v 0.457760423 0.0377798676 0 +v 0.449849725 0.0448675156 0 +v 0.486572266 0.0289916992 0 +v 0.485229492 0.0346221924 0 +v 0.478373528 0.0354213715 0 +v 0.470163614 0.0420787334 0 +v 0.483642578 0.0401611328 0 +v 0.481811523 0.0455932617 0 +v 0.475215912 0.0467300415 0 +v 0.473304749 0.052230835 0 +v 0.468613654 0.0478605032 0 +v 0.460409284 0.054854393 0 +v 0.456641018 0.0439562798 0 +v 0.461998165 0.0489783287 0 +v 0.455362737 0.0500771999 0 +v 0.447416902 0.0573835373 0 +v 0.444714129 0.0327783823 0 +v 0.443935573 0.0392806232 0 +v 0.436984688 0.0399978161 0 +v 0.450859278 0.0385400057 0 +v 0.443031162 0.0457537174 0 +v 0.448700845 0.0511507988 0 +v 0.442005754 0.0521928072 0 +v 0.435270905 0.053196907 0 +v 0.427605271 0.0608625412 0 +v 0.440864176 0.0585930347 0 +v 0.439620435 0.064958781 0 +v 0.444503725 0.069715023 0 +v 0.431999803 0.0728006363 0 +v 0.433168501 0.0662887096 0 +v 0.426647782 0.0675507784 0 +v 0.419162393 0.0755548477 0 +v 0.453929245 0.0561347008 0 +v 0.452355057 0.0621319413 0 +v 0.456752002 0.0663752556 0 +v 0.446012855 0.0635701418 0 +v 0.438288599 0.0712944269 0 +v 0.450654984 0.0680720806 0 +v 0.448843449 0.0739582777 0 +v 0.452538908 0.0775885582 0 +v 0.441229999 0.0818972588 0 +v 0.442904472 0.0758225918 0 +v 0.436882675 0.0776043534 0 +v 0.429489255 0.0857744217 0 +v 0.425627649 0.0742239952 0 +v 0.430769265 0.0792946815 0 +v 0.424555242 0.0808846951 0 +v 0.417266011 0.0891695023 0 +v 0.466865093 0.0535504818 0 +v 0.464926958 0.0591444075 0 +v 0.468837738 0.0628738403 0 +v 0.458656371 0.0606533289 0 +v 0.479736328 0.0509033203 0 +v 0.477416992 0.0560760498 0 +v 0.471177101 0.0576152802 0 +v 0.46280843 0.0646380186 0 +v 0.474853516 0.0610961914 0 +v 0.472045898 0.0659484863 0 +v 0.466291428 0.0679969788 0 +v 0.463542938 0.0729751587 0 +v 0.460518509 0.0700270534 0 +v 0.454708695 0.0720202923 0 +v 0.446935296 0.0797936916 0 +v 0.458066344 0.07530725 0 +v 0.455484837 0.0804981887 0 +v 0.457519531 0.0825195312 0 +v 0.447946548 0.0885715485 0 +v 0.450274348 0.083099246 0 +v 0.444954544 0.0855910182 0 +v 0.437730789 0.0939807892 0 +v 0.468994141 0.0706176758 0 +v 0.465698242 0.075088501 0 +v 0.460612297 0.0778141022 0 +v 0.45280695 0.0856194496 0 +v 0.462158203 0.0793457031 0 +v 0.458374023 0.0833740234 0 +v 0.454345703 0.0871582031 0 +v 0.450080872 0.0907058716 0 +v 0.442925453 0.0913629532 0 +v 0.445587158 0.0940246582 0 +v 0.440872192 0.0971221924 0 +v 0.423441112 0.0875353813 0 +v 0.435416758 0.0838929415 0 +v 0.43390584 0.0901655257 0 +v 0.426830292 0.0987052917 0 +v 0.428172141 0.092243433 0 +v 0.4222956 0.0941785574 0 +v 0.41526413 0.10276413 0 +v 0.439499199 0.0879472494 0 +v 0.432364941 0.0964274406 0 +v 0.435943604 0.100006104 0 +v 0.430809021 0.102684021 0 +v 0.421129227 0.100816727 0 +v 0.425476074 0.105163574 0 +v 0.419952393 0.107452393 0 +v 0.371939898 0.0673942566 0 +v 0.386269778 0.0661590099 0 +v 0.385883033 0.0735091269 0 +v 0.392390311 0.0799746513 0 +v 0.378471613 0.0816574097 0 +v 0.378815114 0.0742340088 0 +v 0.371668845 0.0748825073 0 +v 0.36420846 0.0830001831 0 +v 0.40031904 0.0646548271 0 +v 0.399784088 0.0718298554 0 +v 0.405956566 0.077943325 0 +v 0.392872691 0.0727077723 0 +v 0.385474503 0.0808590651 0 +v 0.399217963 0.0790030956 0 +v 0.398626059 0.0861748457 0 +v 0.404548705 0.0920710564 0 +v 0.391364872 0.0945067406 0 +v 0.391886234 0.0872409344 0 +v 0.385047793 0.0882088542 0 +v 0.377742052 0.0965042114 0 +v 0.371382594 0.0823707581 0 +v 0.378112912 0.0890808105 0 +v 0.371083617 0.0898590088 0 +v 0.363707781 0.0980911255 0 +v 0.414095074 0.0628874302 0 +v 0.413372219 0.0698439777 0 +v 0.406617224 0.0708752871 0 +v 0.420049042 0.0687358379 0 +v 0.412605047 0.0767942667 0 +v 0.418231785 0.0823655128 0 +v 0.411800981 0.0837393403 0 +v 0.405264974 0.0850083828 0 +v 0.398013353 0.0933454037 0 +v 0.41096738 0.0906802416 0 +v 0.410111666 0.0976180136 0 +v 0.403066635 0.106191635 0 +v 0.403813839 0.0991319418 0 +v 0.39738518 0.100515068 0 +v 0.390287399 0.109037399 0 +v 0.416273862 0.0959684849 0 +v 0.409241199 0.104553699 0 +v 0.414245605 0.109558105 0 +v 0.408363342 0.111488342 0 +v 0.396746635 0.107684135 0 +v 0.402313232 0.113250732 0 +v 0.396102905 0.114852905 0 +v 0.370774627 0.0973472595 0 +v 0.3846066 0.0955585241 0 +v 0.384154499 0.102908105 0 +v 0.376976013 0.111351013 0 +v 0.377362072 0.103927612 0 +v 0.370457947 0.10483551 0 +v 0.363182068 0.113182068 0 +v 0.390830457 0.101772189 0 +v 0.383695126 0.110257626 0 +v 0.38973999 0.11630249 0 +v 0.383232117 0.117607117 0 +v 0.370136261 0.112323761 0 +v 0.376586914 0.118774414 0 +v 0.369812012 0.119812012 0 +v 0.265622437 0.00781202316 0 +v 0.265622348 0.0156240463 0 +v 0.273426354 0.023431778 0 +v 0.2578125 0.015625 0 +v 0.28122437 0.00780773163 0 +v 0.281223536 0.0156154633 0 +v 0.28900677 0.0234088898 0 +v 0.27342689 0.0156211853 0 +v 0.265622199 0.0234360695 0 +v 0.281222135 0.0234231949 0 +v 0.281220257 0.0312309265 0 +v 0.288998425 0.0390148163 0 +v 0.273424685 0.0390529633 0 +v 0.273425609 0.0312423706 0 +v 0.26562202 0.0312480927 0 +v 0.2578125 0.03125 0 +v 0.296785295 0.0077958107 0 +v 0.296782315 0.0155916214 0 +v 0.304531455 0.0233573914 0 +v 0.289009511 0.0156059265 0 +v 0.312284708 0.00777244568 0 +v 0.312277526 0.0155448914 0 +v 0.319978118 0.0232658386 0 +v 0.304539174 0.0155715942 0 +v 0.296777487 0.0233874321 0 +v 0.312265933 0.023317337 0 +v 0.312250316 0.0310897827 0 +v 0.31992805 0.0387763977 0 +v 0.30450809 0.0389289856 0 +v 0.304521024 0.0311431885 0 +v 0.29677096 0.0311832428 0 +v 0.289003044 0.031211853 0 +v 0.281217963 0.0390386581 0 +v 0.296762884 0.0389790535 0 +v 0.296753317 0.0467748642 0 +v 0.304475546 0.0545005798 0 +v 0.288986802 0.0546207428 0 +v 0.288993001 0.0468177795 0 +v 0.281215221 0.0468463898 0 +v 0.27342236 0.0546741486 0 +v 0.312230885 0.0388622284 0 +v 0.312208056 0.0466346741 0 +v 0.319858313 0.0542869568 0 +v 0.304492861 0.0467147827 0 +v 0.296742529 0.0545706749 0 +v 0.312182069 0.0544071198 0 +v 0.312153339 0.0621795654 0 +v 0.319772482 0.0697975159 0 +v 0.304435492 0.0700721741 0 +v 0.304456353 0.062286377 0 +v 0.296730518 0.0623664856 0 +v 0.288972497 0.0702266693 0 +v 0.281212151 0.0546541214 0 +v 0.288979948 0.0624237061 0 +v 0.281208694 0.062461853 0 +v 0.273419499 0.0702953339 0 +v 0.265621781 0.0390601158 0 +v 0.265621513 0.046872139 0 +v 0.2578125 0.046875 0 +v 0.273423612 0.0468635559 0 +v 0.265621215 0.0546841621 0 +v 0.27342099 0.0624847412 0 +v 0.265620857 0.0624961853 0 +v 0.2578125 0.0625 0 +v 0.327702105 0.00773382187 0 +v 0.327687949 0.0154676437 0 +v 0.335324466 0.0231227875 0 +v 0.319994658 0.0155105591 0 +v 0.343016982 0.00767612457 0 +v 0.342992514 0.0153522491 0 +v 0.350548208 0.0229167938 0 +v 0.335354805 0.0154151917 0 +v 0.32766521 0.0232014656 0 +v 0.342953086 0.0230283737 0 +v 0.34289977 0.0307044983 0 +v 0.350396335 0.0381946564 0 +v 0.335232675 0.0385379791 0 +v 0.335283518 0.0308303833 0 +v 0.327634513 0.0309352875 0 +v 0.319955766 0.0310211182 0 +v 0.358208835 0.00759553909 0 +v 0.358169883 0.0151910782 0 +v 0.350598395 0.0152778625 0 +v 0.365704238 0.0150909424 0 +v 0.35810715 0.0227866173 0 +v 0.365522742 0.0301818848 0 +v 0.358022422 0.0303821564 0 +v 0.350480437 0.0305557251 0 +v 0.342833757 0.0383806229 0 +v 0.357917309 0.0379776955 0 +v 0.35779357 0.0455732346 0 +v 0.350184798 0.0534725189 0 +v 0.350297362 0.0458335876 0 +v 0.342755944 0.0460567474 0 +v 0.335104823 0.0539531708 0 +v 0.36524111 0.0452728271 0 +v 0.357652873 0.0531687737 0 +v 0.364876032 0.0603637695 0 +v 0.357496947 0.0607643127 0 +v 0.349924445 0.0687503815 0 +v 0.34266752 0.053732872 0 +v 0.350060046 0.0611114502 0 +v 0.34256953 0.0614089966 0 +v 0.334947467 0.0693683624 0 +v 0.327596366 0.0386691093 0 +v 0.327551544 0.0464029312 0 +v 0.319895416 0.0465316772 0 +v 0.335172862 0.046245575 0 +v 0.327500492 0.0541367531 0 +v 0.335029423 0.0616607666 0 +v 0.327443957 0.061870575 0 +v 0.319817185 0.0620422363 0 +v 0.312121987 0.0699520111 0 +v 0.327382475 0.0696043968 0 +v 0.327316731 0.0773382187 0 +v 0.334767163 0.0847835541 0 +v 0.319674134 0.085308075 0 +v 0.319724649 0.0775527954 0 +v 0.31208849 0.0777244568 0 +v 0.304389596 0.0856437683 0 +v 0.342462957 0.0690851212 0 +v 0.342348993 0.0767612457 0 +v 0.349626124 0.084028244 0 +v 0.334859788 0.0770759583 0 +v 0.327247262 0.0850720406 0 +v 0.342228532 0.0844373703 0 +v 0.342102855 0.0921134949 0 +v 0.349300683 0.0993061066 0 +v 0.334570467 0.100198746 0 +v 0.334670424 0.0924911499 0 +v 0.327174693 0.0928058624 0 +v 0.319566846 0.100818634 0 +v 0.312053144 0.0854969025 0 +v 0.319621384 0.0930633545 0 +v 0.312016189 0.0932693481 0 +v 0.304339528 0.101215363 0 +v 0.357327431 0.0683598518 0 +v 0.357146055 0.0759553909 0 +v 0.349779367 0.0763893127 0 +v 0.364444196 0.0754547119 0 +v 0.356954515 0.08355093 0 +v 0.363962293 0.0905456543 0 +v 0.356754482 0.0911464691 0 +v 0.349466085 0.0916671753 0 +v 0.341972828 0.0997896194 0 +v 0.356547713 0.0987420082 0 +v 0.356335878 0.106337547 0 +v 0.348958969 0.114583969 0 +v 0.349131167 0.106945038 0 +v 0.341839671 0.107465744 0 +v 0.334363937 0.115613937 0 +v 0.363447011 0.105636597 0 +v 0.356120586 0.113933086 0 +v 0.362915039 0.120727539 0 +v 0.355903625 0.121528625 0 +v 0.341704369 0.115141869 0 +v 0.3487854 0.1222229 0 +v 0.341567993 0.122817993 0 +v 0.311978042 0.101041794 0 +v 0.327099741 0.100539684 0 +v 0.32702288 0.108273506 0 +v 0.319454193 0.116329193 0 +v 0.319510967 0.108573914 0 +v 0.311938912 0.10881424 0 +v 0.304286957 0.116786957 0 +v 0.334468007 0.107906342 0 +v 0.326944828 0.116007328 0 +v 0.334259033 0.123321533 0 +v 0.32686615 0.12374115 0 +v 0.311899185 0.116586685 0 +v 0.319396973 0.124084473 0 +v 0.311859131 0.124359131 0 +v 0.2656205 0.0703082085 0 +v 0.265620112 0.0781202316 0 +v 0.273416221 0.0859165192 0 +v 0.2578125 0.078125 0 +v 0.281204998 0.0702695847 0 +v 0.281201005 0.0780773163 0 +v 0.288956106 0.0858325958 0 +v 0.27341789 0.0781059265 0 +v 0.265619695 0.0859322548 0 +v 0.281196803 0.0858850479 0 +v 0.281192422 0.0936927795 0 +v 0.288938224 0.101438522 0 +v 0.273412645 0.101537704 0 +v 0.273414463 0.0937271118 0 +v 0.265619248 0.093744278 0 +v 0.2578125 0.09375 0 +v 0.296717495 0.0701622963 0 +v 0.296703517 0.077958107 0 +v 0.28896451 0.0780296326 0 +v 0.30441317 0.0778579712 0 +v 0.296688795 0.0857539177 0 +v 0.304364979 0.0934295654 0 +v 0.296673417 0.0935497284 0 +v 0.288947314 0.0936355591 0 +v 0.281187862 0.101500511 0 +v 0.296657503 0.101345539 0 +v 0.296641231 0.10914135 0 +v 0.288919449 0.117044449 0 +v 0.288928926 0.109241486 0 +v 0.281183213 0.109308243 0 +v 0.27340889 0.11715889 0 +v 0.304313451 0.10900116 0 +v 0.29662466 0.11693716 0 +v 0.304260254 0.124572754 0 +v 0.296607971 0.124732971 0 +v 0.281178474 0.117115974 0 +v 0.288909912 0.124847412 0 +v 0.281173706 0.124923706 0 +v 0.265618801 0.101556301 0 +v 0.265618324 0.109368324 0 +v 0.2578125 0.109375 0 +v 0.273410797 0.109348297 0 +v 0.265617847 0.117180347 0 +v 0.273406982 0.124969482 0 +v 0.265617371 0.124992371 0 +v 0.2578125 0.125 0 +s off +f 0/0/0 1/1/1 2/2/2 3/3/3 +f 1/1/1 4/4/4 5/5/5 2/2/2 +f 2/2/2 5/5/5 7/7/7 10/10/10 +f 3/3/3 2/2/2 10/10/10 11/11/11 +f 4/4/4 12/12/12 6/6/6 5/5/5 +f 12/12/12 13/13/13 14/14/14 6/6/6 +f 6/6/6 14/14/14 16/16/16 18/18/18 +f 5/5/5 6/6/6 18/18/18 7/7/7 +f 7/7/7 18/18/18 8/8/8 19/19/19 +f 18/18/18 16/16/16 20/20/20 8/8/8 +f 8/8/8 20/20/20 21/21/21 24/24/24 +f 19/19/19 8/8/8 24/24/24 25/25/25 +f 11/11/11 10/10/10 9/9/9 27/27/27 +f 10/10/10 7/7/7 19/19/19 9/9/9 +f 9/9/9 19/19/19 25/25/25 28/28/28 +f 27/27/27 9/9/9 28/28/28 29/29/29 +f 13/13/13 30/30/30 15/15/15 14/14/14 +f 30/30/30 31/31/31 32/32/32 15/15/15 +f 15/15/15 32/32/32 34/34/34 36/36/36 +f 14/14/14 15/15/15 36/36/36 16/16/16 +f 31/31/31 37/37/37 33/33/33 32/32/32 +f 37/37/37 38/38/38 39/39/39 33/33/33 +f 33/33/33 39/39/39 41/41/41 43/43/43 +f 32/32/32 33/33/33 43/43/43 34/34/34 +f 34/34/34 43/43/43 35/35/35 44/44/44 +f 43/43/43 41/41/41 45/45/45 35/35/35 +f 35/35/35 45/45/45 46/46/46 49/49/49 +f 44/44/44 35/35/35 49/49/49 50/50/50 +f 16/16/16 36/36/36 17/17/17 20/20/20 +f 36/36/36 34/34/34 44/44/44 17/17/17 +f 17/17/17 44/44/44 50/50/50 51/51/51 +f 20/20/20 17/17/17 51/51/51 21/21/21 +f 21/21/21 51/51/51 22/22/22 52/52/52 +f 51/51/51 50/50/50 53/53/53 22/22/22 +f 22/22/22 53/53/53 54/54/54 57/57/57 +f 52/52/52 22/22/22 57/57/57 58/58/58 +f 50/50/50 49/49/49 48/48/48 53/53/53 +f 49/49/49 46/46/46 60/60/60 48/48/48 +f 48/48/48 60/60/60 61/61/61 63/63/63 +f 53/53/53 48/48/48 63/63/63 54/54/54 +f 54/54/54 63/63/63 55/55/55 64/64/64 +f 63/63/63 61/61/61 65/65/65 55/55/55 +f 55/55/55 65/65/65 66/66/66 69/69/69 +f 64/64/64 55/55/55 69/69/69 70/70/70 +f 58/58/58 57/57/57 56/56/56 72/72/72 +f 57/57/57 54/54/54 64/64/64 56/56/56 +f 56/56/56 64/64/64 70/70/70 73/73/73 +f 72/72/72 56/56/56 73/73/73 74/74/74 +f 29/29/29 28/28/28 26/26/26 76/76/76 +f 28/28/28 25/25/25 77/77/77 26/26/26 +f 26/26/26 77/77/77 78/78/78 80/80/80 +f 76/76/76 26/26/26 80/80/80 81/81/81 +f 25/25/25 24/24/24 23/23/23 77/77/77 +f 24/24/24 21/21/21 52/52/52 23/23/23 +f 23/23/23 52/52/52 58/58/58 82/82/82 +f 77/77/77 23/23/23 82/82/82 78/78/78 +f 78/78/78 82/82/82 59/59/59 83/83/83 +f 82/82/82 58/58/58 72/72/72 59/59/59 +f 59/59/59 72/72/72 74/74/74 84/84/84 +f 83/83/83 59/59/59 84/84/84 85/85/85 +f 81/81/81 80/80/80 79/79/79 87/87/87 +f 80/80/80 78/78/78 83/83/83 79/79/79 +f 79/79/79 83/83/83 85/85/85 88/88/88 +f 87/87/87 79/79/79 88/88/88 89/89/89 +f 38/38/38 90/90/90 40/40/40 39/39/39 +f 90/90/90 91/91/91 92/92/92 40/40/40 +f 40/40/40 92/92/92 94/94/94 96/96/96 +f 39/39/39 40/40/40 96/96/96 41/41/41 +f 91/91/91 97/97/97 93/93/93 92/92/92 +f 97/97/97 98/98/98 99/99/99 93/93/93 +f 93/93/93 99/99/99 101/101/101 103/103/103 +f 92/92/92 93/93/93 103/103/103 94/94/94 +f 94/94/94 103/103/103 95/95/95 104/104/104 +f 103/103/103 101/101/101 105/105/105 95/95/95 +f 95/95/95 105/105/105 106/106/106 109/109/109 +f 104/104/104 95/95/95 109/109/109 110/110/110 +f 41/41/41 96/96/96 42/42/42 45/45/45 +f 96/96/96 94/94/94 104/104/104 42/42/42 +f 42/42/42 104/104/104 110/110/110 111/111/111 +f 45/45/45 42/42/42 111/111/111 46/46/46 +f 98/98/98 112/112/112 100/100/100 99/99/99 +f 112/112/112 113/113/113 114/114/114 100/100/100 +f 100/100/100 114/114/114 116/116/116 118/118/118 +f 99/99/99 100/100/100 118/118/118 101/101/101 +f 113/113/113 119/119/119 115/115/115 114/114/114 +f 119/119/119 120/120/120 121/121/121 115/115/115 +f 115/115/115 121/121/121 123/123/123 125/125/125 +f 114/114/114 115/115/115 125/125/125 116/116/116 +f 116/116/116 125/125/125 117/117/117 126/126/126 +f 125/125/125 123/123/123 127/127/127 117/117/117 +f 117/117/117 127/127/127 128/128/128 131/131/131 +f 126/126/126 117/117/117 131/131/131 132/132/132 +f 101/101/101 118/118/118 102/102/102 105/105/105 +f 118/118/118 116/116/116 126/126/126 102/102/102 +f 102/102/102 126/126/126 132/132/132 133/133/133 +f 105/105/105 102/102/102 133/133/133 106/106/106 +f 106/106/106 133/133/133 107/107/107 134/134/134 +f 133/133/133 132/132/132 135/135/135 107/107/107 +f 107/107/107 135/135/135 136/136/136 139/139/139 +f 134/134/134 107/107/107 139/139/139 140/140/140 +f 132/132/132 131/131/131 130/130/130 135/135/135 +f 131/131/131 128/128/128 142/142/142 130/130/130 +f 130/130/130 142/142/142 143/143/143 145/145/145 +f 135/135/135 130/130/130 145/145/145 136/136/136 +f 136/136/136 145/145/145 137/137/137 146/146/146 +f 145/145/145 143/143/143 147/147/147 137/137/137 +f 137/137/137 147/147/147 148/148/148 151/151/151 +f 146/146/146 137/137/137 151/151/151 152/152/152 +f 140/140/140 139/139/139 138/138/138 154/154/154 +f 139/139/139 136/136/136 146/146/146 138/138/138 +f 138/138/138 146/146/146 152/152/152 155/155/155 +f 154/154/154 138/138/138 155/155/155 156/156/156 +f 46/46/46 111/111/111 47/47/47 60/60/60 +f 111/111/111 110/110/110 158/158/158 47/47/47 +f 47/47/47 158/158/158 159/159/159 160/160/160 +f 60/60/60 47/47/47 160/160/160 61/61/61 +f 110/110/110 109/109/109 108/108/108 158/158/158 +f 109/109/109 106/106/106 134/134/134 108/108/108 +f 108/108/108 134/134/134 140/140/140 161/161/161 +f 158/158/158 108/108/108 161/161/161 159/159/159 +f 159/159/159 161/161/161 141/141/141 162/162/162 +f 161/161/161 140/140/140 154/154/154 141/141/141 +f 141/141/141 154/154/154 156/156/156 163/163/163 +f 162/162/162 141/141/141 163/163/163 164/164/164 +f 61/61/61 160/160/160 62/62/62 65/65/65 +f 160/160/160 159/159/159 162/162/162 62/62/62 +f 62/62/62 162/162/162 164/164/164 165/165/165 +f 65/65/65 62/62/62 165/165/165 66/66/66 +f 66/66/66 165/165/165 67/67/67 166/166/166 +f 165/165/165 164/164/164 167/167/167 67/67/67 +f 67/67/67 167/167/167 168/168/168 171/171/171 +f 166/166/166 67/67/67 171/171/171 172/172/172 +f 164/164/164 163/163/163 157/157/157 167/167/167 +f 163/163/163 156/156/156 174/174/174 157/157/157 +f 157/157/157 174/174/174 175/175/175 177/177/177 +f 167/167/167 157/157/157 177/177/177 168/168/168 +f 168/168/168 177/177/177 169/169/169 178/178/178 +f 177/177/177 175/175/175 179/179/179 169/169/169 +f 169/169/169 179/179/179 180/180/180 183/183/183 +f 178/178/178 169/169/169 183/183/183 184/184/184 +f 172/172/172 171/171/171 170/170/170 186/186/186 +f 171/171/171 168/168/168 178/178/178 170/170/170 +f 170/170/170 178/178/178 184/184/184 187/187/187 +f 186/186/186 170/170/170 187/187/187 188/188/188 +f 156/156/156 155/155/155 153/153/153 174/174/174 +f 155/155/155 152/152/152 190/190/190 153/153/153 +f 153/153/153 190/190/190 191/191/191 193/193/193 +f 174/174/174 153/153/153 193/193/193 175/175/175 +f 152/152/152 151/151/151 150/150/150 190/190/190 +f 151/151/151 148/148/148 194/194/194 150/150/150 +f 150/150/150 194/194/194 195/195/195 197/197/197 +f 190/190/190 150/150/150 197/197/197 191/191/191 +f 191/191/191 197/197/197 192/192/192 198/198/198 +f 197/197/197 195/195/195 199/199/199 192/192/192 +f 192/192/192 199/199/199 200/200/200 203/203/203 +f 198/198/198 192/192/192 203/203/203 204/204/204 +f 175/175/175 193/193/193 176/176/176 179/179/179 +f 193/193/193 191/191/191 198/198/198 176/176/176 +f 176/176/176 198/198/198 204/204/204 205/205/205 +f 179/179/179 176/176/176 205/205/205 180/180/180 +f 180/180/180 205/205/205 181/181/181 206/206/206 +f 205/205/205 204/204/204 207/207/207 181/181/181 +f 181/181/181 207/207/207 208/208/208 211/211/211 +f 206/206/206 181/181/181 211/211/211 212/212/212 +f 204/204/204 203/203/203 202/202/202 207/207/207 +f 203/203/203 200/200/200 214/214/214 202/202/202 +f 202/202/202 214/214/214 215/215/215 217/217/217 +f 207/207/207 202/202/202 217/217/217 208/208/208 +f 208/208/208 217/217/217 209/209/209 218/218/218 +f 217/217/217 215/215/215 219/219/219 209/209/209 +f 209/209/209 219/219/219 220/220/220 223/223/223 +f 218/218/218 209/209/209 223/223/223 224/224/224 +f 212/212/212 211/211/211 210/210/210 226/226/226 +f 211/211/211 208/208/208 218/218/218 210/210/210 +f 210/210/210 218/218/218 224/224/224 227/227/227 +f 226/226/226 210/210/210 227/227/227 228/228/228 +f 188/188/188 187/187/187 185/185/185 230/230/230 +f 187/187/187 184/184/184 231/231/231 185/185/185 +f 185/185/185 231/231/231 232/232/232 234/234/234 +f 230/230/230 185/185/185 234/234/234 235/235/235 +f 184/184/184 183/183/183 182/182/182 231/231/231 +f 183/183/183 180/180/180 206/206/206 182/182/182 +f 182/182/182 206/206/206 212/212/212 237/237/237 +f 231/231/231 182/182/182 237/237/237 232/232/232 +f 232/232/232 237/237/237 213/213/213 238/238/238 +f 237/237/237 212/212/212 226/226/226 213/213/213 +f 213/213/213 226/226/226 228/228/228 239/239/239 +f 238/238/238 213/213/213 239/239/239 240/240/240 +f 235/235/235 234/234/234 233/233/233 242/242/242 +f 234/234/234 232/232/232 238/238/238 233/233/233 +f 233/233/233 238/238/238 240/240/240 243/243/243 +f 242/242/242 233/233/233 243/243/243 244/244/244 +f 89/89/89 88/88/88 86/86/86 246/246/246 +f 88/88/88 85/85/85 247/247/247 86/86/86 +f 86/86/86 247/247/247 248/248/248 251/251/251 +f 246/246/246 86/86/86 251/251/251 252/252/252 +f 85/85/85 84/84/84 75/75/75 247/247/247 +f 84/84/84 74/74/74 253/253/253 75/75/75 +f 75/75/75 253/253/253 254/254/254 256/256/256 +f 247/247/247 75/75/75 256/256/256 248/248/248 +f 248/248/248 256/256/256 249/249/249 257/257/257 +f 256/256/256 254/254/254 258/258/258 249/249/249 +f 249/249/249 258/258/258 259/259/259 262/262/262 +f 257/257/257 249/249/249 262/262/262 263/263/263 +f 252/252/252 251/251/251 250/250/250 265/265/265 +f 251/251/251 248/248/248 257/257/257 250/250/250 +f 250/250/250 257/257/257 263/263/263 266/266/266 +f 265/265/265 250/250/250 266/266/266 267/267/267 +f 74/74/74 73/73/73 71/71/71 253/253/253 +f 73/73/73 70/70/70 268/268/268 71/71/71 +f 71/71/71 268/268/268 269/269/269 270/270/270 +f 253/253/253 71/71/71 270/270/270 254/254/254 +f 70/70/70 69/69/69 68/68/68 268/268/268 +f 69/69/69 66/66/66 166/166/166 68/68/68 +f 68/68/68 166/166/166 172/172/172 271/271/271 +f 268/268/268 68/68/68 271/271/271 269/269/269 +f 269/269/269 271/271/271 173/173/173 272/272/272 +f 271/271/271 172/172/172 186/186/186 173/173/173 +f 173/173/173 186/186/186 188/188/188 273/273/273 +f 272/272/272 173/173/173 273/273/273 274/274/274 +f 254/254/254 270/270/270 255/255/255 258/258/258 +f 270/270/270 269/269/269 272/272/272 255/255/255 +f 255/255/255 272/272/272 274/274/274 275/275/275 +f 258/258/258 255/255/255 275/275/275 259/259/259 +f 259/259/259 275/275/275 260/260/260 276/276/276 +f 275/275/275 274/274/274 277/277/277 260/260/260 +f 260/260/260 277/277/277 278/278/278 280/280/280 +f 276/276/276 260/260/260 280/280/280 281/281/281 +f 274/274/274 273/273/273 189/189/189 277/277/277 +f 273/273/273 188/188/188 230/230/230 189/189/189 +f 189/189/189 230/230/230 235/235/235 283/283/283 +f 277/277/277 189/189/189 283/283/283 278/278/278 +f 278/278/278 283/283/283 236/236/236 284/284/284 +f 283/283/283 235/235/235 242/242/242 236/236/236 +f 236/236/236 242/242/242 244/244/244 285/285/285 +f 284/284/284 236/236/236 285/285/285 286/286/286 +f 281/281/281 280/280/280 279/279/279 288/288/288 +f 280/280/280 278/278/278 284/284/284 279/279/279 +f 279/279/279 284/284/284 286/286/286 289/289/289 +f 288/288/288 279/279/279 289/289/289 290/290/290 +f 267/267/267 266/266/266 264/264/264 292/292/292 +f 266/266/266 263/263/263 293/293/293 264/264/264 +f 264/264/264 293/293/293 294/294/294 296/296/296 +f 292/292/292 264/264/264 296/296/296 297/297/297 +f 263/263/263 262/262/262 261/261/261 293/293/293 +f 262/262/262 259/259/259 276/276/276 261/261/261 +f 261/261/261 276/276/276 281/281/281 298/298/298 +f 293/293/293 261/261/261 298/298/298 294/294/294 +f 294/294/294 298/298/298 282/282/282 299/299/299 +f 298/298/298 281/281/281 288/288/288 282/282/282 +f 282/282/282 288/288/288 290/290/290 300/300/300 +f 299/299/299 282/282/282 300/300/300 301/301/301 +f 297/297/297 296/296/296 295/295/295 303/303/303 +f 296/296/296 294/294/294 299/299/299 295/295/295 +f 295/295/295 299/299/299 301/301/301 304/304/304 +f 303/303/303 295/295/295 304/304/304 305/305/305 +f 120/120/120 306/306/306 122/122/122 121/121/121 +f 306/306/306 307/307/307 308/308/308 122/122/122 +f 122/122/122 308/308/308 310/310/310 312/312/312 +f 121/121/121 122/122/122 312/312/312 123/123/123 +f 307/307/307 313/313/313 309/309/309 308/308/308 +f 313/313/313 314/314/314 315/315/315 309/309/309 +f 309/309/309 315/315/315 317/317/317 319/319/319 +f 308/308/308 309/309/309 319/319/319 310/310/310 +f 310/310/310 319/319/319 311/311/311 320/320/320 +f 319/319/319 317/317/317 321/321/321 311/311/311 +f 311/311/311 321/321/321 322/322/322 325/325/325 +f 320/320/320 311/311/311 325/325/325 326/326/326 +f 123/123/123 312/312/312 124/124/124 127/127/127 +f 312/312/312 310/310/310 320/320/320 124/124/124 +f 124/124/124 320/320/320 326/326/326 327/327/327 +f 127/127/127 124/124/124 327/327/327 128/128/128 +f 314/314/314 328/328/328 316/316/316 315/315/315 +f 328/328/328 329/329/329 330/330/330 316/316/316 +f 316/316/316 330/330/330 332/332/332 334/334/334 +f 315/315/315 316/316/316 334/334/334 317/317/317 +f 329/329/329 335/335/335 331/331/331 330/330/330 +f 335/335/335 336/336/336 337/337/337 331/331/331 +f 331/331/331 337/337/337 339/339/339 341/341/341 +f 330/330/330 331/331/331 341/341/341 332/332/332 +f 332/332/332 341/341/341 333/333/333 342/342/342 +f 341/341/341 339/339/339 343/343/343 333/333/333 +f 333/333/333 343/343/343 344/344/344 347/347/347 +f 342/342/342 333/333/333 347/347/347 348/348/348 +f 317/317/317 334/334/334 318/318/318 321/321/321 +f 334/334/334 332/332/332 342/342/342 318/318/318 +f 318/318/318 342/342/342 348/348/348 349/349/349 +f 321/321/321 318/318/318 349/349/349 322/322/322 +f 322/322/322 349/349/349 323/323/323 350/350/350 +f 349/349/349 348/348/348 351/351/351 323/323/323 +f 323/323/323 351/351/351 352/352/352 355/355/355 +f 350/350/350 323/323/323 355/355/355 356/356/356 +f 348/348/348 347/347/347 346/346/346 351/351/351 +f 347/347/347 344/344/344 358/358/358 346/346/346 +f 346/346/346 358/358/358 359/359/359 361/361/361 +f 351/351/351 346/346/346 361/361/361 352/352/352 +f 352/352/352 361/361/361 353/353/353 362/362/362 +f 361/361/361 359/359/359 363/363/363 353/353/353 +f 353/353/353 363/363/363 364/364/364 367/367/367 +f 362/362/362 353/353/353 367/367/367 368/368/368 +f 356/356/356 355/355/355 354/354/354 370/370/370 +f 355/355/355 352/352/352 362/362/362 354/354/354 +f 354/354/354 362/362/362 368/368/368 371/371/371 +f 370/370/370 354/354/354 371/371/371 372/372/372 +f 128/128/128 327/327/327 129/129/129 142/142/142 +f 327/327/327 326/326/326 374/374/374 129/129/129 +f 129/129/129 374/374/374 375/375/375 376/376/376 +f 142/142/142 129/129/129 376/376/376 143/143/143 +f 326/326/326 325/325/325 324/324/324 374/374/374 +f 325/325/325 322/322/322 350/350/350 324/324/324 +f 324/324/324 350/350/350 356/356/356 377/377/377 +f 374/374/374 324/324/324 377/377/377 375/375/375 +f 375/375/375 377/377/377 357/357/357 378/378/378 +f 377/377/377 356/356/356 370/370/370 357/357/357 +f 357/357/357 370/370/370 372/372/372 379/379/379 +f 378/378/378 357/357/357 379/379/379 380/380/380 +f 143/143/143 376/376/376 144/144/144 147/147/147 +f 376/376/376 375/375/375 378/378/378 144/144/144 +f 144/144/144 378/378/378 380/380/380 381/381/381 +f 147/147/147 144/144/144 381/381/381 148/148/148 +f 336/336/336 382/382/382 338/338/338 337/337/337 +f 382/382/382 383/383/383 384/384/384 338/338/338 +f 338/338/338 384/384/384 386/386/386 388/388/388 +f 337/337/337 338/338/338 388/388/388 339/339/339 +f 383/383/383 389/389/389 385/385/385 384/384/384 +f 389/389/389 390/390/390 391/391/391 385/385/385 +f 385/385/385 391/391/391 393/393/393 395/395/395 +f 384/384/384 385/385/385 395/395/395 386/386/386 +f 386/386/386 395/395/395 387/387/387 396/396/396 +f 395/395/395 393/393/393 397/397/397 387/387/387 +f 387/387/387 397/397/397 398/398/398 401/401/401 +f 396/396/396 387/387/387 401/401/401 402/402/402 +f 339/339/339 388/388/388 340/340/340 343/343/343 +f 388/388/388 386/386/386 396/396/396 340/340/340 +f 340/340/340 396/396/396 402/402/402 403/403/403 +f 343/343/343 340/340/340 403/403/403 344/344/344 +f 390/390/390 404/404/404 392/392/392 391/391/391 +f 404/404/404 405/405/405 406/406/406 392/392/392 +f 392/392/392 406/406/406 408/408/408 410/410/410 +f 391/391/391 392/392/392 410/410/410 393/393/393 +f 405/405/405 411/411/411 407/407/407 406/406/406 +f 411/411/411 412/412/412 413/413/413 407/407/407 +f 407/407/407 413/413/413 415/415/415 417/417/417 +f 406/406/406 407/407/407 417/417/417 408/408/408 +f 408/408/408 417/417/417 409/409/409 418/418/418 +f 417/417/417 415/415/415 419/419/419 409/409/409 +f 409/409/409 419/419/419 420/420/420 423/423/423 +f 418/418/418 409/409/409 423/423/423 424/424/424 +f 393/393/393 410/410/410 394/394/394 397/397/397 +f 410/410/410 408/408/408 418/418/418 394/394/394 +f 394/394/394 418/418/418 424/424/424 425/425/425 +f 397/397/397 394/394/394 425/425/425 398/398/398 +f 398/398/398 425/425/425 399/399/399 426/426/426 +f 425/425/425 424/424/424 427/427/427 399/399/399 +f 399/399/399 427/427/427 428/428/428 431/431/431 +f 426/426/426 399/399/399 431/431/431 432/432/432 +f 424/424/424 423/423/423 422/422/422 427/427/427 +f 423/423/423 420/420/420 434/434/434 422/422/422 +f 422/422/422 434/434/434 435/435/435 437/437/437 +f 427/427/427 422/422/422 437/437/437 428/428/428 +f 428/428/428 437/437/437 429/429/429 438/438/438 +f 437/437/437 435/435/435 439/439/439 429/429/429 +f 429/429/429 439/439/439 440/440/440 443/443/443 +f 438/438/438 429/429/429 443/443/443 444/444/444 +f 432/432/432 431/431/431 430/430/430 446/446/446 +f 431/431/431 428/428/428 438/438/438 430/430/430 +f 430/430/430 438/438/438 444/444/444 447/447/447 +f 446/446/446 430/430/430 447/447/447 448/448/448 +f 344/344/344 403/403/403 345/345/345 358/358/358 +f 403/403/403 402/402/402 450/450/450 345/345/345 +f 345/345/345 450/450/450 451/451/451 452/452/452 +f 358/358/358 345/345/345 452/452/452 359/359/359 +f 402/402/402 401/401/401 400/400/400 450/450/450 +f 401/401/401 398/398/398 426/426/426 400/400/400 +f 400/400/400 426/426/426 432/432/432 453/453/453 +f 450/450/450 400/400/400 453/453/453 451/451/451 +f 451/451/451 453/453/453 433/433/433 454/454/454 +f 453/453/453 432/432/432 446/446/446 433/433/433 +f 433/433/433 446/446/446 448/448/448 455/455/455 +f 454/454/454 433/433/433 455/455/455 456/456/456 +f 359/359/359 452/452/452 360/360/360 363/363/363 +f 452/452/452 451/451/451 454/454/454 360/360/360 +f 360/360/360 454/454/454 456/456/456 457/457/457 +f 363/363/363 360/360/360 457/457/457 364/364/364 +f 364/364/364 457/457/457 365/365/365 458/458/458 +f 457/457/457 456/456/456 459/459/459 365/365/365 +f 365/365/365 459/459/459 460/460/460 463/463/463 +f 458/458/458 365/365/365 463/463/463 464/464/464 +f 456/456/456 455/455/455 449/449/449 459/459/459 +f 455/455/455 448/448/448 466/466/466 449/449/449 +f 449/449/449 466/466/466 467/467/467 469/469/469 +f 459/459/459 449/449/449 469/469/469 460/460/460 +f 460/460/460 469/469/469 461/461/461 470/470/470 +f 469/469/469 467/467/467 471/471/471 461/461/461 +f 461/461/461 471/471/471 472/472/472 475/475/475 +f 470/470/470 461/461/461 475/475/475 476/476/476 +f 464/464/464 463/463/463 462/462/462 478/478/478 +f 463/463/463 460/460/460 470/470/470 462/462/462 +f 462/462/462 470/470/470 476/476/476 479/479/479 +f 478/478/478 462/462/462 479/479/479 480/480/480 +f 448/448/448 447/447/447 445/445/445 466/466/466 +f 447/447/447 444/444/444 482/482/482 445/445/445 +f 445/445/445 482/482/482 483/483/483 485/485/485 +f 466/466/466 445/445/445 485/485/485 467/467/467 +f 444/444/444 443/443/443 442/442/442 482/482/482 +f 443/443/443 440/440/440 486/486/486 442/442/442 +f 442/442/442 486/486/486 487/487/487 489/489/489 +f 482/482/482 442/442/442 489/489/489 483/483/483 +f 483/483/483 489/489/489 484/484/484 490/490/490 +f 489/489/489 487/487/487 491/491/491 484/484/484 +f 484/484/484 491/491/491 492/492/492 495/495/495 +f 490/490/490 484/484/484 495/495/495 496/496/496 +f 467/467/467 485/485/485 468/468/468 471/471/471 +f 485/485/485 483/483/483 490/490/490 468/468/468 +f 468/468/468 490/490/490 496/496/496 497/497/497 +f 471/471/471 468/468/468 497/497/497 472/472/472 +f 472/472/472 497/497/497 473/473/473 498/498/498 +f 497/497/497 496/496/496 499/499/499 473/473/473 +f 473/473/473 499/499/499 500/500/500 503/503/503 +f 498/498/498 473/473/473 503/503/503 504/504/504 +f 496/496/496 495/495/495 494/494/494 499/499/499 +f 495/495/495 492/492/492 506/506/506 494/494/494 +f 494/494/494 506/506/506 507/507/507 509/509/509 +f 499/499/499 494/494/494 509/509/509 500/500/500 +f 500/500/500 509/509/509 501/501/501 510/510/510 +f 509/509/509 507/507/507 511/511/511 501/501/501 +f 501/501/501 511/511/511 512/512/512 515/515/515 +f 510/510/510 501/501/501 515/515/515 516/516/516 +f 504/504/504 503/503/503 502/502/502 518/518/518 +f 503/503/503 500/500/500 510/510/510 502/502/502 +f 502/502/502 510/510/510 516/516/516 519/519/519 +f 518/518/518 502/502/502 519/519/519 520/520/520 +f 480/480/480 479/479/479 477/477/477 522/522/522 +f 479/479/479 476/476/476 523/523/523 477/477/477 +f 477/477/477 523/523/523 524/524/524 526/526/526 +f 522/522/522 477/477/477 526/526/526 527/527/527 +f 476/476/476 475/475/475 474/474/474 523/523/523 +f 475/475/475 472/472/472 498/498/498 474/474/474 +f 474/474/474 498/498/498 504/504/504 529/529/529 +f 523/523/523 474/474/474 529/529/529 524/524/524 +f 524/524/524 529/529/529 505/505/505 530/530/530 +f 529/529/529 504/504/504 518/518/518 505/505/505 +f 505/505/505 518/518/518 520/520/520 531/531/531 +f 530/530/530 505/505/505 531/531/531 532/532/532 +f 527/527/527 526/526/526 525/525/525 534/534/534 +f 526/526/526 524/524/524 530/530/530 525/525/525 +f 525/525/525 530/530/530 532/532/532 535/535/535 +f 534/534/534 525/525/525 535/535/535 536/536/536 +f 148/148/148 381/381/381 149/149/149 194/194/194 +f 381/381/381 380/380/380 538/538/538 149/149/149 +f 149/149/149 538/538/538 539/539/539 541/541/541 +f 194/194/194 149/149/149 541/541/541 195/195/195 +f 380/380/380 379/379/379 373/373/373 538/538/538 +f 379/379/379 372/372/372 542/542/542 373/373/373 +f 373/373/373 542/542/542 543/543/543 545/545/545 +f 538/538/538 373/373/373 545/545/545 539/539/539 +f 539/539/539 545/545/545 540/540/540 546/546/546 +f 545/545/545 543/543/543 547/547/547 540/540/540 +f 540/540/540 547/547/547 548/548/548 551/551/551 +f 546/546/546 540/540/540 551/551/551 552/552/552 +f 195/195/195 541/541/541 196/196/196 199/199/199 +f 541/541/541 539/539/539 546/546/546 196/196/196 +f 196/196/196 546/546/546 552/552/552 553/553/553 +f 199/199/199 196/196/196 553/553/553 200/200/200 +f 372/372/372 371/371/371 369/369/369 542/542/542 +f 371/371/371 368/368/368 554/554/554 369/369/369 +f 369/369/369 554/554/554 555/555/555 556/556/556 +f 542/542/542 369/369/369 556/556/556 543/543/543 +f 368/368/368 367/367/367 366/366/366 554/554/554 +f 367/367/367 364/364/364 458/458/458 366/366/366 +f 366/366/366 458/458/458 464/464/464 557/557/557 +f 554/554/554 366/366/366 557/557/557 555/555/555 +f 555/555/555 557/557/557 465/465/465 558/558/558 +f 557/557/557 464/464/464 478/478/478 465/465/465 +f 465/465/465 478/478/478 480/480/480 559/559/559 +f 558/558/558 465/465/465 559/559/559 560/560/560 +f 543/543/543 556/556/556 544/544/544 547/547/547 +f 556/556/556 555/555/555 558/558/558 544/544/544 +f 544/544/544 558/558/558 560/560/560 561/561/561 +f 547/547/547 544/544/544 561/561/561 548/548/548 +f 548/548/548 561/561/561 549/549/549 562/562/562 +f 561/561/561 560/560/560 563/563/563 549/549/549 +f 549/549/549 563/563/563 564/564/564 566/566/566 +f 562/562/562 549/549/549 566/566/566 567/567/567 +f 560/560/560 559/559/559 481/481/481 563/563/563 +f 559/559/559 480/480/480 522/522/522 481/481/481 +f 481/481/481 522/522/522 527/527/527 569/569/569 +f 563/563/563 481/481/481 569/569/569 564/564/564 +f 564/564/564 569/569/569 528/528/528 570/570/570 +f 569/569/569 527/527/527 534/534/534 528/528/528 +f 528/528/528 534/534/534 536/536/536 571/571/571 +f 570/570/570 528/528/528 571/571/571 572/572/572 +f 567/567/567 566/566/566 565/565/565 574/574/574 +f 566/566/566 564/564/564 570/570/570 565/565/565 +f 565/565/565 570/570/570 572/572/572 575/575/575 +f 574/574/574 565/565/565 575/575/575 576/576/576 +f 200/200/200 553/553/553 201/201/201 214/214/214 +f 553/553/553 552/552/552 578/578/578 201/201/201 +f 201/201/201 578/578/578 579/579/579 580/580/580 +f 214/214/214 201/201/201 580/580/580 215/215/215 +f 552/552/552 551/551/551 550/550/550 578/578/578 +f 551/551/551 548/548/548 562/562/562 550/550/550 +f 550/550/550 562/562/562 567/567/567 581/581/581 +f 578/578/578 550/550/550 581/581/581 579/579/579 +f 579/579/579 581/581/581 568/568/568 582/582/582 +f 581/581/581 567/567/567 574/574/574 568/568/568 +f 568/568/568 574/574/574 576/576/576 583/583/583 +f 582/582/582 568/568/568 583/583/583 584/584/584 +f 215/215/215 580/580/580 216/216/216 219/219/219 +f 580/580/580 579/579/579 582/582/582 216/216/216 +f 216/216/216 582/582/582 584/584/584 585/585/585 +f 219/219/219 216/216/216 585/585/585 220/220/220 +f 220/220/220 585/585/585 221/221/221 586/586/586 +f 585/585/585 584/584/584 587/587/587 221/221/221 +f 221/221/221 587/587/587 588/588/588 591/591/591 +f 586/586/586 221/221/221 591/591/591 592/592/592 +f 584/584/584 583/583/583 577/577/577 587/587/587 +f 583/583/583 576/576/576 594/594/594 577/577/577 +f 577/577/577 594/594/594 595/595/595 597/597/597 +f 587/587/587 577/577/577 597/597/597 588/588/588 +f 588/588/588 597/597/597 589/589/589 598/598/598 +f 597/597/597 595/595/595 599/599/599 589/589/589 +f 589/589/589 599/599/599 600/600/600 603/603/603 +f 598/598/598 589/589/589 603/603/603 604/604/604 +f 592/592/592 591/591/591 590/590/590 606/606/606 +f 591/591/591 588/588/588 598/598/598 590/590/590 +f 590/590/590 598/598/598 604/604/604 607/607/607 +f 606/606/606 590/590/590 607/607/607 608/608/608 +f 576/576/576 575/575/575 573/573/573 594/594/594 +f 575/575/575 572/572/572 610/610/610 573/573/573 +f 573/573/573 610/610/610 611/611/611 613/613/613 +f 594/594/594 573/573/573 613/613/613 595/595/595 +f 572/572/572 571/571/571 537/537/537 610/610/610 +f 571/571/571 536/536/536 614/614/614 537/537/537 +f 537/537/537 614/614/614 615/615/615 617/617/617 +f 610/610/610 537/537/537 617/617/617 611/611/611 +f 611/611/611 617/617/617 612/612/612 618/618/618 +f 617/617/617 615/615/615 619/619/619 612/612/612 +f 612/612/612 619/619/619 620/620/620 623/623/623 +f 618/618/618 612/612/612 623/623/623 624/624/624 +f 595/595/595 613/613/613 596/596/596 599/599/599 +f 613/613/613 611/611/611 618/618/618 596/596/596 +f 596/596/596 618/618/618 624/624/624 625/625/625 +f 599/599/599 596/596/596 625/625/625 600/600/600 +f 600/600/600 625/625/625 601/601/601 626/626/626 +f 625/625/625 624/624/624 627/627/627 601/601/601 +f 601/601/601 627/627/627 628/628/628 631/631/631 +f 626/626/626 601/601/601 631/631/631 632/632/632 +f 624/624/624 623/623/623 622/622/622 627/627/627 +f 623/623/623 620/620/620 634/634/634 622/622/622 +f 622/622/622 634/634/634 635/635/635 637/637/637 +f 627/627/627 622/622/622 637/637/637 628/628/628 +f 628/628/628 637/637/637 629/629/629 638/638/638 +f 637/637/637 635/635/635 639/639/639 629/629/629 +f 629/629/629 639/639/639 640/640/640 643/643/643 +f 638/638/638 629/629/629 643/643/643 644/644/644 +f 632/632/632 631/631/631 630/630/630 646/646/646 +f 631/631/631 628/628/628 638/638/638 630/630/630 +f 630/630/630 638/638/638 644/644/644 647/647/647 +f 646/646/646 630/630/630 647/647/647 648/648/648 +f 608/608/608 607/607/607 605/605/605 650/650/650 +f 607/607/607 604/604/604 651/651/651 605/605/605 +f 605/605/605 651/651/651 652/652/652 654/654/654 +f 650/650/650 605/605/605 654/654/654 655/655/655 +f 604/604/604 603/603/603 602/602/602 651/651/651 +f 603/603/603 600/600/600 626/626/626 602/602/602 +f 602/602/602 626/626/626 632/632/632 657/657/657 +f 651/651/651 602/602/602 657/657/657 652/652/652 +f 652/652/652 657/657/657 633/633/633 658/658/658 +f 657/657/657 632/632/632 646/646/646 633/633/633 +f 633/633/633 646/646/646 648/648/648 659/659/659 +f 658/658/658 633/633/633 659/659/659 660/660/660 +f 655/655/655 654/654/654 653/653/653 662/662/662 +f 654/654/654 652/652/652 658/658/658 653/653/653 +f 653/653/653 658/658/658 660/660/660 663/663/663 +f 662/662/662 653/653/653 663/663/663 664/664/664 +f 536/536/536 535/535/535 533/533/533 614/614/614 +f 535/535/535 532/532/532 666/666/666 533/533/533 +f 533/533/533 666/666/666 667/667/667 669/669/669 +f 614/614/614 533/533/533 669/669/669 615/615/615 +f 532/532/532 531/531/531 521/521/521 666/666/666 +f 531/531/531 520/520/520 670/670/670 521/521/521 +f 521/521/521 670/670/670 671/671/671 673/673/673 +f 666/666/666 521/521/521 673/673/673 667/667/667 +f 667/667/667 673/673/673 668/668/668 674/674/674 +f 673/673/673 671/671/671 675/675/675 668/668/668 +f 668/668/668 675/675/675 676/676/676 679/679/679 +f 674/674/674 668/668/668 679/679/679 680/680/680 +f 615/615/615 669/669/669 616/616/616 619/619/619 +f 669/669/669 667/667/667 674/674/674 616/616/616 +f 616/616/616 674/674/674 680/680/680 681/681/681 +f 619/619/619 616/616/616 681/681/681 620/620/620 +f 520/520/520 519/519/519 517/517/517 670/670/670 +f 519/519/519 516/516/516 682/682/682 517/517/517 +f 517/517/517 682/682/682 683/683/683 685/685/685 +f 670/670/670 517/517/517 685/685/685 671/671/671 +f 516/516/516 515/515/515 514/514/514 682/682/682 +f 515/515/515 512/512/512 686/686/686 514/514/514 +f 514/514/514 686/686/686 687/687/687 689/689/689 +f 682/682/682 514/514/514 689/689/689 683/683/683 +f 683/683/683 689/689/689 684/684/684 690/690/690 +f 689/689/689 687/687/687 691/691/691 684/684/684 +f 684/684/684 691/691/691 692/692/692 695/695/695 +f 690/690/690 684/684/684 695/695/695 696/696/696 +f 671/671/671 685/685/685 672/672/672 675/675/675 +f 685/685/685 683/683/683 690/690/690 672/672/672 +f 672/672/672 690/690/690 696/696/696 697/697/697 +f 675/675/675 672/672/672 697/697/697 676/676/676 +f 676/676/676 697/697/697 677/677/677 698/698/698 +f 697/697/697 696/696/696 699/699/699 677/677/677 +f 677/677/677 699/699/699 700/700/700 703/703/703 +f 698/698/698 677/677/677 703/703/703 704/704/704 +f 696/696/696 695/695/695 694/694/694 699/699/699 +f 695/695/695 692/692/692 706/706/706 694/694/694 +f 694/694/694 706/706/706 707/707/707 709/709/709 +f 699/699/699 694/694/694 709/709/709 700/700/700 +f 700/700/700 709/709/709 701/701/701 710/710/710 +f 709/709/709 707/707/707 711/711/711 701/701/701 +f 701/701/701 711/711/711 712/712/712 715/715/715 +f 710/710/710 701/701/701 715/715/715 716/716/716 +f 704/704/704 703/703/703 702/702/702 718/718/718 +f 703/703/703 700/700/700 710/710/710 702/702/702 +f 702/702/702 710/710/710 716/716/716 719/719/719 +f 718/718/718 702/702/702 719/719/719 720/720/720 +f 620/620/620 681/681/681 621/621/621 634/634/634 +f 681/681/681 680/680/680 722/722/722 621/621/621 +f 621/621/621 722/722/722 723/723/723 724/724/724 +f 634/634/634 621/621/621 724/724/724 635/635/635 +f 680/680/680 679/679/679 678/678/678 722/722/722 +f 679/679/679 676/676/676 698/698/698 678/678/678 +f 678/678/678 698/698/698 704/704/704 725/725/725 +f 722/722/722 678/678/678 725/725/725 723/723/723 +f 723/723/723 725/725/725 705/705/705 726/726/726 +f 725/725/725 704/704/704 718/718/718 705/705/705 +f 705/705/705 718/718/718 720/720/720 727/727/727 +f 726/726/726 705/705/705 727/727/727 728/728/728 +f 635/635/635 724/724/724 636/636/636 639/639/639 +f 724/724/724 723/723/723 726/726/726 636/636/636 +f 636/636/636 726/726/726 728/728/728 729/729/729 +f 639/639/639 636/636/636 729/729/729 640/640/640 +f 640/640/640 729/729/729 641/641/641 730/730/730 +f 729/729/729 728/728/728 731/731/731 641/641/641 +f 641/641/641 731/731/731 732/732/732 735/735/735 +f 730/730/730 641/641/641 735/735/735 736/736/736 +f 728/728/728 727/727/727 721/721/721 731/731/731 +f 727/727/727 720/720/720 738/738/738 721/721/721 +f 721/721/721 738/738/738 739/739/739 741/741/741 +f 731/731/731 721/721/721 741/741/741 732/732/732 +f 732/732/732 741/741/741 733/733/733 742/742/742 +f 741/741/741 739/739/739 743/743/743 733/733/733 +f 733/733/733 743/743/743 744/744/744 747/747/747 +f 742/742/742 733/733/733 747/747/747 748/748/748 +f 736/736/736 735/735/735 734/734/734 750/750/750 +f 735/735/735 732/732/732 742/742/742 734/734/734 +f 734/734/734 742/742/742 748/748/748 751/751/751 +f 750/750/750 734/734/734 751/751/751 752/752/752 +f 720/720/720 719/719/719 717/717/717 738/738/738 +f 719/719/719 716/716/716 754/754/754 717/717/717 +f 717/717/717 754/754/754 755/755/755 757/757/757 +f 738/738/738 717/717/717 757/757/757 739/739/739 +f 716/716/716 715/715/715 714/714/714 754/754/754 +f 715/715/715 712/712/712 758/758/758 714/714/714 +f 714/714/714 758/758/758 759/759/759 761/761/761 +f 754/754/754 714/714/714 761/761/761 755/755/755 +f 755/755/755 761/761/761 756/756/756 762/762/762 +f 761/761/761 759/759/759 763/763/763 756/756/756 +f 756/756/756 763/763/763 764/764/764 767/767/767 +f 762/762/762 756/756/756 767/767/767 768/768/768 +f 739/739/739 757/757/757 740/740/740 743/743/743 +f 757/757/757 755/755/755 762/762/762 740/740/740 +f 740/740/740 762/762/762 768/768/768 769/769/769 +f 743/743/743 740/740/740 769/769/769 744/744/744 +f 744/744/744 769/769/769 745/745/745 770/770/770 +f 769/769/769 768/768/768 771/771/771 745/745/745 +f 745/745/745 771/771/771 772/772/772 775/775/775 +f 770/770/770 745/745/745 775/775/775 776/776/776 +f 768/768/768 767/767/767 766/766/766 771/771/771 +f 767/767/767 764/764/764 778/778/778 766/766/766 +f 766/766/766 778/778/778 779/779/779 781/781/781 +f 771/771/771 766/766/766 781/781/781 772/772/772 +f 772/772/772 781/781/781 773/773/773 782/782/782 +f 781/781/781 779/779/779 783/783/783 773/773/773 +f 773/773/773 783/783/783 784/784/784 785/785/785 +f 782/782/782 773/773/773 785/785/785 786/786/786 +f 776/776/776 775/775/775 774/774/774 787/787/787 +f 775/775/775 772/772/772 782/782/782 774/774/774 +f 774/774/774 782/782/782 786/786/786 788/788/788 +f 787/787/787 774/774/774 788/788/788 789/789/789 +f 752/752/752 751/751/751 749/749/749 790/790/790 +f 751/751/751 748/748/748 791/791/791 749/749/749 +f 749/749/749 791/791/791 792/792/792 794/794/794 +f 790/790/790 749/749/749 794/794/794 795/795/795 +f 748/748/748 747/747/747 746/746/746 791/791/791 +f 747/747/747 744/744/744 770/770/770 746/746/746 +f 746/746/746 770/770/770 776/776/776 797/797/797 +f 791/791/791 746/746/746 797/797/797 792/792/792 +f 792/792/792 797/797/797 777/777/777 798/798/798 +f 797/797/797 776/776/776 787/787/787 777/777/777 +f 777/777/777 787/787/787 789/789/789 799/799/799 +f 798/798/798 777/777/777 799/799/799 800/800/800 +f 795/795/795 794/794/794 793/793/793 801/801/801 +f 794/794/794 792/792/792 798/798/798 793/793/793 +f 793/793/793 798/798/798 800/800/800 802/802/802 +f 801/801/801 793/793/793 802/802/802 803/803/803 +f 664/664/664 663/663/663 661/661/661 804/804/804 +f 663/663/663 660/660/660 805/805/805 661/661/661 +f 661/661/661 805/805/805 806/806/806 809/809/809 +f 804/804/804 661/661/661 809/809/809 810/810/810 +f 660/660/660 659/659/659 649/649/649 805/805/805 +f 659/659/659 648/648/648 812/812/812 649/649/649 +f 649/649/649 812/812/812 813/813/813 815/815/815 +f 805/805/805 649/649/649 815/815/815 806/806/806 +f 806/806/806 815/815/815 807/807/807 816/816/816 +f 815/815/815 813/813/813 817/817/817 807/807/807 +f 807/807/807 817/817/817 818/818/818 821/821/821 +f 816/816/816 807/807/807 821/821/821 822/822/822 +f 810/810/810 809/809/809 808/808/808 824/824/824 +f 809/809/809 806/806/806 816/816/816 808/808/808 +f 808/808/808 816/816/816 822/822/822 825/825/825 +f 824/824/824 808/808/808 825/825/825 826/826/826 +f 648/648/648 647/647/647 645/645/645 812/812/812 +f 647/647/647 644/644/644 828/828/828 645/645/645 +f 645/645/645 828/828/828 829/829/829 830/830/830 +f 812/812/812 645/645/645 830/830/830 813/813/813 +f 644/644/644 643/643/643 642/642/642 828/828/828 +f 643/643/643 640/640/640 730/730/730 642/642/642 +f 642/642/642 730/730/730 736/736/736 831/831/831 +f 828/828/828 642/642/642 831/831/831 829/829/829 +f 829/829/829 831/831/831 737/737/737 832/832/832 +f 831/831/831 736/736/736 750/750/750 737/737/737 +f 737/737/737 750/750/750 752/752/752 833/833/833 +f 832/832/832 737/737/737 833/833/833 834/834/834 +f 813/813/813 830/830/830 814/814/814 817/817/817 +f 830/830/830 829/829/829 832/832/832 814/814/814 +f 814/814/814 832/832/832 834/834/834 835/835/835 +f 817/817/817 814/814/814 835/835/835 818/818/818 +f 818/818/818 835/835/835 819/819/819 836/836/836 +f 835/835/835 834/834/834 837/837/837 819/819/819 +f 819/819/819 837/837/837 838/838/838 840/840/840 +f 836/836/836 819/819/819 840/840/840 841/841/841 +f 834/834/834 833/833/833 753/753/753 837/837/837 +f 833/833/833 752/752/752 790/790/790 753/753/753 +f 753/753/753 790/790/790 795/795/795 843/843/843 +f 837/837/837 753/753/753 843/843/843 838/838/838 +f 838/838/838 843/843/843 796/796/796 844/844/844 +f 843/843/843 795/795/795 801/801/801 796/796/796 +f 796/796/796 801/801/801 803/803/803 845/845/845 +f 844/844/844 796/796/796 845/845/845 846/846/846 +f 841/841/841 840/840/840 839/839/839 847/847/847 +f 840/840/840 838/838/838 844/844/844 839/839/839 +f 839/839/839 844/844/844 846/846/846 848/848/848 +f 847/847/847 839/839/839 848/848/848 849/849/849 +f 826/826/826 825/825/825 823/823/823 850/850/850 +f 825/825/825 822/822/822 851/851/851 823/823/823 +f 823/823/823 851/851/851 852/852/852 854/854/854 +f 850/850/850 823/823/823 854/854/854 855/855/855 +f 822/822/822 821/821/821 820/820/820 851/851/851 +f 821/821/821 818/818/818 836/836/836 820/820/820 +f 820/820/820 836/836/836 841/841/841 857/857/857 +f 851/851/851 820/820/820 857/857/857 852/852/852 +f 852/852/852 857/857/857 842/842/842 858/858/858 +f 857/857/857 841/841/841 847/847/847 842/842/842 +f 842/842/842 847/847/847 849/849/849 859/859/859 +f 858/858/858 842/842/842 859/859/859 860/860/860 +f 855/855/855 854/854/854 853/853/853 861/861/861 +f 854/854/854 852/852/852 858/858/858 853/853/853 +f 853/853/853 858/858/858 860/860/860 862/862/862 +f 861/861/861 853/853/853 862/862/862 863/863/863 +f 305/305/305 304/304/304 302/302/302 864/864/864 +f 304/304/304 301/301/301 865/865/865 302/302/302 +f 302/302/302 865/865/865 866/866/866 869/869/869 +f 864/864/864 302/302/302 869/869/869 870/870/870 +f 301/301/301 300/300/300 291/291/291 865/865/865 +f 300/300/300 290/290/290 871/871/871 291/291/291 +f 291/291/291 871/871/871 872/872/872 874/874/874 +f 865/865/865 291/291/291 874/874/874 866/866/866 +f 866/866/866 874/874/874 867/867/867 875/875/875 +f 874/874/874 872/872/872 876/876/876 867/867/867 +f 867/867/867 876/876/876 877/877/877 880/880/880 +f 875/875/875 867/867/867 880/880/880 881/881/881 +f 870/870/870 869/869/869 868/868/868 883/883/883 +f 869/869/869 866/866/866 875/875/875 868/868/868 +f 868/868/868 875/875/875 881/881/881 884/884/884 +f 883/883/883 868/868/868 884/884/884 885/885/885 +f 290/290/290 289/289/289 287/287/287 871/871/871 +f 289/289/289 286/286/286 886/886/886 287/287/287 +f 287/287/287 886/886/886 887/887/887 889/889/889 +f 871/871/871 287/287/287 889/889/889 872/872/872 +f 286/286/286 285/285/285 245/245/245 886/886/886 +f 285/285/285 244/244/244 890/890/890 245/245/245 +f 245/245/245 890/890/890 891/891/891 893/893/893 +f 886/886/886 245/245/245 893/893/893 887/887/887 +f 887/887/887 893/893/893 888/888/888 894/894/894 +f 893/893/893 891/891/891 895/895/895 888/888/888 +f 888/888/888 895/895/895 896/896/896 899/899/899 +f 894/894/894 888/888/888 899/899/899 900/900/900 +f 872/872/872 889/889/889 873/873/873 876/876/876 +f 889/889/889 887/887/887 894/894/894 873/873/873 +f 873/873/873 894/894/894 900/900/900 901/901/901 +f 876/876/876 873/873/873 901/901/901 877/877/877 +f 877/877/877 901/901/901 878/878/878 902/902/902 +f 901/901/901 900/900/900 903/903/903 878/878/878 +f 878/878/878 903/903/903 904/904/904 907/907/907 +f 902/902/902 878/878/878 907/907/907 908/908/908 +f 900/900/900 899/899/899 898/898/898 903/903/903 +f 899/899/899 896/896/896 910/910/910 898/898/898 +f 898/898/898 910/910/910 911/911/911 913/913/913 +f 903/903/903 898/898/898 913/913/913 904/904/904 +f 904/904/904 913/913/913 905/905/905 914/914/914 +f 913/913/913 911/911/911 915/915/915 905/905/905 +f 905/905/905 915/915/915 916/916/916 919/919/919 +f 914/914/914 905/905/905 919/919/919 920/920/920 +f 908/908/908 907/907/907 906/906/906 922/922/922 +f 907/907/907 904/904/904 914/914/914 906/906/906 +f 906/906/906 914/914/914 920/920/920 923/923/923 +f 922/922/922 906/906/906 923/923/923 924/924/924 +f 885/885/885 884/884/884 882/882/882 926/926/926 +f 884/884/884 881/881/881 927/927/927 882/882/882 +f 882/882/882 927/927/927 928/928/928 930/930/930 +f 926/926/926 882/882/882 930/930/930 931/931/931 +f 881/881/881 880/880/880 879/879/879 927/927/927 +f 880/880/880 877/877/877 902/902/902 879/879/879 +f 879/879/879 902/902/902 908/908/908 932/932/932 +f 927/927/927 879/879/879 932/932/932 928/928/928 +f 928/928/928 932/932/932 909/909/909 933/933/933 +f 932/932/932 908/908/908 922/922/922 909/909/909 +f 909/909/909 922/922/922 924/924/924 934/934/934 +f 933/933/933 909/909/909 934/934/934 935/935/935 +f 931/931/931 930/930/930 929/929/929 937/937/937 +f 930/930/930 928/928/928 933/933/933 929/929/929 +f 929/929/929 933/933/933 935/935/935 938/938/938 +f 937/937/937 929/929/929 938/938/938 939/939/939 +f 244/244/244 243/243/243 241/241/241 890/890/890 +f 243/243/243 240/240/240 940/940/940 241/241/241 +f 241/241/241 940/940/940 941/941/941 943/943/943 +f 890/890/890 241/241/241 943/943/943 891/891/891 +f 240/240/240 239/239/239 229/229/229 940/940/940 +f 239/239/239 228/228/228 944/944/944 229/229/229 +f 229/229/229 944/944/944 945/945/945 947/947/947 +f 940/940/940 229/229/229 947/947/947 941/941/941 +f 941/941/941 947/947/947 942/942/942 948/948/948 +f 947/947/947 945/945/945 949/949/949 942/942/942 +f 942/942/942 949/949/949 950/950/950 953/953/953 +f 948/948/948 942/942/942 953/953/953 954/954/954 +f 891/891/891 943/943/943 892/892/892 895/895/895 +f 943/943/943 941/941/941 948/948/948 892/892/892 +f 892/892/892 948/948/948 954/954/954 955/955/955 +f 895/895/895 892/892/892 955/955/955 896/896/896 +f 228/228/228 227/227/227 225/225/225 944/944/944 +f 227/227/227 224/224/224 956/956/956 225/225/225 +f 225/225/225 956/956/956 957/957/957 958/958/958 +f 944/944/944 225/225/225 958/958/958 945/945/945 +f 224/224/224 223/223/223 222/222/222 956/956/956 +f 223/223/223 220/220/220 586/586/586 222/222/222 +f 222/222/222 586/586/586 592/592/592 959/959/959 +f 956/956/956 222/222/222 959/959/959 957/957/957 +f 957/957/957 959/959/959 593/593/593 960/960/960 +f 959/959/959 592/592/592 606/606/606 593/593/593 +f 593/593/593 606/606/606 608/608/608 961/961/961 +f 960/960/960 593/593/593 961/961/961 962/962/962 +f 945/945/945 958/958/958 946/946/946 949/949/949 +f 958/958/958 957/957/957 960/960/960 946/946/946 +f 946/946/946 960/960/960 962/962/962 963/963/963 +f 949/949/949 946/946/946 963/963/963 950/950/950 +f 950/950/950 963/963/963 951/951/951 964/964/964 +f 963/963/963 962/962/962 965/965/965 951/951/951 +f 951/951/951 965/965/965 966/966/966 968/968/968 +f 964/964/964 951/951/951 968/968/968 969/969/969 +f 962/962/962 961/961/961 609/609/609 965/965/965 +f 961/961/961 608/608/608 650/650/650 609/609/609 +f 609/609/609 650/650/650 655/655/655 971/971/971 +f 965/965/965 609/609/609 971/971/971 966/966/966 +f 966/966/966 971/971/971 656/656/656 972/972/972 +f 971/971/971 655/655/655 662/662/662 656/656/656 +f 656/656/656 662/662/662 664/664/664 973/973/973 +f 972/972/972 656/656/656 973/973/973 974/974/974 +f 969/969/969 968/968/968 967/967/967 976/976/976 +f 968/968/968 966/966/966 972/972/972 967/967/967 +f 967/967/967 972/972/972 974/974/974 977/977/977 +f 976/976/976 967/967/967 977/977/977 978/978/978 +f 896/896/896 955/955/955 897/897/897 910/910/910 +f 955/955/955 954/954/954 980/980/980 897/897/897 +f 897/897/897 980/980/980 981/981/981 982/982/982 +f 910/910/910 897/897/897 982/982/982 911/911/911 +f 954/954/954 953/953/953 952/952/952 980/980/980 +f 953/953/953 950/950/950 964/964/964 952/952/952 +f 952/952/952 964/964/964 969/969/969 983/983/983 +f 980/980/980 952/952/952 983/983/983 981/981/981 +f 981/981/981 983/983/983 970/970/970 984/984/984 +f 983/983/983 969/969/969 976/976/976 970/970/970 +f 970/970/970 976/976/976 978/978/978 985/985/985 +f 984/984/984 970/970/970 985/985/985 986/986/986 +f 911/911/911 982/982/982 912/912/912 915/915/915 +f 982/982/982 981/981/981 984/984/984 912/912/912 +f 912/912/912 984/984/984 986/986/986 987/987/987 +f 915/915/915 912/912/912 987/987/987 916/916/916 +f 916/916/916 987/987/987 917/917/917 988/988/988 +f 987/987/987 986/986/986 989/989/989 917/917/917 +f 917/917/917 989/989/989 990/990/990 993/993/993 +f 988/988/988 917/917/917 993/993/993 994/994/994 +f 986/986/986 985/985/985 979/979/979 989/989/989 +f 985/985/985 978/978/978 996/996/996 979/979/979 +f 979/979/979 996/996/996 997/997/997 999/999/999 +f 989/989/989 979/979/979 999/999/999 990/990/990 +f 990/990/990 999/999/999 991/991/991 1000/1000/1000 +f 999/999/999 997/997/997 1001/1001/1001 991/991/991 +f 991/991/991 1001/1001/1001 1002/1002/1002 1005/1005/1005 +f 1000/1000/1000 991/991/991 1005/1005/1005 1006/1006/1006 +f 994/994/994 993/993/993 992/992/992 1008/1008/1008 +f 993/993/993 990/990/990 1000/1000/1000 992/992/992 +f 992/992/992 1000/1000/1000 1006/1006/1006 1009/1009/1009 +f 1008/1008/1008 992/992/992 1009/1009/1009 1010/1010/1010 +f 978/978/978 977/977/977 975/975/975 996/996/996 +f 977/977/977 974/974/974 1012/1012/1012 975/975/975 +f 975/975/975 1012/1012/1012 1013/1013/1013 1014/1014/1014 +f 996/996/996 975/975/975 1014/1014/1014 997/997/997 +f 974/974/974 973/973/973 665/665/665 1012/1012/1012 +f 973/973/973 664/664/664 804/804/804 665/665/665 +f 665/665/665 804/804/804 810/810/810 1015/1015/1015 +f 1012/1012/1012 665/665/665 1015/1015/1015 1013/1013/1013 +f 1013/1013/1013 1015/1015/1015 811/811/811 1016/1016/1016 +f 1015/1015/1015 810/810/810 824/824/824 811/811/811 +f 811/811/811 824/824/824 826/826/826 1017/1017/1017 +f 1016/1016/1016 811/811/811 1017/1017/1017 1018/1018/1018 +f 997/997/997 1014/1014/1014 998/998/998 1001/1001/1001 +f 1014/1014/1014 1013/1013/1013 1016/1016/1016 998/998/998 +f 998/998/998 1016/1016/1016 1018/1018/1018 1019/1019/1019 +f 1001/1001/1001 998/998/998 1019/1019/1019 1002/1002/1002 +f 1002/1002/1002 1019/1019/1019 1003/1003/1003 1020/1020/1020 +f 1019/1019/1019 1018/1018/1018 1021/1021/1021 1003/1003/1003 +f 1003/1003/1003 1021/1021/1021 1022/1022/1022 1024/1024/1024 +f 1020/1020/1020 1003/1003/1003 1024/1024/1024 1025/1025/1025 +f 1018/1018/1018 1017/1017/1017 827/827/827 1021/1021/1021 +f 1017/1017/1017 826/826/826 850/850/850 827/827/827 +f 827/827/827 850/850/850 855/855/855 1027/1027/1027 +f 1021/1021/1021 827/827/827 1027/1027/1027 1022/1022/1022 +f 1022/1022/1022 1027/1027/1027 856/856/856 1028/1028/1028 +f 1027/1027/1027 855/855/855 861/861/861 856/856/856 +f 856/856/856 861/861/861 863/863/863 1029/1029/1029 +f 1028/1028/1028 856/856/856 1029/1029/1029 1030/1030/1030 +f 1025/1025/1025 1024/1024/1024 1023/1023/1023 1031/1031/1031 +f 1024/1024/1024 1022/1022/1022 1028/1028/1028 1023/1023/1023 +f 1023/1023/1023 1028/1028/1028 1030/1030/1030 1032/1032/1032 +f 1031/1031/1031 1023/1023/1023 1032/1032/1032 1033/1033/1033 +f 1010/1010/1010 1009/1009/1009 1007/1007/1007 1034/1034/1034 +f 1009/1009/1009 1006/1006/1006 1035/1035/1035 1007/1007/1007 +f 1007/1007/1007 1035/1035/1035 1036/1036/1036 1038/1038/1038 +f 1034/1034/1034 1007/1007/1007 1038/1038/1038 1039/1039/1039 +f 1006/1006/1006 1005/1005/1005 1004/1004/1004 1035/1035/1035 +f 1005/1005/1005 1002/1002/1002 1020/1020/1020 1004/1004/1004 +f 1004/1004/1004 1020/1020/1020 1025/1025/1025 1041/1041/1041 +f 1035/1035/1035 1004/1004/1004 1041/1041/1041 1036/1036/1036 +f 1036/1036/1036 1041/1041/1041 1026/1026/1026 1042/1042/1042 +f 1041/1041/1041 1025/1025/1025 1031/1031/1031 1026/1026/1026 +f 1026/1026/1026 1031/1031/1031 1033/1033/1033 1043/1043/1043 +f 1042/1042/1042 1026/1026/1026 1043/1043/1043 1044/1044/1044 +f 1039/1039/1039 1038/1038/1038 1037/1037/1037 1045/1045/1045 +f 1038/1038/1038 1036/1036/1036 1042/1042/1042 1037/1037/1037 +f 1037/1037/1037 1042/1042/1042 1044/1044/1044 1046/1046/1046 +f 1045/1045/1045 1037/1037/1037 1046/1046/1046 1047/1047/1047 +f 939/939/939 938/938/938 936/936/936 1048/1048/1048 +f 938/938/938 935/935/935 1049/1049/1049 936/936/936 +f 936/936/936 1049/1049/1049 1050/1050/1050 1053/1053/1053 +f 1048/1048/1048 936/936/936 1053/1053/1053 1054/1054/1054 +f 935/935/935 934/934/934 925/925/925 1049/1049/1049 +f 934/934/934 924/924/924 1055/1055/1055 925/925/925 +f 925/925/925 1055/1055/1055 1056/1056/1056 1058/1058/1058 +f 1049/1049/1049 925/925/925 1058/1058/1058 1050/1050/1050 +f 1050/1050/1050 1058/1058/1058 1051/1051/1051 1059/1059/1059 +f 1058/1058/1058 1056/1056/1056 1060/1060/1060 1051/1051/1051 +f 1051/1051/1051 1060/1060/1060 1061/1061/1061 1064/1064/1064 +f 1059/1059/1059 1051/1051/1051 1064/1064/1064 1065/1065/1065 +f 1054/1054/1054 1053/1053/1053 1052/1052/1052 1067/1067/1067 +f 1053/1053/1053 1050/1050/1050 1059/1059/1059 1052/1052/1052 +f 1052/1052/1052 1059/1059/1059 1065/1065/1065 1068/1068/1068 +f 1067/1067/1067 1052/1052/1052 1068/1068/1068 1069/1069/1069 +f 924/924/924 923/923/923 921/921/921 1055/1055/1055 +f 923/923/923 920/920/920 1070/1070/1070 921/921/921 +f 921/921/921 1070/1070/1070 1071/1071/1071 1072/1072/1072 +f 1055/1055/1055 921/921/921 1072/1072/1072 1056/1056/1056 +f 920/920/920 919/919/919 918/918/918 1070/1070/1070 +f 919/919/919 916/916/916 988/988/988 918/918/918 +f 918/918/918 988/988/988 994/994/994 1073/1073/1073 +f 1070/1070/1070 918/918/918 1073/1073/1073 1071/1071/1071 +f 1071/1071/1071 1073/1073/1073 995/995/995 1074/1074/1074 +f 1073/1073/1073 994/994/994 1008/1008/1008 995/995/995 +f 995/995/995 1008/1008/1008 1010/1010/1010 1075/1075/1075 +f 1074/1074/1074 995/995/995 1075/1075/1075 1076/1076/1076 +f 1056/1056/1056 1072/1072/1072 1057/1057/1057 1060/1060/1060 +f 1072/1072/1072 1071/1071/1071 1074/1074/1074 1057/1057/1057 +f 1057/1057/1057 1074/1074/1074 1076/1076/1076 1077/1077/1077 +f 1060/1060/1060 1057/1057/1057 1077/1077/1077 1061/1061/1061 +f 1061/1061/1061 1077/1077/1077 1062/1062/1062 1078/1078/1078 +f 1077/1077/1077 1076/1076/1076 1079/1079/1079 1062/1062/1062 +f 1062/1062/1062 1079/1079/1079 1080/1080/1080 1082/1082/1082 +f 1078/1078/1078 1062/1062/1062 1082/1082/1082 1083/1083/1083 +f 1076/1076/1076 1075/1075/1075 1011/1011/1011 1079/1079/1079 +f 1075/1075/1075 1010/1010/1010 1034/1034/1034 1011/1011/1011 +f 1011/1011/1011 1034/1034/1034 1039/1039/1039 1085/1085/1085 +f 1079/1079/1079 1011/1011/1011 1085/1085/1085 1080/1080/1080 +f 1080/1080/1080 1085/1085/1085 1040/1040/1040 1086/1086/1086 +f 1085/1085/1085 1039/1039/1039 1045/1045/1045 1040/1040/1040 +f 1040/1040/1040 1045/1045/1045 1047/1047/1047 1087/1087/1087 +f 1086/1086/1086 1040/1040/1040 1087/1087/1087 1088/1088/1088 +f 1083/1083/1083 1082/1082/1082 1081/1081/1081 1089/1089/1089 +f 1082/1082/1082 1080/1080/1080 1086/1086/1086 1081/1081/1081 +f 1081/1081/1081 1086/1086/1086 1088/1088/1088 1090/1090/1090 +f 1089/1089/1089 1081/1081/1081 1090/1090/1090 1091/1091/1091 +f 1069/1069/1069 1068/1068/1068 1066/1066/1066 1092/1092/1092 +f 1068/1068/1068 1065/1065/1065 1093/1093/1093 1066/1066/1066 +f 1066/1066/1066 1093/1093/1093 1094/1094/1094 1096/1096/1096 +f 1092/1092/1092 1066/1066/1066 1096/1096/1096 1097/1097/1097 +f 1065/1065/1065 1064/1064/1064 1063/1063/1063 1093/1093/1093 +f 1064/1064/1064 1061/1061/1061 1078/1078/1078 1063/1063/1063 +f 1063/1063/1063 1078/1078/1078 1083/1083/1083 1098/1098/1098 +f 1093/1093/1093 1063/1063/1063 1098/1098/1098 1094/1094/1094 +f 1094/1094/1094 1098/1098/1098 1084/1084/1084 1099/1099/1099 +f 1098/1098/1098 1083/1083/1083 1089/1089/1089 1084/1084/1084 +f 1084/1084/1084 1089/1089/1089 1091/1091/1091 1100/1100/1100 +f 1099/1099/1099 1084/1084/1084 1100/1100/1100 1101/1101/1101 +f 1097/1097/1097 1096/1096/1096 1095/1095/1095 1102/1102/1102 +f 1096/1096/1096 1094/1094/1094 1099/1099/1099 1095/1095/1095 +f 1095/1095/1095 1099/1099/1099 1101/1101/1101 1103/1103/1103 +f 1102/1102/1102 1095/1095/1095 1103/1103/1103 1104/1104/1104 +f 412/412/412 1105/1105/1105 414/414/414 413/413/413 +f 1105/1105/1105 1106/1106/1106 1107/1107/1107 414/414/414 +f 414/414/414 1107/1107/1107 1109/1109/1109 1111/1111/1111 +f 413/413/413 414/414/414 1111/1111/1111 415/415/415 +f 1106/1106/1106 1112/1112/1112 1108/1108/1108 1107/1107/1107 +f 1112/1112/1112 1113/1113/1113 1114/1114/1114 1108/1108/1108 +f 1108/1108/1108 1114/1114/1114 1116/1116/1116 1118/1118/1118 +f 1107/1107/1107 1108/1108/1108 1118/1118/1118 1109/1109/1109 +f 1109/1109/1109 1118/1118/1118 1110/1110/1110 1119/1119/1119 +f 1118/1118/1118 1116/1116/1116 1120/1120/1120 1110/1110/1110 +f 1110/1110/1110 1120/1120/1120 1121/1121/1121 1124/1124/1124 +f 1119/1119/1119 1110/1110/1110 1124/1124/1124 1125/1125/1125 +f 415/415/415 1111/1111/1111 416/416/416 419/419/419 +f 1111/1111/1111 1109/1109/1109 1119/1119/1119 416/416/416 +f 416/416/416 1119/1119/1119 1125/1125/1125 1126/1126/1126 +f 419/419/419 416/416/416 1126/1126/1126 420/420/420 +f 1113/1113/1113 1127/1127/1127 1115/1115/1115 1114/1114/1114 +f 1127/1127/1127 1128/1128/1128 1129/1129/1129 1115/1115/1115 +f 1115/1115/1115 1129/1129/1129 1131/1131/1131 1133/1133/1133 +f 1114/1114/1114 1115/1115/1115 1133/1133/1133 1116/1116/1116 +f 1128/1128/1128 1134/1134/1134 1130/1130/1130 1129/1129/1129 +f 1134/1134/1134 1135/1135/1135 1136/1136/1136 1130/1130/1130 +f 1130/1130/1130 1136/1136/1136 1138/1138/1138 1140/1140/1140 +f 1129/1129/1129 1130/1130/1130 1140/1140/1140 1131/1131/1131 +f 1131/1131/1131 1140/1140/1140 1132/1132/1132 1141/1141/1141 +f 1140/1140/1140 1138/1138/1138 1142/1142/1142 1132/1132/1132 +f 1132/1132/1132 1142/1142/1142 1143/1143/1143 1146/1146/1146 +f 1141/1141/1141 1132/1132/1132 1146/1146/1146 1147/1147/1147 +f 1116/1116/1116 1133/1133/1133 1117/1117/1117 1120/1120/1120 +f 1133/1133/1133 1131/1131/1131 1141/1141/1141 1117/1117/1117 +f 1117/1117/1117 1141/1141/1141 1147/1147/1147 1148/1148/1148 +f 1120/1120/1120 1117/1117/1117 1148/1148/1148 1121/1121/1121 +f 1121/1121/1121 1148/1148/1148 1122/1122/1122 1149/1149/1149 +f 1148/1148/1148 1147/1147/1147 1150/1150/1150 1122/1122/1122 +f 1122/1122/1122 1150/1150/1150 1151/1151/1151 1154/1154/1154 +f 1149/1149/1149 1122/1122/1122 1154/1154/1154 1155/1155/1155 +f 1147/1147/1147 1146/1146/1146 1145/1145/1145 1150/1150/1150 +f 1146/1146/1146 1143/1143/1143 1157/1157/1157 1145/1145/1145 +f 1145/1145/1145 1157/1157/1157 1158/1158/1158 1160/1160/1160 +f 1150/1150/1150 1145/1145/1145 1160/1160/1160 1151/1151/1151 +f 1151/1151/1151 1160/1160/1160 1152/1152/1152 1161/1161/1161 +f 1160/1160/1160 1158/1158/1158 1162/1162/1162 1152/1152/1152 +f 1152/1152/1152 1162/1162/1162 1163/1163/1163 1166/1166/1166 +f 1161/1161/1161 1152/1152/1152 1166/1166/1166 1167/1167/1167 +f 1155/1155/1155 1154/1154/1154 1153/1153/1153 1169/1169/1169 +f 1154/1154/1154 1151/1151/1151 1161/1161/1161 1153/1153/1153 +f 1153/1153/1153 1161/1161/1161 1167/1167/1167 1170/1170/1170 +f 1169/1169/1169 1153/1153/1153 1170/1170/1170 1171/1171/1171 +f 420/420/420 1126/1126/1126 421/421/421 434/434/434 +f 1126/1126/1126 1125/1125/1125 1173/1173/1173 421/421/421 +f 421/421/421 1173/1173/1173 1174/1174/1174 1175/1175/1175 +f 434/434/434 421/421/421 1175/1175/1175 435/435/435 +f 1125/1125/1125 1124/1124/1124 1123/1123/1123 1173/1173/1173 +f 1124/1124/1124 1121/1121/1121 1149/1149/1149 1123/1123/1123 +f 1123/1123/1123 1149/1149/1149 1155/1155/1155 1176/1176/1176 +f 1173/1173/1173 1123/1123/1123 1176/1176/1176 1174/1174/1174 +f 1174/1174/1174 1176/1176/1176 1156/1156/1156 1177/1177/1177 +f 1176/1176/1176 1155/1155/1155 1169/1169/1169 1156/1156/1156 +f 1156/1156/1156 1169/1169/1169 1171/1171/1171 1178/1178/1178 +f 1177/1177/1177 1156/1156/1156 1178/1178/1178 1179/1179/1179 +f 435/435/435 1175/1175/1175 436/436/436 439/439/439 +f 1175/1175/1175 1174/1174/1174 1177/1177/1177 436/436/436 +f 436/436/436 1177/1177/1177 1179/1179/1179 1180/1180/1180 +f 439/439/439 436/436/436 1180/1180/1180 440/440/440 +f 1135/1135/1135 1181/1181/1181 1137/1137/1137 1136/1136/1136 +f 1181/1181/1181 1182/1182/1182 1183/1183/1183 1137/1137/1137 +f 1137/1137/1137 1183/1183/1183 1185/1185/1185 1187/1187/1187 +f 1136/1136/1136 1137/1137/1137 1187/1187/1187 1138/1138/1138 +f 1182/1182/1182 1188/1188/1188 1184/1184/1184 1183/1183/1183 +f 1188/1188/1188 1189/1189/1189 1190/1190/1190 1184/1184/1184 +f 1184/1184/1184 1190/1190/1190 1192/1192/1192 1194/1194/1194 +f 1183/1183/1183 1184/1184/1184 1194/1194/1194 1185/1185/1185 +f 1185/1185/1185 1194/1194/1194 1186/1186/1186 1195/1195/1195 +f 1194/1194/1194 1192/1192/1192 1196/1196/1196 1186/1186/1186 +f 1186/1186/1186 1196/1196/1196 1197/1197/1197 1200/1200/1200 +f 1195/1195/1195 1186/1186/1186 1200/1200/1200 1201/1201/1201 +f 1138/1138/1138 1187/1187/1187 1139/1139/1139 1142/1142/1142 +f 1187/1187/1187 1185/1185/1185 1195/1195/1195 1139/1139/1139 +f 1139/1139/1139 1195/1195/1195 1201/1201/1201 1202/1202/1202 +f 1142/1142/1142 1139/1139/1139 1202/1202/1202 1143/1143/1143 +f 1189/1189/1189 1203/1203/1203 1191/1191/1191 1190/1190/1190 +f 1203/1203/1203 1204/1204/1204 1205/1205/1205 1191/1191/1191 +f 1191/1191/1191 1205/1205/1205 1207/1207/1207 1209/1209/1209 +f 1190/1190/1190 1191/1191/1191 1209/1209/1209 1192/1192/1192 +f 1204/1204/1204 1210/1210/1210 1206/1206/1206 1205/1205/1205 +f 1210/1210/1210 1211/1211/1211 1212/1212/1212 1206/1206/1206 +f 1206/1206/1206 1212/1212/1212 1214/1214/1214 1216/1216/1216 +f 1205/1205/1205 1206/1206/1206 1216/1216/1216 1207/1207/1207 +f 1207/1207/1207 1216/1216/1216 1208/1208/1208 1217/1217/1217 +f 1216/1216/1216 1214/1214/1214 1218/1218/1218 1208/1208/1208 +f 1208/1208/1208 1218/1218/1218 1219/1219/1219 1222/1222/1222 +f 1217/1217/1217 1208/1208/1208 1222/1222/1222 1223/1223/1223 +f 1192/1192/1192 1209/1209/1209 1193/1193/1193 1196/1196/1196 +f 1209/1209/1209 1207/1207/1207 1217/1217/1217 1193/1193/1193 +f 1193/1193/1193 1217/1217/1217 1223/1223/1223 1224/1224/1224 +f 1196/1196/1196 1193/1193/1193 1224/1224/1224 1197/1197/1197 +f 1197/1197/1197 1224/1224/1224 1198/1198/1198 1225/1225/1225 +f 1224/1224/1224 1223/1223/1223 1226/1226/1226 1198/1198/1198 +f 1198/1198/1198 1226/1226/1226 1227/1227/1227 1230/1230/1230 +f 1225/1225/1225 1198/1198/1198 1230/1230/1230 1231/1231/1231 +f 1223/1223/1223 1222/1222/1222 1221/1221/1221 1226/1226/1226 +f 1222/1222/1222 1219/1219/1219 1233/1233/1233 1221/1221/1221 +f 1221/1221/1221 1233/1233/1233 1234/1234/1234 1236/1236/1236 +f 1226/1226/1226 1221/1221/1221 1236/1236/1236 1227/1227/1227 +f 1227/1227/1227 1236/1236/1236 1228/1228/1228 1237/1237/1237 +f 1236/1236/1236 1234/1234/1234 1238/1238/1238 1228/1228/1228 +f 1228/1228/1228 1238/1238/1238 1239/1239/1239 1242/1242/1242 +f 1237/1237/1237 1228/1228/1228 1242/1242/1242 1243/1243/1243 +f 1231/1231/1231 1230/1230/1230 1229/1229/1229 1245/1245/1245 +f 1230/1230/1230 1227/1227/1227 1237/1237/1237 1229/1229/1229 +f 1229/1229/1229 1237/1237/1237 1243/1243/1243 1246/1246/1246 +f 1245/1245/1245 1229/1229/1229 1246/1246/1246 1247/1247/1247 +f 1143/1143/1143 1202/1202/1202 1144/1144/1144 1157/1157/1157 +f 1202/1202/1202 1201/1201/1201 1249/1249/1249 1144/1144/1144 +f 1144/1144/1144 1249/1249/1249 1250/1250/1250 1251/1251/1251 +f 1157/1157/1157 1144/1144/1144 1251/1251/1251 1158/1158/1158 +f 1201/1201/1201 1200/1200/1200 1199/1199/1199 1249/1249/1249 +f 1200/1200/1200 1197/1197/1197 1225/1225/1225 1199/1199/1199 +f 1199/1199/1199 1225/1225/1225 1231/1231/1231 1252/1252/1252 +f 1249/1249/1249 1199/1199/1199 1252/1252/1252 1250/1250/1250 +f 1250/1250/1250 1252/1252/1252 1232/1232/1232 1253/1253/1253 +f 1252/1252/1252 1231/1231/1231 1245/1245/1245 1232/1232/1232 +f 1232/1232/1232 1245/1245/1245 1247/1247/1247 1254/1254/1254 +f 1253/1253/1253 1232/1232/1232 1254/1254/1254 1255/1255/1255 +f 1158/1158/1158 1251/1251/1251 1159/1159/1159 1162/1162/1162 +f 1251/1251/1251 1250/1250/1250 1253/1253/1253 1159/1159/1159 +f 1159/1159/1159 1253/1253/1253 1255/1255/1255 1256/1256/1256 +f 1162/1162/1162 1159/1159/1159 1256/1256/1256 1163/1163/1163 +f 1163/1163/1163 1256/1256/1256 1164/1164/1164 1257/1257/1257 +f 1256/1256/1256 1255/1255/1255 1258/1258/1258 1164/1164/1164 +f 1164/1164/1164 1258/1258/1258 1259/1259/1259 1262/1262/1262 +f 1257/1257/1257 1164/1164/1164 1262/1262/1262 1263/1263/1263 +f 1255/1255/1255 1254/1254/1254 1248/1248/1248 1258/1258/1258 +f 1254/1254/1254 1247/1247/1247 1265/1265/1265 1248/1248/1248 +f 1248/1248/1248 1265/1265/1265 1266/1266/1266 1268/1268/1268 +f 1258/1258/1258 1248/1248/1248 1268/1268/1268 1259/1259/1259 +f 1259/1259/1259 1268/1268/1268 1260/1260/1260 1269/1269/1269 +f 1268/1268/1268 1266/1266/1266 1270/1270/1270 1260/1260/1260 +f 1260/1260/1260 1270/1270/1270 1271/1271/1271 1274/1274/1274 +f 1269/1269/1269 1260/1260/1260 1274/1274/1274 1275/1275/1275 +f 1263/1263/1263 1262/1262/1262 1261/1261/1261 1277/1277/1277 +f 1262/1262/1262 1259/1259/1259 1269/1269/1269 1261/1261/1261 +f 1261/1261/1261 1269/1269/1269 1275/1275/1275 1278/1278/1278 +f 1277/1277/1277 1261/1261/1261 1278/1278/1278 1279/1279/1279 +f 1247/1247/1247 1246/1246/1246 1244/1244/1244 1265/1265/1265 +f 1246/1246/1246 1243/1243/1243 1281/1281/1281 1244/1244/1244 +f 1244/1244/1244 1281/1281/1281 1282/1282/1282 1284/1284/1284 +f 1265/1265/1265 1244/1244/1244 1284/1284/1284 1266/1266/1266 +f 1243/1243/1243 1242/1242/1242 1241/1241/1241 1281/1281/1281 +f 1242/1242/1242 1239/1239/1239 1285/1285/1285 1241/1241/1241 +f 1241/1241/1241 1285/1285/1285 1286/1286/1286 1288/1288/1288 +f 1281/1281/1281 1241/1241/1241 1288/1288/1288 1282/1282/1282 +f 1282/1282/1282 1288/1288/1288 1283/1283/1283 1289/1289/1289 +f 1288/1288/1288 1286/1286/1286 1290/1290/1290 1283/1283/1283 +f 1283/1283/1283 1290/1290/1290 1291/1291/1291 1294/1294/1294 +f 1289/1289/1289 1283/1283/1283 1294/1294/1294 1295/1295/1295 +f 1266/1266/1266 1284/1284/1284 1267/1267/1267 1270/1270/1270 +f 1284/1284/1284 1282/1282/1282 1289/1289/1289 1267/1267/1267 +f 1267/1267/1267 1289/1289/1289 1295/1295/1295 1296/1296/1296 +f 1270/1270/1270 1267/1267/1267 1296/1296/1296 1271/1271/1271 +f 1271/1271/1271 1296/1296/1296 1272/1272/1272 1297/1297/1297 +f 1296/1296/1296 1295/1295/1295 1298/1298/1298 1272/1272/1272 +f 1272/1272/1272 1298/1298/1298 1299/1299/1299 1302/1302/1302 +f 1297/1297/1297 1272/1272/1272 1302/1302/1302 1303/1303/1303 +f 1295/1295/1295 1294/1294/1294 1293/1293/1293 1298/1298/1298 +f 1294/1294/1294 1291/1291/1291 1305/1305/1305 1293/1293/1293 +f 1293/1293/1293 1305/1305/1305 1306/1306/1306 1308/1308/1308 +f 1298/1298/1298 1293/1293/1293 1308/1308/1308 1299/1299/1299 +f 1299/1299/1299 1308/1308/1308 1300/1300/1300 1309/1309/1309 +f 1308/1308/1308 1306/1306/1306 1310/1310/1310 1300/1300/1300 +f 1300/1300/1300 1310/1310/1310 1311/1311/1311 1314/1314/1314 +f 1309/1309/1309 1300/1300/1300 1314/1314/1314 1315/1315/1315 +f 1303/1303/1303 1302/1302/1302 1301/1301/1301 1317/1317/1317 +f 1302/1302/1302 1299/1299/1299 1309/1309/1309 1301/1301/1301 +f 1301/1301/1301 1309/1309/1309 1315/1315/1315 1318/1318/1318 +f 1317/1317/1317 1301/1301/1301 1318/1318/1318 1319/1319/1319 +f 1279/1279/1279 1278/1278/1278 1276/1276/1276 1321/1321/1321 +f 1278/1278/1278 1275/1275/1275 1322/1322/1322 1276/1276/1276 +f 1276/1276/1276 1322/1322/1322 1323/1323/1323 1325/1325/1325 +f 1321/1321/1321 1276/1276/1276 1325/1325/1325 1326/1326/1326 +f 1275/1275/1275 1274/1274/1274 1273/1273/1273 1322/1322/1322 +f 1274/1274/1274 1271/1271/1271 1297/1297/1297 1273/1273/1273 +f 1273/1273/1273 1297/1297/1297 1303/1303/1303 1328/1328/1328 +f 1322/1322/1322 1273/1273/1273 1328/1328/1328 1323/1323/1323 +f 1323/1323/1323 1328/1328/1328 1304/1304/1304 1329/1329/1329 +f 1328/1328/1328 1303/1303/1303 1317/1317/1317 1304/1304/1304 +f 1304/1304/1304 1317/1317/1317 1319/1319/1319 1330/1330/1330 +f 1329/1329/1329 1304/1304/1304 1330/1330/1330 1331/1331/1331 +f 1326/1326/1326 1325/1325/1325 1324/1324/1324 1333/1333/1333 +f 1325/1325/1325 1323/1323/1323 1329/1329/1329 1324/1324/1324 +f 1324/1324/1324 1329/1329/1329 1331/1331/1331 1334/1334/1334 +f 1333/1333/1333 1324/1324/1324 1334/1334/1334 1335/1335/1335 +f 440/440/440 1180/1180/1180 441/441/441 486/486/486 +f 1180/1180/1180 1179/1179/1179 1337/1337/1337 441/441/441 +f 441/441/441 1337/1337/1337 1338/1338/1338 1340/1340/1340 +f 486/486/486 441/441/441 1340/1340/1340 487/487/487 +f 1179/1179/1179 1178/1178/1178 1172/1172/1172 1337/1337/1337 +f 1178/1178/1178 1171/1171/1171 1341/1341/1341 1172/1172/1172 +f 1172/1172/1172 1341/1341/1341 1342/1342/1342 1344/1344/1344 +f 1337/1337/1337 1172/1172/1172 1344/1344/1344 1338/1338/1338 +f 1338/1338/1338 1344/1344/1344 1339/1339/1339 1345/1345/1345 +f 1344/1344/1344 1342/1342/1342 1346/1346/1346 1339/1339/1339 +f 1339/1339/1339 1346/1346/1346 1347/1347/1347 1350/1350/1350 +f 1345/1345/1345 1339/1339/1339 1350/1350/1350 1351/1351/1351 +f 487/487/487 1340/1340/1340 488/488/488 491/491/491 +f 1340/1340/1340 1338/1338/1338 1345/1345/1345 488/488/488 +f 488/488/488 1345/1345/1345 1351/1351/1351 1352/1352/1352 +f 491/491/491 488/488/488 1352/1352/1352 492/492/492 +f 1171/1171/1171 1170/1170/1170 1168/1168/1168 1341/1341/1341 +f 1170/1170/1170 1167/1167/1167 1353/1353/1353 1168/1168/1168 +f 1168/1168/1168 1353/1353/1353 1354/1354/1354 1355/1355/1355 +f 1341/1341/1341 1168/1168/1168 1355/1355/1355 1342/1342/1342 +f 1167/1167/1167 1166/1166/1166 1165/1165/1165 1353/1353/1353 +f 1166/1166/1166 1163/1163/1163 1257/1257/1257 1165/1165/1165 +f 1165/1165/1165 1257/1257/1257 1263/1263/1263 1356/1356/1356 +f 1353/1353/1353 1165/1165/1165 1356/1356/1356 1354/1354/1354 +f 1354/1354/1354 1356/1356/1356 1264/1264/1264 1357/1357/1357 +f 1356/1356/1356 1263/1263/1263 1277/1277/1277 1264/1264/1264 +f 1264/1264/1264 1277/1277/1277 1279/1279/1279 1358/1358/1358 +f 1357/1357/1357 1264/1264/1264 1358/1358/1358 1359/1359/1359 +f 1342/1342/1342 1355/1355/1355 1343/1343/1343 1346/1346/1346 +f 1355/1355/1355 1354/1354/1354 1357/1357/1357 1343/1343/1343 +f 1343/1343/1343 1357/1357/1357 1359/1359/1359 1360/1360/1360 +f 1346/1346/1346 1343/1343/1343 1360/1360/1360 1347/1347/1347 +f 1347/1347/1347 1360/1360/1360 1348/1348/1348 1361/1361/1361 +f 1360/1360/1360 1359/1359/1359 1362/1362/1362 1348/1348/1348 +f 1348/1348/1348 1362/1362/1362 1363/1363/1363 1365/1365/1365 +f 1361/1361/1361 1348/1348/1348 1365/1365/1365 1366/1366/1366 +f 1359/1359/1359 1358/1358/1358 1280/1280/1280 1362/1362/1362 +f 1358/1358/1358 1279/1279/1279 1321/1321/1321 1280/1280/1280 +f 1280/1280/1280 1321/1321/1321 1326/1326/1326 1368/1368/1368 +f 1362/1362/1362 1280/1280/1280 1368/1368/1368 1363/1363/1363 +f 1363/1363/1363 1368/1368/1368 1327/1327/1327 1369/1369/1369 +f 1368/1368/1368 1326/1326/1326 1333/1333/1333 1327/1327/1327 +f 1327/1327/1327 1333/1333/1333 1335/1335/1335 1370/1370/1370 +f 1369/1369/1369 1327/1327/1327 1370/1370/1370 1371/1371/1371 +f 1366/1366/1366 1365/1365/1365 1364/1364/1364 1373/1373/1373 +f 1365/1365/1365 1363/1363/1363 1369/1369/1369 1364/1364/1364 +f 1364/1364/1364 1369/1369/1369 1371/1371/1371 1374/1374/1374 +f 1373/1373/1373 1364/1364/1364 1374/1374/1374 1375/1375/1375 +f 492/492/492 1352/1352/1352 493/493/493 506/506/506 +f 1352/1352/1352 1351/1351/1351 1377/1377/1377 493/493/493 +f 493/493/493 1377/1377/1377 1378/1378/1378 1379/1379/1379 +f 506/506/506 493/493/493 1379/1379/1379 507/507/507 +f 1351/1351/1351 1350/1350/1350 1349/1349/1349 1377/1377/1377 +f 1350/1350/1350 1347/1347/1347 1361/1361/1361 1349/1349/1349 +f 1349/1349/1349 1361/1361/1361 1366/1366/1366 1380/1380/1380 +f 1377/1377/1377 1349/1349/1349 1380/1380/1380 1378/1378/1378 +f 1378/1378/1378 1380/1380/1380 1367/1367/1367 1381/1381/1381 +f 1380/1380/1380 1366/1366/1366 1373/1373/1373 1367/1367/1367 +f 1367/1367/1367 1373/1373/1373 1375/1375/1375 1382/1382/1382 +f 1381/1381/1381 1367/1367/1367 1382/1382/1382 1383/1383/1383 +f 507/507/507 1379/1379/1379 508/508/508 511/511/511 +f 1379/1379/1379 1378/1378/1378 1381/1381/1381 508/508/508 +f 508/508/508 1381/1381/1381 1383/1383/1383 1384/1384/1384 +f 511/511/511 508/508/508 1384/1384/1384 512/512/512 +f 1211/1211/1211 1385/1385/1385 1213/1213/1213 1212/1212/1212 +f 1385/1385/1385 1386/1386/1386 1387/1387/1387 1213/1213/1213 +f 1213/1213/1213 1387/1387/1387 1389/1389/1389 1391/1391/1391 +f 1212/1212/1212 1213/1213/1213 1391/1391/1391 1214/1214/1214 +f 1386/1386/1386 1392/1392/1392 1388/1388/1388 1387/1387/1387 +f 1392/1392/1392 1393/1393/1393 1394/1394/1394 1388/1388/1388 +f 1388/1388/1388 1394/1394/1394 1396/1396/1396 1398/1398/1398 +f 1387/1387/1387 1388/1388/1388 1398/1398/1398 1389/1389/1389 +f 1389/1389/1389 1398/1398/1398 1390/1390/1390 1399/1399/1399 +f 1398/1398/1398 1396/1396/1396 1400/1400/1400 1390/1390/1390 +f 1390/1390/1390 1400/1400/1400 1401/1401/1401 1404/1404/1404 +f 1399/1399/1399 1390/1390/1390 1404/1404/1404 1405/1405/1405 +f 1214/1214/1214 1391/1391/1391 1215/1215/1215 1218/1218/1218 +f 1391/1391/1391 1389/1389/1389 1399/1399/1399 1215/1215/1215 +f 1215/1215/1215 1399/1399/1399 1405/1405/1405 1406/1406/1406 +f 1218/1218/1218 1215/1215/1215 1406/1406/1406 1219/1219/1219 +f 1393/1393/1393 1407/1407/1407 1395/1395/1395 1394/1394/1394 +f 1407/1407/1407 1408/1408/1408 1409/1409/1409 1395/1395/1395 +f 1395/1395/1395 1409/1409/1409 1411/1411/1411 1413/1413/1413 +f 1394/1394/1394 1395/1395/1395 1413/1413/1413 1396/1396/1396 +f 1408/1408/1408 1414/1414/1414 1410/1410/1410 1409/1409/1409 +f 1414/1414/1414 1415/1415/1415 1416/1416/1416 1410/1410/1410 +f 1410/1410/1410 1416/1416/1416 1418/1418/1418 1420/1420/1420 +f 1409/1409/1409 1410/1410/1410 1420/1420/1420 1411/1411/1411 +f 1411/1411/1411 1420/1420/1420 1412/1412/1412 1421/1421/1421 +f 1420/1420/1420 1418/1418/1418 1422/1422/1422 1412/1412/1412 +f 1412/1412/1412 1422/1422/1422 1423/1423/1423 1426/1426/1426 +f 1421/1421/1421 1412/1412/1412 1426/1426/1426 1427/1427/1427 +f 1396/1396/1396 1413/1413/1413 1397/1397/1397 1400/1400/1400 +f 1413/1413/1413 1411/1411/1411 1421/1421/1421 1397/1397/1397 +f 1397/1397/1397 1421/1421/1421 1427/1427/1427 1428/1428/1428 +f 1400/1400/1400 1397/1397/1397 1428/1428/1428 1401/1401/1401 +f 1401/1401/1401 1428/1428/1428 1402/1402/1402 1429/1429/1429 +f 1428/1428/1428 1427/1427/1427 1430/1430/1430 1402/1402/1402 +f 1402/1402/1402 1430/1430/1430 1431/1431/1431 1434/1434/1434 +f 1429/1429/1429 1402/1402/1402 1434/1434/1434 1435/1435/1435 +f 1427/1427/1427 1426/1426/1426 1425/1425/1425 1430/1430/1430 +f 1426/1426/1426 1423/1423/1423 1437/1437/1437 1425/1425/1425 +f 1425/1425/1425 1437/1437/1437 1438/1438/1438 1440/1440/1440 +f 1430/1430/1430 1425/1425/1425 1440/1440/1440 1431/1431/1431 +f 1431/1431/1431 1440/1440/1440 1432/1432/1432 1441/1441/1441 +f 1440/1440/1440 1438/1438/1438 1442/1442/1442 1432/1432/1432 +f 1432/1432/1432 1442/1442/1442 1443/1443/1443 1446/1446/1446 +f 1441/1441/1441 1432/1432/1432 1446/1446/1446 1447/1447/1447 +f 1435/1435/1435 1434/1434/1434 1433/1433/1433 1449/1449/1449 +f 1434/1434/1434 1431/1431/1431 1441/1441/1441 1433/1433/1433 +f 1433/1433/1433 1441/1441/1441 1447/1447/1447 1450/1450/1450 +f 1449/1449/1449 1433/1433/1433 1450/1450/1450 1451/1451/1451 +f 1219/1219/1219 1406/1406/1406 1220/1220/1220 1233/1233/1233 +f 1406/1406/1406 1405/1405/1405 1453/1453/1453 1220/1220/1220 +f 1220/1220/1220 1453/1453/1453 1454/1454/1454 1455/1455/1455 +f 1233/1233/1233 1220/1220/1220 1455/1455/1455 1234/1234/1234 +f 1405/1405/1405 1404/1404/1404 1403/1403/1403 1453/1453/1453 +f 1404/1404/1404 1401/1401/1401 1429/1429/1429 1403/1403/1403 +f 1403/1403/1403 1429/1429/1429 1435/1435/1435 1456/1456/1456 +f 1453/1453/1453 1403/1403/1403 1456/1456/1456 1454/1454/1454 +f 1454/1454/1454 1456/1456/1456 1436/1436/1436 1457/1457/1457 +f 1456/1456/1456 1435/1435/1435 1449/1449/1449 1436/1436/1436 +f 1436/1436/1436 1449/1449/1449 1451/1451/1451 1458/1458/1458 +f 1457/1457/1457 1436/1436/1436 1458/1458/1458 1459/1459/1459 +f 1234/1234/1234 1455/1455/1455 1235/1235/1235 1238/1238/1238 +f 1455/1455/1455 1454/1454/1454 1457/1457/1457 1235/1235/1235 +f 1235/1235/1235 1457/1457/1457 1459/1459/1459 1460/1460/1460 +f 1238/1238/1238 1235/1235/1235 1460/1460/1460 1239/1239/1239 +f 1415/1415/1415 1461/1461/1461 1417/1417/1417 1416/1416/1416 +f 1461/1461/1461 1462/1462/1462 1463/1463/1463 1417/1417/1417 +f 1417/1417/1417 1463/1463/1463 1465/1465/1465 1467/1467/1467 +f 1416/1416/1416 1417/1417/1417 1467/1467/1467 1418/1418/1418 +f 1462/1462/1462 1468/1468/1468 1464/1464/1464 1463/1463/1463 +f 1468/1468/1468 1469/1469/1469 1470/1470/1470 1464/1464/1464 +f 1464/1464/1464 1470/1470/1470 1472/1472/1472 1474/1474/1474 +f 1463/1463/1463 1464/1464/1464 1474/1474/1474 1465/1465/1465 +f 1465/1465/1465 1474/1474/1474 1466/1466/1466 1475/1475/1475 +f 1474/1474/1474 1472/1472/1472 1476/1476/1476 1466/1466/1466 +f 1466/1466/1466 1476/1476/1476 1477/1477/1477 1480/1480/1480 +f 1475/1475/1475 1466/1466/1466 1480/1480/1480 1481/1481/1481 +f 1418/1418/1418 1467/1467/1467 1419/1419/1419 1422/1422/1422 +f 1467/1467/1467 1465/1465/1465 1475/1475/1475 1419/1419/1419 +f 1419/1419/1419 1475/1475/1475 1481/1481/1481 1482/1482/1482 +f 1422/1422/1422 1419/1419/1419 1482/1482/1482 1423/1423/1423 +f 1469/1469/1469 1483/1483/1483 1471/1471/1471 1470/1470/1470 +f 1483/1483/1483 1484/1484/1484 1485/1485/1485 1471/1471/1471 +f 1471/1471/1471 1485/1485/1485 1487/1487/1487 1489/1489/1489 +f 1470/1470/1470 1471/1471/1471 1489/1489/1489 1472/1472/1472 +f 1484/1484/1484 1490/1490/1490 1486/1486/1486 1485/1485/1485 +f 1490/1490/1490 1491/1491/1491 1492/1492/1492 1486/1486/1486 +f 1486/1486/1486 1492/1492/1492 1494/1494/1494 1496/1496/1496 +f 1485/1485/1485 1486/1486/1486 1496/1496/1496 1487/1487/1487 +f 1487/1487/1487 1496/1496/1496 1488/1488/1488 1497/1497/1497 +f 1496/1496/1496 1494/1494/1494 1498/1498/1498 1488/1488/1488 +f 1488/1488/1488 1498/1498/1498 1499/1499/1499 1502/1502/1502 +f 1497/1497/1497 1488/1488/1488 1502/1502/1502 1503/1503/1503 +f 1472/1472/1472 1489/1489/1489 1473/1473/1473 1476/1476/1476 +f 1489/1489/1489 1487/1487/1487 1497/1497/1497 1473/1473/1473 +f 1473/1473/1473 1497/1497/1497 1503/1503/1503 1504/1504/1504 +f 1476/1476/1476 1473/1473/1473 1504/1504/1504 1477/1477/1477 +f 1477/1477/1477 1504/1504/1504 1478/1478/1478 1505/1505/1505 +f 1504/1504/1504 1503/1503/1503 1506/1506/1506 1478/1478/1478 +f 1478/1478/1478 1506/1506/1506 1507/1507/1507 1510/1510/1510 +f 1505/1505/1505 1478/1478/1478 1510/1510/1510 1511/1511/1511 +f 1503/1503/1503 1502/1502/1502 1501/1501/1501 1506/1506/1506 +f 1502/1502/1502 1499/1499/1499 1513/1513/1513 1501/1501/1501 +f 1501/1501/1501 1513/1513/1513 1514/1514/1514 1516/1516/1516 +f 1506/1506/1506 1501/1501/1501 1516/1516/1516 1507/1507/1507 +f 1507/1507/1507 1516/1516/1516 1508/1508/1508 1517/1517/1517 +f 1516/1516/1516 1514/1514/1514 1518/1518/1518 1508/1508/1508 +f 1508/1508/1508 1518/1518/1518 1519/1519/1519 1522/1522/1522 +f 1517/1517/1517 1508/1508/1508 1522/1522/1522 1523/1523/1523 +f 1511/1511/1511 1510/1510/1510 1509/1509/1509 1525/1525/1525 +f 1510/1510/1510 1507/1507/1507 1517/1517/1517 1509/1509/1509 +f 1509/1509/1509 1517/1517/1517 1523/1523/1523 1526/1526/1526 +f 1525/1525/1525 1509/1509/1509 1526/1526/1526 1527/1527/1527 +f 1423/1423/1423 1482/1482/1482 1424/1424/1424 1437/1437/1437 +f 1482/1482/1482 1481/1481/1481 1529/1529/1529 1424/1424/1424 +f 1424/1424/1424 1529/1529/1529 1530/1530/1530 1531/1531/1531 +f 1437/1437/1437 1424/1424/1424 1531/1531/1531 1438/1438/1438 +f 1481/1481/1481 1480/1480/1480 1479/1479/1479 1529/1529/1529 +f 1480/1480/1480 1477/1477/1477 1505/1505/1505 1479/1479/1479 +f 1479/1479/1479 1505/1505/1505 1511/1511/1511 1532/1532/1532 +f 1529/1529/1529 1479/1479/1479 1532/1532/1532 1530/1530/1530 +f 1530/1530/1530 1532/1532/1532 1512/1512/1512 1533/1533/1533 +f 1532/1532/1532 1511/1511/1511 1525/1525/1525 1512/1512/1512 +f 1512/1512/1512 1525/1525/1525 1527/1527/1527 1534/1534/1534 +f 1533/1533/1533 1512/1512/1512 1534/1534/1534 1535/1535/1535 +f 1438/1438/1438 1531/1531/1531 1439/1439/1439 1442/1442/1442 +f 1531/1531/1531 1530/1530/1530 1533/1533/1533 1439/1439/1439 +f 1439/1439/1439 1533/1533/1533 1535/1535/1535 1536/1536/1536 +f 1442/1442/1442 1439/1439/1439 1536/1536/1536 1443/1443/1443 +f 1443/1443/1443 1536/1536/1536 1444/1444/1444 1537/1537/1537 +f 1536/1536/1536 1535/1535/1535 1538/1538/1538 1444/1444/1444 +f 1444/1444/1444 1538/1538/1538 1539/1539/1539 1542/1542/1542 +f 1537/1537/1537 1444/1444/1444 1542/1542/1542 1543/1543/1543 +f 1535/1535/1535 1534/1534/1534 1528/1528/1528 1538/1538/1538 +f 1534/1534/1534 1527/1527/1527 1545/1545/1545 1528/1528/1528 +f 1528/1528/1528 1545/1545/1545 1546/1546/1546 1548/1548/1548 +f 1538/1538/1538 1528/1528/1528 1548/1548/1548 1539/1539/1539 +f 1539/1539/1539 1548/1548/1548 1540/1540/1540 1549/1549/1549 +f 1548/1548/1548 1546/1546/1546 1550/1550/1550 1540/1540/1540 +f 1540/1540/1540 1550/1550/1550 1551/1551/1551 1554/1554/1554 +f 1549/1549/1549 1540/1540/1540 1554/1554/1554 1555/1555/1555 +f 1543/1543/1543 1542/1542/1542 1541/1541/1541 1557/1557/1557 +f 1542/1542/1542 1539/1539/1539 1549/1549/1549 1541/1541/1541 +f 1541/1541/1541 1549/1549/1549 1555/1555/1555 1558/1558/1558 +f 1557/1557/1557 1541/1541/1541 1558/1558/1558 1559/1559/1559 +f 1527/1527/1527 1526/1526/1526 1524/1524/1524 1545/1545/1545 +f 1526/1526/1526 1523/1523/1523 1561/1561/1561 1524/1524/1524 +f 1524/1524/1524 1561/1561/1561 1562/1562/1562 1564/1564/1564 +f 1545/1545/1545 1524/1524/1524 1564/1564/1564 1546/1546/1546 +f 1523/1523/1523 1522/1522/1522 1521/1521/1521 1561/1561/1561 +f 1522/1522/1522 1519/1519/1519 1565/1565/1565 1521/1521/1521 +f 1521/1521/1521 1565/1565/1565 1566/1566/1566 1568/1568/1568 +f 1561/1561/1561 1521/1521/1521 1568/1568/1568 1562/1562/1562 +f 1562/1562/1562 1568/1568/1568 1563/1563/1563 1569/1569/1569 +f 1568/1568/1568 1566/1566/1566 1570/1570/1570 1563/1563/1563 +f 1563/1563/1563 1570/1570/1570 1571/1571/1571 1574/1574/1574 +f 1569/1569/1569 1563/1563/1563 1574/1574/1574 1575/1575/1575 +f 1546/1546/1546 1564/1564/1564 1547/1547/1547 1550/1550/1550 +f 1564/1564/1564 1562/1562/1562 1569/1569/1569 1547/1547/1547 +f 1547/1547/1547 1569/1569/1569 1575/1575/1575 1576/1576/1576 +f 1550/1550/1550 1547/1547/1547 1576/1576/1576 1551/1551/1551 +f 1551/1551/1551 1576/1576/1576 1552/1552/1552 1577/1577/1577 +f 1576/1576/1576 1575/1575/1575 1578/1578/1578 1552/1552/1552 +f 1552/1552/1552 1578/1578/1578 1579/1579/1579 1582/1582/1582 +f 1577/1577/1577 1552/1552/1552 1582/1582/1582 1583/1583/1583 +f 1575/1575/1575 1574/1574/1574 1573/1573/1573 1578/1578/1578 +f 1574/1574/1574 1571/1571/1571 1585/1585/1585 1573/1573/1573 +f 1573/1573/1573 1585/1585/1585 1586/1586/1586 1588/1588/1588 +f 1578/1578/1578 1573/1573/1573 1588/1588/1588 1579/1579/1579 +f 1579/1579/1579 1588/1588/1588 1580/1580/1580 1589/1589/1589 +f 1588/1588/1588 1586/1586/1586 1590/1590/1590 1580/1580/1580 +f 1580/1580/1580 1590/1590/1590 1591/1591/1591 1594/1594/1594 +f 1589/1589/1589 1580/1580/1580 1594/1594/1594 1595/1595/1595 +f 1583/1583/1583 1582/1582/1582 1581/1581/1581 1597/1597/1597 +f 1582/1582/1582 1579/1579/1579 1589/1589/1589 1581/1581/1581 +f 1581/1581/1581 1589/1589/1589 1595/1595/1595 1598/1598/1598 +f 1597/1597/1597 1581/1581/1581 1598/1598/1598 1599/1599/1599 +f 1559/1559/1559 1558/1558/1558 1556/1556/1556 1601/1601/1601 +f 1558/1558/1558 1555/1555/1555 1602/1602/1602 1556/1556/1556 +f 1556/1556/1556 1602/1602/1602 1603/1603/1603 1605/1605/1605 +f 1601/1601/1601 1556/1556/1556 1605/1605/1605 1606/1606/1606 +f 1555/1555/1555 1554/1554/1554 1553/1553/1553 1602/1602/1602 +f 1554/1554/1554 1551/1551/1551 1577/1577/1577 1553/1553/1553 +f 1553/1553/1553 1577/1577/1577 1583/1583/1583 1608/1608/1608 +f 1602/1602/1602 1553/1553/1553 1608/1608/1608 1603/1603/1603 +f 1603/1603/1603 1608/1608/1608 1584/1584/1584 1609/1609/1609 +f 1608/1608/1608 1583/1583/1583 1597/1597/1597 1584/1584/1584 +f 1584/1584/1584 1597/1597/1597 1599/1599/1599 1610/1610/1610 +f 1609/1609/1609 1584/1584/1584 1610/1610/1610 1611/1611/1611 +f 1606/1606/1606 1605/1605/1605 1604/1604/1604 1613/1613/1613 +f 1605/1605/1605 1603/1603/1603 1609/1609/1609 1604/1604/1604 +f 1604/1604/1604 1609/1609/1609 1611/1611/1611 1614/1614/1614 +f 1613/1613/1613 1604/1604/1604 1614/1614/1614 1615/1615/1615 +f 1239/1239/1239 1460/1460/1460 1240/1240/1240 1285/1285/1285 +f 1460/1460/1460 1459/1459/1459 1617/1617/1617 1240/1240/1240 +f 1240/1240/1240 1617/1617/1617 1618/1618/1618 1620/1620/1620 +f 1285/1285/1285 1240/1240/1240 1620/1620/1620 1286/1286/1286 +f 1459/1459/1459 1458/1458/1458 1452/1452/1452 1617/1617/1617 +f 1458/1458/1458 1451/1451/1451 1621/1621/1621 1452/1452/1452 +f 1452/1452/1452 1621/1621/1621 1622/1622/1622 1624/1624/1624 +f 1617/1617/1617 1452/1452/1452 1624/1624/1624 1618/1618/1618 +f 1618/1618/1618 1624/1624/1624 1619/1619/1619 1625/1625/1625 +f 1624/1624/1624 1622/1622/1622 1626/1626/1626 1619/1619/1619 +f 1619/1619/1619 1626/1626/1626 1627/1627/1627 1630/1630/1630 +f 1625/1625/1625 1619/1619/1619 1630/1630/1630 1631/1631/1631 +f 1286/1286/1286 1620/1620/1620 1287/1287/1287 1290/1290/1290 +f 1620/1620/1620 1618/1618/1618 1625/1625/1625 1287/1287/1287 +f 1287/1287/1287 1625/1625/1625 1631/1631/1631 1632/1632/1632 +f 1290/1290/1290 1287/1287/1287 1632/1632/1632 1291/1291/1291 +f 1451/1451/1451 1450/1450/1450 1448/1448/1448 1621/1621/1621 +f 1450/1450/1450 1447/1447/1447 1633/1633/1633 1448/1448/1448 +f 1448/1448/1448 1633/1633/1633 1634/1634/1634 1635/1635/1635 +f 1621/1621/1621 1448/1448/1448 1635/1635/1635 1622/1622/1622 +f 1447/1447/1447 1446/1446/1446 1445/1445/1445 1633/1633/1633 +f 1446/1446/1446 1443/1443/1443 1537/1537/1537 1445/1445/1445 +f 1445/1445/1445 1537/1537/1537 1543/1543/1543 1636/1636/1636 +f 1633/1633/1633 1445/1445/1445 1636/1636/1636 1634/1634/1634 +f 1634/1634/1634 1636/1636/1636 1544/1544/1544 1637/1637/1637 +f 1636/1636/1636 1543/1543/1543 1557/1557/1557 1544/1544/1544 +f 1544/1544/1544 1557/1557/1557 1559/1559/1559 1638/1638/1638 +f 1637/1637/1637 1544/1544/1544 1638/1638/1638 1639/1639/1639 +f 1622/1622/1622 1635/1635/1635 1623/1623/1623 1626/1626/1626 +f 1635/1635/1635 1634/1634/1634 1637/1637/1637 1623/1623/1623 +f 1623/1623/1623 1637/1637/1637 1639/1639/1639 1640/1640/1640 +f 1626/1626/1626 1623/1623/1623 1640/1640/1640 1627/1627/1627 +f 1627/1627/1627 1640/1640/1640 1628/1628/1628 1641/1641/1641 +f 1640/1640/1640 1639/1639/1639 1642/1642/1642 1628/1628/1628 +f 1628/1628/1628 1642/1642/1642 1643/1643/1643 1645/1645/1645 +f 1641/1641/1641 1628/1628/1628 1645/1645/1645 1646/1646/1646 +f 1639/1639/1639 1638/1638/1638 1560/1560/1560 1642/1642/1642 +f 1638/1638/1638 1559/1559/1559 1601/1601/1601 1560/1560/1560 +f 1560/1560/1560 1601/1601/1601 1606/1606/1606 1648/1648/1648 +f 1642/1642/1642 1560/1560/1560 1648/1648/1648 1643/1643/1643 +f 1643/1643/1643 1648/1648/1648 1607/1607/1607 1649/1649/1649 +f 1648/1648/1648 1606/1606/1606 1613/1613/1613 1607/1607/1607 +f 1607/1607/1607 1613/1613/1613 1615/1615/1615 1650/1650/1650 +f 1649/1649/1649 1607/1607/1607 1650/1650/1650 1651/1651/1651 +f 1646/1646/1646 1645/1645/1645 1644/1644/1644 1653/1653/1653 +f 1645/1645/1645 1643/1643/1643 1649/1649/1649 1644/1644/1644 +f 1644/1644/1644 1649/1649/1649 1651/1651/1651 1654/1654/1654 +f 1653/1653/1653 1644/1644/1644 1654/1654/1654 1655/1655/1655 +f 1291/1291/1291 1632/1632/1632 1292/1292/1292 1305/1305/1305 +f 1632/1632/1632 1631/1631/1631 1657/1657/1657 1292/1292/1292 +f 1292/1292/1292 1657/1657/1657 1658/1658/1658 1659/1659/1659 +f 1305/1305/1305 1292/1292/1292 1659/1659/1659 1306/1306/1306 +f 1631/1631/1631 1630/1630/1630 1629/1629/1629 1657/1657/1657 +f 1630/1630/1630 1627/1627/1627 1641/1641/1641 1629/1629/1629 +f 1629/1629/1629 1641/1641/1641 1646/1646/1646 1660/1660/1660 +f 1657/1657/1657 1629/1629/1629 1660/1660/1660 1658/1658/1658 +f 1658/1658/1658 1660/1660/1660 1647/1647/1647 1661/1661/1661 +f 1660/1660/1660 1646/1646/1646 1653/1653/1653 1647/1647/1647 +f 1647/1647/1647 1653/1653/1653 1655/1655/1655 1662/1662/1662 +f 1661/1661/1661 1647/1647/1647 1662/1662/1662 1663/1663/1663 +f 1306/1306/1306 1659/1659/1659 1307/1307/1307 1310/1310/1310 +f 1659/1659/1659 1658/1658/1658 1661/1661/1661 1307/1307/1307 +f 1307/1307/1307 1661/1661/1661 1663/1663/1663 1664/1664/1664 +f 1310/1310/1310 1307/1307/1307 1664/1664/1664 1311/1311/1311 +f 1311/1311/1311 1664/1664/1664 1312/1312/1312 1665/1665/1665 +f 1664/1664/1664 1663/1663/1663 1666/1666/1666 1312/1312/1312 +f 1312/1312/1312 1666/1666/1666 1667/1667/1667 1670/1670/1670 +f 1665/1665/1665 1312/1312/1312 1670/1670/1670 1671/1671/1671 +f 1663/1663/1663 1662/1662/1662 1656/1656/1656 1666/1666/1666 +f 1662/1662/1662 1655/1655/1655 1673/1673/1673 1656/1656/1656 +f 1656/1656/1656 1673/1673/1673 1674/1674/1674 1676/1676/1676 +f 1666/1666/1666 1656/1656/1656 1676/1676/1676 1667/1667/1667 +f 1667/1667/1667 1676/1676/1676 1668/1668/1668 1677/1677/1677 +f 1676/1676/1676 1674/1674/1674 1678/1678/1678 1668/1668/1668 +f 1668/1668/1668 1678/1678/1678 1679/1679/1679 1682/1682/1682 +f 1677/1677/1677 1668/1668/1668 1682/1682/1682 1683/1683/1683 +f 1671/1671/1671 1670/1670/1670 1669/1669/1669 1685/1685/1685 +f 1670/1670/1670 1667/1667/1667 1677/1677/1677 1669/1669/1669 +f 1669/1669/1669 1677/1677/1677 1683/1683/1683 1686/1686/1686 +f 1685/1685/1685 1669/1669/1669 1686/1686/1686 1687/1687/1687 +f 1655/1655/1655 1654/1654/1654 1652/1652/1652 1673/1673/1673 +f 1654/1654/1654 1651/1651/1651 1689/1689/1689 1652/1652/1652 +f 1652/1652/1652 1689/1689/1689 1690/1690/1690 1692/1692/1692 +f 1673/1673/1673 1652/1652/1652 1692/1692/1692 1674/1674/1674 +f 1651/1651/1651 1650/1650/1650 1616/1616/1616 1689/1689/1689 +f 1650/1650/1650 1615/1615/1615 1693/1693/1693 1616/1616/1616 +f 1616/1616/1616 1693/1693/1693 1694/1694/1694 1696/1696/1696 +f 1689/1689/1689 1616/1616/1616 1696/1696/1696 1690/1690/1690 +f 1690/1690/1690 1696/1696/1696 1691/1691/1691 1697/1697/1697 +f 1696/1696/1696 1694/1694/1694 1698/1698/1698 1691/1691/1691 +f 1691/1691/1691 1698/1698/1698 1699/1699/1699 1702/1702/1702 +f 1697/1697/1697 1691/1691/1691 1702/1702/1702 1703/1703/1703 +f 1674/1674/1674 1692/1692/1692 1675/1675/1675 1678/1678/1678 +f 1692/1692/1692 1690/1690/1690 1697/1697/1697 1675/1675/1675 +f 1675/1675/1675 1697/1697/1697 1703/1703/1703 1704/1704/1704 +f 1678/1678/1678 1675/1675/1675 1704/1704/1704 1679/1679/1679 +f 1679/1679/1679 1704/1704/1704 1680/1680/1680 1705/1705/1705 +f 1704/1704/1704 1703/1703/1703 1706/1706/1706 1680/1680/1680 +f 1680/1680/1680 1706/1706/1706 1707/1707/1707 1710/1710/1710 +f 1705/1705/1705 1680/1680/1680 1710/1710/1710 1711/1711/1711 +f 1703/1703/1703 1702/1702/1702 1701/1701/1701 1706/1706/1706 +f 1702/1702/1702 1699/1699/1699 1713/1713/1713 1701/1701/1701 +f 1701/1701/1701 1713/1713/1713 1714/1714/1714 1716/1716/1716 +f 1706/1706/1706 1701/1701/1701 1716/1716/1716 1707/1707/1707 +f 1707/1707/1707 1716/1716/1716 1708/1708/1708 1717/1717/1717 +f 1716/1716/1716 1714/1714/1714 1718/1718/1718 1708/1708/1708 +f 1708/1708/1708 1718/1718/1718 1719/1719/1719 1722/1722/1722 +f 1717/1717/1717 1708/1708/1708 1722/1722/1722 1723/1723/1723 +f 1711/1711/1711 1710/1710/1710 1709/1709/1709 1725/1725/1725 +f 1710/1710/1710 1707/1707/1707 1717/1717/1717 1709/1709/1709 +f 1709/1709/1709 1717/1717/1717 1723/1723/1723 1726/1726/1726 +f 1725/1725/1725 1709/1709/1709 1726/1726/1726 1727/1727/1727 +f 1687/1687/1687 1686/1686/1686 1684/1684/1684 1729/1729/1729 +f 1686/1686/1686 1683/1683/1683 1730/1730/1730 1684/1684/1684 +f 1684/1684/1684 1730/1730/1730 1731/1731/1731 1733/1733/1733 +f 1729/1729/1729 1684/1684/1684 1733/1733/1733 1734/1734/1734 +f 1683/1683/1683 1682/1682/1682 1681/1681/1681 1730/1730/1730 +f 1682/1682/1682 1679/1679/1679 1705/1705/1705 1681/1681/1681 +f 1681/1681/1681 1705/1705/1705 1711/1711/1711 1736/1736/1736 +f 1730/1730/1730 1681/1681/1681 1736/1736/1736 1731/1731/1731 +f 1731/1731/1731 1736/1736/1736 1712/1712/1712 1737/1737/1737 +f 1736/1736/1736 1711/1711/1711 1725/1725/1725 1712/1712/1712 +f 1712/1712/1712 1725/1725/1725 1727/1727/1727 1738/1738/1738 +f 1737/1737/1737 1712/1712/1712 1738/1738/1738 1739/1739/1739 +f 1734/1734/1734 1733/1733/1733 1732/1732/1732 1741/1741/1741 +f 1733/1733/1733 1731/1731/1731 1737/1737/1737 1732/1732/1732 +f 1732/1732/1732 1737/1737/1737 1739/1739/1739 1742/1742/1742 +f 1741/1741/1741 1732/1732/1732 1742/1742/1742 1743/1743/1743 +f 1615/1615/1615 1614/1614/1614 1612/1612/1612 1693/1693/1693 +f 1614/1614/1614 1611/1611/1611 1745/1745/1745 1612/1612/1612 +f 1612/1612/1612 1745/1745/1745 1746/1746/1746 1748/1748/1748 +f 1693/1693/1693 1612/1612/1612 1748/1748/1748 1694/1694/1694 +f 1611/1611/1611 1610/1610/1610 1600/1600/1600 1745/1745/1745 +f 1610/1610/1610 1599/1599/1599 1749/1749/1749 1600/1600/1600 +f 1600/1600/1600 1749/1749/1749 1750/1750/1750 1752/1752/1752 +f 1745/1745/1745 1600/1600/1600 1752/1752/1752 1746/1746/1746 +f 1746/1746/1746 1752/1752/1752 1747/1747/1747 1753/1753/1753 +f 1752/1752/1752 1750/1750/1750 1754/1754/1754 1747/1747/1747 +f 1747/1747/1747 1754/1754/1754 1755/1755/1755 1758/1758/1758 +f 1753/1753/1753 1747/1747/1747 1758/1758/1758 1759/1759/1759 +f 1694/1694/1694 1748/1748/1748 1695/1695/1695 1698/1698/1698 +f 1748/1748/1748 1746/1746/1746 1753/1753/1753 1695/1695/1695 +f 1695/1695/1695 1753/1753/1753 1759/1759/1759 1760/1760/1760 +f 1698/1698/1698 1695/1695/1695 1760/1760/1760 1699/1699/1699 +f 1599/1599/1599 1598/1598/1598 1596/1596/1596 1749/1749/1749 +f 1598/1598/1598 1595/1595/1595 1761/1761/1761 1596/1596/1596 +f 1596/1596/1596 1761/1761/1761 1762/1762/1762 1764/1764/1764 +f 1749/1749/1749 1596/1596/1596 1764/1764/1764 1750/1750/1750 +f 1595/1595/1595 1594/1594/1594 1593/1593/1593 1761/1761/1761 +f 1594/1594/1594 1591/1591/1591 1765/1765/1765 1593/1593/1593 +f 1593/1593/1593 1765/1765/1765 1766/1766/1766 1768/1768/1768 +f 1761/1761/1761 1593/1593/1593 1768/1768/1768 1762/1762/1762 +f 1762/1762/1762 1768/1768/1768 1763/1763/1763 1769/1769/1769 +f 1768/1768/1768 1766/1766/1766 1770/1770/1770 1763/1763/1763 +f 1763/1763/1763 1770/1770/1770 1771/1771/1771 1774/1774/1774 +f 1769/1769/1769 1763/1763/1763 1774/1774/1774 1775/1775/1775 +f 1750/1750/1750 1764/1764/1764 1751/1751/1751 1754/1754/1754 +f 1764/1764/1764 1762/1762/1762 1769/1769/1769 1751/1751/1751 +f 1751/1751/1751 1769/1769/1769 1775/1775/1775 1776/1776/1776 +f 1754/1754/1754 1751/1751/1751 1776/1776/1776 1755/1755/1755 +f 1755/1755/1755 1776/1776/1776 1756/1756/1756 1777/1777/1777 +f 1776/1776/1776 1775/1775/1775 1778/1778/1778 1756/1756/1756 +f 1756/1756/1756 1778/1778/1778 1779/1779/1779 1782/1782/1782 +f 1777/1777/1777 1756/1756/1756 1782/1782/1782 1783/1783/1783 +f 1775/1775/1775 1774/1774/1774 1773/1773/1773 1778/1778/1778 +f 1774/1774/1774 1771/1771/1771 1785/1785/1785 1773/1773/1773 +f 1773/1773/1773 1785/1785/1785 1786/1786/1786 1788/1788/1788 +f 1778/1778/1778 1773/1773/1773 1788/1788/1788 1779/1779/1779 +f 1779/1779/1779 1788/1788/1788 1780/1780/1780 1789/1789/1789 +f 1788/1788/1788 1786/1786/1786 1790/1790/1790 1780/1780/1780 +f 1780/1780/1780 1790/1790/1790 1791/1791/1791 1794/1794/1794 +f 1789/1789/1789 1780/1780/1780 1794/1794/1794 1795/1795/1795 +f 1783/1783/1783 1782/1782/1782 1781/1781/1781 1797/1797/1797 +f 1782/1782/1782 1779/1779/1779 1789/1789/1789 1781/1781/1781 +f 1781/1781/1781 1789/1789/1789 1795/1795/1795 1798/1798/1798 +f 1797/1797/1797 1781/1781/1781 1798/1798/1798 1799/1799/1799 +f 1699/1699/1699 1760/1760/1760 1700/1700/1700 1713/1713/1713 +f 1760/1760/1760 1759/1759/1759 1801/1801/1801 1700/1700/1700 +f 1700/1700/1700 1801/1801/1801 1802/1802/1802 1803/1803/1803 +f 1713/1713/1713 1700/1700/1700 1803/1803/1803 1714/1714/1714 +f 1759/1759/1759 1758/1758/1758 1757/1757/1757 1801/1801/1801 +f 1758/1758/1758 1755/1755/1755 1777/1777/1777 1757/1757/1757 +f 1757/1757/1757 1777/1777/1777 1783/1783/1783 1804/1804/1804 +f 1801/1801/1801 1757/1757/1757 1804/1804/1804 1802/1802/1802 +f 1802/1802/1802 1804/1804/1804 1784/1784/1784 1805/1805/1805 +f 1804/1804/1804 1783/1783/1783 1797/1797/1797 1784/1784/1784 +f 1784/1784/1784 1797/1797/1797 1799/1799/1799 1806/1806/1806 +f 1805/1805/1805 1784/1784/1784 1806/1806/1806 1807/1807/1807 +f 1714/1714/1714 1803/1803/1803 1715/1715/1715 1718/1718/1718 +f 1803/1803/1803 1802/1802/1802 1805/1805/1805 1715/1715/1715 +f 1715/1715/1715 1805/1805/1805 1807/1807/1807 1808/1808/1808 +f 1718/1718/1718 1715/1715/1715 1808/1808/1808 1719/1719/1719 +f 1719/1719/1719 1808/1808/1808 1720/1720/1720 1809/1809/1809 +f 1808/1808/1808 1807/1807/1807 1810/1810/1810 1720/1720/1720 +f 1720/1720/1720 1810/1810/1810 1811/1811/1811 1814/1814/1814 +f 1809/1809/1809 1720/1720/1720 1814/1814/1814 1815/1815/1815 +f 1807/1807/1807 1806/1806/1806 1800/1800/1800 1810/1810/1810 +f 1806/1806/1806 1799/1799/1799 1817/1817/1817 1800/1800/1800 +f 1800/1800/1800 1817/1817/1817 1818/1818/1818 1820/1820/1820 +f 1810/1810/1810 1800/1800/1800 1820/1820/1820 1811/1811/1811 +f 1811/1811/1811 1820/1820/1820 1812/1812/1812 1821/1821/1821 +f 1820/1820/1820 1818/1818/1818 1822/1822/1822 1812/1812/1812 +f 1812/1812/1812 1822/1822/1822 1823/1823/1823 1826/1826/1826 +f 1821/1821/1821 1812/1812/1812 1826/1826/1826 1827/1827/1827 +f 1815/1815/1815 1814/1814/1814 1813/1813/1813 1829/1829/1829 +f 1814/1814/1814 1811/1811/1811 1821/1821/1821 1813/1813/1813 +f 1813/1813/1813 1821/1821/1821 1827/1827/1827 1830/1830/1830 +f 1829/1829/1829 1813/1813/1813 1830/1830/1830 1831/1831/1831 +f 1799/1799/1799 1798/1798/1798 1796/1796/1796 1817/1817/1817 +f 1798/1798/1798 1795/1795/1795 1833/1833/1833 1796/1796/1796 +f 1796/1796/1796 1833/1833/1833 1834/1834/1834 1836/1836/1836 +f 1817/1817/1817 1796/1796/1796 1836/1836/1836 1818/1818/1818 +f 1795/1795/1795 1794/1794/1794 1793/1793/1793 1833/1833/1833 +f 1794/1794/1794 1791/1791/1791 1837/1837/1837 1793/1793/1793 +f 1793/1793/1793 1837/1837/1837 1838/1838/1838 1840/1840/1840 +f 1833/1833/1833 1793/1793/1793 1840/1840/1840 1834/1834/1834 +f 1834/1834/1834 1840/1840/1840 1835/1835/1835 1841/1841/1841 +f 1840/1840/1840 1838/1838/1838 1842/1842/1842 1835/1835/1835 +f 1835/1835/1835 1842/1842/1842 1843/1843/1843 1846/1846/1846 +f 1841/1841/1841 1835/1835/1835 1846/1846/1846 1847/1847/1847 +f 1818/1818/1818 1836/1836/1836 1819/1819/1819 1822/1822/1822 +f 1836/1836/1836 1834/1834/1834 1841/1841/1841 1819/1819/1819 +f 1819/1819/1819 1841/1841/1841 1847/1847/1847 1848/1848/1848 +f 1822/1822/1822 1819/1819/1819 1848/1848/1848 1823/1823/1823 +f 1823/1823/1823 1848/1848/1848 1824/1824/1824 1849/1849/1849 +f 1848/1848/1848 1847/1847/1847 1850/1850/1850 1824/1824/1824 +f 1824/1824/1824 1850/1850/1850 1851/1851/1851 1854/1854/1854 +f 1849/1849/1849 1824/1824/1824 1854/1854/1854 1855/1855/1855 +f 1847/1847/1847 1846/1846/1846 1845/1845/1845 1850/1850/1850 +f 1846/1846/1846 1843/1843/1843 1857/1857/1857 1845/1845/1845 +f 1845/1845/1845 1857/1857/1857 1858/1858/1858 1860/1860/1860 +f 1850/1850/1850 1845/1845/1845 1860/1860/1860 1851/1851/1851 +f 1851/1851/1851 1860/1860/1860 1852/1852/1852 1861/1861/1861 +f 1860/1860/1860 1858/1858/1858 1862/1862/1862 1852/1852/1852 +f 1852/1852/1852 1862/1862/1862 1863/1863/1863 1864/1864/1864 +f 1861/1861/1861 1852/1852/1852 1864/1864/1864 1865/1865/1865 +f 1855/1855/1855 1854/1854/1854 1853/1853/1853 1866/1866/1866 +f 1854/1854/1854 1851/1851/1851 1861/1861/1861 1853/1853/1853 +f 1853/1853/1853 1861/1861/1861 1865/1865/1865 1867/1867/1867 +f 1866/1866/1866 1853/1853/1853 1867/1867/1867 1868/1868/1868 +f 1831/1831/1831 1830/1830/1830 1828/1828/1828 1869/1869/1869 +f 1830/1830/1830 1827/1827/1827 1870/1870/1870 1828/1828/1828 +f 1828/1828/1828 1870/1870/1870 1871/1871/1871 1873/1873/1873 +f 1869/1869/1869 1828/1828/1828 1873/1873/1873 1874/1874/1874 +f 1827/1827/1827 1826/1826/1826 1825/1825/1825 1870/1870/1870 +f 1826/1826/1826 1823/1823/1823 1849/1849/1849 1825/1825/1825 +f 1825/1825/1825 1849/1849/1849 1855/1855/1855 1876/1876/1876 +f 1870/1870/1870 1825/1825/1825 1876/1876/1876 1871/1871/1871 +f 1871/1871/1871 1876/1876/1876 1856/1856/1856 1877/1877/1877 +f 1876/1876/1876 1855/1855/1855 1866/1866/1866 1856/1856/1856 +f 1856/1856/1856 1866/1866/1866 1868/1868/1868 1878/1878/1878 +f 1877/1877/1877 1856/1856/1856 1878/1878/1878 1879/1879/1879 +f 1874/1874/1874 1873/1873/1873 1872/1872/1872 1880/1880/1880 +f 1873/1873/1873 1871/1871/1871 1877/1877/1877 1872/1872/1872 +f 1872/1872/1872 1877/1877/1877 1879/1879/1879 1881/1881/1881 +f 1880/1880/1880 1872/1872/1872 1881/1881/1881 1882/1882/1882 +f 1743/1743/1743 1742/1742/1742 1740/1740/1740 1883/1883/1883 +f 1742/1742/1742 1739/1739/1739 1884/1884/1884 1740/1740/1740 +f 1740/1740/1740 1884/1884/1884 1885/1885/1885 1888/1888/1888 +f 1883/1883/1883 1740/1740/1740 1888/1888/1888 1889/1889/1889 +f 1739/1739/1739 1738/1738/1738 1728/1728/1728 1884/1884/1884 +f 1738/1738/1738 1727/1727/1727 1891/1891/1891 1728/1728/1728 +f 1728/1728/1728 1891/1891/1891 1892/1892/1892 1894/1894/1894 +f 1884/1884/1884 1728/1728/1728 1894/1894/1894 1885/1885/1885 +f 1885/1885/1885 1894/1894/1894 1886/1886/1886 1895/1895/1895 +f 1894/1894/1894 1892/1892/1892 1896/1896/1896 1886/1886/1886 +f 1886/1886/1886 1896/1896/1896 1897/1897/1897 1900/1900/1900 +f 1895/1895/1895 1886/1886/1886 1900/1900/1900 1901/1901/1901 +f 1889/1889/1889 1888/1888/1888 1887/1887/1887 1903/1903/1903 +f 1888/1888/1888 1885/1885/1885 1895/1895/1895 1887/1887/1887 +f 1887/1887/1887 1895/1895/1895 1901/1901/1901 1904/1904/1904 +f 1903/1903/1903 1887/1887/1887 1904/1904/1904 1905/1905/1905 +f 1727/1727/1727 1726/1726/1726 1724/1724/1724 1891/1891/1891 +f 1726/1726/1726 1723/1723/1723 1907/1907/1907 1724/1724/1724 +f 1724/1724/1724 1907/1907/1907 1908/1908/1908 1909/1909/1909 +f 1891/1891/1891 1724/1724/1724 1909/1909/1909 1892/1892/1892 +f 1723/1723/1723 1722/1722/1722 1721/1721/1721 1907/1907/1907 +f 1722/1722/1722 1719/1719/1719 1809/1809/1809 1721/1721/1721 +f 1721/1721/1721 1809/1809/1809 1815/1815/1815 1910/1910/1910 +f 1907/1907/1907 1721/1721/1721 1910/1910/1910 1908/1908/1908 +f 1908/1908/1908 1910/1910/1910 1816/1816/1816 1911/1911/1911 +f 1910/1910/1910 1815/1815/1815 1829/1829/1829 1816/1816/1816 +f 1816/1816/1816 1829/1829/1829 1831/1831/1831 1912/1912/1912 +f 1911/1911/1911 1816/1816/1816 1912/1912/1912 1913/1913/1913 +f 1892/1892/1892 1909/1909/1909 1893/1893/1893 1896/1896/1896 +f 1909/1909/1909 1908/1908/1908 1911/1911/1911 1893/1893/1893 +f 1893/1893/1893 1911/1911/1911 1913/1913/1913 1914/1914/1914 +f 1896/1896/1896 1893/1893/1893 1914/1914/1914 1897/1897/1897 +f 1897/1897/1897 1914/1914/1914 1898/1898/1898 1915/1915/1915 +f 1914/1914/1914 1913/1913/1913 1916/1916/1916 1898/1898/1898 +f 1898/1898/1898 1916/1916/1916 1917/1917/1917 1919/1919/1919 +f 1915/1915/1915 1898/1898/1898 1919/1919/1919 1920/1920/1920 +f 1913/1913/1913 1912/1912/1912 1832/1832/1832 1916/1916/1916 +f 1912/1912/1912 1831/1831/1831 1869/1869/1869 1832/1832/1832 +f 1832/1832/1832 1869/1869/1869 1874/1874/1874 1922/1922/1922 +f 1916/1916/1916 1832/1832/1832 1922/1922/1922 1917/1917/1917 +f 1917/1917/1917 1922/1922/1922 1875/1875/1875 1923/1923/1923 +f 1922/1922/1922 1874/1874/1874 1880/1880/1880 1875/1875/1875 +f 1875/1875/1875 1880/1880/1880 1882/1882/1882 1924/1924/1924 +f 1923/1923/1923 1875/1875/1875 1924/1924/1924 1925/1925/1925 +f 1920/1920/1920 1919/1919/1919 1918/1918/1918 1926/1926/1926 +f 1919/1919/1919 1917/1917/1917 1923/1923/1923 1918/1918/1918 +f 1918/1918/1918 1923/1923/1923 1925/1925/1925 1927/1927/1927 +f 1926/1926/1926 1918/1918/1918 1927/1927/1927 1928/1928/1928 +f 1905/1905/1905 1904/1904/1904 1902/1902/1902 1929/1929/1929 +f 1904/1904/1904 1901/1901/1901 1930/1930/1930 1902/1902/1902 +f 1902/1902/1902 1930/1930/1930 1931/1931/1931 1933/1933/1933 +f 1929/1929/1929 1902/1902/1902 1933/1933/1933 1934/1934/1934 +f 1901/1901/1901 1900/1900/1900 1899/1899/1899 1930/1930/1930 +f 1900/1900/1900 1897/1897/1897 1915/1915/1915 1899/1899/1899 +f 1899/1899/1899 1915/1915/1915 1920/1920/1920 1936/1936/1936 +f 1930/1930/1930 1899/1899/1899 1936/1936/1936 1931/1931/1931 +f 1931/1931/1931 1936/1936/1936 1921/1921/1921 1937/1937/1937 +f 1936/1936/1936 1920/1920/1920 1926/1926/1926 1921/1921/1921 +f 1921/1921/1921 1926/1926/1926 1928/1928/1928 1938/1938/1938 +f 1937/1937/1937 1921/1921/1921 1938/1938/1938 1939/1939/1939 +f 1934/1934/1934 1933/1933/1933 1932/1932/1932 1940/1940/1940 +f 1933/1933/1933 1931/1931/1931 1937/1937/1937 1932/1932/1932 +f 1932/1932/1932 1937/1937/1937 1939/1939/1939 1941/1941/1941 +f 1940/1940/1940 1932/1932/1932 1941/1941/1941 1942/1942/1942 +f 512/512/512 1384/1384/1384 513/513/513 686/686/686 +f 1384/1384/1384 1383/1383/1383 1943/1943/1943 513/513/513 +f 513/513/513 1943/1943/1943 1944/1944/1944 1946/1946/1946 +f 686/686/686 513/513/513 1946/1946/1946 687/687/687 +f 1383/1383/1383 1382/1382/1382 1376/1376/1376 1943/1943/1943 +f 1382/1382/1382 1375/1375/1375 1947/1947/1947 1376/1376/1376 +f 1376/1376/1376 1947/1947/1947 1948/1948/1948 1950/1950/1950 +f 1943/1943/1943 1376/1376/1376 1950/1950/1950 1944/1944/1944 +f 1944/1944/1944 1950/1950/1950 1945/1945/1945 1951/1951/1951 +f 1950/1950/1950 1948/1948/1948 1952/1952/1952 1945/1945/1945 +f 1945/1945/1945 1952/1952/1952 1953/1953/1953 1956/1956/1956 +f 1951/1951/1951 1945/1945/1945 1956/1956/1956 1957/1957/1957 +f 687/687/687 1946/1946/1946 688/688/688 691/691/691 +f 1946/1946/1946 1944/1944/1944 1951/1951/1951 688/688/688 +f 688/688/688 1951/1951/1951 1957/1957/1957 1958/1958/1958 +f 691/691/691 688/688/688 1958/1958/1958 692/692/692 +f 1375/1375/1375 1374/1374/1374 1372/1372/1372 1947/1947/1947 +f 1374/1374/1374 1371/1371/1371 1959/1959/1959 1372/1372/1372 +f 1372/1372/1372 1959/1959/1959 1960/1960/1960 1962/1962/1962 +f 1947/1947/1947 1372/1372/1372 1962/1962/1962 1948/1948/1948 +f 1371/1371/1371 1370/1370/1370 1336/1336/1336 1959/1959/1959 +f 1370/1370/1370 1335/1335/1335 1963/1963/1963 1336/1336/1336 +f 1336/1336/1336 1963/1963/1963 1964/1964/1964 1966/1966/1966 +f 1959/1959/1959 1336/1336/1336 1966/1966/1966 1960/1960/1960 +f 1960/1960/1960 1966/1966/1966 1961/1961/1961 1967/1967/1967 +f 1966/1966/1966 1964/1964/1964 1968/1968/1968 1961/1961/1961 +f 1961/1961/1961 1968/1968/1968 1969/1969/1969 1972/1972/1972 +f 1967/1967/1967 1961/1961/1961 1972/1972/1972 1973/1973/1973 +f 1948/1948/1948 1962/1962/1962 1949/1949/1949 1952/1952/1952 +f 1962/1962/1962 1960/1960/1960 1967/1967/1967 1949/1949/1949 +f 1949/1949/1949 1967/1967/1967 1973/1973/1973 1974/1974/1974 +f 1952/1952/1952 1949/1949/1949 1974/1974/1974 1953/1953/1953 +f 1953/1953/1953 1974/1974/1974 1954/1954/1954 1975/1975/1975 +f 1974/1974/1974 1973/1973/1973 1976/1976/1976 1954/1954/1954 +f 1954/1954/1954 1976/1976/1976 1977/1977/1977 1980/1980/1980 +f 1975/1975/1975 1954/1954/1954 1980/1980/1980 1981/1981/1981 +f 1973/1973/1973 1972/1972/1972 1971/1971/1971 1976/1976/1976 +f 1972/1972/1972 1969/1969/1969 1983/1983/1983 1971/1971/1971 +f 1971/1971/1971 1983/1983/1983 1984/1984/1984 1986/1986/1986 +f 1976/1976/1976 1971/1971/1971 1986/1986/1986 1977/1977/1977 +f 1977/1977/1977 1986/1986/1986 1978/1978/1978 1987/1987/1987 +f 1986/1986/1986 1984/1984/1984 1988/1988/1988 1978/1978/1978 +f 1978/1978/1978 1988/1988/1988 1989/1989/1989 1992/1992/1992 +f 1987/1987/1987 1978/1978/1978 1992/1992/1992 1993/1993/1993 +f 1981/1981/1981 1980/1980/1980 1979/1979/1979 1995/1995/1995 +f 1980/1980/1980 1977/1977/1977 1987/1987/1987 1979/1979/1979 +f 1979/1979/1979 1987/1987/1987 1993/1993/1993 1996/1996/1996 +f 1995/1995/1995 1979/1979/1979 1996/1996/1996 1997/1997/1997 +f 692/692/692 1958/1958/1958 693/693/693 706/706/706 +f 1958/1958/1958 1957/1957/1957 1999/1999/1999 693/693/693 +f 693/693/693 1999/1999/1999 2000/2000/2000 2001/2001/2001 +f 706/706/706 693/693/693 2001/2001/2001 707/707/707 +f 1957/1957/1957 1956/1956/1956 1955/1955/1955 1999/1999/1999 +f 1956/1956/1956 1953/1953/1953 1975/1975/1975 1955/1955/1955 +f 1955/1955/1955 1975/1975/1975 1981/1981/1981 2002/2002/2002 +f 1999/1999/1999 1955/1955/1955 2002/2002/2002 2000/2000/2000 +f 2000/2000/2000 2002/2002/2002 1982/1982/1982 2003/2003/2003 +f 2002/2002/2002 1981/1981/1981 1995/1995/1995 1982/1982/1982 +f 1982/1982/1982 1995/1995/1995 1997/1997/1997 2004/2004/2004 +f 2003/2003/2003 1982/1982/1982 2004/2004/2004 2005/2005/2005 +f 707/707/707 2001/2001/2001 708/708/708 711/711/711 +f 2001/2001/2001 2000/2000/2000 2003/2003/2003 708/708/708 +f 708/708/708 2003/2003/2003 2005/2005/2005 2006/2006/2006 +f 711/711/711 708/708/708 2006/2006/2006 712/712/712 +f 1335/1335/1335 1334/1334/1334 1332/1332/1332 1963/1963/1963 +f 1334/1334/1334 1331/1331/1331 2007/2007/2007 1332/1332/1332 +f 1332/1332/1332 2007/2007/2007 2008/2008/2008 2010/2010/2010 +f 1963/1963/1963 1332/1332/1332 2010/2010/2010 1964/1964/1964 +f 1331/1331/1331 1330/1330/1330 1320/1320/1320 2007/2007/2007 +f 1330/1330/1330 1319/1319/1319 2011/2011/2011 1320/1320/1320 +f 1320/1320/1320 2011/2011/2011 2012/2012/2012 2014/2014/2014 +f 2007/2007/2007 1320/1320/1320 2014/2014/2014 2008/2008/2008 +f 2008/2008/2008 2014/2014/2014 2009/2009/2009 2015/2015/2015 +f 2014/2014/2014 2012/2012/2012 2016/2016/2016 2009/2009/2009 +f 2009/2009/2009 2016/2016/2016 2017/2017/2017 2020/2020/2020 +f 2015/2015/2015 2009/2009/2009 2020/2020/2020 2021/2021/2021 +f 1964/1964/1964 2010/2010/2010 1965/1965/1965 1968/1968/1968 +f 2010/2010/2010 2008/2008/2008 2015/2015/2015 1965/1965/1965 +f 1965/1965/1965 2015/2015/2015 2021/2021/2021 2022/2022/2022 +f 1968/1968/1968 1965/1965/1965 2022/2022/2022 1969/1969/1969 +f 1319/1319/1319 1318/1318/1318 1316/1316/1316 2011/2011/2011 +f 1318/1318/1318 1315/1315/1315 2023/2023/2023 1316/1316/1316 +f 1316/1316/1316 2023/2023/2023 2024/2024/2024 2025/2025/2025 +f 2011/2011/2011 1316/1316/1316 2025/2025/2025 2012/2012/2012 +f 1315/1315/1315 1314/1314/1314 1313/1313/1313 2023/2023/2023 +f 1314/1314/1314 1311/1311/1311 1665/1665/1665 1313/1313/1313 +f 1313/1313/1313 1665/1665/1665 1671/1671/1671 2026/2026/2026 +f 2023/2023/2023 1313/1313/1313 2026/2026/2026 2024/2024/2024 +f 2024/2024/2024 2026/2026/2026 1672/1672/1672 2027/2027/2027 +f 2026/2026/2026 1671/1671/1671 1685/1685/1685 1672/1672/1672 +f 1672/1672/1672 1685/1685/1685 1687/1687/1687 2028/2028/2028 +f 2027/2027/2027 1672/1672/1672 2028/2028/2028 2029/2029/2029 +f 2012/2012/2012 2025/2025/2025 2013/2013/2013 2016/2016/2016 +f 2025/2025/2025 2024/2024/2024 2027/2027/2027 2013/2013/2013 +f 2013/2013/2013 2027/2027/2027 2029/2029/2029 2030/2030/2030 +f 2016/2016/2016 2013/2013/2013 2030/2030/2030 2017/2017/2017 +f 2017/2017/2017 2030/2030/2030 2018/2018/2018 2031/2031/2031 +f 2030/2030/2030 2029/2029/2029 2032/2032/2032 2018/2018/2018 +f 2018/2018/2018 2032/2032/2032 2033/2033/2033 2035/2035/2035 +f 2031/2031/2031 2018/2018/2018 2035/2035/2035 2036/2036/2036 +f 2029/2029/2029 2028/2028/2028 1688/1688/1688 2032/2032/2032 +f 2028/2028/2028 1687/1687/1687 1729/1729/1729 1688/1688/1688 +f 1688/1688/1688 1729/1729/1729 1734/1734/1734 2038/2038/2038 +f 2032/2032/2032 1688/1688/1688 2038/2038/2038 2033/2033/2033 +f 2033/2033/2033 2038/2038/2038 1735/1735/1735 2039/2039/2039 +f 2038/2038/2038 1734/1734/1734 1741/1741/1741 1735/1735/1735 +f 1735/1735/1735 1741/1741/1741 1743/1743/1743 2040/2040/2040 +f 2039/2039/2039 1735/1735/1735 2040/2040/2040 2041/2041/2041 +f 2036/2036/2036 2035/2035/2035 2034/2034/2034 2043/2043/2043 +f 2035/2035/2035 2033/2033/2033 2039/2039/2039 2034/2034/2034 +f 2034/2034/2034 2039/2039/2039 2041/2041/2041 2044/2044/2044 +f 2043/2043/2043 2034/2034/2034 2044/2044/2044 2045/2045/2045 +f 1969/1969/1969 2022/2022/2022 1970/1970/1970 1983/1983/1983 +f 2022/2022/2022 2021/2021/2021 2047/2047/2047 1970/1970/1970 +f 1970/1970/1970 2047/2047/2047 2048/2048/2048 2049/2049/2049 +f 1983/1983/1983 1970/1970/1970 2049/2049/2049 1984/1984/1984 +f 2021/2021/2021 2020/2020/2020 2019/2019/2019 2047/2047/2047 +f 2020/2020/2020 2017/2017/2017 2031/2031/2031 2019/2019/2019 +f 2019/2019/2019 2031/2031/2031 2036/2036/2036 2050/2050/2050 +f 2047/2047/2047 2019/2019/2019 2050/2050/2050 2048/2048/2048 +f 2048/2048/2048 2050/2050/2050 2037/2037/2037 2051/2051/2051 +f 2050/2050/2050 2036/2036/2036 2043/2043/2043 2037/2037/2037 +f 2037/2037/2037 2043/2043/2043 2045/2045/2045 2052/2052/2052 +f 2051/2051/2051 2037/2037/2037 2052/2052/2052 2053/2053/2053 +f 1984/1984/1984 2049/2049/2049 1985/1985/1985 1988/1988/1988 +f 2049/2049/2049 2048/2048/2048 2051/2051/2051 1985/1985/1985 +f 1985/1985/1985 2051/2051/2051 2053/2053/2053 2054/2054/2054 +f 1988/1988/1988 1985/1985/1985 2054/2054/2054 1989/1989/1989 +f 1989/1989/1989 2054/2054/2054 1990/1990/1990 2055/2055/2055 +f 2054/2054/2054 2053/2053/2053 2056/2056/2056 1990/1990/1990 +f 1990/1990/1990 2056/2056/2056 2057/2057/2057 2060/2060/2060 +f 2055/2055/2055 1990/1990/1990 2060/2060/2060 2061/2061/2061 +f 2053/2053/2053 2052/2052/2052 2046/2046/2046 2056/2056/2056 +f 2052/2052/2052 2045/2045/2045 2063/2063/2063 2046/2046/2046 +f 2046/2046/2046 2063/2063/2063 2064/2064/2064 2066/2066/2066 +f 2056/2056/2056 2046/2046/2046 2066/2066/2066 2057/2057/2057 +f 2057/2057/2057 2066/2066/2066 2058/2058/2058 2067/2067/2067 +f 2066/2066/2066 2064/2064/2064 2068/2068/2068 2058/2058/2058 +f 2058/2058/2058 2068/2068/2068 2069/2069/2069 2072/2072/2072 +f 2067/2067/2067 2058/2058/2058 2072/2072/2072 2073/2073/2073 +f 2061/2061/2061 2060/2060/2060 2059/2059/2059 2075/2075/2075 +f 2060/2060/2060 2057/2057/2057 2067/2067/2067 2059/2059/2059 +f 2059/2059/2059 2067/2067/2067 2073/2073/2073 2076/2076/2076 +f 2075/2075/2075 2059/2059/2059 2076/2076/2076 2077/2077/2077 +f 2045/2045/2045 2044/2044/2044 2042/2042/2042 2063/2063/2063 +f 2044/2044/2044 2041/2041/2041 2079/2079/2079 2042/2042/2042 +f 2042/2042/2042 2079/2079/2079 2080/2080/2080 2081/2081/2081 +f 2063/2063/2063 2042/2042/2042 2081/2081/2081 2064/2064/2064 +f 2041/2041/2041 2040/2040/2040 1744/1744/1744 2079/2079/2079 +f 2040/2040/2040 1743/1743/1743 1883/1883/1883 1744/1744/1744 +f 1744/1744/1744 1883/1883/1883 1889/1889/1889 2082/2082/2082 +f 2079/2079/2079 1744/1744/1744 2082/2082/2082 2080/2080/2080 +f 2080/2080/2080 2082/2082/2082 1890/1890/1890 2083/2083/2083 +f 2082/2082/2082 1889/1889/1889 1903/1903/1903 1890/1890/1890 +f 1890/1890/1890 1903/1903/1903 1905/1905/1905 2084/2084/2084 +f 2083/2083/2083 1890/1890/1890 2084/2084/2084 2085/2085/2085 +f 2064/2064/2064 2081/2081/2081 2065/2065/2065 2068/2068/2068 +f 2081/2081/2081 2080/2080/2080 2083/2083/2083 2065/2065/2065 +f 2065/2065/2065 2083/2083/2083 2085/2085/2085 2086/2086/2086 +f 2068/2068/2068 2065/2065/2065 2086/2086/2086 2069/2069/2069 +f 2069/2069/2069 2086/2086/2086 2070/2070/2070 2087/2087/2087 +f 2086/2086/2086 2085/2085/2085 2088/2088/2088 2070/2070/2070 +f 2070/2070/2070 2088/2088/2088 2089/2089/2089 2091/2091/2091 +f 2087/2087/2087 2070/2070/2070 2091/2091/2091 2092/2092/2092 +f 2085/2085/2085 2084/2084/2084 1906/1906/1906 2088/2088/2088 +f 2084/2084/2084 1905/1905/1905 1929/1929/1929 1906/1906/1906 +f 1906/1906/1906 1929/1929/1929 1934/1934/1934 2094/2094/2094 +f 2088/2088/2088 1906/1906/1906 2094/2094/2094 2089/2089/2089 +f 2089/2089/2089 2094/2094/2094 1935/1935/1935 2095/2095/2095 +f 2094/2094/2094 1934/1934/1934 1940/1940/1940 1935/1935/1935 +f 1935/1935/1935 1940/1940/1940 1942/1942/1942 2096/2096/2096 +f 2095/2095/2095 1935/1935/1935 2096/2096/2096 2097/2097/2097 +f 2092/2092/2092 2091/2091/2091 2090/2090/2090 2098/2098/2098 +f 2091/2091/2091 2089/2089/2089 2095/2095/2095 2090/2090/2090 +f 2090/2090/2090 2095/2095/2095 2097/2097/2097 2099/2099/2099 +f 2098/2098/2098 2090/2090/2090 2099/2099/2099 2100/2100/2100 +f 2077/2077/2077 2076/2076/2076 2074/2074/2074 2101/2101/2101 +f 2076/2076/2076 2073/2073/2073 2102/2102/2102 2074/2074/2074 +f 2074/2074/2074 2102/2102/2102 2103/2103/2103 2105/2105/2105 +f 2101/2101/2101 2074/2074/2074 2105/2105/2105 2106/2106/2106 +f 2073/2073/2073 2072/2072/2072 2071/2071/2071 2102/2102/2102 +f 2072/2072/2072 2069/2069/2069 2087/2087/2087 2071/2071/2071 +f 2071/2071/2071 2087/2087/2087 2092/2092/2092 2108/2108/2108 +f 2102/2102/2102 2071/2071/2071 2108/2108/2108 2103/2103/2103 +f 2103/2103/2103 2108/2108/2108 2093/2093/2093 2109/2109/2109 +f 2108/2108/2108 2092/2092/2092 2098/2098/2098 2093/2093/2093 +f 2093/2093/2093 2098/2098/2098 2100/2100/2100 2110/2110/2110 +f 2109/2109/2109 2093/2093/2093 2110/2110/2110 2111/2111/2111 +f 2106/2106/2106 2105/2105/2105 2104/2104/2104 2112/2112/2112 +f 2105/2105/2105 2103/2103/2103 2109/2109/2109 2104/2104/2104 +f 2104/2104/2104 2109/2109/2109 2111/2111/2111 2113/2113/2113 +f 2112/2112/2112 2104/2104/2104 2113/2113/2113 2114/2114/2114 +f 712/712/712 2006/2006/2006 713/713/713 758/758/758 +f 2006/2006/2006 2005/2005/2005 2115/2115/2115 713/713/713 +f 713/713/713 2115/2115/2115 2116/2116/2116 2118/2118/2118 +f 758/758/758 713/713/713 2118/2118/2118 759/759/759 +f 2005/2005/2005 2004/2004/2004 1998/1998/1998 2115/2115/2115 +f 2004/2004/2004 1997/1997/1997 2119/2119/2119 1998/1998/1998 +f 1998/1998/1998 2119/2119/2119 2120/2120/2120 2122/2122/2122 +f 2115/2115/2115 1998/1998/1998 2122/2122/2122 2116/2116/2116 +f 2116/2116/2116 2122/2122/2122 2117/2117/2117 2123/2123/2123 +f 2122/2122/2122 2120/2120/2120 2124/2124/2124 2117/2117/2117 +f 2117/2117/2117 2124/2124/2124 2125/2125/2125 2128/2128/2128 +f 2123/2123/2123 2117/2117/2117 2128/2128/2128 2129/2129/2129 +f 759/759/759 2118/2118/2118 760/760/760 763/763/763 +f 2118/2118/2118 2116/2116/2116 2123/2123/2123 760/760/760 +f 760/760/760 2123/2123/2123 2129/2129/2129 2130/2130/2130 +f 763/763/763 760/760/760 2130/2130/2130 764/764/764 +f 1997/1997/1997 1996/1996/1996 1994/1994/1994 2119/2119/2119 +f 1996/1996/1996 1993/1993/1993 2131/2131/2131 1994/1994/1994 +f 1994/1994/1994 2131/2131/2131 2132/2132/2132 2133/2133/2133 +f 2119/2119/2119 1994/1994/1994 2133/2133/2133 2120/2120/2120 +f 1993/1993/1993 1992/1992/1992 1991/1991/1991 2131/2131/2131 +f 1992/1992/1992 1989/1989/1989 2055/2055/2055 1991/1991/1991 +f 1991/1991/1991 2055/2055/2055 2061/2061/2061 2134/2134/2134 +f 2131/2131/2131 1991/1991/1991 2134/2134/2134 2132/2132/2132 +f 2132/2132/2132 2134/2134/2134 2062/2062/2062 2135/2135/2135 +f 2134/2134/2134 2061/2061/2061 2075/2075/2075 2062/2062/2062 +f 2062/2062/2062 2075/2075/2075 2077/2077/2077 2136/2136/2136 +f 2135/2135/2135 2062/2062/2062 2136/2136/2136 2137/2137/2137 +f 2120/2120/2120 2133/2133/2133 2121/2121/2121 2124/2124/2124 +f 2133/2133/2133 2132/2132/2132 2135/2135/2135 2121/2121/2121 +f 2121/2121/2121 2135/2135/2135 2137/2137/2137 2138/2138/2138 +f 2124/2124/2124 2121/2121/2121 2138/2138/2138 2125/2125/2125 +f 2125/2125/2125 2138/2138/2138 2126/2126/2126 2139/2139/2139 +f 2138/2138/2138 2137/2137/2137 2140/2140/2140 2126/2126/2126 +f 2126/2126/2126 2140/2140/2140 2141/2141/2141 2143/2143/2143 +f 2139/2139/2139 2126/2126/2126 2143/2143/2143 2144/2144/2144 +f 2137/2137/2137 2136/2136/2136 2078/2078/2078 2140/2140/2140 +f 2136/2136/2136 2077/2077/2077 2101/2101/2101 2078/2078/2078 +f 2078/2078/2078 2101/2101/2101 2106/2106/2106 2146/2146/2146 +f 2140/2140/2140 2078/2078/2078 2146/2146/2146 2141/2141/2141 +f 2141/2141/2141 2146/2146/2146 2107/2107/2107 2147/2147/2147 +f 2146/2146/2146 2106/2106/2106 2112/2112/2112 2107/2107/2107 +f 2107/2107/2107 2112/2112/2112 2114/2114/2114 2148/2148/2148 +f 2147/2147/2147 2107/2107/2107 2148/2148/2148 2149/2149/2149 +f 2144/2144/2144 2143/2143/2143 2142/2142/2142 2150/2150/2150 +f 2143/2143/2143 2141/2141/2141 2147/2147/2147 2142/2142/2142 +f 2142/2142/2142 2147/2147/2147 2149/2149/2149 2151/2151/2151 +f 2150/2150/2150 2142/2142/2142 2151/2151/2151 2152/2152/2152 +f 764/764/764 2130/2130/2130 765/765/765 778/778/778 +f 2130/2130/2130 2129/2129/2129 2153/2153/2153 765/765/765 +f 765/765/765 2153/2153/2153 2154/2154/2154 2155/2155/2155 +f 778/778/778 765/765/765 2155/2155/2155 779/779/779 +f 2129/2129/2129 2128/2128/2128 2127/2127/2127 2153/2153/2153 +f 2128/2128/2128 2125/2125/2125 2139/2139/2139 2127/2127/2127 +f 2127/2127/2127 2139/2139/2139 2144/2144/2144 2156/2156/2156 +f 2153/2153/2153 2127/2127/2127 2156/2156/2156 2154/2154/2154 +f 2154/2154/2154 2156/2156/2156 2145/2145/2145 2157/2157/2157 +f 2156/2156/2156 2144/2144/2144 2150/2150/2150 2145/2145/2145 +f 2145/2145/2145 2150/2150/2150 2152/2152/2152 2158/2158/2158 +f 2157/2157/2157 2145/2145/2145 2158/2158/2158 2159/2159/2159 +f 779/779/779 2155/2155/2155 780/780/780 783/783/783 +f 2155/2155/2155 2154/2154/2154 2157/2157/2157 780/780/780 +f 780/780/780 2157/2157/2157 2159/2159/2159 2160/2160/2160 +f 783/783/783 780/780/780 2160/2160/2160 784/784/784 +f 1491/1491/1491 2161/2161/2161 1493/1493/1493 1492/1492/1492 +f 2161/2161/2161 2162/2162/2162 2163/2163/2163 1493/1493/1493 +f 1493/1493/1493 2163/2163/2163 2165/2165/2165 2167/2167/2167 +f 1492/1492/1492 1493/1493/1493 2167/2167/2167 1494/1494/1494 +f 2162/2162/2162 2168/2168/2168 2164/2164/2164 2163/2163/2163 +f 2168/2168/2168 2169/2169/2169 2170/2170/2170 2164/2164/2164 +f 2164/2164/2164 2170/2170/2170 2172/2172/2172 2174/2174/2174 +f 2163/2163/2163 2164/2164/2164 2174/2174/2174 2165/2165/2165 +f 2165/2165/2165 2174/2174/2174 2166/2166/2166 2175/2175/2175 +f 2174/2174/2174 2172/2172/2172 2176/2176/2176 2166/2166/2166 +f 2166/2166/2166 2176/2176/2176 2177/2177/2177 2180/2180/2180 +f 2175/2175/2175 2166/2166/2166 2180/2180/2180 2181/2181/2181 +f 1494/1494/1494 2167/2167/2167 1495/1495/1495 1498/1498/1498 +f 2167/2167/2167 2165/2165/2165 2175/2175/2175 1495/1495/1495 +f 1495/1495/1495 2175/2175/2175 2181/2181/2181 2182/2182/2182 +f 1498/1498/1498 1495/1495/1495 2182/2182/2182 1499/1499/1499 +f 2169/2169/2169 2183/2183/2183 2171/2171/2171 2170/2170/2170 +f 2183/2183/2183 2184/2184/2184 2185/2185/2185 2171/2171/2171 +f 2171/2171/2171 2185/2185/2185 2187/2187/2187 2189/2189/2189 +f 2170/2170/2170 2171/2171/2171 2189/2189/2189 2172/2172/2172 +f 2184/2184/2184 2190/2190/2190 2186/2186/2186 2185/2185/2185 +f 2190/2190/2190 2191/2191/2191 2192/2192/2192 2186/2186/2186 +f 2186/2186/2186 2192/2192/2192 2194/2194/2194 2196/2196/2196 +f 2185/2185/2185 2186/2186/2186 2196/2196/2196 2187/2187/2187 +f 2187/2187/2187 2196/2196/2196 2188/2188/2188 2197/2197/2197 +f 2196/2196/2196 2194/2194/2194 2198/2198/2198 2188/2188/2188 +f 2188/2188/2188 2198/2198/2198 2199/2199/2199 2202/2202/2202 +f 2197/2197/2197 2188/2188/2188 2202/2202/2202 2203/2203/2203 +f 2172/2172/2172 2189/2189/2189 2173/2173/2173 2176/2176/2176 +f 2189/2189/2189 2187/2187/2187 2197/2197/2197 2173/2173/2173 +f 2173/2173/2173 2197/2197/2197 2203/2203/2203 2204/2204/2204 +f 2176/2176/2176 2173/2173/2173 2204/2204/2204 2177/2177/2177 +f 2177/2177/2177 2204/2204/2204 2178/2178/2178 2205/2205/2205 +f 2204/2204/2204 2203/2203/2203 2206/2206/2206 2178/2178/2178 +f 2178/2178/2178 2206/2206/2206 2207/2207/2207 2210/2210/2210 +f 2205/2205/2205 2178/2178/2178 2210/2210/2210 2211/2211/2211 +f 2203/2203/2203 2202/2202/2202 2201/2201/2201 2206/2206/2206 +f 2202/2202/2202 2199/2199/2199 2213/2213/2213 2201/2201/2201 +f 2201/2201/2201 2213/2213/2213 2214/2214/2214 2216/2216/2216 +f 2206/2206/2206 2201/2201/2201 2216/2216/2216 2207/2207/2207 +f 2207/2207/2207 2216/2216/2216 2208/2208/2208 2217/2217/2217 +f 2216/2216/2216 2214/2214/2214 2218/2218/2218 2208/2208/2208 +f 2208/2208/2208 2218/2218/2218 2219/2219/2219 2222/2222/2222 +f 2217/2217/2217 2208/2208/2208 2222/2222/2222 2223/2223/2223 +f 2211/2211/2211 2210/2210/2210 2209/2209/2209 2225/2225/2225 +f 2210/2210/2210 2207/2207/2207 2217/2217/2217 2209/2209/2209 +f 2209/2209/2209 2217/2217/2217 2223/2223/2223 2226/2226/2226 +f 2225/2225/2225 2209/2209/2209 2226/2226/2226 2227/2227/2227 +f 1499/1499/1499 2182/2182/2182 1500/1500/1500 1513/1513/1513 +f 2182/2182/2182 2181/2181/2181 2229/2229/2229 1500/1500/1500 +f 1500/1500/1500 2229/2229/2229 2230/2230/2230 2231/2231/2231 +f 1513/1513/1513 1500/1500/1500 2231/2231/2231 1514/1514/1514 +f 2181/2181/2181 2180/2180/2180 2179/2179/2179 2229/2229/2229 +f 2180/2180/2180 2177/2177/2177 2205/2205/2205 2179/2179/2179 +f 2179/2179/2179 2205/2205/2205 2211/2211/2211 2232/2232/2232 +f 2229/2229/2229 2179/2179/2179 2232/2232/2232 2230/2230/2230 +f 2230/2230/2230 2232/2232/2232 2212/2212/2212 2233/2233/2233 +f 2232/2232/2232 2211/2211/2211 2225/2225/2225 2212/2212/2212 +f 2212/2212/2212 2225/2225/2225 2227/2227/2227 2234/2234/2234 +f 2233/2233/2233 2212/2212/2212 2234/2234/2234 2235/2235/2235 +f 1514/1514/1514 2231/2231/2231 1515/1515/1515 1518/1518/1518 +f 2231/2231/2231 2230/2230/2230 2233/2233/2233 1515/1515/1515 +f 1515/1515/1515 2233/2233/2233 2235/2235/2235 2236/2236/2236 +f 1518/1518/1518 1515/1515/1515 2236/2236/2236 1519/1519/1519 +f 2191/2191/2191 2237/2237/2237 2193/2193/2193 2192/2192/2192 +f 2237/2237/2237 2238/2238/2238 2239/2239/2239 2193/2193/2193 +f 2193/2193/2193 2239/2239/2239 2241/2241/2241 2243/2243/2243 +f 2192/2192/2192 2193/2193/2193 2243/2243/2243 2194/2194/2194 +f 2238/2238/2238 2244/2244/2244 2240/2240/2240 2239/2239/2239 +f 2244/2244/2244 2245/2245/2245 2246/2246/2246 2240/2240/2240 +f 2240/2240/2240 2246/2246/2246 2248/2248/2248 2250/2250/2250 +f 2239/2239/2239 2240/2240/2240 2250/2250/2250 2241/2241/2241 +f 2241/2241/2241 2250/2250/2250 2242/2242/2242 2251/2251/2251 +f 2250/2250/2250 2248/2248/2248 2252/2252/2252 2242/2242/2242 +f 2242/2242/2242 2252/2252/2252 2253/2253/2253 2256/2256/2256 +f 2251/2251/2251 2242/2242/2242 2256/2256/2256 2257/2257/2257 +f 2194/2194/2194 2243/2243/2243 2195/2195/2195 2198/2198/2198 +f 2243/2243/2243 2241/2241/2241 2251/2251/2251 2195/2195/2195 +f 2195/2195/2195 2251/2251/2251 2257/2257/2257 2258/2258/2258 +f 2198/2198/2198 2195/2195/2195 2258/2258/2258 2199/2199/2199 +f 2245/2245/2245 2259/2259/2259 2247/2247/2247 2246/2246/2246 +f 2259/2259/2259 2260/2260/2260 2261/2261/2261 2247/2247/2247 +f 2247/2247/2247 2261/2261/2261 2263/2263/2263 2265/2265/2265 +f 2246/2246/2246 2247/2247/2247 2265/2265/2265 2248/2248/2248 +f 2260/2260/2260 2266/2266/2266 2262/2262/2262 2261/2261/2261 +f 2266/2266/2266 2267/2267/2267 2268/2268/2268 2262/2262/2262 +f 2262/2262/2262 2268/2268/2268 2270/2270/2270 2272/2272/2272 +f 2261/2261/2261 2262/2262/2262 2272/2272/2272 2263/2263/2263 +f 2263/2263/2263 2272/2272/2272 2264/2264/2264 2273/2273/2273 +f 2272/2272/2272 2270/2270/2270 2274/2274/2274 2264/2264/2264 +f 2264/2264/2264 2274/2274/2274 2275/2275/2275 2278/2278/2278 +f 2273/2273/2273 2264/2264/2264 2278/2278/2278 2279/2279/2279 +f 2248/2248/2248 2265/2265/2265 2249/2249/2249 2252/2252/2252 +f 2265/2265/2265 2263/2263/2263 2273/2273/2273 2249/2249/2249 +f 2249/2249/2249 2273/2273/2273 2279/2279/2279 2280/2280/2280 +f 2252/2252/2252 2249/2249/2249 2280/2280/2280 2253/2253/2253 +f 2253/2253/2253 2280/2280/2280 2254/2254/2254 2281/2281/2281 +f 2280/2280/2280 2279/2279/2279 2282/2282/2282 2254/2254/2254 +f 2254/2254/2254 2282/2282/2282 2283/2283/2283 2286/2286/2286 +f 2281/2281/2281 2254/2254/2254 2286/2286/2286 2287/2287/2287 +f 2279/2279/2279 2278/2278/2278 2277/2277/2277 2282/2282/2282 +f 2278/2278/2278 2275/2275/2275 2289/2289/2289 2277/2277/2277 +f 2277/2277/2277 2289/2289/2289 2290/2290/2290 2292/2292/2292 +f 2282/2282/2282 2277/2277/2277 2292/2292/2292 2283/2283/2283 +f 2283/2283/2283 2292/2292/2292 2284/2284/2284 2293/2293/2293 +f 2292/2292/2292 2290/2290/2290 2294/2294/2294 2284/2284/2284 +f 2284/2284/2284 2294/2294/2294 2295/2295/2295 2298/2298/2298 +f 2293/2293/2293 2284/2284/2284 2298/2298/2298 2299/2299/2299 +f 2287/2287/2287 2286/2286/2286 2285/2285/2285 2301/2301/2301 +f 2286/2286/2286 2283/2283/2283 2293/2293/2293 2285/2285/2285 +f 2285/2285/2285 2293/2293/2293 2299/2299/2299 2302/2302/2302 +f 2301/2301/2301 2285/2285/2285 2302/2302/2302 2303/2303/2303 +f 2199/2199/2199 2258/2258/2258 2200/2200/2200 2213/2213/2213 +f 2258/2258/2258 2257/2257/2257 2305/2305/2305 2200/2200/2200 +f 2200/2200/2200 2305/2305/2305 2306/2306/2306 2307/2307/2307 +f 2213/2213/2213 2200/2200/2200 2307/2307/2307 2214/2214/2214 +f 2257/2257/2257 2256/2256/2256 2255/2255/2255 2305/2305/2305 +f 2256/2256/2256 2253/2253/2253 2281/2281/2281 2255/2255/2255 +f 2255/2255/2255 2281/2281/2281 2287/2287/2287 2308/2308/2308 +f 2305/2305/2305 2255/2255/2255 2308/2308/2308 2306/2306/2306 +f 2306/2306/2306 2308/2308/2308 2288/2288/2288 2309/2309/2309 +f 2308/2308/2308 2287/2287/2287 2301/2301/2301 2288/2288/2288 +f 2288/2288/2288 2301/2301/2301 2303/2303/2303 2310/2310/2310 +f 2309/2309/2309 2288/2288/2288 2310/2310/2310 2311/2311/2311 +f 2214/2214/2214 2307/2307/2307 2215/2215/2215 2218/2218/2218 +f 2307/2307/2307 2306/2306/2306 2309/2309/2309 2215/2215/2215 +f 2215/2215/2215 2309/2309/2309 2311/2311/2311 2312/2312/2312 +f 2218/2218/2218 2215/2215/2215 2312/2312/2312 2219/2219/2219 +f 2219/2219/2219 2312/2312/2312 2220/2220/2220 2313/2313/2313 +f 2312/2312/2312 2311/2311/2311 2314/2314/2314 2220/2220/2220 +f 2220/2220/2220 2314/2314/2314 2315/2315/2315 2318/2318/2318 +f 2313/2313/2313 2220/2220/2220 2318/2318/2318 2319/2319/2319 +f 2311/2311/2311 2310/2310/2310 2304/2304/2304 2314/2314/2314 +f 2310/2310/2310 2303/2303/2303 2321/2321/2321 2304/2304/2304 +f 2304/2304/2304 2321/2321/2321 2322/2322/2322 2324/2324/2324 +f 2314/2314/2314 2304/2304/2304 2324/2324/2324 2315/2315/2315 +f 2315/2315/2315 2324/2324/2324 2316/2316/2316 2325/2325/2325 +f 2324/2324/2324 2322/2322/2322 2326/2326/2326 2316/2316/2316 +f 2316/2316/2316 2326/2326/2326 2327/2327/2327 2330/2330/2330 +f 2325/2325/2325 2316/2316/2316 2330/2330/2330 2331/2331/2331 +f 2319/2319/2319 2318/2318/2318 2317/2317/2317 2333/2333/2333 +f 2318/2318/2318 2315/2315/2315 2325/2325/2325 2317/2317/2317 +f 2317/2317/2317 2325/2325/2325 2331/2331/2331 2334/2334/2334 +f 2333/2333/2333 2317/2317/2317 2334/2334/2334 2335/2335/2335 +f 2303/2303/2303 2302/2302/2302 2300/2300/2300 2321/2321/2321 +f 2302/2302/2302 2299/2299/2299 2337/2337/2337 2300/2300/2300 +f 2300/2300/2300 2337/2337/2337 2338/2338/2338 2340/2340/2340 +f 2321/2321/2321 2300/2300/2300 2340/2340/2340 2322/2322/2322 +f 2299/2299/2299 2298/2298/2298 2297/2297/2297 2337/2337/2337 +f 2298/2298/2298 2295/2295/2295 2341/2341/2341 2297/2297/2297 +f 2297/2297/2297 2341/2341/2341 2342/2342/2342 2344/2344/2344 +f 2337/2337/2337 2297/2297/2297 2344/2344/2344 2338/2338/2338 +f 2338/2338/2338 2344/2344/2344 2339/2339/2339 2345/2345/2345 +f 2344/2344/2344 2342/2342/2342 2346/2346/2346 2339/2339/2339 +f 2339/2339/2339 2346/2346/2346 2347/2347/2347 2350/2350/2350 +f 2345/2345/2345 2339/2339/2339 2350/2350/2350 2351/2351/2351 +f 2322/2322/2322 2340/2340/2340 2323/2323/2323 2326/2326/2326 +f 2340/2340/2340 2338/2338/2338 2345/2345/2345 2323/2323/2323 +f 2323/2323/2323 2345/2345/2345 2351/2351/2351 2352/2352/2352 +f 2326/2326/2326 2323/2323/2323 2352/2352/2352 2327/2327/2327 +f 2327/2327/2327 2352/2352/2352 2328/2328/2328 2353/2353/2353 +f 2352/2352/2352 2351/2351/2351 2354/2354/2354 2328/2328/2328 +f 2328/2328/2328 2354/2354/2354 2355/2355/2355 2358/2358/2358 +f 2353/2353/2353 2328/2328/2328 2358/2358/2358 2359/2359/2359 +f 2351/2351/2351 2350/2350/2350 2349/2349/2349 2354/2354/2354 +f 2350/2350/2350 2347/2347/2347 2361/2361/2361 2349/2349/2349 +f 2349/2349/2349 2361/2361/2361 2362/2362/2362 2364/2364/2364 +f 2354/2354/2354 2349/2349/2349 2364/2364/2364 2355/2355/2355 +f 2355/2355/2355 2364/2364/2364 2356/2356/2356 2365/2365/2365 +f 2364/2364/2364 2362/2362/2362 2366/2366/2366 2356/2356/2356 +f 2356/2356/2356 2366/2366/2366 2367/2367/2367 2370/2370/2370 +f 2365/2365/2365 2356/2356/2356 2370/2370/2370 2371/2371/2371 +f 2359/2359/2359 2358/2358/2358 2357/2357/2357 2373/2373/2373 +f 2358/2358/2358 2355/2355/2355 2365/2365/2365 2357/2357/2357 +f 2357/2357/2357 2365/2365/2365 2371/2371/2371 2374/2374/2374 +f 2373/2373/2373 2357/2357/2357 2374/2374/2374 2375/2375/2375 +f 2335/2335/2335 2334/2334/2334 2332/2332/2332 2377/2377/2377 +f 2334/2334/2334 2331/2331/2331 2378/2378/2378 2332/2332/2332 +f 2332/2332/2332 2378/2378/2378 2379/2379/2379 2381/2381/2381 +f 2377/2377/2377 2332/2332/2332 2381/2381/2381 2382/2382/2382 +f 2331/2331/2331 2330/2330/2330 2329/2329/2329 2378/2378/2378 +f 2330/2330/2330 2327/2327/2327 2353/2353/2353 2329/2329/2329 +f 2329/2329/2329 2353/2353/2353 2359/2359/2359 2384/2384/2384 +f 2378/2378/2378 2329/2329/2329 2384/2384/2384 2379/2379/2379 +f 2379/2379/2379 2384/2384/2384 2360/2360/2360 2385/2385/2385 +f 2384/2384/2384 2359/2359/2359 2373/2373/2373 2360/2360/2360 +f 2360/2360/2360 2373/2373/2373 2375/2375/2375 2386/2386/2386 +f 2385/2385/2385 2360/2360/2360 2386/2386/2386 2387/2387/2387 +f 2382/2382/2382 2381/2381/2381 2380/2380/2380 2389/2389/2389 +f 2381/2381/2381 2379/2379/2379 2385/2385/2385 2380/2380/2380 +f 2380/2380/2380 2385/2385/2385 2387/2387/2387 2390/2390/2390 +f 2389/2389/2389 2380/2380/2380 2390/2390/2390 2391/2391/2391 +f 1519/1519/1519 2236/2236/2236 1520/1520/1520 1565/1565/1565 +f 2236/2236/2236 2235/2235/2235 2393/2393/2393 1520/1520/1520 +f 1520/1520/1520 2393/2393/2393 2394/2394/2394 2396/2396/2396 +f 1565/1565/1565 1520/1520/1520 2396/2396/2396 1566/1566/1566 +f 2235/2235/2235 2234/2234/2234 2228/2228/2228 2393/2393/2393 +f 2234/2234/2234 2227/2227/2227 2397/2397/2397 2228/2228/2228 +f 2228/2228/2228 2397/2397/2397 2398/2398/2398 2400/2400/2400 +f 2393/2393/2393 2228/2228/2228 2400/2400/2400 2394/2394/2394 +f 2394/2394/2394 2400/2400/2400 2395/2395/2395 2401/2401/2401 +f 2400/2400/2400 2398/2398/2398 2402/2402/2402 2395/2395/2395 +f 2395/2395/2395 2402/2402/2402 2403/2403/2403 2406/2406/2406 +f 2401/2401/2401 2395/2395/2395 2406/2406/2406 2407/2407/2407 +f 1566/1566/1566 2396/2396/2396 1567/1567/1567 1570/1570/1570 +f 2396/2396/2396 2394/2394/2394 2401/2401/2401 1567/1567/1567 +f 1567/1567/1567 2401/2401/2401 2407/2407/2407 2408/2408/2408 +f 1570/1570/1570 1567/1567/1567 2408/2408/2408 1571/1571/1571 +f 2227/2227/2227 2226/2226/2226 2224/2224/2224 2397/2397/2397 +f 2226/2226/2226 2223/2223/2223 2409/2409/2409 2224/2224/2224 +f 2224/2224/2224 2409/2409/2409 2410/2410/2410 2411/2411/2411 +f 2397/2397/2397 2224/2224/2224 2411/2411/2411 2398/2398/2398 +f 2223/2223/2223 2222/2222/2222 2221/2221/2221 2409/2409/2409 +f 2222/2222/2222 2219/2219/2219 2313/2313/2313 2221/2221/2221 +f 2221/2221/2221 2313/2313/2313 2319/2319/2319 2412/2412/2412 +f 2409/2409/2409 2221/2221/2221 2412/2412/2412 2410/2410/2410 +f 2410/2410/2410 2412/2412/2412 2320/2320/2320 2413/2413/2413 +f 2412/2412/2412 2319/2319/2319 2333/2333/2333 2320/2320/2320 +f 2320/2320/2320 2333/2333/2333 2335/2335/2335 2414/2414/2414 +f 2413/2413/2413 2320/2320/2320 2414/2414/2414 2415/2415/2415 +f 2398/2398/2398 2411/2411/2411 2399/2399/2399 2402/2402/2402 +f 2411/2411/2411 2410/2410/2410 2413/2413/2413 2399/2399/2399 +f 2399/2399/2399 2413/2413/2413 2415/2415/2415 2416/2416/2416 +f 2402/2402/2402 2399/2399/2399 2416/2416/2416 2403/2403/2403 +f 2403/2403/2403 2416/2416/2416 2404/2404/2404 2417/2417/2417 +f 2416/2416/2416 2415/2415/2415 2418/2418/2418 2404/2404/2404 +f 2404/2404/2404 2418/2418/2418 2419/2419/2419 2421/2421/2421 +f 2417/2417/2417 2404/2404/2404 2421/2421/2421 2422/2422/2422 +f 2415/2415/2415 2414/2414/2414 2336/2336/2336 2418/2418/2418 +f 2414/2414/2414 2335/2335/2335 2377/2377/2377 2336/2336/2336 +f 2336/2336/2336 2377/2377/2377 2382/2382/2382 2424/2424/2424 +f 2418/2418/2418 2336/2336/2336 2424/2424/2424 2419/2419/2419 +f 2419/2419/2419 2424/2424/2424 2383/2383/2383 2425/2425/2425 +f 2424/2424/2424 2382/2382/2382 2389/2389/2389 2383/2383/2383 +f 2383/2383/2383 2389/2389/2389 2391/2391/2391 2426/2426/2426 +f 2425/2425/2425 2383/2383/2383 2426/2426/2426 2427/2427/2427 +f 2422/2422/2422 2421/2421/2421 2420/2420/2420 2429/2429/2429 +f 2421/2421/2421 2419/2419/2419 2425/2425/2425 2420/2420/2420 +f 2420/2420/2420 2425/2425/2425 2427/2427/2427 2430/2430/2430 +f 2429/2429/2429 2420/2420/2420 2430/2430/2430 2431/2431/2431 +f 1571/1571/1571 2408/2408/2408 1572/1572/1572 1585/1585/1585 +f 2408/2408/2408 2407/2407/2407 2433/2433/2433 1572/1572/1572 +f 1572/1572/1572 2433/2433/2433 2434/2434/2434 2435/2435/2435 +f 1585/1585/1585 1572/1572/1572 2435/2435/2435 1586/1586/1586 +f 2407/2407/2407 2406/2406/2406 2405/2405/2405 2433/2433/2433 +f 2406/2406/2406 2403/2403/2403 2417/2417/2417 2405/2405/2405 +f 2405/2405/2405 2417/2417/2417 2422/2422/2422 2436/2436/2436 +f 2433/2433/2433 2405/2405/2405 2436/2436/2436 2434/2434/2434 +f 2434/2434/2434 2436/2436/2436 2423/2423/2423 2437/2437/2437 +f 2436/2436/2436 2422/2422/2422 2429/2429/2429 2423/2423/2423 +f 2423/2423/2423 2429/2429/2429 2431/2431/2431 2438/2438/2438 +f 2437/2437/2437 2423/2423/2423 2438/2438/2438 2439/2439/2439 +f 1586/1586/1586 2435/2435/2435 1587/1587/1587 1590/1590/1590 +f 2435/2435/2435 2434/2434/2434 2437/2437/2437 1587/1587/1587 +f 1587/1587/1587 2437/2437/2437 2439/2439/2439 2440/2440/2440 +f 1590/1590/1590 1587/1587/1587 2440/2440/2440 1591/1591/1591 +f 2267/2267/2267 2441/2441/2441 2269/2269/2269 2268/2268/2268 +f 2441/2441/2441 2442/2442/2442 2443/2443/2443 2269/2269/2269 +f 2269/2269/2269 2443/2443/2443 2445/2445/2445 2447/2447/2447 +f 2268/2268/2268 2269/2269/2269 2447/2447/2447 2270/2270/2270 +f 2442/2442/2442 2448/2448/2448 2444/2444/2444 2443/2443/2443 +f 2448/2448/2448 2449/2449/2449 2450/2450/2450 2444/2444/2444 +f 2444/2444/2444 2450/2450/2450 2452/2452/2452 2454/2454/2454 +f 2443/2443/2443 2444/2444/2444 2454/2454/2454 2445/2445/2445 +f 2445/2445/2445 2454/2454/2454 2446/2446/2446 2455/2455/2455 +f 2454/2454/2454 2452/2452/2452 2456/2456/2456 2446/2446/2446 +f 2446/2446/2446 2456/2456/2456 2457/2457/2457 2460/2460/2460 +f 2455/2455/2455 2446/2446/2446 2460/2460/2460 2461/2461/2461 +f 2270/2270/2270 2447/2447/2447 2271/2271/2271 2274/2274/2274 +f 2447/2447/2447 2445/2445/2445 2455/2455/2455 2271/2271/2271 +f 2271/2271/2271 2455/2455/2455 2461/2461/2461 2462/2462/2462 +f 2274/2274/2274 2271/2271/2271 2462/2462/2462 2275/2275/2275 +f 2449/2449/2449 2463/2463/2463 2451/2451/2451 2450/2450/2450 +f 2463/2463/2463 2464/2464/2464 2465/2465/2465 2451/2451/2451 +f 2451/2451/2451 2465/2465/2465 2467/2467/2467 2469/2469/2469 +f 2450/2450/2450 2451/2451/2451 2469/2469/2469 2452/2452/2452 +f 2464/2464/2464 2470/2470/2470 2466/2466/2466 2465/2465/2465 +f 2470/2470/2470 2471/2471/2471 2472/2472/2472 2466/2466/2466 +f 2466/2466/2466 2472/2472/2472 2474/2474/2474 2476/2476/2476 +f 2465/2465/2465 2466/2466/2466 2476/2476/2476 2467/2467/2467 +f 2467/2467/2467 2476/2476/2476 2468/2468/2468 2477/2477/2477 +f 2476/2476/2476 2474/2474/2474 2478/2478/2478 2468/2468/2468 +f 2468/2468/2468 2478/2478/2478 2479/2479/2479 2482/2482/2482 +f 2477/2477/2477 2468/2468/2468 2482/2482/2482 2483/2483/2483 +f 2452/2452/2452 2469/2469/2469 2453/2453/2453 2456/2456/2456 +f 2469/2469/2469 2467/2467/2467 2477/2477/2477 2453/2453/2453 +f 2453/2453/2453 2477/2477/2477 2483/2483/2483 2484/2484/2484 +f 2456/2456/2456 2453/2453/2453 2484/2484/2484 2457/2457/2457 +f 2457/2457/2457 2484/2484/2484 2458/2458/2458 2485/2485/2485 +f 2484/2484/2484 2483/2483/2483 2486/2486/2486 2458/2458/2458 +f 2458/2458/2458 2486/2486/2486 2487/2487/2487 2490/2490/2490 +f 2485/2485/2485 2458/2458/2458 2490/2490/2490 2491/2491/2491 +f 2483/2483/2483 2482/2482/2482 2481/2481/2481 2486/2486/2486 +f 2482/2482/2482 2479/2479/2479 2493/2493/2493 2481/2481/2481 +f 2481/2481/2481 2493/2493/2493 2494/2494/2494 2496/2496/2496 +f 2486/2486/2486 2481/2481/2481 2496/2496/2496 2487/2487/2487 +f 2487/2487/2487 2496/2496/2496 2488/2488/2488 2497/2497/2497 +f 2496/2496/2496 2494/2494/2494 2498/2498/2498 2488/2488/2488 +f 2488/2488/2488 2498/2498/2498 2499/2499/2499 2502/2502/2502 +f 2497/2497/2497 2488/2488/2488 2502/2502/2502 2503/2503/2503 +f 2491/2491/2491 2490/2490/2490 2489/2489/2489 2505/2505/2505 +f 2490/2490/2490 2487/2487/2487 2497/2497/2497 2489/2489/2489 +f 2489/2489/2489 2497/2497/2497 2503/2503/2503 2506/2506/2506 +f 2505/2505/2505 2489/2489/2489 2506/2506/2506 2507/2507/2507 +f 2275/2275/2275 2462/2462/2462 2276/2276/2276 2289/2289/2289 +f 2462/2462/2462 2461/2461/2461 2509/2509/2509 2276/2276/2276 +f 2276/2276/2276 2509/2509/2509 2510/2510/2510 2511/2511/2511 +f 2289/2289/2289 2276/2276/2276 2511/2511/2511 2290/2290/2290 +f 2461/2461/2461 2460/2460/2460 2459/2459/2459 2509/2509/2509 +f 2460/2460/2460 2457/2457/2457 2485/2485/2485 2459/2459/2459 +f 2459/2459/2459 2485/2485/2485 2491/2491/2491 2512/2512/2512 +f 2509/2509/2509 2459/2459/2459 2512/2512/2512 2510/2510/2510 +f 2510/2510/2510 2512/2512/2512 2492/2492/2492 2513/2513/2513 +f 2512/2512/2512 2491/2491/2491 2505/2505/2505 2492/2492/2492 +f 2492/2492/2492 2505/2505/2505 2507/2507/2507 2514/2514/2514 +f 2513/2513/2513 2492/2492/2492 2514/2514/2514 2515/2515/2515 +f 2290/2290/2290 2511/2511/2511 2291/2291/2291 2294/2294/2294 +f 2511/2511/2511 2510/2510/2510 2513/2513/2513 2291/2291/2291 +f 2291/2291/2291 2513/2513/2513 2515/2515/2515 2516/2516/2516 +f 2294/2294/2294 2291/2291/2291 2516/2516/2516 2295/2295/2295 +f 2471/2471/2471 2517/2517/2517 2473/2473/2473 2472/2472/2472 +f 2517/2517/2517 2518/2518/2518 2519/2519/2519 2473/2473/2473 +f 2473/2473/2473 2519/2519/2519 2521/2521/2521 2523/2523/2523 +f 2472/2472/2472 2473/2473/2473 2523/2523/2523 2474/2474/2474 +f 2518/2518/2518 2524/2524/2524 2520/2520/2520 2519/2519/2519 +f 2524/2524/2524 2525/2525/2525 2526/2526/2526 2520/2520/2520 +f 2520/2520/2520 2526/2526/2526 2528/2528/2528 2530/2530/2530 +f 2519/2519/2519 2520/2520/2520 2530/2530/2530 2521/2521/2521 +f 2521/2521/2521 2530/2530/2530 2522/2522/2522 2531/2531/2531 +f 2530/2530/2530 2528/2528/2528 2532/2532/2532 2522/2522/2522 +f 2522/2522/2522 2532/2532/2532 2533/2533/2533 2536/2536/2536 +f 2531/2531/2531 2522/2522/2522 2536/2536/2536 2537/2537/2537 +f 2474/2474/2474 2523/2523/2523 2475/2475/2475 2478/2478/2478 +f 2523/2523/2523 2521/2521/2521 2531/2531/2531 2475/2475/2475 +f 2475/2475/2475 2531/2531/2531 2537/2537/2537 2538/2538/2538 +f 2478/2478/2478 2475/2475/2475 2538/2538/2538 2479/2479/2479 +f 2525/2525/2525 2539/2539/2539 2527/2527/2527 2526/2526/2526 +f 2539/2539/2539 2540/2540/2540 2541/2541/2541 2527/2527/2527 +f 2527/2527/2527 2541/2541/2541 2543/2543/2543 2545/2545/2545 +f 2526/2526/2526 2527/2527/2527 2545/2545/2545 2528/2528/2528 +f 2540/2540/2540 2546/2546/2546 2542/2542/2542 2541/2541/2541 +f 2546/2546/2546 2547/2547/2547 2548/2548/2548 2542/2542/2542 +f 2542/2542/2542 2548/2548/2548 2550/2550/2550 2552/2552/2552 +f 2541/2541/2541 2542/2542/2542 2552/2552/2552 2543/2543/2543 +f 2543/2543/2543 2552/2552/2552 2544/2544/2544 2553/2553/2553 +f 2552/2552/2552 2550/2550/2550 2554/2554/2554 2544/2544/2544 +f 2544/2544/2544 2554/2554/2554 2555/2555/2555 2558/2558/2558 +f 2553/2553/2553 2544/2544/2544 2558/2558/2558 2559/2559/2559 +f 2528/2528/2528 2545/2545/2545 2529/2529/2529 2532/2532/2532 +f 2545/2545/2545 2543/2543/2543 2553/2553/2553 2529/2529/2529 +f 2529/2529/2529 2553/2553/2553 2559/2559/2559 2560/2560/2560 +f 2532/2532/2532 2529/2529/2529 2560/2560/2560 2533/2533/2533 +f 2533/2533/2533 2560/2560/2560 2534/2534/2534 2561/2561/2561 +f 2560/2560/2560 2559/2559/2559 2562/2562/2562 2534/2534/2534 +f 2534/2534/2534 2562/2562/2562 2563/2563/2563 2566/2566/2566 +f 2561/2561/2561 2534/2534/2534 2566/2566/2566 2567/2567/2567 +f 2559/2559/2559 2558/2558/2558 2557/2557/2557 2562/2562/2562 +f 2558/2558/2558 2555/2555/2555 2569/2569/2569 2557/2557/2557 +f 2557/2557/2557 2569/2569/2569 2570/2570/2570 2572/2572/2572 +f 2562/2562/2562 2557/2557/2557 2572/2572/2572 2563/2563/2563 +f 2563/2563/2563 2572/2572/2572 2564/2564/2564 2573/2573/2573 +f 2572/2572/2572 2570/2570/2570 2574/2574/2574 2564/2564/2564 +f 2564/2564/2564 2574/2574/2574 2575/2575/2575 2578/2578/2578 +f 2573/2573/2573 2564/2564/2564 2578/2578/2578 2579/2579/2579 +f 2567/2567/2567 2566/2566/2566 2565/2565/2565 2581/2581/2581 +f 2566/2566/2566 2563/2563/2563 2573/2573/2573 2565/2565/2565 +f 2565/2565/2565 2573/2573/2573 2579/2579/2579 2582/2582/2582 +f 2581/2581/2581 2565/2565/2565 2582/2582/2582 2583/2583/2583 +f 2479/2479/2479 2538/2538/2538 2480/2480/2480 2493/2493/2493 +f 2538/2538/2538 2537/2537/2537 2585/2585/2585 2480/2480/2480 +f 2480/2480/2480 2585/2585/2585 2586/2586/2586 2587/2587/2587 +f 2493/2493/2493 2480/2480/2480 2587/2587/2587 2494/2494/2494 +f 2537/2537/2537 2536/2536/2536 2535/2535/2535 2585/2585/2585 +f 2536/2536/2536 2533/2533/2533 2561/2561/2561 2535/2535/2535 +f 2535/2535/2535 2561/2561/2561 2567/2567/2567 2588/2588/2588 +f 2585/2585/2585 2535/2535/2535 2588/2588/2588 2586/2586/2586 +f 2586/2586/2586 2588/2588/2588 2568/2568/2568 2589/2589/2589 +f 2588/2588/2588 2567/2567/2567 2581/2581/2581 2568/2568/2568 +f 2568/2568/2568 2581/2581/2581 2583/2583/2583 2590/2590/2590 +f 2589/2589/2589 2568/2568/2568 2590/2590/2590 2591/2591/2591 +f 2494/2494/2494 2587/2587/2587 2495/2495/2495 2498/2498/2498 +f 2587/2587/2587 2586/2586/2586 2589/2589/2589 2495/2495/2495 +f 2495/2495/2495 2589/2589/2589 2591/2591/2591 2592/2592/2592 +f 2498/2498/2498 2495/2495/2495 2592/2592/2592 2499/2499/2499 +f 2499/2499/2499 2592/2592/2592 2500/2500/2500 2593/2593/2593 +f 2592/2592/2592 2591/2591/2591 2594/2594/2594 2500/2500/2500 +f 2500/2500/2500 2594/2594/2594 2595/2595/2595 2598/2598/2598 +f 2593/2593/2593 2500/2500/2500 2598/2598/2598 2599/2599/2599 +f 2591/2591/2591 2590/2590/2590 2584/2584/2584 2594/2594/2594 +f 2590/2590/2590 2583/2583/2583 2601/2601/2601 2584/2584/2584 +f 2584/2584/2584 2601/2601/2601 2602/2602/2602 2604/2604/2604 +f 2594/2594/2594 2584/2584/2584 2604/2604/2604 2595/2595/2595 +f 2595/2595/2595 2604/2604/2604 2596/2596/2596 2605/2605/2605 +f 2604/2604/2604 2602/2602/2602 2606/2606/2606 2596/2596/2596 +f 2596/2596/2596 2606/2606/2606 2607/2607/2607 2610/2610/2610 +f 2605/2605/2605 2596/2596/2596 2610/2610/2610 2611/2611/2611 +f 2599/2599/2599 2598/2598/2598 2597/2597/2597 2613/2613/2613 +f 2598/2598/2598 2595/2595/2595 2605/2605/2605 2597/2597/2597 +f 2597/2597/2597 2605/2605/2605 2611/2611/2611 2614/2614/2614 +f 2613/2613/2613 2597/2597/2597 2614/2614/2614 2615/2615/2615 +f 2583/2583/2583 2582/2582/2582 2580/2580/2580 2601/2601/2601 +f 2582/2582/2582 2579/2579/2579 2617/2617/2617 2580/2580/2580 +f 2580/2580/2580 2617/2617/2617 2618/2618/2618 2620/2620/2620 +f 2601/2601/2601 2580/2580/2580 2620/2620/2620 2602/2602/2602 +f 2579/2579/2579 2578/2578/2578 2577/2577/2577 2617/2617/2617 +f 2578/2578/2578 2575/2575/2575 2621/2621/2621 2577/2577/2577 +f 2577/2577/2577 2621/2621/2621 2622/2622/2622 2624/2624/2624 +f 2617/2617/2617 2577/2577/2577 2624/2624/2624 2618/2618/2618 +f 2618/2618/2618 2624/2624/2624 2619/2619/2619 2625/2625/2625 +f 2624/2624/2624 2622/2622/2622 2626/2626/2626 2619/2619/2619 +f 2619/2619/2619 2626/2626/2626 2627/2627/2627 2630/2630/2630 +f 2625/2625/2625 2619/2619/2619 2630/2630/2630 2631/2631/2631 +f 2602/2602/2602 2620/2620/2620 2603/2603/2603 2606/2606/2606 +f 2620/2620/2620 2618/2618/2618 2625/2625/2625 2603/2603/2603 +f 2603/2603/2603 2625/2625/2625 2631/2631/2631 2632/2632/2632 +f 2606/2606/2606 2603/2603/2603 2632/2632/2632 2607/2607/2607 +f 2607/2607/2607 2632/2632/2632 2608/2608/2608 2633/2633/2633 +f 2632/2632/2632 2631/2631/2631 2634/2634/2634 2608/2608/2608 +f 2608/2608/2608 2634/2634/2634 2635/2635/2635 2638/2638/2638 +f 2633/2633/2633 2608/2608/2608 2638/2638/2638 2639/2639/2639 +f 2631/2631/2631 2630/2630/2630 2629/2629/2629 2634/2634/2634 +f 2630/2630/2630 2627/2627/2627 2641/2641/2641 2629/2629/2629 +f 2629/2629/2629 2641/2641/2641 2642/2642/2642 2644/2644/2644 +f 2634/2634/2634 2629/2629/2629 2644/2644/2644 2635/2635/2635 +f 2635/2635/2635 2644/2644/2644 2636/2636/2636 2645/2645/2645 +f 2644/2644/2644 2642/2642/2642 2646/2646/2646 2636/2636/2636 +f 2636/2636/2636 2646/2646/2646 2647/2647/2647 2650/2650/2650 +f 2645/2645/2645 2636/2636/2636 2650/2650/2650 2651/2651/2651 +f 2639/2639/2639 2638/2638/2638 2637/2637/2637 2653/2653/2653 +f 2638/2638/2638 2635/2635/2635 2645/2645/2645 2637/2637/2637 +f 2637/2637/2637 2645/2645/2645 2651/2651/2651 2654/2654/2654 +f 2653/2653/2653 2637/2637/2637 2654/2654/2654 2655/2655/2655 +f 2615/2615/2615 2614/2614/2614 2612/2612/2612 2657/2657/2657 +f 2614/2614/2614 2611/2611/2611 2658/2658/2658 2612/2612/2612 +f 2612/2612/2612 2658/2658/2658 2659/2659/2659 2661/2661/2661 +f 2657/2657/2657 2612/2612/2612 2661/2661/2661 2662/2662/2662 +f 2611/2611/2611 2610/2610/2610 2609/2609/2609 2658/2658/2658 +f 2610/2610/2610 2607/2607/2607 2633/2633/2633 2609/2609/2609 +f 2609/2609/2609 2633/2633/2633 2639/2639/2639 2664/2664/2664 +f 2658/2658/2658 2609/2609/2609 2664/2664/2664 2659/2659/2659 +f 2659/2659/2659 2664/2664/2664 2640/2640/2640 2665/2665/2665 +f 2664/2664/2664 2639/2639/2639 2653/2653/2653 2640/2640/2640 +f 2640/2640/2640 2653/2653/2653 2655/2655/2655 2666/2666/2666 +f 2665/2665/2665 2640/2640/2640 2666/2666/2666 2667/2667/2667 +f 2662/2662/2662 2661/2661/2661 2660/2660/2660 2669/2669/2669 +f 2661/2661/2661 2659/2659/2659 2665/2665/2665 2660/2660/2660 +f 2660/2660/2660 2665/2665/2665 2667/2667/2667 2670/2670/2670 +f 2669/2669/2669 2660/2660/2660 2670/2670/2670 2671/2671/2671 +f 2295/2295/2295 2516/2516/2516 2296/2296/2296 2341/2341/2341 +f 2516/2516/2516 2515/2515/2515 2673/2673/2673 2296/2296/2296 +f 2296/2296/2296 2673/2673/2673 2674/2674/2674 2676/2676/2676 +f 2341/2341/2341 2296/2296/2296 2676/2676/2676 2342/2342/2342 +f 2515/2515/2515 2514/2514/2514 2508/2508/2508 2673/2673/2673 +f 2514/2514/2514 2507/2507/2507 2677/2677/2677 2508/2508/2508 +f 2508/2508/2508 2677/2677/2677 2678/2678/2678 2680/2680/2680 +f 2673/2673/2673 2508/2508/2508 2680/2680/2680 2674/2674/2674 +f 2674/2674/2674 2680/2680/2680 2675/2675/2675 2681/2681/2681 +f 2680/2680/2680 2678/2678/2678 2682/2682/2682 2675/2675/2675 +f 2675/2675/2675 2682/2682/2682 2683/2683/2683 2686/2686/2686 +f 2681/2681/2681 2675/2675/2675 2686/2686/2686 2687/2687/2687 +f 2342/2342/2342 2676/2676/2676 2343/2343/2343 2346/2346/2346 +f 2676/2676/2676 2674/2674/2674 2681/2681/2681 2343/2343/2343 +f 2343/2343/2343 2681/2681/2681 2687/2687/2687 2688/2688/2688 +f 2346/2346/2346 2343/2343/2343 2688/2688/2688 2347/2347/2347 +f 2507/2507/2507 2506/2506/2506 2504/2504/2504 2677/2677/2677 +f 2506/2506/2506 2503/2503/2503 2689/2689/2689 2504/2504/2504 +f 2504/2504/2504 2689/2689/2689 2690/2690/2690 2691/2691/2691 +f 2677/2677/2677 2504/2504/2504 2691/2691/2691 2678/2678/2678 +f 2503/2503/2503 2502/2502/2502 2501/2501/2501 2689/2689/2689 +f 2502/2502/2502 2499/2499/2499 2593/2593/2593 2501/2501/2501 +f 2501/2501/2501 2593/2593/2593 2599/2599/2599 2692/2692/2692 +f 2689/2689/2689 2501/2501/2501 2692/2692/2692 2690/2690/2690 +f 2690/2690/2690 2692/2692/2692 2600/2600/2600 2693/2693/2693 +f 2692/2692/2692 2599/2599/2599 2613/2613/2613 2600/2600/2600 +f 2600/2600/2600 2613/2613/2613 2615/2615/2615 2694/2694/2694 +f 2693/2693/2693 2600/2600/2600 2694/2694/2694 2695/2695/2695 +f 2678/2678/2678 2691/2691/2691 2679/2679/2679 2682/2682/2682 +f 2691/2691/2691 2690/2690/2690 2693/2693/2693 2679/2679/2679 +f 2679/2679/2679 2693/2693/2693 2695/2695/2695 2696/2696/2696 +f 2682/2682/2682 2679/2679/2679 2696/2696/2696 2683/2683/2683 +f 2683/2683/2683 2696/2696/2696 2684/2684/2684 2697/2697/2697 +f 2696/2696/2696 2695/2695/2695 2698/2698/2698 2684/2684/2684 +f 2684/2684/2684 2698/2698/2698 2699/2699/2699 2701/2701/2701 +f 2697/2697/2697 2684/2684/2684 2701/2701/2701 2702/2702/2702 +f 2695/2695/2695 2694/2694/2694 2616/2616/2616 2698/2698/2698 +f 2694/2694/2694 2615/2615/2615 2657/2657/2657 2616/2616/2616 +f 2616/2616/2616 2657/2657/2657 2662/2662/2662 2704/2704/2704 +f 2698/2698/2698 2616/2616/2616 2704/2704/2704 2699/2699/2699 +f 2699/2699/2699 2704/2704/2704 2663/2663/2663 2705/2705/2705 +f 2704/2704/2704 2662/2662/2662 2669/2669/2669 2663/2663/2663 +f 2663/2663/2663 2669/2669/2669 2671/2671/2671 2706/2706/2706 +f 2705/2705/2705 2663/2663/2663 2706/2706/2706 2707/2707/2707 +f 2702/2702/2702 2701/2701/2701 2700/2700/2700 2709/2709/2709 +f 2701/2701/2701 2699/2699/2699 2705/2705/2705 2700/2700/2700 +f 2700/2700/2700 2705/2705/2705 2707/2707/2707 2710/2710/2710 +f 2709/2709/2709 2700/2700/2700 2710/2710/2710 2711/2711/2711 +f 2347/2347/2347 2688/2688/2688 2348/2348/2348 2361/2361/2361 +f 2688/2688/2688 2687/2687/2687 2713/2713/2713 2348/2348/2348 +f 2348/2348/2348 2713/2713/2713 2714/2714/2714 2715/2715/2715 +f 2361/2361/2361 2348/2348/2348 2715/2715/2715 2362/2362/2362 +f 2687/2687/2687 2686/2686/2686 2685/2685/2685 2713/2713/2713 +f 2686/2686/2686 2683/2683/2683 2697/2697/2697 2685/2685/2685 +f 2685/2685/2685 2697/2697/2697 2702/2702/2702 2716/2716/2716 +f 2713/2713/2713 2685/2685/2685 2716/2716/2716 2714/2714/2714 +f 2714/2714/2714 2716/2716/2716 2703/2703/2703 2717/2717/2717 +f 2716/2716/2716 2702/2702/2702 2709/2709/2709 2703/2703/2703 +f 2703/2703/2703 2709/2709/2709 2711/2711/2711 2718/2718/2718 +f 2717/2717/2717 2703/2703/2703 2718/2718/2718 2719/2719/2719 +f 2362/2362/2362 2715/2715/2715 2363/2363/2363 2366/2366/2366 +f 2715/2715/2715 2714/2714/2714 2717/2717/2717 2363/2363/2363 +f 2363/2363/2363 2717/2717/2717 2719/2719/2719 2720/2720/2720 +f 2366/2366/2366 2363/2363/2363 2720/2720/2720 2367/2367/2367 +f 2367/2367/2367 2720/2720/2720 2368/2368/2368 2721/2721/2721 +f 2720/2720/2720 2719/2719/2719 2722/2722/2722 2368/2368/2368 +f 2368/2368/2368 2722/2722/2722 2723/2723/2723 2726/2726/2726 +f 2721/2721/2721 2368/2368/2368 2726/2726/2726 2727/2727/2727 +f 2719/2719/2719 2718/2718/2718 2712/2712/2712 2722/2722/2722 +f 2718/2718/2718 2711/2711/2711 2729/2729/2729 2712/2712/2712 +f 2712/2712/2712 2729/2729/2729 2730/2730/2730 2732/2732/2732 +f 2722/2722/2722 2712/2712/2712 2732/2732/2732 2723/2723/2723 +f 2723/2723/2723 2732/2732/2732 2724/2724/2724 2733/2733/2733 +f 2732/2732/2732 2730/2730/2730 2734/2734/2734 2724/2724/2724 +f 2724/2724/2724 2734/2734/2734 2735/2735/2735 2738/2738/2738 +f 2733/2733/2733 2724/2724/2724 2738/2738/2738 2739/2739/2739 +f 2727/2727/2727 2726/2726/2726 2725/2725/2725 2741/2741/2741 +f 2726/2726/2726 2723/2723/2723 2733/2733/2733 2725/2725/2725 +f 2725/2725/2725 2733/2733/2733 2739/2739/2739 2742/2742/2742 +f 2741/2741/2741 2725/2725/2725 2742/2742/2742 2743/2743/2743 +f 2711/2711/2711 2710/2710/2710 2708/2708/2708 2729/2729/2729 +f 2710/2710/2710 2707/2707/2707 2745/2745/2745 2708/2708/2708 +f 2708/2708/2708 2745/2745/2745 2746/2746/2746 2748/2748/2748 +f 2729/2729/2729 2708/2708/2708 2748/2748/2748 2730/2730/2730 +f 2707/2707/2707 2706/2706/2706 2672/2672/2672 2745/2745/2745 +f 2706/2706/2706 2671/2671/2671 2749/2749/2749 2672/2672/2672 +f 2672/2672/2672 2749/2749/2749 2750/2750/2750 2752/2752/2752 +f 2745/2745/2745 2672/2672/2672 2752/2752/2752 2746/2746/2746 +f 2746/2746/2746 2752/2752/2752 2747/2747/2747 2753/2753/2753 +f 2752/2752/2752 2750/2750/2750 2754/2754/2754 2747/2747/2747 +f 2747/2747/2747 2754/2754/2754 2755/2755/2755 2758/2758/2758 +f 2753/2753/2753 2747/2747/2747 2758/2758/2758 2759/2759/2759 +f 2730/2730/2730 2748/2748/2748 2731/2731/2731 2734/2734/2734 +f 2748/2748/2748 2746/2746/2746 2753/2753/2753 2731/2731/2731 +f 2731/2731/2731 2753/2753/2753 2759/2759/2759 2760/2760/2760 +f 2734/2734/2734 2731/2731/2731 2760/2760/2760 2735/2735/2735 +f 2735/2735/2735 2760/2760/2760 2736/2736/2736 2761/2761/2761 +f 2760/2760/2760 2759/2759/2759 2762/2762/2762 2736/2736/2736 +f 2736/2736/2736 2762/2762/2762 2763/2763/2763 2766/2766/2766 +f 2761/2761/2761 2736/2736/2736 2766/2766/2766 2767/2767/2767 +f 2759/2759/2759 2758/2758/2758 2757/2757/2757 2762/2762/2762 +f 2758/2758/2758 2755/2755/2755 2769/2769/2769 2757/2757/2757 +f 2757/2757/2757 2769/2769/2769 2770/2770/2770 2772/2772/2772 +f 2762/2762/2762 2757/2757/2757 2772/2772/2772 2763/2763/2763 +f 2763/2763/2763 2772/2772/2772 2764/2764/2764 2773/2773/2773 +f 2772/2772/2772 2770/2770/2770 2774/2774/2774 2764/2764/2764 +f 2764/2764/2764 2774/2774/2774 2775/2775/2775 2778/2778/2778 +f 2773/2773/2773 2764/2764/2764 2778/2778/2778 2779/2779/2779 +f 2767/2767/2767 2766/2766/2766 2765/2765/2765 2781/2781/2781 +f 2766/2766/2766 2763/2763/2763 2773/2773/2773 2765/2765/2765 +f 2765/2765/2765 2773/2773/2773 2779/2779/2779 2782/2782/2782 +f 2781/2781/2781 2765/2765/2765 2782/2782/2782 2783/2783/2783 +f 2743/2743/2743 2742/2742/2742 2740/2740/2740 2785/2785/2785 +f 2742/2742/2742 2739/2739/2739 2786/2786/2786 2740/2740/2740 +f 2740/2740/2740 2786/2786/2786 2787/2787/2787 2789/2789/2789 +f 2785/2785/2785 2740/2740/2740 2789/2789/2789 2790/2790/2790 +f 2739/2739/2739 2738/2738/2738 2737/2737/2737 2786/2786/2786 +f 2738/2738/2738 2735/2735/2735 2761/2761/2761 2737/2737/2737 +f 2737/2737/2737 2761/2761/2761 2767/2767/2767 2792/2792/2792 +f 2786/2786/2786 2737/2737/2737 2792/2792/2792 2787/2787/2787 +f 2787/2787/2787 2792/2792/2792 2768/2768/2768 2793/2793/2793 +f 2792/2792/2792 2767/2767/2767 2781/2781/2781 2768/2768/2768 +f 2768/2768/2768 2781/2781/2781 2783/2783/2783 2794/2794/2794 +f 2793/2793/2793 2768/2768/2768 2794/2794/2794 2795/2795/2795 +f 2790/2790/2790 2789/2789/2789 2788/2788/2788 2797/2797/2797 +f 2789/2789/2789 2787/2787/2787 2793/2793/2793 2788/2788/2788 +f 2788/2788/2788 2793/2793/2793 2795/2795/2795 2798/2798/2798 +f 2797/2797/2797 2788/2788/2788 2798/2798/2798 2799/2799/2799 +f 2671/2671/2671 2670/2670/2670 2668/2668/2668 2749/2749/2749 +f 2670/2670/2670 2667/2667/2667 2801/2801/2801 2668/2668/2668 +f 2668/2668/2668 2801/2801/2801 2802/2802/2802 2804/2804/2804 +f 2749/2749/2749 2668/2668/2668 2804/2804/2804 2750/2750/2750 +f 2667/2667/2667 2666/2666/2666 2656/2656/2656 2801/2801/2801 +f 2666/2666/2666 2655/2655/2655 2805/2805/2805 2656/2656/2656 +f 2656/2656/2656 2805/2805/2805 2806/2806/2806 2808/2808/2808 +f 2801/2801/2801 2656/2656/2656 2808/2808/2808 2802/2802/2802 +f 2802/2802/2802 2808/2808/2808 2803/2803/2803 2809/2809/2809 +f 2808/2808/2808 2806/2806/2806 2810/2810/2810 2803/2803/2803 +f 2803/2803/2803 2810/2810/2810 2811/2811/2811 2814/2814/2814 +f 2809/2809/2809 2803/2803/2803 2814/2814/2814 2815/2815/2815 +f 2750/2750/2750 2804/2804/2804 2751/2751/2751 2754/2754/2754 +f 2804/2804/2804 2802/2802/2802 2809/2809/2809 2751/2751/2751 +f 2751/2751/2751 2809/2809/2809 2815/2815/2815 2816/2816/2816 +f 2754/2754/2754 2751/2751/2751 2816/2816/2816 2755/2755/2755 +f 2655/2655/2655 2654/2654/2654 2652/2652/2652 2805/2805/2805 +f 2654/2654/2654 2651/2651/2651 2817/2817/2817 2652/2652/2652 +f 2652/2652/2652 2817/2817/2817 2818/2818/2818 2820/2820/2820 +f 2805/2805/2805 2652/2652/2652 2820/2820/2820 2806/2806/2806 +f 2651/2651/2651 2650/2650/2650 2649/2649/2649 2817/2817/2817 +f 2650/2650/2650 2647/2647/2647 2821/2821/2821 2649/2649/2649 +f 2649/2649/2649 2821/2821/2821 2822/2822/2822 2824/2824/2824 +f 2817/2817/2817 2649/2649/2649 2824/2824/2824 2818/2818/2818 +f 2818/2818/2818 2824/2824/2824 2819/2819/2819 2825/2825/2825 +f 2824/2824/2824 2822/2822/2822 2826/2826/2826 2819/2819/2819 +f 2819/2819/2819 2826/2826/2826 2827/2827/2827 2830/2830/2830 +f 2825/2825/2825 2819/2819/2819 2830/2830/2830 2831/2831/2831 +f 2806/2806/2806 2820/2820/2820 2807/2807/2807 2810/2810/2810 +f 2820/2820/2820 2818/2818/2818 2825/2825/2825 2807/2807/2807 +f 2807/2807/2807 2825/2825/2825 2831/2831/2831 2832/2832/2832 +f 2810/2810/2810 2807/2807/2807 2832/2832/2832 2811/2811/2811 +f 2811/2811/2811 2832/2832/2832 2812/2812/2812 2833/2833/2833 +f 2832/2832/2832 2831/2831/2831 2834/2834/2834 2812/2812/2812 +f 2812/2812/2812 2834/2834/2834 2835/2835/2835 2838/2838/2838 +f 2833/2833/2833 2812/2812/2812 2838/2838/2838 2839/2839/2839 +f 2831/2831/2831 2830/2830/2830 2829/2829/2829 2834/2834/2834 +f 2830/2830/2830 2827/2827/2827 2841/2841/2841 2829/2829/2829 +f 2829/2829/2829 2841/2841/2841 2842/2842/2842 2844/2844/2844 +f 2834/2834/2834 2829/2829/2829 2844/2844/2844 2835/2835/2835 +f 2835/2835/2835 2844/2844/2844 2836/2836/2836 2845/2845/2845 +f 2844/2844/2844 2842/2842/2842 2846/2846/2846 2836/2836/2836 +f 2836/2836/2836 2846/2846/2846 2847/2847/2847 2850/2850/2850 +f 2845/2845/2845 2836/2836/2836 2850/2850/2850 2851/2851/2851 +f 2839/2839/2839 2838/2838/2838 2837/2837/2837 2853/2853/2853 +f 2838/2838/2838 2835/2835/2835 2845/2845/2845 2837/2837/2837 +f 2837/2837/2837 2845/2845/2845 2851/2851/2851 2854/2854/2854 +f 2853/2853/2853 2837/2837/2837 2854/2854/2854 2855/2855/2855 +f 2755/2755/2755 2816/2816/2816 2756/2756/2756 2769/2769/2769 +f 2816/2816/2816 2815/2815/2815 2857/2857/2857 2756/2756/2756 +f 2756/2756/2756 2857/2857/2857 2858/2858/2858 2859/2859/2859 +f 2769/2769/2769 2756/2756/2756 2859/2859/2859 2770/2770/2770 +f 2815/2815/2815 2814/2814/2814 2813/2813/2813 2857/2857/2857 +f 2814/2814/2814 2811/2811/2811 2833/2833/2833 2813/2813/2813 +f 2813/2813/2813 2833/2833/2833 2839/2839/2839 2860/2860/2860 +f 2857/2857/2857 2813/2813/2813 2860/2860/2860 2858/2858/2858 +f 2858/2858/2858 2860/2860/2860 2840/2840/2840 2861/2861/2861 +f 2860/2860/2860 2839/2839/2839 2853/2853/2853 2840/2840/2840 +f 2840/2840/2840 2853/2853/2853 2855/2855/2855 2862/2862/2862 +f 2861/2861/2861 2840/2840/2840 2862/2862/2862 2863/2863/2863 +f 2770/2770/2770 2859/2859/2859 2771/2771/2771 2774/2774/2774 +f 2859/2859/2859 2858/2858/2858 2861/2861/2861 2771/2771/2771 +f 2771/2771/2771 2861/2861/2861 2863/2863/2863 2864/2864/2864 +f 2774/2774/2774 2771/2771/2771 2864/2864/2864 2775/2775/2775 +f 2775/2775/2775 2864/2864/2864 2776/2776/2776 2865/2865/2865 +f 2864/2864/2864 2863/2863/2863 2866/2866/2866 2776/2776/2776 +f 2776/2776/2776 2866/2866/2866 2867/2867/2867 2870/2870/2870 +f 2865/2865/2865 2776/2776/2776 2870/2870/2870 2871/2871/2871 +f 2863/2863/2863 2862/2862/2862 2856/2856/2856 2866/2866/2866 +f 2862/2862/2862 2855/2855/2855 2873/2873/2873 2856/2856/2856 +f 2856/2856/2856 2873/2873/2873 2874/2874/2874 2876/2876/2876 +f 2866/2866/2866 2856/2856/2856 2876/2876/2876 2867/2867/2867 +f 2867/2867/2867 2876/2876/2876 2868/2868/2868 2877/2877/2877 +f 2876/2876/2876 2874/2874/2874 2878/2878/2878 2868/2868/2868 +f 2868/2868/2868 2878/2878/2878 2879/2879/2879 2882/2882/2882 +f 2877/2877/2877 2868/2868/2868 2882/2882/2882 2883/2883/2883 +f 2871/2871/2871 2870/2870/2870 2869/2869/2869 2885/2885/2885 +f 2870/2870/2870 2867/2867/2867 2877/2877/2877 2869/2869/2869 +f 2869/2869/2869 2877/2877/2877 2883/2883/2883 2886/2886/2886 +f 2885/2885/2885 2869/2869/2869 2886/2886/2886 2887/2887/2887 +f 2855/2855/2855 2854/2854/2854 2852/2852/2852 2873/2873/2873 +f 2854/2854/2854 2851/2851/2851 2889/2889/2889 2852/2852/2852 +f 2852/2852/2852 2889/2889/2889 2890/2890/2890 2892/2892/2892 +f 2873/2873/2873 2852/2852/2852 2892/2892/2892 2874/2874/2874 +f 2851/2851/2851 2850/2850/2850 2849/2849/2849 2889/2889/2889 +f 2850/2850/2850 2847/2847/2847 2893/2893/2893 2849/2849/2849 +f 2849/2849/2849 2893/2893/2893 2894/2894/2894 2896/2896/2896 +f 2889/2889/2889 2849/2849/2849 2896/2896/2896 2890/2890/2890 +f 2890/2890/2890 2896/2896/2896 2891/2891/2891 2897/2897/2897 +f 2896/2896/2896 2894/2894/2894 2898/2898/2898 2891/2891/2891 +f 2891/2891/2891 2898/2898/2898 2899/2899/2899 2902/2902/2902 +f 2897/2897/2897 2891/2891/2891 2902/2902/2902 2903/2903/2903 +f 2874/2874/2874 2892/2892/2892 2875/2875/2875 2878/2878/2878 +f 2892/2892/2892 2890/2890/2890 2897/2897/2897 2875/2875/2875 +f 2875/2875/2875 2897/2897/2897 2903/2903/2903 2904/2904/2904 +f 2878/2878/2878 2875/2875/2875 2904/2904/2904 2879/2879/2879 +f 2879/2879/2879 2904/2904/2904 2880/2880/2880 2905/2905/2905 +f 2904/2904/2904 2903/2903/2903 2906/2906/2906 2880/2880/2880 +f 2880/2880/2880 2906/2906/2906 2907/2907/2907 2910/2910/2910 +f 2905/2905/2905 2880/2880/2880 2910/2910/2910 2911/2911/2911 +f 2903/2903/2903 2902/2902/2902 2901/2901/2901 2906/2906/2906 +f 2902/2902/2902 2899/2899/2899 2913/2913/2913 2901/2901/2901 +f 2901/2901/2901 2913/2913/2913 2914/2914/2914 2916/2916/2916 +f 2906/2906/2906 2901/2901/2901 2916/2916/2916 2907/2907/2907 +f 2907/2907/2907 2916/2916/2916 2908/2908/2908 2917/2917/2917 +f 2916/2916/2916 2914/2914/2914 2918/2918/2918 2908/2908/2908 +f 2908/2908/2908 2918/2918/2918 2919/2919/2919 2920/2920/2920 +f 2917/2917/2917 2908/2908/2908 2920/2920/2920 2921/2921/2921 +f 2911/2911/2911 2910/2910/2910 2909/2909/2909 2922/2922/2922 +f 2910/2910/2910 2907/2907/2907 2917/2917/2917 2909/2909/2909 +f 2909/2909/2909 2917/2917/2917 2921/2921/2921 2923/2923/2923 +f 2922/2922/2922 2909/2909/2909 2923/2923/2923 2924/2924/2924 +f 2887/2887/2887 2886/2886/2886 2884/2884/2884 2925/2925/2925 +f 2886/2886/2886 2883/2883/2883 2926/2926/2926 2884/2884/2884 +f 2884/2884/2884 2926/2926/2926 2927/2927/2927 2929/2929/2929 +f 2925/2925/2925 2884/2884/2884 2929/2929/2929 2930/2930/2930 +f 2883/2883/2883 2882/2882/2882 2881/2881/2881 2926/2926/2926 +f 2882/2882/2882 2879/2879/2879 2905/2905/2905 2881/2881/2881 +f 2881/2881/2881 2905/2905/2905 2911/2911/2911 2932/2932/2932 +f 2926/2926/2926 2881/2881/2881 2932/2932/2932 2927/2927/2927 +f 2927/2927/2927 2932/2932/2932 2912/2912/2912 2933/2933/2933 +f 2932/2932/2932 2911/2911/2911 2922/2922/2922 2912/2912/2912 +f 2912/2912/2912 2922/2922/2922 2924/2924/2924 2934/2934/2934 +f 2933/2933/2933 2912/2912/2912 2934/2934/2934 2935/2935/2935 +f 2930/2930/2930 2929/2929/2929 2928/2928/2928 2936/2936/2936 +f 2929/2929/2929 2927/2927/2927 2933/2933/2933 2928/2928/2928 +f 2928/2928/2928 2933/2933/2933 2935/2935/2935 2937/2937/2937 +f 2936/2936/2936 2928/2928/2928 2937/2937/2937 2938/2938/2938 +f 2799/2799/2799 2798/2798/2798 2796/2796/2796 2939/2939/2939 +f 2798/2798/2798 2795/2795/2795 2940/2940/2940 2796/2796/2796 +f 2796/2796/2796 2940/2940/2940 2941/2941/2941 2944/2944/2944 +f 2939/2939/2939 2796/2796/2796 2944/2944/2944 2945/2945/2945 +f 2795/2795/2795 2794/2794/2794 2784/2784/2784 2940/2940/2940 +f 2794/2794/2794 2783/2783/2783 2947/2947/2947 2784/2784/2784 +f 2784/2784/2784 2947/2947/2947 2948/2948/2948 2950/2950/2950 +f 2940/2940/2940 2784/2784/2784 2950/2950/2950 2941/2941/2941 +f 2941/2941/2941 2950/2950/2950 2942/2942/2942 2951/2951/2951 +f 2950/2950/2950 2948/2948/2948 2952/2952/2952 2942/2942/2942 +f 2942/2942/2942 2952/2952/2952 2953/2953/2953 2956/2956/2956 +f 2951/2951/2951 2942/2942/2942 2956/2956/2956 2957/2957/2957 +f 2945/2945/2945 2944/2944/2944 2943/2943/2943 2959/2959/2959 +f 2944/2944/2944 2941/2941/2941 2951/2951/2951 2943/2943/2943 +f 2943/2943/2943 2951/2951/2951 2957/2957/2957 2960/2960/2960 +f 2959/2959/2959 2943/2943/2943 2960/2960/2960 2961/2961/2961 +f 2783/2783/2783 2782/2782/2782 2780/2780/2780 2947/2947/2947 +f 2782/2782/2782 2779/2779/2779 2963/2963/2963 2780/2780/2780 +f 2780/2780/2780 2963/2963/2963 2964/2964/2964 2965/2965/2965 +f 2947/2947/2947 2780/2780/2780 2965/2965/2965 2948/2948/2948 +f 2779/2779/2779 2778/2778/2778 2777/2777/2777 2963/2963/2963 +f 2778/2778/2778 2775/2775/2775 2865/2865/2865 2777/2777/2777 +f 2777/2777/2777 2865/2865/2865 2871/2871/2871 2966/2966/2966 +f 2963/2963/2963 2777/2777/2777 2966/2966/2966 2964/2964/2964 +f 2964/2964/2964 2966/2966/2966 2872/2872/2872 2967/2967/2967 +f 2966/2966/2966 2871/2871/2871 2885/2885/2885 2872/2872/2872 +f 2872/2872/2872 2885/2885/2885 2887/2887/2887 2968/2968/2968 +f 2967/2967/2967 2872/2872/2872 2968/2968/2968 2969/2969/2969 +f 2948/2948/2948 2965/2965/2965 2949/2949/2949 2952/2952/2952 +f 2965/2965/2965 2964/2964/2964 2967/2967/2967 2949/2949/2949 +f 2949/2949/2949 2967/2967/2967 2969/2969/2969 2970/2970/2970 +f 2952/2952/2952 2949/2949/2949 2970/2970/2970 2953/2953/2953 +f 2953/2953/2953 2970/2970/2970 2954/2954/2954 2971/2971/2971 +f 2970/2970/2970 2969/2969/2969 2972/2972/2972 2954/2954/2954 +f 2954/2954/2954 2972/2972/2972 2973/2973/2973 2975/2975/2975 +f 2971/2971/2971 2954/2954/2954 2975/2975/2975 2976/2976/2976 +f 2969/2969/2969 2968/2968/2968 2888/2888/2888 2972/2972/2972 +f 2968/2968/2968 2887/2887/2887 2925/2925/2925 2888/2888/2888 +f 2888/2888/2888 2925/2925/2925 2930/2930/2930 2978/2978/2978 +f 2972/2972/2972 2888/2888/2888 2978/2978/2978 2973/2973/2973 +f 2973/2973/2973 2978/2978/2978 2931/2931/2931 2979/2979/2979 +f 2978/2978/2978 2930/2930/2930 2936/2936/2936 2931/2931/2931 +f 2931/2931/2931 2936/2936/2936 2938/2938/2938 2980/2980/2980 +f 2979/2979/2979 2931/2931/2931 2980/2980/2980 2981/2981/2981 +f 2976/2976/2976 2975/2975/2975 2974/2974/2974 2982/2982/2982 +f 2975/2975/2975 2973/2973/2973 2979/2979/2979 2974/2974/2974 +f 2974/2974/2974 2979/2979/2979 2981/2981/2981 2983/2983/2983 +f 2982/2982/2982 2974/2974/2974 2983/2983/2983 2984/2984/2984 +f 2961/2961/2961 2960/2960/2960 2958/2958/2958 2985/2985/2985 +f 2960/2960/2960 2957/2957/2957 2986/2986/2986 2958/2958/2958 +f 2958/2958/2958 2986/2986/2986 2987/2987/2987 2989/2989/2989 +f 2985/2985/2985 2958/2958/2958 2989/2989/2989 2990/2990/2990 +f 2957/2957/2957 2956/2956/2956 2955/2955/2955 2986/2986/2986 +f 2956/2956/2956 2953/2953/2953 2971/2971/2971 2955/2955/2955 +f 2955/2955/2955 2971/2971/2971 2976/2976/2976 2992/2992/2992 +f 2986/2986/2986 2955/2955/2955 2992/2992/2992 2987/2987/2987 +f 2987/2987/2987 2992/2992/2992 2977/2977/2977 2993/2993/2993 +f 2992/2992/2992 2976/2976/2976 2982/2982/2982 2977/2977/2977 +f 2977/2977/2977 2982/2982/2982 2984/2984/2984 2994/2994/2994 +f 2993/2993/2993 2977/2977/2977 2994/2994/2994 2995/2995/2995 +f 2990/2990/2990 2989/2989/2989 2988/2988/2988 2996/2996/2996 +f 2989/2989/2989 2987/2987/2987 2993/2993/2993 2988/2988/2988 +f 2988/2988/2988 2993/2993/2993 2995/2995/2995 2997/2997/2997 +f 2996/2996/2996 2988/2988/2988 2997/2997/2997 2998/2998/2998 +f 1591/1591/1591 2440/2440/2440 1592/1592/1592 1765/1765/1765 +f 2440/2440/2440 2439/2439/2439 2999/2999/2999 1592/1592/1592 +f 1592/1592/1592 2999/2999/2999 3000/3000/3000 3002/3002/3002 +f 1765/1765/1765 1592/1592/1592 3002/3002/3002 1766/1766/1766 +f 2439/2439/2439 2438/2438/2438 2432/2432/2432 2999/2999/2999 +f 2438/2438/2438 2431/2431/2431 3003/3003/3003 2432/2432/2432 +f 2432/2432/2432 3003/3003/3003 3004/3004/3004 3006/3006/3006 +f 2999/2999/2999 2432/2432/2432 3006/3006/3006 3000/3000/3000 +f 3000/3000/3000 3006/3006/3006 3001/3001/3001 3007/3007/3007 +f 3006/3006/3006 3004/3004/3004 3008/3008/3008 3001/3001/3001 +f 3001/3001/3001 3008/3008/3008 3009/3009/3009 3012/3012/3012 +f 3007/3007/3007 3001/3001/3001 3012/3012/3012 3013/3013/3013 +f 1766/1766/1766 3002/3002/3002 1767/1767/1767 1770/1770/1770 +f 3002/3002/3002 3000/3000/3000 3007/3007/3007 1767/1767/1767 +f 1767/1767/1767 3007/3007/3007 3013/3013/3013 3014/3014/3014 +f 1770/1770/1770 1767/1767/1767 3014/3014/3014 1771/1771/1771 +f 2431/2431/2431 2430/2430/2430 2428/2428/2428 3003/3003/3003 +f 2430/2430/2430 2427/2427/2427 3015/3015/3015 2428/2428/2428 +f 2428/2428/2428 3015/3015/3015 3016/3016/3016 3018/3018/3018 +f 3003/3003/3003 2428/2428/2428 3018/3018/3018 3004/3004/3004 +f 2427/2427/2427 2426/2426/2426 2392/2392/2392 3015/3015/3015 +f 2426/2426/2426 2391/2391/2391 3019/3019/3019 2392/2392/2392 +f 2392/2392/2392 3019/3019/3019 3020/3020/3020 3022/3022/3022 +f 3015/3015/3015 2392/2392/2392 3022/3022/3022 3016/3016/3016 +f 3016/3016/3016 3022/3022/3022 3017/3017/3017 3023/3023/3023 +f 3022/3022/3022 3020/3020/3020 3024/3024/3024 3017/3017/3017 +f 3017/3017/3017 3024/3024/3024 3025/3025/3025 3028/3028/3028 +f 3023/3023/3023 3017/3017/3017 3028/3028/3028 3029/3029/3029 +f 3004/3004/3004 3018/3018/3018 3005/3005/3005 3008/3008/3008 +f 3018/3018/3018 3016/3016/3016 3023/3023/3023 3005/3005/3005 +f 3005/3005/3005 3023/3023/3023 3029/3029/3029 3030/3030/3030 +f 3008/3008/3008 3005/3005/3005 3030/3030/3030 3009/3009/3009 +f 3009/3009/3009 3030/3030/3030 3010/3010/3010 3031/3031/3031 +f 3030/3030/3030 3029/3029/3029 3032/3032/3032 3010/3010/3010 +f 3010/3010/3010 3032/3032/3032 3033/3033/3033 3036/3036/3036 +f 3031/3031/3031 3010/3010/3010 3036/3036/3036 3037/3037/3037 +f 3029/3029/3029 3028/3028/3028 3027/3027/3027 3032/3032/3032 +f 3028/3028/3028 3025/3025/3025 3039/3039/3039 3027/3027/3027 +f 3027/3027/3027 3039/3039/3039 3040/3040/3040 3042/3042/3042 +f 3032/3032/3032 3027/3027/3027 3042/3042/3042 3033/3033/3033 +f 3033/3033/3033 3042/3042/3042 3034/3034/3034 3043/3043/3043 +f 3042/3042/3042 3040/3040/3040 3044/3044/3044 3034/3034/3034 +f 3034/3034/3034 3044/3044/3044 3045/3045/3045 3048/3048/3048 +f 3043/3043/3043 3034/3034/3034 3048/3048/3048 3049/3049/3049 +f 3037/3037/3037 3036/3036/3036 3035/3035/3035 3051/3051/3051 +f 3036/3036/3036 3033/3033/3033 3043/3043/3043 3035/3035/3035 +f 3035/3035/3035 3043/3043/3043 3049/3049/3049 3052/3052/3052 +f 3051/3051/3051 3035/3035/3035 3052/3052/3052 3053/3053/3053 +f 1771/1771/1771 3014/3014/3014 1772/1772/1772 1785/1785/1785 +f 3014/3014/3014 3013/3013/3013 3055/3055/3055 1772/1772/1772 +f 1772/1772/1772 3055/3055/3055 3056/3056/3056 3057/3057/3057 +f 1785/1785/1785 1772/1772/1772 3057/3057/3057 1786/1786/1786 +f 3013/3013/3013 3012/3012/3012 3011/3011/3011 3055/3055/3055 +f 3012/3012/3012 3009/3009/3009 3031/3031/3031 3011/3011/3011 +f 3011/3011/3011 3031/3031/3031 3037/3037/3037 3058/3058/3058 +f 3055/3055/3055 3011/3011/3011 3058/3058/3058 3056/3056/3056 +f 3056/3056/3056 3058/3058/3058 3038/3038/3038 3059/3059/3059 +f 3058/3058/3058 3037/3037/3037 3051/3051/3051 3038/3038/3038 +f 3038/3038/3038 3051/3051/3051 3053/3053/3053 3060/3060/3060 +f 3059/3059/3059 3038/3038/3038 3060/3060/3060 3061/3061/3061 +f 1786/1786/1786 3057/3057/3057 1787/1787/1787 1790/1790/1790 +f 3057/3057/3057 3056/3056/3056 3059/3059/3059 1787/1787/1787 +f 1787/1787/1787 3059/3059/3059 3061/3061/3061 3062/3062/3062 +f 1790/1790/1790 1787/1787/1787 3062/3062/3062 1791/1791/1791 +f 2391/2391/2391 2390/2390/2390 2388/2388/2388 3019/3019/3019 +f 2390/2390/2390 2387/2387/2387 3063/3063/3063 2388/2388/2388 +f 2388/2388/2388 3063/3063/3063 3064/3064/3064 3066/3066/3066 +f 3019/3019/3019 2388/2388/2388 3066/3066/3066 3020/3020/3020 +f 2387/2387/2387 2386/2386/2386 2376/2376/2376 3063/3063/3063 +f 2386/2386/2386 2375/2375/2375 3067/3067/3067 2376/2376/2376 +f 2376/2376/2376 3067/3067/3067 3068/3068/3068 3070/3070/3070 +f 3063/3063/3063 2376/2376/2376 3070/3070/3070 3064/3064/3064 +f 3064/3064/3064 3070/3070/3070 3065/3065/3065 3071/3071/3071 +f 3070/3070/3070 3068/3068/3068 3072/3072/3072 3065/3065/3065 +f 3065/3065/3065 3072/3072/3072 3073/3073/3073 3076/3076/3076 +f 3071/3071/3071 3065/3065/3065 3076/3076/3076 3077/3077/3077 +f 3020/3020/3020 3066/3066/3066 3021/3021/3021 3024/3024/3024 +f 3066/3066/3066 3064/3064/3064 3071/3071/3071 3021/3021/3021 +f 3021/3021/3021 3071/3071/3071 3077/3077/3077 3078/3078/3078 +f 3024/3024/3024 3021/3021/3021 3078/3078/3078 3025/3025/3025 +f 2375/2375/2375 2374/2374/2374 2372/2372/2372 3067/3067/3067 +f 2374/2374/2374 2371/2371/2371 3079/3079/3079 2372/2372/2372 +f 2372/2372/2372 3079/3079/3079 3080/3080/3080 3081/3081/3081 +f 3067/3067/3067 2372/2372/2372 3081/3081/3081 3068/3068/3068 +f 2371/2371/2371 2370/2370/2370 2369/2369/2369 3079/3079/3079 +f 2370/2370/2370 2367/2367/2367 2721/2721/2721 2369/2369/2369 +f 2369/2369/2369 2721/2721/2721 2727/2727/2727 3082/3082/3082 +f 3079/3079/3079 2369/2369/2369 3082/3082/3082 3080/3080/3080 +f 3080/3080/3080 3082/3082/3082 2728/2728/2728 3083/3083/3083 +f 3082/3082/3082 2727/2727/2727 2741/2741/2741 2728/2728/2728 +f 2728/2728/2728 2741/2741/2741 2743/2743/2743 3084/3084/3084 +f 3083/3083/3083 2728/2728/2728 3084/3084/3084 3085/3085/3085 +f 3068/3068/3068 3081/3081/3081 3069/3069/3069 3072/3072/3072 +f 3081/3081/3081 3080/3080/3080 3083/3083/3083 3069/3069/3069 +f 3069/3069/3069 3083/3083/3083 3085/3085/3085 3086/3086/3086 +f 3072/3072/3072 3069/3069/3069 3086/3086/3086 3073/3073/3073 +f 3073/3073/3073 3086/3086/3086 3074/3074/3074 3087/3087/3087 +f 3086/3086/3086 3085/3085/3085 3088/3088/3088 3074/3074/3074 +f 3074/3074/3074 3088/3088/3088 3089/3089/3089 3091/3091/3091 +f 3087/3087/3087 3074/3074/3074 3091/3091/3091 3092/3092/3092 +f 3085/3085/3085 3084/3084/3084 2744/2744/2744 3088/3088/3088 +f 3084/3084/3084 2743/2743/2743 2785/2785/2785 2744/2744/2744 +f 2744/2744/2744 2785/2785/2785 2790/2790/2790 3094/3094/3094 +f 3088/3088/3088 2744/2744/2744 3094/3094/3094 3089/3089/3089 +f 3089/3089/3089 3094/3094/3094 2791/2791/2791 3095/3095/3095 +f 3094/3094/3094 2790/2790/2790 2797/2797/2797 2791/2791/2791 +f 2791/2791/2791 2797/2797/2797 2799/2799/2799 3096/3096/3096 +f 3095/3095/3095 2791/2791/2791 3096/3096/3096 3097/3097/3097 +f 3092/3092/3092 3091/3091/3091 3090/3090/3090 3099/3099/3099 +f 3091/3091/3091 3089/3089/3089 3095/3095/3095 3090/3090/3090 +f 3090/3090/3090 3095/3095/3095 3097/3097/3097 3100/3100/3100 +f 3099/3099/3099 3090/3090/3090 3100/3100/3100 3101/3101/3101 +f 3025/3025/3025 3078/3078/3078 3026/3026/3026 3039/3039/3039 +f 3078/3078/3078 3077/3077/3077 3103/3103/3103 3026/3026/3026 +f 3026/3026/3026 3103/3103/3103 3104/3104/3104 3105/3105/3105 +f 3039/3039/3039 3026/3026/3026 3105/3105/3105 3040/3040/3040 +f 3077/3077/3077 3076/3076/3076 3075/3075/3075 3103/3103/3103 +f 3076/3076/3076 3073/3073/3073 3087/3087/3087 3075/3075/3075 +f 3075/3075/3075 3087/3087/3087 3092/3092/3092 3106/3106/3106 +f 3103/3103/3103 3075/3075/3075 3106/3106/3106 3104/3104/3104 +f 3104/3104/3104 3106/3106/3106 3093/3093/3093 3107/3107/3107 +f 3106/3106/3106 3092/3092/3092 3099/3099/3099 3093/3093/3093 +f 3093/3093/3093 3099/3099/3099 3101/3101/3101 3108/3108/3108 +f 3107/3107/3107 3093/3093/3093 3108/3108/3108 3109/3109/3109 +f 3040/3040/3040 3105/3105/3105 3041/3041/3041 3044/3044/3044 +f 3105/3105/3105 3104/3104/3104 3107/3107/3107 3041/3041/3041 +f 3041/3041/3041 3107/3107/3107 3109/3109/3109 3110/3110/3110 +f 3044/3044/3044 3041/3041/3041 3110/3110/3110 3045/3045/3045 +f 3045/3045/3045 3110/3110/3110 3046/3046/3046 3111/3111/3111 +f 3110/3110/3110 3109/3109/3109 3112/3112/3112 3046/3046/3046 +f 3046/3046/3046 3112/3112/3112 3113/3113/3113 3116/3116/3116 +f 3111/3111/3111 3046/3046/3046 3116/3116/3116 3117/3117/3117 +f 3109/3109/3109 3108/3108/3108 3102/3102/3102 3112/3112/3112 +f 3108/3108/3108 3101/3101/3101 3119/3119/3119 3102/3102/3102 +f 3102/3102/3102 3119/3119/3119 3120/3120/3120 3122/3122/3122 +f 3112/3112/3112 3102/3102/3102 3122/3122/3122 3113/3113/3113 +f 3113/3113/3113 3122/3122/3122 3114/3114/3114 3123/3123/3123 +f 3122/3122/3122 3120/3120/3120 3124/3124/3124 3114/3114/3114 +f 3114/3114/3114 3124/3124/3124 3125/3125/3125 3128/3128/3128 +f 3123/3123/3123 3114/3114/3114 3128/3128/3128 3129/3129/3129 +f 3117/3117/3117 3116/3116/3116 3115/3115/3115 3131/3131/3131 +f 3116/3116/3116 3113/3113/3113 3123/3123/3123 3115/3115/3115 +f 3115/3115/3115 3123/3123/3123 3129/3129/3129 3132/3132/3132 +f 3131/3131/3131 3115/3115/3115 3132/3132/3132 3133/3133/3133 +f 3101/3101/3101 3100/3100/3100 3098/3098/3098 3119/3119/3119 +f 3100/3100/3100 3097/3097/3097 3135/3135/3135 3098/3098/3098 +f 3098/3098/3098 3135/3135/3135 3136/3136/3136 3137/3137/3137 +f 3119/3119/3119 3098/3098/3098 3137/3137/3137 3120/3120/3120 +f 3097/3097/3097 3096/3096/3096 2800/2800/2800 3135/3135/3135 +f 3096/3096/3096 2799/2799/2799 2939/2939/2939 2800/2800/2800 +f 2800/2800/2800 2939/2939/2939 2945/2945/2945 3138/3138/3138 +f 3135/3135/3135 2800/2800/2800 3138/3138/3138 3136/3136/3136 +f 3136/3136/3136 3138/3138/3138 2946/2946/2946 3139/3139/3139 +f 3138/3138/3138 2945/2945/2945 2959/2959/2959 2946/2946/2946 +f 2946/2946/2946 2959/2959/2959 2961/2961/2961 3140/3140/3140 +f 3139/3139/3139 2946/2946/2946 3140/3140/3140 3141/3141/3141 +f 3120/3120/3120 3137/3137/3137 3121/3121/3121 3124/3124/3124 +f 3137/3137/3137 3136/3136/3136 3139/3139/3139 3121/3121/3121 +f 3121/3121/3121 3139/3139/3139 3141/3141/3141 3142/3142/3142 +f 3124/3124/3124 3121/3121/3121 3142/3142/3142 3125/3125/3125 +f 3125/3125/3125 3142/3142/3142 3126/3126/3126 3143/3143/3143 +f 3142/3142/3142 3141/3141/3141 3144/3144/3144 3126/3126/3126 +f 3126/3126/3126 3144/3144/3144 3145/3145/3145 3147/3147/3147 +f 3143/3143/3143 3126/3126/3126 3147/3147/3147 3148/3148/3148 +f 3141/3141/3141 3140/3140/3140 2962/2962/2962 3144/3144/3144 +f 3140/3140/3140 2961/2961/2961 2985/2985/2985 2962/2962/2962 +f 2962/2962/2962 2985/2985/2985 2990/2990/2990 3150/3150/3150 +f 3144/3144/3144 2962/2962/2962 3150/3150/3150 3145/3145/3145 +f 3145/3145/3145 3150/3150/3150 2991/2991/2991 3151/3151/3151 +f 3150/3150/3150 2990/2990/2990 2996/2996/2996 2991/2991/2991 +f 2991/2991/2991 2996/2996/2996 2998/2998/2998 3152/3152/3152 +f 3151/3151/3151 2991/2991/2991 3152/3152/3152 3153/3153/3153 +f 3148/3148/3148 3147/3147/3147 3146/3146/3146 3154/3154/3154 +f 3147/3147/3147 3145/3145/3145 3151/3151/3151 3146/3146/3146 +f 3146/3146/3146 3151/3151/3151 3153/3153/3153 3155/3155/3155 +f 3154/3154/3154 3146/3146/3146 3155/3155/3155 3156/3156/3156 +f 3133/3133/3133 3132/3132/3132 3130/3130/3130 3157/3157/3157 +f 3132/3132/3132 3129/3129/3129 3158/3158/3158 3130/3130/3130 +f 3130/3130/3130 3158/3158/3158 3159/3159/3159 3161/3161/3161 +f 3157/3157/3157 3130/3130/3130 3161/3161/3161 3162/3162/3162 +f 3129/3129/3129 3128/3128/3128 3127/3127/3127 3158/3158/3158 +f 3128/3128/3128 3125/3125/3125 3143/3143/3143 3127/3127/3127 +f 3127/3127/3127 3143/3143/3143 3148/3148/3148 3164/3164/3164 +f 3158/3158/3158 3127/3127/3127 3164/3164/3164 3159/3159/3159 +f 3159/3159/3159 3164/3164/3164 3149/3149/3149 3165/3165/3165 +f 3164/3164/3164 3148/3148/3148 3154/3154/3154 3149/3149/3149 +f 3149/3149/3149 3154/3154/3154 3156/3156/3156 3166/3166/3166 +f 3165/3165/3165 3149/3149/3149 3166/3166/3166 3167/3167/3167 +f 3162/3162/3162 3161/3161/3161 3160/3160/3160 3168/3168/3168 +f 3161/3161/3161 3159/3159/3159 3165/3165/3165 3160/3160/3160 +f 3160/3160/3160 3165/3165/3165 3167/3167/3167 3169/3169/3169 +f 3168/3168/3168 3160/3160/3160 3169/3169/3169 3170/3170/3170 +f 1791/1791/1791 3062/3062/3062 1792/1792/1792 1837/1837/1837 +f 3062/3062/3062 3061/3061/3061 3171/3171/3171 1792/1792/1792 +f 1792/1792/1792 3171/3171/3171 3172/3172/3172 3174/3174/3174 +f 1837/1837/1837 1792/1792/1792 3174/3174/3174 1838/1838/1838 +f 3061/3061/3061 3060/3060/3060 3054/3054/3054 3171/3171/3171 +f 3060/3060/3060 3053/3053/3053 3175/3175/3175 3054/3054/3054 +f 3054/3054/3054 3175/3175/3175 3176/3176/3176 3178/3178/3178 +f 3171/3171/3171 3054/3054/3054 3178/3178/3178 3172/3172/3172 +f 3172/3172/3172 3178/3178/3178 3173/3173/3173 3179/3179/3179 +f 3178/3178/3178 3176/3176/3176 3180/3180/3180 3173/3173/3173 +f 3173/3173/3173 3180/3180/3180 3181/3181/3181 3184/3184/3184 +f 3179/3179/3179 3173/3173/3173 3184/3184/3184 3185/3185/3185 +f 1838/1838/1838 3174/3174/3174 1839/1839/1839 1842/1842/1842 +f 3174/3174/3174 3172/3172/3172 3179/3179/3179 1839/1839/1839 +f 1839/1839/1839 3179/3179/3179 3185/3185/3185 3186/3186/3186 +f 1842/1842/1842 1839/1839/1839 3186/3186/3186 1843/1843/1843 +f 3053/3053/3053 3052/3052/3052 3050/3050/3050 3175/3175/3175 +f 3052/3052/3052 3049/3049/3049 3187/3187/3187 3050/3050/3050 +f 3050/3050/3050 3187/3187/3187 3188/3188/3188 3189/3189/3189 +f 3175/3175/3175 3050/3050/3050 3189/3189/3189 3176/3176/3176 +f 3049/3049/3049 3048/3048/3048 3047/3047/3047 3187/3187/3187 +f 3048/3048/3048 3045/3045/3045 3111/3111/3111 3047/3047/3047 +f 3047/3047/3047 3111/3111/3111 3117/3117/3117 3190/3190/3190 +f 3187/3187/3187 3047/3047/3047 3190/3190/3190 3188/3188/3188 +f 3188/3188/3188 3190/3190/3190 3118/3118/3118 3191/3191/3191 +f 3190/3190/3190 3117/3117/3117 3131/3131/3131 3118/3118/3118 +f 3118/3118/3118 3131/3131/3131 3133/3133/3133 3192/3192/3192 +f 3191/3191/3191 3118/3118/3118 3192/3192/3192 3193/3193/3193 +f 3176/3176/3176 3189/3189/3189 3177/3177/3177 3180/3180/3180 +f 3189/3189/3189 3188/3188/3188 3191/3191/3191 3177/3177/3177 +f 3177/3177/3177 3191/3191/3191 3193/3193/3193 3194/3194/3194 +f 3180/3180/3180 3177/3177/3177 3194/3194/3194 3181/3181/3181 +f 3181/3181/3181 3194/3194/3194 3182/3182/3182 3195/3195/3195 +f 3194/3194/3194 3193/3193/3193 3196/3196/3196 3182/3182/3182 +f 3182/3182/3182 3196/3196/3196 3197/3197/3197 3199/3199/3199 +f 3195/3195/3195 3182/3182/3182 3199/3199/3199 3200/3200/3200 +f 3193/3193/3193 3192/3192/3192 3134/3134/3134 3196/3196/3196 +f 3192/3192/3192 3133/3133/3133 3157/3157/3157 3134/3134/3134 +f 3134/3134/3134 3157/3157/3157 3162/3162/3162 3202/3202/3202 +f 3196/3196/3196 3134/3134/3134 3202/3202/3202 3197/3197/3197 +f 3197/3197/3197 3202/3202/3202 3163/3163/3163 3203/3203/3203 +f 3202/3202/3202 3162/3162/3162 3168/3168/3168 3163/3163/3163 +f 3163/3163/3163 3168/3168/3168 3170/3170/3170 3204/3204/3204 +f 3203/3203/3203 3163/3163/3163 3204/3204/3204 3205/3205/3205 +f 3200/3200/3200 3199/3199/3199 3198/3198/3198 3206/3206/3206 +f 3199/3199/3199 3197/3197/3197 3203/3203/3203 3198/3198/3198 +f 3198/3198/3198 3203/3203/3203 3205/3205/3205 3207/3207/3207 +f 3206/3206/3206 3198/3198/3198 3207/3207/3207 3208/3208/3208 +f 1843/1843/1843 3186/3186/3186 1844/1844/1844 1857/1857/1857 +f 3186/3186/3186 3185/3185/3185 3209/3209/3209 1844/1844/1844 +f 1844/1844/1844 3209/3209/3209 3210/3210/3210 3211/3211/3211 +f 1857/1857/1857 1844/1844/1844 3211/3211/3211 1858/1858/1858 +f 3185/3185/3185 3184/3184/3184 3183/3183/3183 3209/3209/3209 +f 3184/3184/3184 3181/3181/3181 3195/3195/3195 3183/3183/3183 +f 3183/3183/3183 3195/3195/3195 3200/3200/3200 3212/3212/3212 +f 3209/3209/3209 3183/3183/3183 3212/3212/3212 3210/3210/3210 +f 3210/3210/3210 3212/3212/3212 3201/3201/3201 3213/3213/3213 +f 3212/3212/3212 3200/3200/3200 3206/3206/3206 3201/3201/3201 +f 3201/3201/3201 3206/3206/3206 3208/3208/3208 3214/3214/3214 +f 3213/3213/3213 3201/3201/3201 3214/3214/3214 3215/3215/3215 +f 1858/1858/1858 3211/3211/3211 1859/1859/1859 1862/1862/1862 +f 3211/3211/3211 3210/3210/3210 3213/3213/3213 1859/1859/1859 +f 1859/1859/1859 3213/3213/3213 3215/3215/3215 3216/3216/3216 +f 1862/1862/1862 1859/1859/1859 3216/3216/3216 1863/1863/1863 +f 2547/2547/2547 3217/3217/3217 2549/2549/2549 2548/2548/2548 +f 3217/3217/3217 3218/3218/3218 3219/3219/3219 2549/2549/2549 +f 2549/2549/2549 3219/3219/3219 3221/3221/3221 3223/3223/3223 +f 2548/2548/2548 2549/2549/2549 3223/3223/3223 2550/2550/2550 +f 3218/3218/3218 3224/3224/3224 3220/3220/3220 3219/3219/3219 +f 3224/3224/3224 3225/3225/3225 3226/3226/3226 3220/3220/3220 +f 3220/3220/3220 3226/3226/3226 3228/3228/3228 3230/3230/3230 +f 3219/3219/3219 3220/3220/3220 3230/3230/3230 3221/3221/3221 +f 3221/3221/3221 3230/3230/3230 3222/3222/3222 3231/3231/3231 +f 3230/3230/3230 3228/3228/3228 3232/3232/3232 3222/3222/3222 +f 3222/3222/3222 3232/3232/3232 3233/3233/3233 3236/3236/3236 +f 3231/3231/3231 3222/3222/3222 3236/3236/3236 3237/3237/3237 +f 2550/2550/2550 3223/3223/3223 2551/2551/2551 2554/2554/2554 +f 3223/3223/3223 3221/3221/3221 3231/3231/3231 2551/2551/2551 +f 2551/2551/2551 3231/3231/3231 3237/3237/3237 3238/3238/3238 +f 2554/2554/2554 2551/2551/2551 3238/3238/3238 2555/2555/2555 +f 3225/3225/3225 3239/3239/3239 3227/3227/3227 3226/3226/3226 +f 3239/3239/3239 3240/3240/3240 3241/3241/3241 3227/3227/3227 +f 3227/3227/3227 3241/3241/3241 3243/3243/3243 3245/3245/3245 +f 3226/3226/3226 3227/3227/3227 3245/3245/3245 3228/3228/3228 +f 3240/3240/3240 3246/3246/3246 3242/3242/3242 3241/3241/3241 +f 3246/3246/3246 3247/3247/3247 3248/3248/3248 3242/3242/3242 +f 3242/3242/3242 3248/3248/3248 3250/3250/3250 3252/3252/3252 +f 3241/3241/3241 3242/3242/3242 3252/3252/3252 3243/3243/3243 +f 3243/3243/3243 3252/3252/3252 3244/3244/3244 3253/3253/3253 +f 3252/3252/3252 3250/3250/3250 3254/3254/3254 3244/3244/3244 +f 3244/3244/3244 3254/3254/3254 3255/3255/3255 3258/3258/3258 +f 3253/3253/3253 3244/3244/3244 3258/3258/3258 3259/3259/3259 +f 3228/3228/3228 3245/3245/3245 3229/3229/3229 3232/3232/3232 +f 3245/3245/3245 3243/3243/3243 3253/3253/3253 3229/3229/3229 +f 3229/3229/3229 3253/3253/3253 3259/3259/3259 3260/3260/3260 +f 3232/3232/3232 3229/3229/3229 3260/3260/3260 3233/3233/3233 +f 3233/3233/3233 3260/3260/3260 3234/3234/3234 3261/3261/3261 +f 3260/3260/3260 3259/3259/3259 3262/3262/3262 3234/3234/3234 +f 3234/3234/3234 3262/3262/3262 3263/3263/3263 3266/3266/3266 +f 3261/3261/3261 3234/3234/3234 3266/3266/3266 3267/3267/3267 +f 3259/3259/3259 3258/3258/3258 3257/3257/3257 3262/3262/3262 +f 3258/3258/3258 3255/3255/3255 3269/3269/3269 3257/3257/3257 +f 3257/3257/3257 3269/3269/3269 3270/3270/3270 3272/3272/3272 +f 3262/3262/3262 3257/3257/3257 3272/3272/3272 3263/3263/3263 +f 3263/3263/3263 3272/3272/3272 3264/3264/3264 3273/3273/3273 +f 3272/3272/3272 3270/3270/3270 3274/3274/3274 3264/3264/3264 +f 3264/3264/3264 3274/3274/3274 3275/3275/3275 3278/3278/3278 +f 3273/3273/3273 3264/3264/3264 3278/3278/3278 3279/3279/3279 +f 3267/3267/3267 3266/3266/3266 3265/3265/3265 3281/3281/3281 +f 3266/3266/3266 3263/3263/3263 3273/3273/3273 3265/3265/3265 +f 3265/3265/3265 3273/3273/3273 3279/3279/3279 3282/3282/3282 +f 3281/3281/3281 3265/3265/3265 3282/3282/3282 3283/3283/3283 +f 2555/2555/2555 3238/3238/3238 2556/2556/2556 2569/2569/2569 +f 3238/3238/3238 3237/3237/3237 3285/3285/3285 2556/2556/2556 +f 2556/2556/2556 3285/3285/3285 3286/3286/3286 3287/3287/3287 +f 2569/2569/2569 2556/2556/2556 3287/3287/3287 2570/2570/2570 +f 3237/3237/3237 3236/3236/3236 3235/3235/3235 3285/3285/3285 +f 3236/3236/3236 3233/3233/3233 3261/3261/3261 3235/3235/3235 +f 3235/3235/3235 3261/3261/3261 3267/3267/3267 3288/3288/3288 +f 3285/3285/3285 3235/3235/3235 3288/3288/3288 3286/3286/3286 +f 3286/3286/3286 3288/3288/3288 3268/3268/3268 3289/3289/3289 +f 3288/3288/3288 3267/3267/3267 3281/3281/3281 3268/3268/3268 +f 3268/3268/3268 3281/3281/3281 3283/3283/3283 3290/3290/3290 +f 3289/3289/3289 3268/3268/3268 3290/3290/3290 3291/3291/3291 +f 2570/2570/2570 3287/3287/3287 2571/2571/2571 2574/2574/2574 +f 3287/3287/3287 3286/3286/3286 3289/3289/3289 2571/2571/2571 +f 2571/2571/2571 3289/3289/3289 3291/3291/3291 3292/3292/3292 +f 2574/2574/2574 2571/2571/2571 3292/3292/3292 2575/2575/2575 +f 3247/3247/3247 3293/3293/3293 3249/3249/3249 3248/3248/3248 +f 3293/3293/3293 3294/3294/3294 3295/3295/3295 3249/3249/3249 +f 3249/3249/3249 3295/3295/3295 3297/3297/3297 3299/3299/3299 +f 3248/3248/3248 3249/3249/3249 3299/3299/3299 3250/3250/3250 +f 3294/3294/3294 3300/3300/3300 3296/3296/3296 3295/3295/3295 +f 3300/3300/3300 3301/3301/3301 3302/3302/3302 3296/3296/3296 +f 3296/3296/3296 3302/3302/3302 3304/3304/3304 3306/3306/3306 +f 3295/3295/3295 3296/3296/3296 3306/3306/3306 3297/3297/3297 +f 3297/3297/3297 3306/3306/3306 3298/3298/3298 3307/3307/3307 +f 3306/3306/3306 3304/3304/3304 3308/3308/3308 3298/3298/3298 +f 3298/3298/3298 3308/3308/3308 3309/3309/3309 3312/3312/3312 +f 3307/3307/3307 3298/3298/3298 3312/3312/3312 3313/3313/3313 +f 3250/3250/3250 3299/3299/3299 3251/3251/3251 3254/3254/3254 +f 3299/3299/3299 3297/3297/3297 3307/3307/3307 3251/3251/3251 +f 3251/3251/3251 3307/3307/3307 3313/3313/3313 3314/3314/3314 +f 3254/3254/3254 3251/3251/3251 3314/3314/3314 3255/3255/3255 +f 3301/3301/3301 3315/3315/3315 3303/3303/3303 3302/3302/3302 +f 3315/3315/3315 3316/3316/3316 3317/3317/3317 3303/3303/3303 +f 3303/3303/3303 3317/3317/3317 3319/3319/3319 3321/3321/3321 +f 3302/3302/3302 3303/3303/3303 3321/3321/3321 3304/3304/3304 +f 3316/3316/3316 3322/3322/3322 3318/3318/3318 3317/3317/3317 +f 3322/3322/3322 3323/3323/3323 3324/3324/3324 3318/3318/3318 +f 3318/3318/3318 3324/3324/3324 3326/3326/3326 3328/3328/3328 +f 3317/3317/3317 3318/3318/3318 3328/3328/3328 3319/3319/3319 +f 3319/3319/3319 3328/3328/3328 3320/3320/3320 3329/3329/3329 +f 3328/3328/3328 3326/3326/3326 3330/3330/3330 3320/3320/3320 +f 3320/3320/3320 3330/3330/3330 3331/3331/3331 3334/3334/3334 +f 3329/3329/3329 3320/3320/3320 3334/3334/3334 3335/3335/3335 +f 3304/3304/3304 3321/3321/3321 3305/3305/3305 3308/3308/3308 +f 3321/3321/3321 3319/3319/3319 3329/3329/3329 3305/3305/3305 +f 3305/3305/3305 3329/3329/3329 3335/3335/3335 3336/3336/3336 +f 3308/3308/3308 3305/3305/3305 3336/3336/3336 3309/3309/3309 +f 3309/3309/3309 3336/3336/3336 3310/3310/3310 3337/3337/3337 +f 3336/3336/3336 3335/3335/3335 3338/3338/3338 3310/3310/3310 +f 3310/3310/3310 3338/3338/3338 3339/3339/3339 3342/3342/3342 +f 3337/3337/3337 3310/3310/3310 3342/3342/3342 3343/3343/3343 +f 3335/3335/3335 3334/3334/3334 3333/3333/3333 3338/3338/3338 +f 3334/3334/3334 3331/3331/3331 3345/3345/3345 3333/3333/3333 +f 3333/3333/3333 3345/3345/3345 3346/3346/3346 3348/3348/3348 +f 3338/3338/3338 3333/3333/3333 3348/3348/3348 3339/3339/3339 +f 3339/3339/3339 3348/3348/3348 3340/3340/3340 3349/3349/3349 +f 3348/3348/3348 3346/3346/3346 3350/3350/3350 3340/3340/3340 +f 3340/3340/3340 3350/3350/3350 3351/3351/3351 3354/3354/3354 +f 3349/3349/3349 3340/3340/3340 3354/3354/3354 3355/3355/3355 +f 3343/3343/3343 3342/3342/3342 3341/3341/3341 3357/3357/3357 +f 3342/3342/3342 3339/3339/3339 3349/3349/3349 3341/3341/3341 +f 3341/3341/3341 3349/3349/3349 3355/3355/3355 3358/3358/3358 +f 3357/3357/3357 3341/3341/3341 3358/3358/3358 3359/3359/3359 +f 3255/3255/3255 3314/3314/3314 3256/3256/3256 3269/3269/3269 +f 3314/3314/3314 3313/3313/3313 3361/3361/3361 3256/3256/3256 +f 3256/3256/3256 3361/3361/3361 3362/3362/3362 3363/3363/3363 +f 3269/3269/3269 3256/3256/3256 3363/3363/3363 3270/3270/3270 +f 3313/3313/3313 3312/3312/3312 3311/3311/3311 3361/3361/3361 +f 3312/3312/3312 3309/3309/3309 3337/3337/3337 3311/3311/3311 +f 3311/3311/3311 3337/3337/3337 3343/3343/3343 3364/3364/3364 +f 3361/3361/3361 3311/3311/3311 3364/3364/3364 3362/3362/3362 +f 3362/3362/3362 3364/3364/3364 3344/3344/3344 3365/3365/3365 +f 3364/3364/3364 3343/3343/3343 3357/3357/3357 3344/3344/3344 +f 3344/3344/3344 3357/3357/3357 3359/3359/3359 3366/3366/3366 +f 3365/3365/3365 3344/3344/3344 3366/3366/3366 3367/3367/3367 +f 3270/3270/3270 3363/3363/3363 3271/3271/3271 3274/3274/3274 +f 3363/3363/3363 3362/3362/3362 3365/3365/3365 3271/3271/3271 +f 3271/3271/3271 3365/3365/3365 3367/3367/3367 3368/3368/3368 +f 3274/3274/3274 3271/3271/3271 3368/3368/3368 3275/3275/3275 +f 3275/3275/3275 3368/3368/3368 3276/3276/3276 3369/3369/3369 +f 3368/3368/3368 3367/3367/3367 3370/3370/3370 3276/3276/3276 +f 3276/3276/3276 3370/3370/3370 3371/3371/3371 3374/3374/3374 +f 3369/3369/3369 3276/3276/3276 3374/3374/3374 3375/3375/3375 +f 3367/3367/3367 3366/3366/3366 3360/3360/3360 3370/3370/3370 +f 3366/3366/3366 3359/3359/3359 3377/3377/3377 3360/3360/3360 +f 3360/3360/3360 3377/3377/3377 3378/3378/3378 3380/3380/3380 +f 3370/3370/3370 3360/3360/3360 3380/3380/3380 3371/3371/3371 +f 3371/3371/3371 3380/3380/3380 3372/3372/3372 3381/3381/3381 +f 3380/3380/3380 3378/3378/3378 3382/3382/3382 3372/3372/3372 +f 3372/3372/3372 3382/3382/3382 3383/3383/3383 3386/3386/3386 +f 3381/3381/3381 3372/3372/3372 3386/3386/3386 3387/3387/3387 +f 3375/3375/3375 3374/3374/3374 3373/3373/3373 3389/3389/3389 +f 3374/3374/3374 3371/3371/3371 3381/3381/3381 3373/3373/3373 +f 3373/3373/3373 3381/3381/3381 3387/3387/3387 3390/3390/3390 +f 3389/3389/3389 3373/3373/3373 3390/3390/3390 3391/3391/3391 +f 3359/3359/3359 3358/3358/3358 3356/3356/3356 3377/3377/3377 +f 3358/3358/3358 3355/3355/3355 3393/3393/3393 3356/3356/3356 +f 3356/3356/3356 3393/3393/3393 3394/3394/3394 3396/3396/3396 +f 3377/3377/3377 3356/3356/3356 3396/3396/3396 3378/3378/3378 +f 3355/3355/3355 3354/3354/3354 3353/3353/3353 3393/3393/3393 +f 3354/3354/3354 3351/3351/3351 3397/3397/3397 3353/3353/3353 +f 3353/3353/3353 3397/3397/3397 3398/3398/3398 3400/3400/3400 +f 3393/3393/3393 3353/3353/3353 3400/3400/3400 3394/3394/3394 +f 3394/3394/3394 3400/3400/3400 3395/3395/3395 3401/3401/3401 +f 3400/3400/3400 3398/3398/3398 3402/3402/3402 3395/3395/3395 +f 3395/3395/3395 3402/3402/3402 3403/3403/3403 3406/3406/3406 +f 3401/3401/3401 3395/3395/3395 3406/3406/3406 3407/3407/3407 +f 3378/3378/3378 3396/3396/3396 3379/3379/3379 3382/3382/3382 +f 3396/3396/3396 3394/3394/3394 3401/3401/3401 3379/3379/3379 +f 3379/3379/3379 3401/3401/3401 3407/3407/3407 3408/3408/3408 +f 3382/3382/3382 3379/3379/3379 3408/3408/3408 3383/3383/3383 +f 3383/3383/3383 3408/3408/3408 3384/3384/3384 3409/3409/3409 +f 3408/3408/3408 3407/3407/3407 3410/3410/3410 3384/3384/3384 +f 3384/3384/3384 3410/3410/3410 3411/3411/3411 3414/3414/3414 +f 3409/3409/3409 3384/3384/3384 3414/3414/3414 3415/3415/3415 +f 3407/3407/3407 3406/3406/3406 3405/3405/3405 3410/3410/3410 +f 3406/3406/3406 3403/3403/3403 3417/3417/3417 3405/3405/3405 +f 3405/3405/3405 3417/3417/3417 3418/3418/3418 3420/3420/3420 +f 3410/3410/3410 3405/3405/3405 3420/3420/3420 3411/3411/3411 +f 3411/3411/3411 3420/3420/3420 3412/3412/3412 3421/3421/3421 +f 3420/3420/3420 3418/3418/3418 3422/3422/3422 3412/3412/3412 +f 3412/3412/3412 3422/3422/3422 3423/3423/3423 3426/3426/3426 +f 3421/3421/3421 3412/3412/3412 3426/3426/3426 3427/3427/3427 +f 3415/3415/3415 3414/3414/3414 3413/3413/3413 3429/3429/3429 +f 3414/3414/3414 3411/3411/3411 3421/3421/3421 3413/3413/3413 +f 3413/3413/3413 3421/3421/3421 3427/3427/3427 3430/3430/3430 +f 3429/3429/3429 3413/3413/3413 3430/3430/3430 3431/3431/3431 +f 3391/3391/3391 3390/3390/3390 3388/3388/3388 3433/3433/3433 +f 3390/3390/3390 3387/3387/3387 3434/3434/3434 3388/3388/3388 +f 3388/3388/3388 3434/3434/3434 3435/3435/3435 3437/3437/3437 +f 3433/3433/3433 3388/3388/3388 3437/3437/3437 3438/3438/3438 +f 3387/3387/3387 3386/3386/3386 3385/3385/3385 3434/3434/3434 +f 3386/3386/3386 3383/3383/3383 3409/3409/3409 3385/3385/3385 +f 3385/3385/3385 3409/3409/3409 3415/3415/3415 3440/3440/3440 +f 3434/3434/3434 3385/3385/3385 3440/3440/3440 3435/3435/3435 +f 3435/3435/3435 3440/3440/3440 3416/3416/3416 3441/3441/3441 +f 3440/3440/3440 3415/3415/3415 3429/3429/3429 3416/3416/3416 +f 3416/3416/3416 3429/3429/3429 3431/3431/3431 3442/3442/3442 +f 3441/3441/3441 3416/3416/3416 3442/3442/3442 3443/3443/3443 +f 3438/3438/3438 3437/3437/3437 3436/3436/3436 3445/3445/3445 +f 3437/3437/3437 3435/3435/3435 3441/3441/3441 3436/3436/3436 +f 3436/3436/3436 3441/3441/3441 3443/3443/3443 3446/3446/3446 +f 3445/3445/3445 3436/3436/3436 3446/3446/3446 3447/3447/3447 +f 2575/2575/2575 3292/3292/3292 2576/2576/2576 2621/2621/2621 +f 3292/3292/3292 3291/3291/3291 3449/3449/3449 2576/2576/2576 +f 2576/2576/2576 3449/3449/3449 3450/3450/3450 3452/3452/3452 +f 2621/2621/2621 2576/2576/2576 3452/3452/3452 2622/2622/2622 +f 3291/3291/3291 3290/3290/3290 3284/3284/3284 3449/3449/3449 +f 3290/3290/3290 3283/3283/3283 3453/3453/3453 3284/3284/3284 +f 3284/3284/3284 3453/3453/3453 3454/3454/3454 3456/3456/3456 +f 3449/3449/3449 3284/3284/3284 3456/3456/3456 3450/3450/3450 +f 3450/3450/3450 3456/3456/3456 3451/3451/3451 3457/3457/3457 +f 3456/3456/3456 3454/3454/3454 3458/3458/3458 3451/3451/3451 +f 3451/3451/3451 3458/3458/3458 3459/3459/3459 3462/3462/3462 +f 3457/3457/3457 3451/3451/3451 3462/3462/3462 3463/3463/3463 +f 2622/2622/2622 3452/3452/3452 2623/2623/2623 2626/2626/2626 +f 3452/3452/3452 3450/3450/3450 3457/3457/3457 2623/2623/2623 +f 2623/2623/2623 3457/3457/3457 3463/3463/3463 3464/3464/3464 +f 2626/2626/2626 2623/2623/2623 3464/3464/3464 2627/2627/2627 +f 3283/3283/3283 3282/3282/3282 3280/3280/3280 3453/3453/3453 +f 3282/3282/3282 3279/3279/3279 3465/3465/3465 3280/3280/3280 +f 3280/3280/3280 3465/3465/3465 3466/3466/3466 3467/3467/3467 +f 3453/3453/3453 3280/3280/3280 3467/3467/3467 3454/3454/3454 +f 3279/3279/3279 3278/3278/3278 3277/3277/3277 3465/3465/3465 +f 3278/3278/3278 3275/3275/3275 3369/3369/3369 3277/3277/3277 +f 3277/3277/3277 3369/3369/3369 3375/3375/3375 3468/3468/3468 +f 3465/3465/3465 3277/3277/3277 3468/3468/3468 3466/3466/3466 +f 3466/3466/3466 3468/3468/3468 3376/3376/3376 3469/3469/3469 +f 3468/3468/3468 3375/3375/3375 3389/3389/3389 3376/3376/3376 +f 3376/3376/3376 3389/3389/3389 3391/3391/3391 3470/3470/3470 +f 3469/3469/3469 3376/3376/3376 3470/3470/3470 3471/3471/3471 +f 3454/3454/3454 3467/3467/3467 3455/3455/3455 3458/3458/3458 +f 3467/3467/3467 3466/3466/3466 3469/3469/3469 3455/3455/3455 +f 3455/3455/3455 3469/3469/3469 3471/3471/3471 3472/3472/3472 +f 3458/3458/3458 3455/3455/3455 3472/3472/3472 3459/3459/3459 +f 3459/3459/3459 3472/3472/3472 3460/3460/3460 3473/3473/3473 +f 3472/3472/3472 3471/3471/3471 3474/3474/3474 3460/3460/3460 +f 3460/3460/3460 3474/3474/3474 3475/3475/3475 3477/3477/3477 +f 3473/3473/3473 3460/3460/3460 3477/3477/3477 3478/3478/3478 +f 3471/3471/3471 3470/3470/3470 3392/3392/3392 3474/3474/3474 +f 3470/3470/3470 3391/3391/3391 3433/3433/3433 3392/3392/3392 +f 3392/3392/3392 3433/3433/3433 3438/3438/3438 3480/3480/3480 +f 3474/3474/3474 3392/3392/3392 3480/3480/3480 3475/3475/3475 +f 3475/3475/3475 3480/3480/3480 3439/3439/3439 3481/3481/3481 +f 3480/3480/3480 3438/3438/3438 3445/3445/3445 3439/3439/3439 +f 3439/3439/3439 3445/3445/3445 3447/3447/3447 3482/3482/3482 +f 3481/3481/3481 3439/3439/3439 3482/3482/3482 3483/3483/3483 +f 3478/3478/3478 3477/3477/3477 3476/3476/3476 3485/3485/3485 +f 3477/3477/3477 3475/3475/3475 3481/3481/3481 3476/3476/3476 +f 3476/3476/3476 3481/3481/3481 3483/3483/3483 3486/3486/3486 +f 3485/3485/3485 3476/3476/3476 3486/3486/3486 3487/3487/3487 +f 2627/2627/2627 3464/3464/3464 2628/2628/2628 2641/2641/2641 +f 3464/3464/3464 3463/3463/3463 3489/3489/3489 2628/2628/2628 +f 2628/2628/2628 3489/3489/3489 3490/3490/3490 3491/3491/3491 +f 2641/2641/2641 2628/2628/2628 3491/3491/3491 2642/2642/2642 +f 3463/3463/3463 3462/3462/3462 3461/3461/3461 3489/3489/3489 +f 3462/3462/3462 3459/3459/3459 3473/3473/3473 3461/3461/3461 +f 3461/3461/3461 3473/3473/3473 3478/3478/3478 3492/3492/3492 +f 3489/3489/3489 3461/3461/3461 3492/3492/3492 3490/3490/3490 +f 3490/3490/3490 3492/3492/3492 3479/3479/3479 3493/3493/3493 +f 3492/3492/3492 3478/3478/3478 3485/3485/3485 3479/3479/3479 +f 3479/3479/3479 3485/3485/3485 3487/3487/3487 3494/3494/3494 +f 3493/3493/3493 3479/3479/3479 3494/3494/3494 3495/3495/3495 +f 2642/2642/2642 3491/3491/3491 2643/2643/2643 2646/2646/2646 +f 3491/3491/3491 3490/3490/3490 3493/3493/3493 2643/2643/2643 +f 2643/2643/2643 3493/3493/3493 3495/3495/3495 3496/3496/3496 +f 2646/2646/2646 2643/2643/2643 3496/3496/3496 2647/2647/2647 +f 3323/3323/3323 3497/3497/3497 3325/3325/3325 3324/3324/3324 +f 3497/3497/3497 3498/3498/3498 3499/3499/3499 3325/3325/3325 +f 3325/3325/3325 3499/3499/3499 3501/3501/3501 3503/3503/3503 +f 3324/3324/3324 3325/3325/3325 3503/3503/3503 3326/3326/3326 +f 3498/3498/3498 3504/3504/3504 3500/3500/3500 3499/3499/3499 +f 3504/3504/3504 3505/3505/3505 3506/3506/3506 3500/3500/3500 +f 3500/3500/3500 3506/3506/3506 3508/3508/3508 3510/3510/3510 +f 3499/3499/3499 3500/3500/3500 3510/3510/3510 3501/3501/3501 +f 3501/3501/3501 3510/3510/3510 3502/3502/3502 3511/3511/3511 +f 3510/3510/3510 3508/3508/3508 3512/3512/3512 3502/3502/3502 +f 3502/3502/3502 3512/3512/3512 3513/3513/3513 3516/3516/3516 +f 3511/3511/3511 3502/3502/3502 3516/3516/3516 3517/3517/3517 +f 3326/3326/3326 3503/3503/3503 3327/3327/3327 3330/3330/3330 +f 3503/3503/3503 3501/3501/3501 3511/3511/3511 3327/3327/3327 +f 3327/3327/3327 3511/3511/3511 3517/3517/3517 3518/3518/3518 +f 3330/3330/3330 3327/3327/3327 3518/3518/3518 3331/3331/3331 +f 3505/3505/3505 3519/3519/3519 3507/3507/3507 3506/3506/3506 +f 3519/3519/3519 3520/3520/3520 3521/3521/3521 3507/3507/3507 +f 3507/3507/3507 3521/3521/3521 3523/3523/3523 3525/3525/3525 +f 3506/3506/3506 3507/3507/3507 3525/3525/3525 3508/3508/3508 +f 3520/3520/3520 3526/3526/3526 3522/3522/3522 3521/3521/3521 +f 3526/3526/3526 3527/3527/3527 3528/3528/3528 3522/3522/3522 +f 3522/3522/3522 3528/3528/3528 3530/3530/3530 3532/3532/3532 +f 3521/3521/3521 3522/3522/3522 3532/3532/3532 3523/3523/3523 +f 3523/3523/3523 3532/3532/3532 3524/3524/3524 3533/3533/3533 +f 3532/3532/3532 3530/3530/3530 3534/3534/3534 3524/3524/3524 +f 3524/3524/3524 3534/3534/3534 3535/3535/3535 3538/3538/3538 +f 3533/3533/3533 3524/3524/3524 3538/3538/3538 3539/3539/3539 +f 3508/3508/3508 3525/3525/3525 3509/3509/3509 3512/3512/3512 +f 3525/3525/3525 3523/3523/3523 3533/3533/3533 3509/3509/3509 +f 3509/3509/3509 3533/3533/3533 3539/3539/3539 3540/3540/3540 +f 3512/3512/3512 3509/3509/3509 3540/3540/3540 3513/3513/3513 +f 3513/3513/3513 3540/3540/3540 3514/3514/3514 3541/3541/3541 +f 3540/3540/3540 3539/3539/3539 3542/3542/3542 3514/3514/3514 +f 3514/3514/3514 3542/3542/3542 3543/3543/3543 3546/3546/3546 +f 3541/3541/3541 3514/3514/3514 3546/3546/3546 3547/3547/3547 +f 3539/3539/3539 3538/3538/3538 3537/3537/3537 3542/3542/3542 +f 3538/3538/3538 3535/3535/3535 3549/3549/3549 3537/3537/3537 +f 3537/3537/3537 3549/3549/3549 3550/3550/3550 3552/3552/3552 +f 3542/3542/3542 3537/3537/3537 3552/3552/3552 3543/3543/3543 +f 3543/3543/3543 3552/3552/3552 3544/3544/3544 3553/3553/3553 +f 3552/3552/3552 3550/3550/3550 3554/3554/3554 3544/3544/3544 +f 3544/3544/3544 3554/3554/3554 3555/3555/3555 3558/3558/3558 +f 3553/3553/3553 3544/3544/3544 3558/3558/3558 3559/3559/3559 +f 3547/3547/3547 3546/3546/3546 3545/3545/3545 3561/3561/3561 +f 3546/3546/3546 3543/3543/3543 3553/3553/3553 3545/3545/3545 +f 3545/3545/3545 3553/3553/3553 3559/3559/3559 3562/3562/3562 +f 3561/3561/3561 3545/3545/3545 3562/3562/3562 3563/3563/3563 +f 3331/3331/3331 3518/3518/3518 3332/3332/3332 3345/3345/3345 +f 3518/3518/3518 3517/3517/3517 3565/3565/3565 3332/3332/3332 +f 3332/3332/3332 3565/3565/3565 3566/3566/3566 3567/3567/3567 +f 3345/3345/3345 3332/3332/3332 3567/3567/3567 3346/3346/3346 +f 3517/3517/3517 3516/3516/3516 3515/3515/3515 3565/3565/3565 +f 3516/3516/3516 3513/3513/3513 3541/3541/3541 3515/3515/3515 +f 3515/3515/3515 3541/3541/3541 3547/3547/3547 3568/3568/3568 +f 3565/3565/3565 3515/3515/3515 3568/3568/3568 3566/3566/3566 +f 3566/3566/3566 3568/3568/3568 3548/3548/3548 3569/3569/3569 +f 3568/3568/3568 3547/3547/3547 3561/3561/3561 3548/3548/3548 +f 3548/3548/3548 3561/3561/3561 3563/3563/3563 3570/3570/3570 +f 3569/3569/3569 3548/3548/3548 3570/3570/3570 3571/3571/3571 +f 3346/3346/3346 3567/3567/3567 3347/3347/3347 3350/3350/3350 +f 3567/3567/3567 3566/3566/3566 3569/3569/3569 3347/3347/3347 +f 3347/3347/3347 3569/3569/3569 3571/3571/3571 3572/3572/3572 +f 3350/3350/3350 3347/3347/3347 3572/3572/3572 3351/3351/3351 +f 3527/3527/3527 3573/3573/3573 3529/3529/3529 3528/3528/3528 +f 3573/3573/3573 3574/3574/3574 3575/3575/3575 3529/3529/3529 +f 3529/3529/3529 3575/3575/3575 3577/3577/3577 3579/3579/3579 +f 3528/3528/3528 3529/3529/3529 3579/3579/3579 3530/3530/3530 +f 3574/3574/3574 3580/3580/3580 3576/3576/3576 3575/3575/3575 +f 3580/3580/3580 3581/3581/3581 3582/3582/3582 3576/3576/3576 +f 3576/3576/3576 3582/3582/3582 3584/3584/3584 3586/3586/3586 +f 3575/3575/3575 3576/3576/3576 3586/3586/3586 3577/3577/3577 +f 3577/3577/3577 3586/3586/3586 3578/3578/3578 3587/3587/3587 +f 3586/3586/3586 3584/3584/3584 3588/3588/3588 3578/3578/3578 +f 3578/3578/3578 3588/3588/3588 3589/3589/3589 3592/3592/3592 +f 3587/3587/3587 3578/3578/3578 3592/3592/3592 3593/3593/3593 +f 3530/3530/3530 3579/3579/3579 3531/3531/3531 3534/3534/3534 +f 3579/3579/3579 3577/3577/3577 3587/3587/3587 3531/3531/3531 +f 3531/3531/3531 3587/3587/3587 3593/3593/3593 3594/3594/3594 +f 3534/3534/3534 3531/3531/3531 3594/3594/3594 3535/3535/3535 +f 3581/3581/3581 3595/3595/3595 3583/3583/3583 3582/3582/3582 +f 3595/3595/3595 3596/3596/3596 3597/3597/3597 3583/3583/3583 +f 3583/3583/3583 3597/3597/3597 3599/3599/3599 3601/3601/3601 +f 3582/3582/3582 3583/3583/3583 3601/3601/3601 3584/3584/3584 +f 3596/3596/3596 3602/3602/3602 3598/3598/3598 3597/3597/3597 +f 3602/3602/3602 3603/3603/3603 3604/3604/3604 3598/3598/3598 +f 3598/3598/3598 3604/3604/3604 3605/3605/3605 3606/3606/3606 +f 3597/3597/3597 3598/3598/3598 3606/3606/3606 3599/3599/3599 +f 3599/3599/3599 3606/3606/3606 3600/3600/3600 3607/3607/3607 +f 3606/3606/3606 3605/3605/3605 3608/3608/3608 3600/3600/3600 +f 3600/3600/3600 3608/3608/3608 3609/3609/3609 3610/3610/3610 +f 3607/3607/3607 3600/3600/3600 3610/3610/3610 3612/3612/3612 +f 3584/3584/3584 3601/3601/3601 3585/3585/3585 3588/3588/3588 +f 3601/3601/3601 3599/3599/3599 3607/3607/3607 3585/3585/3585 +f 3585/3585/3585 3607/3607/3607 3612/3612/3612 3613/3613/3613 +f 3588/3588/3588 3585/3585/3585 3613/3613/3613 3589/3589/3589 +f 3589/3589/3589 3613/3613/3613 3590/3590/3590 3614/3614/3614 +f 3613/3613/3613 3612/3612/3612 3615/3615/3615 3590/3590/3590 +f 3590/3590/3590 3615/3615/3615 3616/3616/3616 3619/3619/3619 +f 3614/3614/3614 3590/3590/3590 3619/3619/3619 3620/3620/3620 +f 3612/3612/3612 3610/3610/3610 3611/3611/3611 3615/3615/3615 +f 3610/3610/3610 3609/3609/3609 3622/3622/3622 3611/3611/3611 +f 3611/3611/3611 3622/3622/3622 3623/3623/3623 3624/3624/3624 +f 3615/3615/3615 3611/3611/3611 3624/3624/3624 3616/3616/3616 +f 3616/3616/3616 3624/3624/3624 3617/3617/3617 3625/3625/3625 +f 3624/3624/3624 3623/3623/3623 3626/3626/3626 3617/3617/3617 +f 3617/3617/3617 3626/3626/3626 3627/3627/3627 3628/3628/3628 +f 3625/3625/3625 3617/3617/3617 3628/3628/3628 3630/3630/3630 +f 3620/3620/3620 3619/3619/3619 3618/3618/3618 3632/3632/3632 +f 3619/3619/3619 3616/3616/3616 3625/3625/3625 3618/3618/3618 +f 3618/3618/3618 3625/3625/3625 3630/3630/3630 3633/3633/3633 +f 3632/3632/3632 3618/3618/3618 3633/3633/3633 3634/3634/3634 +f 3535/3535/3535 3594/3594/3594 3536/3536/3536 3549/3549/3549 +f 3594/3594/3594 3593/3593/3593 3636/3636/3636 3536/3536/3536 +f 3536/3536/3536 3636/3636/3636 3637/3637/3637 3638/3638/3638 +f 3549/3549/3549 3536/3536/3536 3638/3638/3638 3550/3550/3550 +f 3593/3593/3593 3592/3592/3592 3591/3591/3591 3636/3636/3636 +f 3592/3592/3592 3589/3589/3589 3614/3614/3614 3591/3591/3591 +f 3591/3591/3591 3614/3614/3614 3620/3620/3620 3639/3639/3639 +f 3636/3636/3636 3591/3591/3591 3639/3639/3639 3637/3637/3637 +f 3637/3637/3637 3639/3639/3639 3621/3621/3621 3640/3640/3640 +f 3639/3639/3639 3620/3620/3620 3632/3632/3632 3621/3621/3621 +f 3621/3621/3621 3632/3632/3632 3634/3634/3634 3641/3641/3641 +f 3640/3640/3640 3621/3621/3621 3641/3641/3641 3642/3642/3642 +f 3550/3550/3550 3638/3638/3638 3551/3551/3551 3554/3554/3554 +f 3638/3638/3638 3637/3637/3637 3640/3640/3640 3551/3551/3551 +f 3551/3551/3551 3640/3640/3640 3642/3642/3642 3643/3643/3643 +f 3554/3554/3554 3551/3551/3551 3643/3643/3643 3555/3555/3555 +f 3555/3555/3555 3643/3643/3643 3556/3556/3556 3644/3644/3644 +f 3643/3643/3643 3642/3642/3642 3645/3645/3645 3556/3556/3556 +f 3556/3556/3556 3645/3645/3645 3646/3646/3646 3649/3649/3649 +f 3644/3644/3644 3556/3556/3556 3649/3649/3649 3650/3650/3650 +f 3642/3642/3642 3641/3641/3641 3635/3635/3635 3645/3645/3645 +f 3641/3641/3641 3634/3634/3634 3652/3652/3652 3635/3635/3635 +f 3635/3635/3635 3652/3652/3652 3653/3653/3653 3655/3655/3655 +f 3645/3645/3645 3635/3635/3635 3655/3655/3655 3646/3646/3646 +f 3646/3646/3646 3655/3655/3655 3647/3647/3647 3656/3656/3656 +f 3655/3655/3655 3653/3653/3653 3657/3657/3657 3647/3647/3647 +f 3647/3647/3647 3657/3657/3657 3658/3658/3658 3661/3661/3661 +f 3656/3656/3656 3647/3647/3647 3661/3661/3661 3662/3662/3662 +f 3650/3650/3650 3649/3649/3649 3648/3648/3648 3664/3664/3664 +f 3649/3649/3649 3646/3646/3646 3656/3656/3656 3648/3648/3648 +f 3648/3648/3648 3656/3656/3656 3662/3662/3662 3665/3665/3665 +f 3664/3664/3664 3648/3648/3648 3665/3665/3665 3666/3666/3666 +f 3634/3634/3634 3633/3633/3633 3631/3631/3631 3652/3652/3652 +f 3633/3633/3633 3630/3630/3630 3668/3668/3668 3631/3631/3631 +f 3631/3631/3631 3668/3668/3668 3669/3669/3669 3671/3671/3671 +f 3652/3652/3652 3631/3631/3631 3671/3671/3671 3653/3653/3653 +f 3630/3630/3630 3628/3628/3628 3629/3629/3629 3668/3668/3668 +f 3628/3628/3628 3627/3627/3627 3672/3672/3672 3629/3629/3629 +f 3629/3629/3629 3672/3672/3672 3673/3673/3673 3674/3674/3674 +f 3668/3668/3668 3629/3629/3629 3674/3674/3674 3669/3669/3669 +f 3669/3669/3669 3674/3674/3674 3670/3670/3670 3675/3675/3675 +f 3674/3674/3674 3673/3673/3673 3676/3676/3676 3670/3670/3670 +f 3670/3670/3670 3676/3676/3676 3677/3677/3677 3678/3678/3678 +f 3675/3675/3675 3670/3670/3670 3678/3678/3678 3680/3680/3680 +f 3653/3653/3653 3671/3671/3671 3654/3654/3654 3657/3657/3657 +f 3671/3671/3671 3669/3669/3669 3675/3675/3675 3654/3654/3654 +f 3654/3654/3654 3675/3675/3675 3680/3680/3680 3681/3681/3681 +f 3657/3657/3657 3654/3654/3654 3681/3681/3681 3658/3658/3658 +f 3658/3658/3658 3681/3681/3681 3659/3659/3659 3682/3682/3682 +f 3681/3681/3681 3680/3680/3680 3683/3683/3683 3659/3659/3659 +f 3659/3659/3659 3683/3683/3683 3684/3684/3684 3687/3687/3687 +f 3682/3682/3682 3659/3659/3659 3687/3687/3687 3688/3688/3688 +f 3680/3680/3680 3678/3678/3678 3679/3679/3679 3683/3683/3683 +f 3678/3678/3678 3677/3677/3677 3690/3690/3690 3679/3679/3679 +f 3679/3679/3679 3690/3690/3690 3691/3691/3691 3692/3692/3692 +f 3683/3683/3683 3679/3679/3679 3692/3692/3692 3684/3684/3684 +f 3684/3684/3684 3692/3692/3692 3685/3685/3685 3693/3693/3693 +f 3692/3692/3692 3691/3691/3691 3694/3694/3694 3685/3685/3685 +f 3685/3685/3685 3694/3694/3694 3695/3695/3695 3696/3696/3696 +f 3693/3693/3693 3685/3685/3685 3696/3696/3696 3698/3698/3698 +f 3688/3688/3688 3687/3687/3687 3686/3686/3686 3700/3700/3700 +f 3687/3687/3687 3684/3684/3684 3693/3693/3693 3686/3686/3686 +f 3686/3686/3686 3693/3693/3693 3698/3698/3698 3701/3701/3701 +f 3700/3700/3700 3686/3686/3686 3701/3701/3701 3702/3702/3702 +f 3666/3666/3666 3665/3665/3665 3663/3663/3663 3704/3704/3704 +f 3665/3665/3665 3662/3662/3662 3705/3705/3705 3663/3663/3663 +f 3663/3663/3663 3705/3705/3705 3706/3706/3706 3708/3708/3708 +f 3704/3704/3704 3663/3663/3663 3708/3708/3708 3709/3709/3709 +f 3662/3662/3662 3661/3661/3661 3660/3660/3660 3705/3705/3705 +f 3661/3661/3661 3658/3658/3658 3682/3682/3682 3660/3660/3660 +f 3660/3660/3660 3682/3682/3682 3688/3688/3688 3711/3711/3711 +f 3705/3705/3705 3660/3660/3660 3711/3711/3711 3706/3706/3706 +f 3706/3706/3706 3711/3711/3711 3689/3689/3689 3712/3712/3712 +f 3711/3711/3711 3688/3688/3688 3700/3700/3700 3689/3689/3689 +f 3689/3689/3689 3700/3700/3700 3702/3702/3702 3713/3713/3713 +f 3712/3712/3712 3689/3689/3689 3713/3713/3713 3714/3714/3714 +f 3709/3709/3709 3708/3708/3708 3707/3707/3707 3716/3716/3716 +f 3708/3708/3708 3706/3706/3706 3712/3712/3712 3707/3707/3707 +f 3707/3707/3707 3712/3712/3712 3714/3714/3714 3717/3717/3717 +f 3716/3716/3716 3707/3707/3707 3717/3717/3717 3718/3718/3718 +f 3351/3351/3351 3572/3572/3572 3352/3352/3352 3397/3397/3397 +f 3572/3572/3572 3571/3571/3571 3720/3720/3720 3352/3352/3352 +f 3352/3352/3352 3720/3720/3720 3721/3721/3721 3723/3723/3723 +f 3397/3397/3397 3352/3352/3352 3723/3723/3723 3398/3398/3398 +f 3571/3571/3571 3570/3570/3570 3564/3564/3564 3720/3720/3720 +f 3570/3570/3570 3563/3563/3563 3724/3724/3724 3564/3564/3564 +f 3564/3564/3564 3724/3724/3724 3725/3725/3725 3727/3727/3727 +f 3720/3720/3720 3564/3564/3564 3727/3727/3727 3721/3721/3721 +f 3721/3721/3721 3727/3727/3727 3722/3722/3722 3728/3728/3728 +f 3727/3727/3727 3725/3725/3725 3729/3729/3729 3722/3722/3722 +f 3722/3722/3722 3729/3729/3729 3730/3730/3730 3733/3733/3733 +f 3728/3728/3728 3722/3722/3722 3733/3733/3733 3734/3734/3734 +f 3398/3398/3398 3723/3723/3723 3399/3399/3399 3402/3402/3402 +f 3723/3723/3723 3721/3721/3721 3728/3728/3728 3399/3399/3399 +f 3399/3399/3399 3728/3728/3728 3734/3734/3734 3735/3735/3735 +f 3402/3402/3402 3399/3399/3399 3735/3735/3735 3403/3403/3403 +f 3563/3563/3563 3562/3562/3562 3560/3560/3560 3724/3724/3724 +f 3562/3562/3562 3559/3559/3559 3736/3736/3736 3560/3560/3560 +f 3560/3560/3560 3736/3736/3736 3737/3737/3737 3738/3738/3738 +f 3724/3724/3724 3560/3560/3560 3738/3738/3738 3725/3725/3725 +f 3559/3559/3559 3558/3558/3558 3557/3557/3557 3736/3736/3736 +f 3558/3558/3558 3555/3555/3555 3644/3644/3644 3557/3557/3557 +f 3557/3557/3557 3644/3644/3644 3650/3650/3650 3739/3739/3739 +f 3736/3736/3736 3557/3557/3557 3739/3739/3739 3737/3737/3737 +f 3737/3737/3737 3739/3739/3739 3651/3651/3651 3740/3740/3740 +f 3739/3739/3739 3650/3650/3650 3664/3664/3664 3651/3651/3651 +f 3651/3651/3651 3664/3664/3664 3666/3666/3666 3741/3741/3741 +f 3740/3740/3740 3651/3651/3651 3741/3741/3741 3742/3742/3742 +f 3725/3725/3725 3738/3738/3738 3726/3726/3726 3729/3729/3729 +f 3738/3738/3738 3737/3737/3737 3740/3740/3740 3726/3726/3726 +f 3726/3726/3726 3740/3740/3740 3742/3742/3742 3743/3743/3743 +f 3729/3729/3729 3726/3726/3726 3743/3743/3743 3730/3730/3730 +f 3730/3730/3730 3743/3743/3743 3731/3731/3731 3744/3744/3744 +f 3743/3743/3743 3742/3742/3742 3745/3745/3745 3731/3731/3731 +f 3731/3731/3731 3745/3745/3745 3746/3746/3746 3748/3748/3748 +f 3744/3744/3744 3731/3731/3731 3748/3748/3748 3749/3749/3749 +f 3742/3742/3742 3741/3741/3741 3667/3667/3667 3745/3745/3745 +f 3741/3741/3741 3666/3666/3666 3704/3704/3704 3667/3667/3667 +f 3667/3667/3667 3704/3704/3704 3709/3709/3709 3751/3751/3751 +f 3745/3745/3745 3667/3667/3667 3751/3751/3751 3746/3746/3746 +f 3746/3746/3746 3751/3751/3751 3710/3710/3710 3752/3752/3752 +f 3751/3751/3751 3709/3709/3709 3716/3716/3716 3710/3710/3710 +f 3710/3710/3710 3716/3716/3716 3718/3718/3718 3753/3753/3753 +f 3752/3752/3752 3710/3710/3710 3753/3753/3753 3754/3754/3754 +f 3749/3749/3749 3748/3748/3748 3747/3747/3747 3756/3756/3756 +f 3748/3748/3748 3746/3746/3746 3752/3752/3752 3747/3747/3747 +f 3747/3747/3747 3752/3752/3752 3754/3754/3754 3757/3757/3757 +f 3756/3756/3756 3747/3747/3747 3757/3757/3757 3758/3758/3758 +f 3403/3403/3403 3735/3735/3735 3404/3404/3404 3417/3417/3417 +f 3735/3735/3735 3734/3734/3734 3760/3760/3760 3404/3404/3404 +f 3404/3404/3404 3760/3760/3760 3761/3761/3761 3762/3762/3762 +f 3417/3417/3417 3404/3404/3404 3762/3762/3762 3418/3418/3418 +f 3734/3734/3734 3733/3733/3733 3732/3732/3732 3760/3760/3760 +f 3733/3733/3733 3730/3730/3730 3744/3744/3744 3732/3732/3732 +f 3732/3732/3732 3744/3744/3744 3749/3749/3749 3763/3763/3763 +f 3760/3760/3760 3732/3732/3732 3763/3763/3763 3761/3761/3761 +f 3761/3761/3761 3763/3763/3763 3750/3750/3750 3764/3764/3764 +f 3763/3763/3763 3749/3749/3749 3756/3756/3756 3750/3750/3750 +f 3750/3750/3750 3756/3756/3756 3758/3758/3758 3765/3765/3765 +f 3764/3764/3764 3750/3750/3750 3765/3765/3765 3766/3766/3766 +f 3418/3418/3418 3762/3762/3762 3419/3419/3419 3422/3422/3422 +f 3762/3762/3762 3761/3761/3761 3764/3764/3764 3419/3419/3419 +f 3419/3419/3419 3764/3764/3764 3766/3766/3766 3767/3767/3767 +f 3422/3422/3422 3419/3419/3419 3767/3767/3767 3423/3423/3423 +f 3423/3423/3423 3767/3767/3767 3424/3424/3424 3768/3768/3768 +f 3767/3767/3767 3766/3766/3766 3769/3769/3769 3424/3424/3424 +f 3424/3424/3424 3769/3769/3769 3770/3770/3770 3773/3773/3773 +f 3768/3768/3768 3424/3424/3424 3773/3773/3773 3774/3774/3774 +f 3766/3766/3766 3765/3765/3765 3759/3759/3759 3769/3769/3769 +f 3765/3765/3765 3758/3758/3758 3776/3776/3776 3759/3759/3759 +f 3759/3759/3759 3776/3776/3776 3777/3777/3777 3779/3779/3779 +f 3769/3769/3769 3759/3759/3759 3779/3779/3779 3770/3770/3770 +f 3770/3770/3770 3779/3779/3779 3771/3771/3771 3780/3780/3780 +f 3779/3779/3779 3777/3777/3777 3781/3781/3781 3771/3771/3771 +f 3771/3771/3771 3781/3781/3781 3782/3782/3782 3785/3785/3785 +f 3780/3780/3780 3771/3771/3771 3785/3785/3785 3786/3786/3786 +f 3774/3774/3774 3773/3773/3773 3772/3772/3772 3788/3788/3788 +f 3773/3773/3773 3770/3770/3770 3780/3780/3780 3772/3772/3772 +f 3772/3772/3772 3780/3780/3780 3786/3786/3786 3789/3789/3789 +f 3788/3788/3788 3772/3772/3772 3789/3789/3789 3790/3790/3790 +f 3758/3758/3758 3757/3757/3757 3755/3755/3755 3776/3776/3776 +f 3757/3757/3757 3754/3754/3754 3792/3792/3792 3755/3755/3755 +f 3755/3755/3755 3792/3792/3792 3793/3793/3793 3795/3795/3795 +f 3776/3776/3776 3755/3755/3755 3795/3795/3795 3777/3777/3777 +f 3754/3754/3754 3753/3753/3753 3719/3719/3719 3792/3792/3792 +f 3753/3753/3753 3718/3718/3718 3796/3796/3796 3719/3719/3719 +f 3719/3719/3719 3796/3796/3796 3797/3797/3797 3799/3799/3799 +f 3792/3792/3792 3719/3719/3719 3799/3799/3799 3793/3793/3793 +f 3793/3793/3793 3799/3799/3799 3794/3794/3794 3800/3800/3800 +f 3799/3799/3799 3797/3797/3797 3801/3801/3801 3794/3794/3794 +f 3794/3794/3794 3801/3801/3801 3802/3802/3802 3805/3805/3805 +f 3800/3800/3800 3794/3794/3794 3805/3805/3805 3806/3806/3806 +f 3777/3777/3777 3795/3795/3795 3778/3778/3778 3781/3781/3781 +f 3795/3795/3795 3793/3793/3793 3800/3800/3800 3778/3778/3778 +f 3778/3778/3778 3800/3800/3800 3806/3806/3806 3807/3807/3807 +f 3781/3781/3781 3778/3778/3778 3807/3807/3807 3782/3782/3782 +f 3782/3782/3782 3807/3807/3807 3783/3783/3783 3808/3808/3808 +f 3807/3807/3807 3806/3806/3806 3809/3809/3809 3783/3783/3783 +f 3783/3783/3783 3809/3809/3809 3810/3810/3810 3813/3813/3813 +f 3808/3808/3808 3783/3783/3783 3813/3813/3813 3814/3814/3814 +f 3806/3806/3806 3805/3805/3805 3804/3804/3804 3809/3809/3809 +f 3805/3805/3805 3802/3802/3802 3816/3816/3816 3804/3804/3804 +f 3804/3804/3804 3816/3816/3816 3817/3817/3817 3819/3819/3819 +f 3809/3809/3809 3804/3804/3804 3819/3819/3819 3810/3810/3810 +f 3810/3810/3810 3819/3819/3819 3811/3811/3811 3820/3820/3820 +f 3819/3819/3819 3817/3817/3817 3821/3821/3821 3811/3811/3811 +f 3811/3811/3811 3821/3821/3821 3822/3822/3822 3825/3825/3825 +f 3820/3820/3820 3811/3811/3811 3825/3825/3825 3826/3826/3826 +f 3814/3814/3814 3813/3813/3813 3812/3812/3812 3828/3828/3828 +f 3813/3813/3813 3810/3810/3810 3820/3820/3820 3812/3812/3812 +f 3812/3812/3812 3820/3820/3820 3826/3826/3826 3829/3829/3829 +f 3828/3828/3828 3812/3812/3812 3829/3829/3829 3830/3830/3830 +f 3790/3790/3790 3789/3789/3789 3787/3787/3787 3832/3832/3832 +f 3789/3789/3789 3786/3786/3786 3833/3833/3833 3787/3787/3787 +f 3787/3787/3787 3833/3833/3833 3834/3834/3834 3836/3836/3836 +f 3832/3832/3832 3787/3787/3787 3836/3836/3836 3837/3837/3837 +f 3786/3786/3786 3785/3785/3785 3784/3784/3784 3833/3833/3833 +f 3785/3785/3785 3782/3782/3782 3808/3808/3808 3784/3784/3784 +f 3784/3784/3784 3808/3808/3808 3814/3814/3814 3839/3839/3839 +f 3833/3833/3833 3784/3784/3784 3839/3839/3839 3834/3834/3834 +f 3834/3834/3834 3839/3839/3839 3815/3815/3815 3840/3840/3840 +f 3839/3839/3839 3814/3814/3814 3828/3828/3828 3815/3815/3815 +f 3815/3815/3815 3828/3828/3828 3830/3830/3830 3841/3841/3841 +f 3840/3840/3840 3815/3815/3815 3841/3841/3841 3842/3842/3842 +f 3837/3837/3837 3836/3836/3836 3835/3835/3835 3844/3844/3844 +f 3836/3836/3836 3834/3834/3834 3840/3840/3840 3835/3835/3835 +f 3835/3835/3835 3840/3840/3840 3842/3842/3842 3845/3845/3845 +f 3844/3844/3844 3835/3835/3835 3845/3845/3845 3846/3846/3846 +f 3718/3718/3718 3717/3717/3717 3715/3715/3715 3796/3796/3796 +f 3717/3717/3717 3714/3714/3714 3848/3848/3848 3715/3715/3715 +f 3715/3715/3715 3848/3848/3848 3849/3849/3849 3851/3851/3851 +f 3796/3796/3796 3715/3715/3715 3851/3851/3851 3797/3797/3797 +f 3714/3714/3714 3713/3713/3713 3703/3703/3703 3848/3848/3848 +f 3713/3713/3713 3702/3702/3702 3852/3852/3852 3703/3703/3703 +f 3703/3703/3703 3852/3852/3852 3853/3853/3853 3855/3855/3855 +f 3848/3848/3848 3703/3703/3703 3855/3855/3855 3849/3849/3849 +f 3849/3849/3849 3855/3855/3855 3850/3850/3850 3856/3856/3856 +f 3855/3855/3855 3853/3853/3853 3857/3857/3857 3850/3850/3850 +f 3850/3850/3850 3857/3857/3857 3858/3858/3858 3861/3861/3861 +f 3856/3856/3856 3850/3850/3850 3861/3861/3861 3862/3862/3862 +f 3797/3797/3797 3851/3851/3851 3798/3798/3798 3801/3801/3801 +f 3851/3851/3851 3849/3849/3849 3856/3856/3856 3798/3798/3798 +f 3798/3798/3798 3856/3856/3856 3862/3862/3862 3863/3863/3863 +f 3801/3801/3801 3798/3798/3798 3863/3863/3863 3802/3802/3802 +f 3702/3702/3702 3701/3701/3701 3699/3699/3699 3852/3852/3852 +f 3701/3701/3701 3698/3698/3698 3864/3864/3864 3699/3699/3699 +f 3699/3699/3699 3864/3864/3864 3865/3865/3865 3867/3867/3867 +f 3852/3852/3852 3699/3699/3699 3867/3867/3867 3853/3853/3853 +f 3698/3698/3698 3696/3696/3696 3697/3697/3697 3864/3864/3864 +f 3696/3696/3696 3695/3695/3695 3868/3868/3868 3697/3697/3697 +f 3697/3697/3697 3868/3868/3868 3869/3869/3869 3870/3870/3870 +f 3864/3864/3864 3697/3697/3697 3870/3870/3870 3865/3865/3865 +f 3865/3865/3865 3870/3870/3870 3866/3866/3866 3871/3871/3871 +f 3870/3870/3870 3869/3869/3869 3872/3872/3872 3866/3866/3866 +f 3866/3866/3866 3872/3872/3872 3873/3873/3873 3874/3874/3874 +f 3871/3871/3871 3866/3866/3866 3874/3874/3874 3876/3876/3876 +f 3853/3853/3853 3867/3867/3867 3854/3854/3854 3857/3857/3857 +f 3867/3867/3867 3865/3865/3865 3871/3871/3871 3854/3854/3854 +f 3854/3854/3854 3871/3871/3871 3876/3876/3876 3877/3877/3877 +f 3857/3857/3857 3854/3854/3854 3877/3877/3877 3858/3858/3858 +f 3858/3858/3858 3877/3877/3877 3859/3859/3859 3878/3878/3878 +f 3877/3877/3877 3876/3876/3876 3879/3879/3879 3859/3859/3859 +f 3859/3859/3859 3879/3879/3879 3880/3880/3880 3883/3883/3883 +f 3878/3878/3878 3859/3859/3859 3883/3883/3883 3884/3884/3884 +f 3876/3876/3876 3874/3874/3874 3875/3875/3875 3879/3879/3879 +f 3874/3874/3874 3873/3873/3873 3886/3886/3886 3875/3875/3875 +f 3875/3875/3875 3886/3886/3886 3887/3887/3887 3888/3888/3888 +f 3879/3879/3879 3875/3875/3875 3888/3888/3888 3880/3880/3880 +f 3880/3880/3880 3888/3888/3888 3881/3881/3881 3889/3889/3889 +f 3888/3888/3888 3887/3887/3887 3890/3890/3890 3881/3881/3881 +f 3881/3881/3881 3890/3890/3890 3891/3891/3891 3892/3892/3892 +f 3889/3889/3889 3881/3881/3881 3892/3892/3892 3894/3894/3894 +f 3884/3884/3884 3883/3883/3883 3882/3882/3882 3896/3896/3896 +f 3883/3883/3883 3880/3880/3880 3889/3889/3889 3882/3882/3882 +f 3882/3882/3882 3889/3889/3889 3894/3894/3894 3897/3897/3897 +f 3896/3896/3896 3882/3882/3882 3897/3897/3897 3898/3898/3898 +f 3802/3802/3802 3863/3863/3863 3803/3803/3803 3816/3816/3816 +f 3863/3863/3863 3862/3862/3862 3900/3900/3900 3803/3803/3803 +f 3803/3803/3803 3900/3900/3900 3901/3901/3901 3902/3902/3902 +f 3816/3816/3816 3803/3803/3803 3902/3902/3902 3817/3817/3817 +f 3862/3862/3862 3861/3861/3861 3860/3860/3860 3900/3900/3900 +f 3861/3861/3861 3858/3858/3858 3878/3878/3878 3860/3860/3860 +f 3860/3860/3860 3878/3878/3878 3884/3884/3884 3903/3903/3903 +f 3900/3900/3900 3860/3860/3860 3903/3903/3903 3901/3901/3901 +f 3901/3901/3901 3903/3903/3903 3885/3885/3885 3904/3904/3904 +f 3903/3903/3903 3884/3884/3884 3896/3896/3896 3885/3885/3885 +f 3885/3885/3885 3896/3896/3896 3898/3898/3898 3905/3905/3905 +f 3904/3904/3904 3885/3885/3885 3905/3905/3905 3906/3906/3906 +f 3817/3817/3817 3902/3902/3902 3818/3818/3818 3821/3821/3821 +f 3902/3902/3902 3901/3901/3901 3904/3904/3904 3818/3818/3818 +f 3818/3818/3818 3904/3904/3904 3906/3906/3906 3907/3907/3907 +f 3821/3821/3821 3818/3818/3818 3907/3907/3907 3822/3822/3822 +f 3822/3822/3822 3907/3907/3907 3823/3823/3823 3908/3908/3908 +f 3907/3907/3907 3906/3906/3906 3909/3909/3909 3823/3823/3823 +f 3823/3823/3823 3909/3909/3909 3910/3910/3910 3913/3913/3913 +f 3908/3908/3908 3823/3823/3823 3913/3913/3913 3914/3914/3914 +f 3906/3906/3906 3905/3905/3905 3899/3899/3899 3909/3909/3909 +f 3905/3905/3905 3898/3898/3898 3916/3916/3916 3899/3899/3899 +f 3899/3899/3899 3916/3916/3916 3917/3917/3917 3919/3919/3919 +f 3909/3909/3909 3899/3899/3899 3919/3919/3919 3910/3910/3910 +f 3910/3910/3910 3919/3919/3919 3911/3911/3911 3920/3920/3920 +f 3919/3919/3919 3917/3917/3917 3921/3921/3921 3911/3911/3911 +f 3911/3911/3911 3921/3921/3921 3922/3922/3922 3925/3925/3925 +f 3920/3920/3920 3911/3911/3911 3925/3925/3925 3926/3926/3926 +f 3914/3914/3914 3913/3913/3913 3912/3912/3912 3928/3928/3928 +f 3913/3913/3913 3910/3910/3910 3920/3920/3920 3912/3912/3912 +f 3912/3912/3912 3920/3920/3920 3926/3926/3926 3929/3929/3929 +f 3928/3928/3928 3912/3912/3912 3929/3929/3929 3930/3930/3930 +f 3898/3898/3898 3897/3897/3897 3895/3895/3895 3916/3916/3916 +f 3897/3897/3897 3894/3894/3894 3932/3932/3932 3895/3895/3895 +f 3895/3895/3895 3932/3932/3932 3933/3933/3933 3935/3935/3935 +f 3916/3916/3916 3895/3895/3895 3935/3935/3935 3917/3917/3917 +f 3894/3894/3894 3892/3892/3892 3893/3893/3893 3932/3932/3932 +f 3892/3892/3892 3891/3891/3891 3936/3936/3936 3893/3893/3893 +f 3893/3893/3893 3936/3936/3936 3937/3937/3937 3938/3938/3938 +f 3932/3932/3932 3893/3893/3893 3938/3938/3938 3933/3933/3933 +f 3933/3933/3933 3938/3938/3938 3934/3934/3934 3939/3939/3939 +f 3938/3938/3938 3937/3937/3937 3940/3940/3940 3934/3934/3934 +f 3934/3934/3934 3940/3940/3940 3941/3941/3941 3942/3942/3942 +f 3939/3939/3939 3934/3934/3934 3942/3942/3942 3944/3944/3944 +f 3917/3917/3917 3935/3935/3935 3918/3918/3918 3921/3921/3921 +f 3935/3935/3935 3933/3933/3933 3939/3939/3939 3918/3918/3918 +f 3918/3918/3918 3939/3939/3939 3944/3944/3944 3945/3945/3945 +f 3921/3921/3921 3918/3918/3918 3945/3945/3945 3922/3922/3922 +f 3922/3922/3922 3945/3945/3945 3923/3923/3923 3946/3946/3946 +f 3945/3945/3945 3944/3944/3944 3947/3947/3947 3923/3923/3923 +f 3923/3923/3923 3947/3947/3947 3948/3948/3948 3951/3951/3951 +f 3946/3946/3946 3923/3923/3923 3951/3951/3951 3952/3952/3952 +f 3944/3944/3944 3942/3942/3942 3943/3943/3943 3947/3947/3947 +f 3942/3942/3942 3941/3941/3941 3954/3954/3954 3943/3943/3943 +f 3943/3943/3943 3954/3954/3954 3955/3955/3955 3956/3956/3956 +f 3947/3947/3947 3943/3943/3943 3956/3956/3956 3948/3948/3948 +f 3948/3948/3948 3956/3956/3956 3949/3949/3949 3957/3957/3957 +f 3956/3956/3956 3955/3955/3955 3958/3958/3958 3949/3949/3949 +f 3949/3949/3949 3958/3958/3958 3959/3959/3959 3960/3960/3960 +f 3957/3957/3957 3949/3949/3949 3960/3960/3960 3961/3961/3961 +f 3952/3952/3952 3951/3951/3951 3950/3950/3950 3962/3962/3962 +f 3951/3951/3951 3948/3948/3948 3957/3957/3957 3950/3950/3950 +f 3950/3950/3950 3957/3957/3957 3961/3961/3961 3963/3963/3963 +f 3962/3962/3962 3950/3950/3950 3963/3963/3963 3964/3964/3964 +f 3930/3930/3930 3929/3929/3929 3927/3927/3927 3965/3965/3965 +f 3929/3929/3929 3926/3926/3926 3966/3966/3966 3927/3927/3927 +f 3927/3927/3927 3966/3966/3966 3967/3967/3967 3969/3969/3969 +f 3965/3965/3965 3927/3927/3927 3969/3969/3969 3970/3970/3970 +f 3926/3926/3926 3925/3925/3925 3924/3924/3924 3966/3966/3966 +f 3925/3925/3925 3922/3922/3922 3946/3946/3946 3924/3924/3924 +f 3924/3924/3924 3946/3946/3946 3952/3952/3952 3972/3972/3972 +f 3966/3966/3966 3924/3924/3924 3972/3972/3972 3967/3967/3967 +f 3967/3967/3967 3972/3972/3972 3953/3953/3953 3973/3973/3973 +f 3972/3972/3972 3952/3952/3952 3962/3962/3962 3953/3953/3953 +f 3953/3953/3953 3962/3962/3962 3964/3964/3964 3974/3974/3974 +f 3973/3973/3973 3953/3953/3953 3974/3974/3974 3975/3975/3975 +f 3970/3970/3970 3969/3969/3969 3968/3968/3968 3976/3976/3976 +f 3969/3969/3969 3967/3967/3967 3973/3973/3973 3968/3968/3968 +f 3968/3968/3968 3973/3973/3973 3975/3975/3975 3977/3977/3977 +f 3976/3976/3976 3968/3968/3968 3977/3977/3977 3978/3978/3978 +f 3846/3846/3846 3845/3845/3845 3843/3843/3843 3979/3979/3979 +f 3845/3845/3845 3842/3842/3842 3980/3980/3980 3843/3843/3843 +f 3843/3843/3843 3980/3980/3980 3981/3981/3981 3984/3984/3984 +f 3979/3979/3979 3843/3843/3843 3984/3984/3984 3985/3985/3985 +f 3842/3842/3842 3841/3841/3841 3831/3831/3831 3980/3980/3980 +f 3841/3841/3841 3830/3830/3830 3987/3987/3987 3831/3831/3831 +f 3831/3831/3831 3987/3987/3987 3988/3988/3988 3990/3990/3990 +f 3980/3980/3980 3831/3831/3831 3990/3990/3990 3981/3981/3981 +f 3981/3981/3981 3990/3990/3990 3982/3982/3982 3991/3991/3991 +f 3990/3990/3990 3988/3988/3988 3992/3992/3992 3982/3982/3982 +f 3982/3982/3982 3992/3992/3992 3993/3993/3993 3996/3996/3996 +f 3991/3991/3991 3982/3982/3982 3996/3996/3996 3997/3997/3997 +f 3985/3985/3985 3984/3984/3984 3983/3983/3983 3999/3999/3999 +f 3984/3984/3984 3981/3981/3981 3991/3991/3991 3983/3983/3983 +f 3983/3983/3983 3991/3991/3991 3997/3997/3997 4000/4000/4000 +f 3999/3999/3999 3983/3983/3983 4000/4000/4000 4001/4001/4001 +f 3830/3830/3830 3829/3829/3829 3827/3827/3827 3987/3987/3987 +f 3829/3829/3829 3826/3826/3826 4003/4003/4003 3827/3827/3827 +f 3827/3827/3827 4003/4003/4003 4004/4004/4004 4005/4005/4005 +f 3987/3987/3987 3827/3827/3827 4005/4005/4005 3988/3988/3988 +f 3826/3826/3826 3825/3825/3825 3824/3824/3824 4003/4003/4003 +f 3825/3825/3825 3822/3822/3822 3908/3908/3908 3824/3824/3824 +f 3824/3824/3824 3908/3908/3908 3914/3914/3914 4006/4006/4006 +f 4003/4003/4003 3824/3824/3824 4006/4006/4006 4004/4004/4004 +f 4004/4004/4004 4006/4006/4006 3915/3915/3915 4007/4007/4007 +f 4006/4006/4006 3914/3914/3914 3928/3928/3928 3915/3915/3915 +f 3915/3915/3915 3928/3928/3928 3930/3930/3930 4008/4008/4008 +f 4007/4007/4007 3915/3915/3915 4008/4008/4008 4009/4009/4009 +f 3988/3988/3988 4005/4005/4005 3989/3989/3989 3992/3992/3992 +f 4005/4005/4005 4004/4004/4004 4007/4007/4007 3989/3989/3989 +f 3989/3989/3989 4007/4007/4007 4009/4009/4009 4010/4010/4010 +f 3992/3992/3992 3989/3989/3989 4010/4010/4010 3993/3993/3993 +f 3993/3993/3993 4010/4010/4010 3994/3994/3994 4011/4011/4011 +f 4010/4010/4010 4009/4009/4009 4012/4012/4012 3994/3994/3994 +f 3994/3994/3994 4012/4012/4012 4013/4013/4013 4015/4015/4015 +f 4011/4011/4011 3994/3994/3994 4015/4015/4015 4016/4016/4016 +f 4009/4009/4009 4008/4008/4008 3931/3931/3931 4012/4012/4012 +f 4008/4008/4008 3930/3930/3930 3965/3965/3965 3931/3931/3931 +f 3931/3931/3931 3965/3965/3965 3970/3970/3970 4018/4018/4018 +f 4012/4012/4012 3931/3931/3931 4018/4018/4018 4013/4013/4013 +f 4013/4013/4013 4018/4018/4018 3971/3971/3971 4019/4019/4019 +f 4018/4018/4018 3970/3970/3970 3976/3976/3976 3971/3971/3971 +f 3971/3971/3971 3976/3976/3976 3978/3978/3978 4020/4020/4020 +f 4019/4019/4019 3971/3971/3971 4020/4020/4020 4021/4021/4021 +f 4016/4016/4016 4015/4015/4015 4014/4014/4014 4022/4022/4022 +f 4015/4015/4015 4013/4013/4013 4019/4019/4019 4014/4014/4014 +f 4014/4014/4014 4019/4019/4019 4021/4021/4021 4023/4023/4023 +f 4022/4022/4022 4014/4014/4014 4023/4023/4023 4024/4024/4024 +f 4001/4001/4001 4000/4000/4000 3998/3998/3998 4025/4025/4025 +f 4000/4000/4000 3997/3997/3997 4026/4026/4026 3998/3998/3998 +f 3998/3998/3998 4026/4026/4026 4027/4027/4027 4029/4029/4029 +f 4025/4025/4025 3998/3998/3998 4029/4029/4029 4030/4030/4030 +f 3997/3997/3997 3996/3996/3996 3995/3995/3995 4026/4026/4026 +f 3996/3996/3996 3993/3993/3993 4011/4011/4011 3995/3995/3995 +f 3995/3995/3995 4011/4011/4011 4016/4016/4016 4032/4032/4032 +f 4026/4026/4026 3995/3995/3995 4032/4032/4032 4027/4027/4027 +f 4027/4027/4027 4032/4032/4032 4017/4017/4017 4033/4033/4033 +f 4032/4032/4032 4016/4016/4016 4022/4022/4022 4017/4017/4017 +f 4017/4017/4017 4022/4022/4022 4024/4024/4024 4034/4034/4034 +f 4033/4033/4033 4017/4017/4017 4034/4034/4034 4035/4035/4035 +f 4030/4030/4030 4029/4029/4029 4028/4028/4028 4036/4036/4036 +f 4029/4029/4029 4027/4027/4027 4033/4033/4033 4028/4028/4028 +f 4028/4028/4028 4033/4033/4033 4035/4035/4035 4037/4037/4037 +f 4036/4036/4036 4028/4028/4028 4037/4037/4037 4038/4038/4038 +f 2647/2647/2647 3496/3496/3496 2648/2648/2648 2821/2821/2821 +f 3496/3496/3496 3495/3495/3495 4039/4039/4039 2648/2648/2648 +f 2648/2648/2648 4039/4039/4039 4040/4040/4040 4042/4042/4042 +f 2821/2821/2821 2648/2648/2648 4042/4042/4042 2822/2822/2822 +f 3495/3495/3495 3494/3494/3494 3488/3488/3488 4039/4039/4039 +f 3494/3494/3494 3487/3487/3487 4043/4043/4043 3488/3488/3488 +f 3488/3488/3488 4043/4043/4043 4044/4044/4044 4046/4046/4046 +f 4039/4039/4039 3488/3488/3488 4046/4046/4046 4040/4040/4040 +f 4040/4040/4040 4046/4046/4046 4041/4041/4041 4047/4047/4047 +f 4046/4046/4046 4044/4044/4044 4048/4048/4048 4041/4041/4041 +f 4041/4041/4041 4048/4048/4048 4049/4049/4049 4052/4052/4052 +f 4047/4047/4047 4041/4041/4041 4052/4052/4052 4053/4053/4053 +f 2822/2822/2822 4042/4042/4042 2823/2823/2823 2826/2826/2826 +f 4042/4042/4042 4040/4040/4040 4047/4047/4047 2823/2823/2823 +f 2823/2823/2823 4047/4047/4047 4053/4053/4053 4054/4054/4054 +f 2826/2826/2826 2823/2823/2823 4054/4054/4054 2827/2827/2827 +f 3487/3487/3487 3486/3486/3486 3484/3484/3484 4043/4043/4043 +f 3486/3486/3486 3483/3483/3483 4055/4055/4055 3484/3484/3484 +f 3484/3484/3484 4055/4055/4055 4056/4056/4056 4058/4058/4058 +f 4043/4043/4043 3484/3484/3484 4058/4058/4058 4044/4044/4044 +f 3483/3483/3483 3482/3482/3482 3448/3448/3448 4055/4055/4055 +f 3482/3482/3482 3447/3447/3447 4059/4059/4059 3448/3448/3448 +f 3448/3448/3448 4059/4059/4059 4060/4060/4060 4062/4062/4062 +f 4055/4055/4055 3448/3448/3448 4062/4062/4062 4056/4056/4056 +f 4056/4056/4056 4062/4062/4062 4057/4057/4057 4063/4063/4063 +f 4062/4062/4062 4060/4060/4060 4064/4064/4064 4057/4057/4057 +f 4057/4057/4057 4064/4064/4064 4065/4065/4065 4068/4068/4068 +f 4063/4063/4063 4057/4057/4057 4068/4068/4068 4069/4069/4069 +f 4044/4044/4044 4058/4058/4058 4045/4045/4045 4048/4048/4048 +f 4058/4058/4058 4056/4056/4056 4063/4063/4063 4045/4045/4045 +f 4045/4045/4045 4063/4063/4063 4069/4069/4069 4070/4070/4070 +f 4048/4048/4048 4045/4045/4045 4070/4070/4070 4049/4049/4049 +f 4049/4049/4049 4070/4070/4070 4050/4050/4050 4071/4071/4071 +f 4070/4070/4070 4069/4069/4069 4072/4072/4072 4050/4050/4050 +f 4050/4050/4050 4072/4072/4072 4073/4073/4073 4076/4076/4076 +f 4071/4071/4071 4050/4050/4050 4076/4076/4076 4077/4077/4077 +f 4069/4069/4069 4068/4068/4068 4067/4067/4067 4072/4072/4072 +f 4068/4068/4068 4065/4065/4065 4079/4079/4079 4067/4067/4067 +f 4067/4067/4067 4079/4079/4079 4080/4080/4080 4082/4082/4082 +f 4072/4072/4072 4067/4067/4067 4082/4082/4082 4073/4073/4073 +f 4073/4073/4073 4082/4082/4082 4074/4074/4074 4083/4083/4083 +f 4082/4082/4082 4080/4080/4080 4084/4084/4084 4074/4074/4074 +f 4074/4074/4074 4084/4084/4084 4085/4085/4085 4088/4088/4088 +f 4083/4083/4083 4074/4074/4074 4088/4088/4088 4089/4089/4089 +f 4077/4077/4077 4076/4076/4076 4075/4075/4075 4091/4091/4091 +f 4076/4076/4076 4073/4073/4073 4083/4083/4083 4075/4075/4075 +f 4075/4075/4075 4083/4083/4083 4089/4089/4089 4092/4092/4092 +f 4091/4091/4091 4075/4075/4075 4092/4092/4092 4093/4093/4093 +f 2827/2827/2827 4054/4054/4054 2828/2828/2828 2841/2841/2841 +f 4054/4054/4054 4053/4053/4053 4095/4095/4095 2828/2828/2828 +f 2828/2828/2828 4095/4095/4095 4096/4096/4096 4097/4097/4097 +f 2841/2841/2841 2828/2828/2828 4097/4097/4097 2842/2842/2842 +f 4053/4053/4053 4052/4052/4052 4051/4051/4051 4095/4095/4095 +f 4052/4052/4052 4049/4049/4049 4071/4071/4071 4051/4051/4051 +f 4051/4051/4051 4071/4071/4071 4077/4077/4077 4098/4098/4098 +f 4095/4095/4095 4051/4051/4051 4098/4098/4098 4096/4096/4096 +f 4096/4096/4096 4098/4098/4098 4078/4078/4078 4099/4099/4099 +f 4098/4098/4098 4077/4077/4077 4091/4091/4091 4078/4078/4078 +f 4078/4078/4078 4091/4091/4091 4093/4093/4093 4100/4100/4100 +f 4099/4099/4099 4078/4078/4078 4100/4100/4100 4101/4101/4101 +f 2842/2842/2842 4097/4097/4097 2843/2843/2843 2846/2846/2846 +f 4097/4097/4097 4096/4096/4096 4099/4099/4099 2843/2843/2843 +f 2843/2843/2843 4099/4099/4099 4101/4101/4101 4102/4102/4102 +f 2846/2846/2846 2843/2843/2843 4102/4102/4102 2847/2847/2847 +f 3447/3447/3447 3446/3446/3446 3444/3444/3444 4059/4059/4059 +f 3446/3446/3446 3443/3443/3443 4103/4103/4103 3444/3444/3444 +f 3444/3444/3444 4103/4103/4103 4104/4104/4104 4106/4106/4106 +f 4059/4059/4059 3444/3444/3444 4106/4106/4106 4060/4060/4060 +f 3443/3443/3443 3442/3442/3442 3432/3432/3432 4103/4103/4103 +f 3442/3442/3442 3431/3431/3431 4107/4107/4107 3432/3432/3432 +f 3432/3432/3432 4107/4107/4107 4108/4108/4108 4110/4110/4110 +f 4103/4103/4103 3432/3432/3432 4110/4110/4110 4104/4104/4104 +f 4104/4104/4104 4110/4110/4110 4105/4105/4105 4111/4111/4111 +f 4110/4110/4110 4108/4108/4108 4112/4112/4112 4105/4105/4105 +f 4105/4105/4105 4112/4112/4112 4113/4113/4113 4116/4116/4116 +f 4111/4111/4111 4105/4105/4105 4116/4116/4116 4117/4117/4117 +f 4060/4060/4060 4106/4106/4106 4061/4061/4061 4064/4064/4064 +f 4106/4106/4106 4104/4104/4104 4111/4111/4111 4061/4061/4061 +f 4061/4061/4061 4111/4111/4111 4117/4117/4117 4118/4118/4118 +f 4064/4064/4064 4061/4061/4061 4118/4118/4118 4065/4065/4065 +f 3431/3431/3431 3430/3430/3430 3428/3428/3428 4107/4107/4107 +f 3430/3430/3430 3427/3427/3427 4119/4119/4119 3428/3428/3428 +f 3428/3428/3428 4119/4119/4119 4120/4120/4120 4121/4121/4121 +f 4107/4107/4107 3428/3428/3428 4121/4121/4121 4108/4108/4108 +f 3427/3427/3427 3426/3426/3426 3425/3425/3425 4119/4119/4119 +f 3426/3426/3426 3423/3423/3423 3768/3768/3768 3425/3425/3425 +f 3425/3425/3425 3768/3768/3768 3774/3774/3774 4122/4122/4122 +f 4119/4119/4119 3425/3425/3425 4122/4122/4122 4120/4120/4120 +f 4120/4120/4120 4122/4122/4122 3775/3775/3775 4123/4123/4123 +f 4122/4122/4122 3774/3774/3774 3788/3788/3788 3775/3775/3775 +f 3775/3775/3775 3788/3788/3788 3790/3790/3790 4124/4124/4124 +f 4123/4123/4123 3775/3775/3775 4124/4124/4124 4125/4125/4125 +f 4108/4108/4108 4121/4121/4121 4109/4109/4109 4112/4112/4112 +f 4121/4121/4121 4120/4120/4120 4123/4123/4123 4109/4109/4109 +f 4109/4109/4109 4123/4123/4123 4125/4125/4125 4126/4126/4126 +f 4112/4112/4112 4109/4109/4109 4126/4126/4126 4113/4113/4113 +f 4113/4113/4113 4126/4126/4126 4114/4114/4114 4127/4127/4127 +f 4126/4126/4126 4125/4125/4125 4128/4128/4128 4114/4114/4114 +f 4114/4114/4114 4128/4128/4128 4129/4129/4129 4131/4131/4131 +f 4127/4127/4127 4114/4114/4114 4131/4131/4131 4132/4132/4132 +f 4125/4125/4125 4124/4124/4124 3791/3791/3791 4128/4128/4128 +f 4124/4124/4124 3790/3790/3790 3832/3832/3832 3791/3791/3791 +f 3791/3791/3791 3832/3832/3832 3837/3837/3837 4134/4134/4134 +f 4128/4128/4128 3791/3791/3791 4134/4134/4134 4129/4129/4129 +f 4129/4129/4129 4134/4134/4134 3838/3838/3838 4135/4135/4135 +f 4134/4134/4134 3837/3837/3837 3844/3844/3844 3838/3838/3838 +f 3838/3838/3838 3844/3844/3844 3846/3846/3846 4136/4136/4136 +f 4135/4135/4135 3838/3838/3838 4136/4136/4136 4137/4137/4137 +f 4132/4132/4132 4131/4131/4131 4130/4130/4130 4139/4139/4139 +f 4131/4131/4131 4129/4129/4129 4135/4135/4135 4130/4130/4130 +f 4130/4130/4130 4135/4135/4135 4137/4137/4137 4140/4140/4140 +f 4139/4139/4139 4130/4130/4130 4140/4140/4140 4141/4141/4141 +f 4065/4065/4065 4118/4118/4118 4066/4066/4066 4079/4079/4079 +f 4118/4118/4118 4117/4117/4117 4143/4143/4143 4066/4066/4066 +f 4066/4066/4066 4143/4143/4143 4144/4144/4144 4145/4145/4145 +f 4079/4079/4079 4066/4066/4066 4145/4145/4145 4080/4080/4080 +f 4117/4117/4117 4116/4116/4116 4115/4115/4115 4143/4143/4143 +f 4116/4116/4116 4113/4113/4113 4127/4127/4127 4115/4115/4115 +f 4115/4115/4115 4127/4127/4127 4132/4132/4132 4146/4146/4146 +f 4143/4143/4143 4115/4115/4115 4146/4146/4146 4144/4144/4144 +f 4144/4144/4144 4146/4146/4146 4133/4133/4133 4147/4147/4147 +f 4146/4146/4146 4132/4132/4132 4139/4139/4139 4133/4133/4133 +f 4133/4133/4133 4139/4139/4139 4141/4141/4141 4148/4148/4148 +f 4147/4147/4147 4133/4133/4133 4148/4148/4148 4149/4149/4149 +f 4080/4080/4080 4145/4145/4145 4081/4081/4081 4084/4084/4084 +f 4145/4145/4145 4144/4144/4144 4147/4147/4147 4081/4081/4081 +f 4081/4081/4081 4147/4147/4147 4149/4149/4149 4150/4150/4150 +f 4084/4084/4084 4081/4081/4081 4150/4150/4150 4085/4085/4085 +f 4085/4085/4085 4150/4150/4150 4086/4086/4086 4151/4151/4151 +f 4150/4150/4150 4149/4149/4149 4152/4152/4152 4086/4086/4086 +f 4086/4086/4086 4152/4152/4152 4153/4153/4153 4156/4156/4156 +f 4151/4151/4151 4086/4086/4086 4156/4156/4156 4157/4157/4157 +f 4149/4149/4149 4148/4148/4148 4142/4142/4142 4152/4152/4152 +f 4148/4148/4148 4141/4141/4141 4159/4159/4159 4142/4142/4142 +f 4142/4142/4142 4159/4159/4159 4160/4160/4160 4162/4162/4162 +f 4152/4152/4152 4142/4142/4142 4162/4162/4162 4153/4153/4153 +f 4153/4153/4153 4162/4162/4162 4154/4154/4154 4163/4163/4163 +f 4162/4162/4162 4160/4160/4160 4164/4164/4164 4154/4154/4154 +f 4154/4154/4154 4164/4164/4164 4165/4165/4165 4168/4168/4168 +f 4163/4163/4163 4154/4154/4154 4168/4168/4168 4169/4169/4169 +f 4157/4157/4157 4156/4156/4156 4155/4155/4155 4171/4171/4171 +f 4156/4156/4156 4153/4153/4153 4163/4163/4163 4155/4155/4155 +f 4155/4155/4155 4163/4163/4163 4169/4169/4169 4172/4172/4172 +f 4171/4171/4171 4155/4155/4155 4172/4172/4172 4173/4173/4173 +f 4141/4141/4141 4140/4140/4140 4138/4138/4138 4159/4159/4159 +f 4140/4140/4140 4137/4137/4137 4175/4175/4175 4138/4138/4138 +f 4138/4138/4138 4175/4175/4175 4176/4176/4176 4177/4177/4177 +f 4159/4159/4159 4138/4138/4138 4177/4177/4177 4160/4160/4160 +f 4137/4137/4137 4136/4136/4136 3847/3847/3847 4175/4175/4175 +f 4136/4136/4136 3846/3846/3846 3979/3979/3979 3847/3847/3847 +f 3847/3847/3847 3979/3979/3979 3985/3985/3985 4178/4178/4178 +f 4175/4175/4175 3847/3847/3847 4178/4178/4178 4176/4176/4176 +f 4176/4176/4176 4178/4178/4178 3986/3986/3986 4179/4179/4179 +f 4178/4178/4178 3985/3985/3985 3999/3999/3999 3986/3986/3986 +f 3986/3986/3986 3999/3999/3999 4001/4001/4001 4180/4180/4180 +f 4179/4179/4179 3986/3986/3986 4180/4180/4180 4181/4181/4181 +f 4160/4160/4160 4177/4177/4177 4161/4161/4161 4164/4164/4164 +f 4177/4177/4177 4176/4176/4176 4179/4179/4179 4161/4161/4161 +f 4161/4161/4161 4179/4179/4179 4181/4181/4181 4182/4182/4182 +f 4164/4164/4164 4161/4161/4161 4182/4182/4182 4165/4165/4165 +f 4165/4165/4165 4182/4182/4182 4166/4166/4166 4183/4183/4183 +f 4182/4182/4182 4181/4181/4181 4184/4184/4184 4166/4166/4166 +f 4166/4166/4166 4184/4184/4184 4185/4185/4185 4187/4187/4187 +f 4183/4183/4183 4166/4166/4166 4187/4187/4187 4188/4188/4188 +f 4181/4181/4181 4180/4180/4180 4002/4002/4002 4184/4184/4184 +f 4180/4180/4180 4001/4001/4001 4025/4025/4025 4002/4002/4002 +f 4002/4002/4002 4025/4025/4025 4030/4030/4030 4190/4190/4190 +f 4184/4184/4184 4002/4002/4002 4190/4190/4190 4185/4185/4185 +f 4185/4185/4185 4190/4190/4190 4031/4031/4031 4191/4191/4191 +f 4190/4190/4190 4030/4030/4030 4036/4036/4036 4031/4031/4031 +f 4031/4031/4031 4036/4036/4036 4038/4038/4038 4192/4192/4192 +f 4191/4191/4191 4031/4031/4031 4192/4192/4192 4193/4193/4193 +f 4188/4188/4188 4187/4187/4187 4186/4186/4186 4194/4194/4194 +f 4187/4187/4187 4185/4185/4185 4191/4191/4191 4186/4186/4186 +f 4186/4186/4186 4191/4191/4191 4193/4193/4193 4195/4195/4195 +f 4194/4194/4194 4186/4186/4186 4195/4195/4195 4196/4196/4196 +f 4173/4173/4173 4172/4172/4172 4170/4170/4170 4197/4197/4197 +f 4172/4172/4172 4169/4169/4169 4198/4198/4198 4170/4170/4170 +f 4170/4170/4170 4198/4198/4198 4199/4199/4199 4201/4201/4201 +f 4197/4197/4197 4170/4170/4170 4201/4201/4201 4202/4202/4202 +f 4169/4169/4169 4168/4168/4168 4167/4167/4167 4198/4198/4198 +f 4168/4168/4168 4165/4165/4165 4183/4183/4183 4167/4167/4167 +f 4167/4167/4167 4183/4183/4183 4188/4188/4188 4204/4204/4204 +f 4198/4198/4198 4167/4167/4167 4204/4204/4204 4199/4199/4199 +f 4199/4199/4199 4204/4204/4204 4189/4189/4189 4205/4205/4205 +f 4204/4204/4204 4188/4188/4188 4194/4194/4194 4189/4189/4189 +f 4189/4189/4189 4194/4194/4194 4196/4196/4196 4206/4206/4206 +f 4205/4205/4205 4189/4189/4189 4206/4206/4206 4207/4207/4207 +f 4202/4202/4202 4201/4201/4201 4200/4200/4200 4208/4208/4208 +f 4201/4201/4201 4199/4199/4199 4205/4205/4205 4200/4200/4200 +f 4200/4200/4200 4205/4205/4205 4207/4207/4207 4209/4209/4209 +f 4208/4208/4208 4200/4200/4200 4209/4209/4209 4210/4210/4210 +f 2847/2847/2847 4102/4102/4102 2848/2848/2848 2893/2893/2893 +f 4102/4102/4102 4101/4101/4101 4211/4211/4211 2848/2848/2848 +f 2848/2848/2848 4211/4211/4211 4212/4212/4212 4214/4214/4214 +f 2893/2893/2893 2848/2848/2848 4214/4214/4214 2894/2894/2894 +f 4101/4101/4101 4100/4100/4100 4094/4094/4094 4211/4211/4211 +f 4100/4100/4100 4093/4093/4093 4215/4215/4215 4094/4094/4094 +f 4094/4094/4094 4215/4215/4215 4216/4216/4216 4218/4218/4218 +f 4211/4211/4211 4094/4094/4094 4218/4218/4218 4212/4212/4212 +f 4212/4212/4212 4218/4218/4218 4213/4213/4213 4219/4219/4219 +f 4218/4218/4218 4216/4216/4216 4220/4220/4220 4213/4213/4213 +f 4213/4213/4213 4220/4220/4220 4221/4221/4221 4224/4224/4224 +f 4219/4219/4219 4213/4213/4213 4224/4224/4224 4225/4225/4225 +f 2894/2894/2894 4214/4214/4214 2895/2895/2895 2898/2898/2898 +f 4214/4214/4214 4212/4212/4212 4219/4219/4219 2895/2895/2895 +f 2895/2895/2895 4219/4219/4219 4225/4225/4225 4226/4226/4226 +f 2898/2898/2898 2895/2895/2895 4226/4226/4226 2899/2899/2899 +f 4093/4093/4093 4092/4092/4092 4090/4090/4090 4215/4215/4215 +f 4092/4092/4092 4089/4089/4089 4227/4227/4227 4090/4090/4090 +f 4090/4090/4090 4227/4227/4227 4228/4228/4228 4229/4229/4229 +f 4215/4215/4215 4090/4090/4090 4229/4229/4229 4216/4216/4216 +f 4089/4089/4089 4088/4088/4088 4087/4087/4087 4227/4227/4227 +f 4088/4088/4088 4085/4085/4085 4151/4151/4151 4087/4087/4087 +f 4087/4087/4087 4151/4151/4151 4157/4157/4157 4230/4230/4230 +f 4227/4227/4227 4087/4087/4087 4230/4230/4230 4228/4228/4228 +f 4228/4228/4228 4230/4230/4230 4158/4158/4158 4231/4231/4231 +f 4230/4230/4230 4157/4157/4157 4171/4171/4171 4158/4158/4158 +f 4158/4158/4158 4171/4171/4171 4173/4173/4173 4232/4232/4232 +f 4231/4231/4231 4158/4158/4158 4232/4232/4232 4233/4233/4233 +f 4216/4216/4216 4229/4229/4229 4217/4217/4217 4220/4220/4220 +f 4229/4229/4229 4228/4228/4228 4231/4231/4231 4217/4217/4217 +f 4217/4217/4217 4231/4231/4231 4233/4233/4233 4234/4234/4234 +f 4220/4220/4220 4217/4217/4217 4234/4234/4234 4221/4221/4221 +f 4221/4221/4221 4234/4234/4234 4222/4222/4222 4235/4235/4235 +f 4234/4234/4234 4233/4233/4233 4236/4236/4236 4222/4222/4222 +f 4222/4222/4222 4236/4236/4236 4237/4237/4237 4239/4239/4239 +f 4235/4235/4235 4222/4222/4222 4239/4239/4239 4240/4240/4240 +f 4233/4233/4233 4232/4232/4232 4174/4174/4174 4236/4236/4236 +f 4232/4232/4232 4173/4173/4173 4197/4197/4197 4174/4174/4174 +f 4174/4174/4174 4197/4197/4197 4202/4202/4202 4242/4242/4242 +f 4236/4236/4236 4174/4174/4174 4242/4242/4242 4237/4237/4237 +f 4237/4237/4237 4242/4242/4242 4203/4203/4203 4243/4243/4243 +f 4242/4242/4242 4202/4202/4202 4208/4208/4208 4203/4203/4203 +f 4203/4203/4203 4208/4208/4208 4210/4210/4210 4244/4244/4244 +f 4243/4243/4243 4203/4203/4203 4244/4244/4244 4245/4245/4245 +f 4240/4240/4240 4239/4239/4239 4238/4238/4238 4246/4246/4246 +f 4239/4239/4239 4237/4237/4237 4243/4243/4243 4238/4238/4238 +f 4238/4238/4238 4243/4243/4243 4245/4245/4245 4247/4247/4247 +f 4246/4246/4246 4238/4238/4238 4247/4247/4247 4248/4248/4248 +f 2899/2899/2899 4226/4226/4226 2900/2900/2900 2913/2913/2913 +f 4226/4226/4226 4225/4225/4225 4249/4249/4249 2900/2900/2900 +f 2900/2900/2900 4249/4249/4249 4250/4250/4250 4251/4251/4251 +f 2913/2913/2913 2900/2900/2900 4251/4251/4251 2914/2914/2914 +f 4225/4225/4225 4224/4224/4224 4223/4223/4223 4249/4249/4249 +f 4224/4224/4224 4221/4221/4221 4235/4235/4235 4223/4223/4223 +f 4223/4223/4223 4235/4235/4235 4240/4240/4240 4252/4252/4252 +f 4249/4249/4249 4223/4223/4223 4252/4252/4252 4250/4250/4250 +f 4250/4250/4250 4252/4252/4252 4241/4241/4241 4253/4253/4253 +f 4252/4252/4252 4240/4240/4240 4246/4246/4246 4241/4241/4241 +f 4241/4241/4241 4246/4246/4246 4248/4248/4248 4254/4254/4254 +f 4253/4253/4253 4241/4241/4241 4254/4254/4254 4255/4255/4255 +f 2914/2914/2914 4251/4251/4251 2915/2915/2915 2918/2918/2918 +f 4251/4251/4251 4250/4250/4250 4253/4253/4253 2915/2915/2915 +f 2915/2915/2915 4253/4253/4253 4255/4255/4255 4256/4256/4256 +f 2918/2918/2918 2915/2915/2915 4256/4256/4256 2919/2919/2919 +; diff --git a/regression/hbr_regression/init_shapes.h b/regression/hbr_regression/init_shapes.h index d86791f3..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" @@ -82,6 +50,7 @@ static std::vector g_shapes; #include "../shapes/catmark_edgecorner.h" #include "../shapes/catmark_edgeonly.h" #include "../shapes/catmark_flap.h" +#include "../shapes/catmark_flap2.h" #include "../shapes/catmark_pyramid_creases0.h" #include "../shapes/catmark_pyramid_creases1.h" #include "../shapes/catmark_pyramid.h" @@ -117,6 +86,7 @@ static void initShapes() { g_shapes.push_back( shaperec("catmark_edgecorner", catmark_edgecorner, kCatmark ) ); g_shapes.push_back( shaperec("catmark_edgeonly", catmark_edgeonly, kCatmark ) ); g_shapes.push_back( shaperec("catmark_flap", catmark_flap, kCatmark ) ); + g_shapes.push_back( shaperec("catmark_flap2", catmark_flap2, kCatmark ) ); g_shapes.push_back( shaperec("catmark_pyramid_creases0", catmark_pyramid_creases0, kCatmark ) ); g_shapes.push_back( shaperec("catmark_pyramid_creases1", catmark_pyramid_creases1, kCatmark ) ); g_shapes.push_back( shaperec("catmark_pyramid", catmark_pyramid, kCatmark ) ); 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 7df55a9a..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( @@ -84,6 +52,8 @@ add_executable(osd_regression ${SOURCE_FILES} ) +add_dependencies(osd_regression blarg ) + target_link_libraries(osd_regression ${PLATFORM_LIBRARIES} ) 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 new file mode 100644 index 00000000..f3238bc5 --- /dev/null +++ b/regression/shapes/catmark_flap2.h @@ -0,0 +1,61 @@ +// +// 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. +// +static const std::string catmark_flap2 = +"# This file uses centimeters as units for non-parametric coordinates.\n" +"v -0.500000 -0.125000 0.000000 \n" +"v -0.250000 -0.125000 0.000000 \n" +"v 0.000000 -0.125000 0.000000 \n" +"v 0.250000 -0.125000 0.000000 \n" +"v 0.500000 -0.125000 0.000000 \n" +"v -0.500000 0.125000 0.000000 \n" +"v -0.250000 0.125000 0.000000 \n" +"v 0.000000 0.125000 0.000000 \n" +"v 0.250000 0.125000 0.000000 \n" +"v 0.500000 0.125000 0.000000 \n" +"vt 0.000000 0.000000 \n" +"vt 0.250000 0.000000 \n" +"vt 0.500000 0.000000 \n" +"vt 0.750000 0.000000 \n" +"vt 1.000000 0.000000 \n" +"vt 0.000000 0.250000 \n" +"vt 0.250000 0.250000 \n" +"vt 0.500000 0.250000 \n" +"vt 0.750000 0.250000 \n" +"vt 1.000000 0.250000 \n" +"vn 0.000000 0.000000 1.000000 \n" +" vn 0.000000 0.000000 1.000000 \n" +"vn 0.000000 0.000000 1.000000 \n" +"vn 0.000000 0.000000 1.000000 \n" +"vn 0.000000 0.000000 1.000000 \n" +"vn 0.000000 0.000000 1.000000 \n" +"vn 0.000000 0.000000 1.000000 \n" +"vn 0.000000 0.000000 1.000000 \n" +"vn 0.000000 0.000000 1.000000 \n" +"vn 0.000000 0.000000 1.000000 \n" +"f 1/1/1 2/2/2 7/7/3 6/6/4 \n" +"f 2/2/2 3/3/5 8/8/6 7/7/3 \n" +"f 3/3/5 4/4/7 9/9/8 8/8/6 \n" +"f 4/4/7 5/5/9 10/10/10 9/9/8 \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"