HYDRA-1071 : Add a flow viewport example that uses a custom GLSLFX shader for Storm#142
HYDRA-1071 : Add a flow viewport example that uses a custom GLSLFX shader for Storm#142lilike-adsk merged 10 commits intodevfrom
Conversation
debloip-adsk
left a comment
debloip-adsk
left a comment
There was a problem hiding this comment.
Looks good, thanks! Only minor touchups and questions
| if (IS_WINDOWS) | ||
| configure_file("plugInfo_Win.json" ${CMAKE_CURRENT_BINARY_DIR}/plugInfo.json) | ||
| else | ||
| ( | ||
| if (IS_LINUX) | ||
| configure_file("plugInfo_Linux.json" ${CMAKE_CURRENT_BINARY_DIR}/plugInfo.json) | ||
| endif() | ||
| if (IS_MACOSX) | ||
| configure_file("plugInfo_OSX.json" ${CMAKE_CURRENT_BINARY_DIR}/plugInfo.json) | ||
| endif() | ||
| ) | ||
| endif() |
There was a problem hiding this comment.
Minor : Wouldn't it be more consistent if we treated all platforms the same way? i.e. I don't see why the if (IS_WINDOWS) case is handled separately from Linux and OSX
There was a problem hiding this comment.
I cannot do this or haven't found a way to do so. The name of the dynamic library is different under windows/Linx and OSX and havcing a single file like I did originally works only on Windows.
There was a problem hiding this comment.
Ah sorry I meant just the CMake if cases, not the plugInfo files themselves. Just that I don't see why the Windows and OSX/Linux cases are nested differently. But it is a nitpick, though I see you've changed it
| @@ -0,0 +1,5 @@ | |||
| This is a pure usd plugin that is a shaders discovery plugin. | |||
| The shaders defined inshadersDef.usda will be loaded by usd/hydra and available for use in a material network in any Hydra plugin. | |||
There was a problem hiding this comment.
Typo : missing space in "inshadersDef.usda"
| // | ||
| // Copyright 2018 Pixar | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "Apache License") | ||
| // with the following modification; you may not use this file except in | ||
| // compliance with the Apache License and the following modification to it: | ||
| // Section 6. Trademarks. is 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 to comply with Section 4(c) of | ||
| // the License and to reproduce the content of the NOTICE file. | ||
| // | ||
| // You may obtain a copy of the Apache License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the Apache License with the above modification is | ||
| // distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the Apache License for the specific | ||
| // language governing permissions and limitations under the Apache License. | ||
| // |
There was a problem hiding this comment.
Why the Pixar license?
There was a problem hiding this comment.
It comes from a Pixar's file from their examples provided with USD, This license was left also in the file from Fusion, so I left it as well.
| // | ||
| // Copyright 2018 Pixar | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "Apache License") | ||
| // with the following modification; you may not use this file except in | ||
| // compliance with the Apache License and the following modification to it: | ||
| // Section 6. Trademarks. is 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 to comply with Section 4(c) of | ||
| // the License and to reproduce the content of the NOTICE file. | ||
| // | ||
| // You may obtain a copy of the Apache License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the Apache License with the above modification is | ||
| // distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the Apache License for the specific | ||
| // language governing permissions and limitations under the Apache License. | ||
| // |
There was a problem hiding this comment.
Why the Pixar license?
There was a problem hiding this comment.
Same as above, it's a file originally made by Pixar.
| #include <pxr/imaging/hd/materialNetworkSchema.h> | ||
| #include <pxr/imaging/hd/materialNodeSchema.h> | ||
| #include <pxr/imaging/hd/materialSchema.h> | ||
| #include <pxr/imaging/hd/perfLog.h>//For HD_TRACE_FUNCTION |
There was a problem hiding this comment.
It's actually used for HD_TRACE_FUNCTION, removing it doesn't compile on different platforms.
3 participants
No description provided.