Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add utilities for processing ies light files #3061

Closed
wants to merge 2 commits into from

Conversation

pmolodo
Copy link
Contributor

@pmolodo pmolodo commented Apr 26, 2024

Description of Change(s)

This adds ies.h and ies.cpp, for processing ies light files.

These are originally taken from blender, v4.1.1:

These files are provided by Blender under the Apache 2.0 license. (See the note here about how the "Blender Cycles rendering engine is available as Apache 2.0").

These are not yet built / used, but merely introduce the files for use in the codebase later (ie, as part of a reworked UsdLux update).

The intent is to allow the Pixar legal approval process to get started early.

  • I have verified that all unit tests pass with the proposed changes
  • I have submitted a signed Contributor License Agreement

@jesschimein
Copy link
Collaborator

Filed as internal issue #USD-9596

@jesschimein
Copy link
Collaborator

/AzurePipelines run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

These are taken unaltered from blender, v4.1.1

- https://projects.blender.org/blender/blender/src/tag/v4.1.1/intern/cycles/util/ies.h
- https://projects.blender.org/blender/blender/src/tag/v4.1.1/intern/cycles/util/ies.cpp

These are not yet built / used, but merely introduce the files for use
in the codebase later.
@pmolodo
Copy link
Contributor Author

pmolodo commented Jun 6, 2024

Updated the way that these files are vendored, to match how pxrCLI11 works - ie, with a patch file.

@pmolodo pmolodo force-pushed the pr/ies branch 3 times, most recently from 27d41db to 6c56762 Compare June 6, 2024 16:48
@jesschimein
Copy link
Collaborator

/AzurePipelines run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@pmolodo
Copy link
Contributor Author

pmolodo commented Jun 6, 2024

This PR doesn't actually build/use ies.h or ies.cpp yet, as we don't want to slow down / alter the actual build until this code is used - this is to get the legal process started - but look at this pr/ies_build branch for one that will build ies.cpp, to validate it at least compiles:

https://github.com/pmolodo/OpenUSD/commits/pr/ies_build/

@pmolodo pmolodo changed the title Add utilites for processing ies light files Add utilities for processing ies light files Jun 14, 2024
@jesschimein
Copy link
Collaborator

/AzurePipelines run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@pmolodo
Copy link
Contributor Author

pmolodo commented Jul 25, 2024

If it helps to get approval from legal - I've since learned that the exact same source code is also hosted in a separate "cycles" repository. The two files in question are the exact same (which I confirmed), and both explicitly say in their headers that they're covered by Apache 2.0:

* SPDX-License-Identifier: Apache-2.0 */

However, the cycles repo has the additional nice feature that the license listed at the root of the project is the Apache 2.0 one.
I can update this PR to reference the cycles repo, instead of the blender one, if it would be preferrable.

Relevant Links:

@pmolodo
Copy link
Contributor Author

pmolodo commented Jul 31, 2024

@pmolodo pmolodo closed this Jul 31, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants