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

Adding the KHR_materials_iridescence effect #2027

Merged
merged 88 commits into from
Jul 25, 2022
Merged
Changes from 1 commit
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
ac53438
Created KHR_materials_thinfilm branch.
UX3D-nopper Jan 17, 2020
23f2796
simplify thickness mapping by using `mix()`
jim-ec Mar 6, 2020
ed86068
fix white space inconsistencies
jim-ec Mar 6, 2020
2e57568
fix glsl code snippet highlighting
jim-ec Mar 6, 2020
d2d2e2f
add transmission specs
jim-ec Mar 25, 2020
36c5432
add thickness spec
jim-ec Mar 25, 2020
03276f9
add absorption spec
jim-ec Mar 26, 2020
8701f10
remove optional dependency on thickness
jim-ec Mar 26, 2020
0aa4f66
fix transmission spec
jim-ec Mar 30, 2020
dfda721
Update README.md
Apr 1, 2020
2f0a7bf
Update README.md
Apr 1, 2020
9b52d13
refactor to refraction extension
jim-ec Apr 1, 2020
a87419f
update thickness extension
jim-ec Apr 1, 2020
f4f6eba
move thickness extension to its own branch
jim-ec Apr 1, 2020
e308ef5
initial draft
jim-ec Apr 1, 2020
6ebfa3c
improve thickness extension
jim-ec Apr 1, 2020
d0196ac
Merge pull request #3 from KhronosGroup/master
UX3D-nopper Apr 28, 2020
90c91ea
Merge branch 'master' into extensions/KHR_materials_thickness
jim-ec Apr 28, 2020
36ab973
Merge branch 'master' into extensions/KHR_materials_transmission
jim-ec Apr 28, 2020
5b6a698
remove refraction related files as already present in KHR_materials_r…
jim-ec Apr 28, 2020
ed16458
remove absorption related files as already present in KHR_materials_a…
jim-ec Apr 28, 2020
0c9896b
Merge pull request #4 from ux3d/extensions/KHR_materials_transmission
Apr 28, 2020
5d7d535
Minor fixes.
UX3D-nopper Apr 28, 2020
285d945
Merge pull request #7 from ux3d/extensions/KHR_materials_thickness
UX3D-nopper Apr 28, 2020
1ac92d0
Merge pull request #8 from KhronosGroup/master
UX3D-nopper Aug 13, 2020
821b165
Initial draft for EXT_lights_environment
UX3D-nopper Aug 13, 2020
a2f177c
Removed thickness.
UX3D-nopper Aug 13, 2020
5cd666e
Fixed some typos. Clarified the coordinate system.
UX3D-nopper Aug 14, 2020
969ec0b
Added physical units.
UX3D-nopper Aug 14, 2020
785ce36
Merge pull request #9 from KhronosGroup/master
UX3D-nopper Oct 19, 2020
3a89422
Merge pull request #10 from KhronosGroup/master
UX3D-nopper Sep 20, 2021
e709fc2
Merge pull request #11 from ux3d/master
UX3D-nopper Sep 20, 2021
847a9dc
Removed nor required extension.
UX3D-nopper Sep 20, 2021
4275e79
Renamed everything.
UX3D-nopper Sep 20, 2021
0f3ac89
Added Ben.
UX3D-nopper Sep 20, 2021
dd4c5f4
Updated iridescence schema to implement full model of Belcour/Barla
PascalSchoen Sep 20, 2021
5be97e2
Added line breaks.
UX3D-nopper Sep 20, 2021
d53fc60
Removed the base extinction coefficient. Renamed the parameters.
UX3D-nopper Sep 21, 2021
23d8344
Added call of duty paper again.
UX3D-nopper Sep 21, 2021
3f53d38
Added more references.
UX3D-nopper Sep 21, 2021
3b614ed
Added reference.
UX3D-nopper Sep 23, 2021
1a5af5b
Add Appendix: Full Khronos Copyright Statement
UX3D-kanzler Oct 28, 2021
cdcb275
Add schema to readme
UX3D-kanzler Oct 28, 2021
874ca18
Add overview
UX3D-kanzler Oct 28, 2021
c8f8883
Explain values
UX3D-kanzler Oct 28, 2021
23df78a
Update overview
UX3D-kanzler Oct 28, 2021
e17a78f
Set state to draft
UX3D-kanzler Oct 28, 2021
0d934bb
Add reference
UX3D-kanzler Oct 28, 2021
0dfaabe
Update header
UX3D-kanzler Oct 28, 2021
2315113
Sorted by company, then first name.
UX3D-nopper Oct 29, 2021
a66118b
Apply change request
UX3D-kanzler Oct 29, 2021
c04a741
Update extensions/2.0/Khronos/KHR_materials_iridescence/schema/glTF.K…
UX3D-kanzler Oct 29, 2021
c2d7925
Updated schema.
UX3D-nopper Oct 30, 2021
e5b1a00
Added another thin film link.
UX3D-nopper Nov 8, 2021
fe598a2
Add implementation details and show effects of thickness and IOR
UX3D-kanzler Nov 16, 2021
2f459fb
Change default values of thickness min and max so that the effect is …
UX3D-kanzler Nov 17, 2021
841d8d5
Clarify default texture value
UX3D-kanzler Nov 19, 2021
bda475a
Add reference to Sample Viewer shader
UX3D-kanzler Nov 19, 2021
0fcc202
Iridescence: Update references
PascalSchoen Feb 7, 2022
3cc4ea7
Remove trailing whitespaces and update implementation details
PascalSchoen Feb 20, 2022
fda1a09
KHR_materials_iridescence: Add reference to the Schlick fresnel defin…
PascalSchoen Feb 20, 2022
42046fb
KHR_materials_iridescence: Set default value of thin-film IOR to 1.3 …
PascalSchoen Feb 20, 2022
433bfd5
KHR_materials_iridescence: Update implementation details
PascalSchoen Feb 21, 2022
a9d321c
KHR_materials_iridescence: Put clearcoat extension interaction into n…
PascalSchoen Feb 21, 2022
25baea1
KHR_materials_iridescence: Make math formulas work in light and dark …
PascalSchoen Feb 22, 2022
7c173ce
KHR_materials_iridescence: Make math formulas bigger
PascalSchoen Feb 22, 2022
7315a62
KHR_materials_iridescence: fix line-breaks in Reference section
PascalSchoen Feb 22, 2022
0403eb0
KHR_materials_iridescence: Fix error in code example
PascalSchoen Feb 22, 2022
d1b79ce
KHR_materials_iridescence: set thickness max. to 400 nm
PascalSchoen Feb 28, 2022
66fe4c2
KHR_materials_iridescence: Update implementation details
PascalSchoen Feb 28, 2022
9cbbd94
KHR_materials_iridescence: add missing closing parenthesis
PascalSchoen Feb 28, 2022
87baef6
KHR_materials_iridescence: align links/references
PascalSchoen Feb 28, 2022
cc82c7e
KHR_materials_iridescence: Use UTF-8 Pi instead of image
PascalSchoen Feb 28, 2022
c25bf01
KHR_materials_iridescence: Add padding around figures
PascalSchoen Feb 28, 2022
21b55ef
KHR_materials_iridescence: Use maximum RGB component instead of lumin…
PascalSchoen Mar 1, 2022
31c92d3
KHR_materials_iridescence: remove clearcoat dependency
PascalSchoen Mar 1, 2022
3d5ef3b
remove unused images
PascalSchoen Mar 1, 2022
35771e1
KHR_materials_iridescence: update default value of iridescenceIOR in …
PascalSchoen Mar 1, 2022
ad87ba6
KHR_materials_iridescence: Removed redundant parenthesis
PascalSchoen Mar 3, 2022
fab8dc6
KHR_materials_iridescence: marked as Release Candidate
PascalSchoen Mar 21, 2022
1b9681c
KHR_materials_iridescence: Add description for energy conservation ap…
PascalSchoen Apr 14, 2022
ba0894c
Change iridescenceIOR to iridescenceIor
UX3D-kanzler Apr 19, 2022
efbeb68
KHR_materials_iridescence: Define behaviour when combined with KHR_ma…
PascalSchoen Apr 28, 2022
8a964d7
Update schema descriptions to match the core spec
lexaknyazev May 5, 2022
09d55c0
KHR_materials_iridescence: Fix issues with combination with KHR_mater…
PascalSchoen May 9, 2022
a9cd1cb
KHR_materials_iridescence: Fix parameter order in rgb_mix()
PascalSchoen May 9, 2022
014bc41
Update to latest copyright statement.
emackey May 31, 2022
1ad76e4
Merge pull request #21 from emackey/extensions/KHR_materials_iridescence
PascalSchoen Jun 1, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update to latest copyright statement.
  • Loading branch information
emackey committed May 31, 2022
commit 014bc417c9397c32b186687bd04b0d53dc3e87a5
58 changes: 29 additions & 29 deletions extensions/2.0/Khronos/KHR_materials_iridescence/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@

## Khronos 3D Formats Working Group

* Pascal Schoen, adidas
* Pascal Schoen, Adidas
* Tobias Haeussler, Dassault Systemes [@proog128](https://github.com/proog128)
* Ben Houston, threekit
* Ben Houston, Threekit, [@bhouston](https://twitter.com/BenHouston3D)
* Mathias Kanzler, UX3D
* Norbert Nopper, UX3D [@UX3DGpuSoftware](https://twitter.com/UX3DGpuSoftware)
* Alexey Knyazev, Individual Contributor, [@lexaknyazev](https://github.com/lexaknyazev)
* Eric Chadwick, Wayfair, [echadwick-wayfair](https://github.com/echadwick-wayfair)

Copyright (C) 2018-2021 The Khronos Group Inc. All Rights Reserved. glTF is a trademark of The Khronos Group Inc.
Copyright (C) 2018-2022 The Khronos Group Inc. All Rights Reserved. glTF is a trademark of The Khronos Group Inc.
See [Appendix](#appendix-full-khronos-copyright-statement) for full Khronos Copyright Statement.

## Status
Expand Down Expand Up @@ -420,36 +422,35 @@ The full derivation of the fast analytical spectral integration is described in

## Appendix: Full Khronos Copyright Statement

Copyright 2018-2021 The Khronos Group Inc.

Some parts of this Specification are purely informative and do not define requirements
necessary for compliance and so are outside the Scope of this Specification. These
parts of the Specification are marked as being non-normative, or identified as
**Implementation Notes**.

Where this Specification includes normative references to external documents, only the
specifically identified sections and functionality of those external documents are in
Scope. Requirements defined by external documents not created by Khronos may contain
contributions from non-members of Khronos not covered by the Khronos Intellectual
Property Rights Policy.
Copyright 2018-2022 The Khronos Group Inc.

This specification is protected by copyright laws and contains material proprietary
to Khronos. Except as described by these terms, it or any components
may not be reproduced, republished, distributed, transmitted, displayed, broadcast
may not be reproduced, republished, distributed, transmitted, displayed, broadcast,
or otherwise exploited in any manner without the express prior written permission
of Khronos.

This specification has been created under the Khronos Intellectual Property Rights
Policy, which is Attachment A of the Khronos Group Membership Agreement available at
www.khronos.org/files/member_agreement.pdf. Khronos grants a conditional
https://www.khronos.org/files/member_agreement.pdf. Khronos grants a conditional
copyright license to use and reproduce the unmodified specification for any purpose,
without fee or royalty, EXCEPT no licenses to any patent, trademark or other
intellectual property rights are granted under these terms. Parties desiring to
implement the specification and make use of Khronos trademarks in relation to that
implementation, and receive reciprocal patent license protection under the Khronos
IP Policy must become Adopters and confirm the implementation as conformant under
the process defined by Khronos for this specification;
see https://www.khronos.org/adopters.
IP Policy must become Adopters under the process defined by Khronos for this specification;
see https://www.khronos.org/conformance/adopters/file-format-adopter-program.

Some parts of this Specification are purely informative and do not define requirements
necessary for compliance and so are outside the Scope of this Specification. These
parts of the Specification are marked as being non-normative, or identified as
**Implementation Notes**.

Where this Specification includes normative references to external documents, only the
specifically identified sections and functionality of those external documents are in
Scope. Requirements defined by external documents not created by Khronos may contain
contributions from non-members of Khronos not covered by the Khronos Intellectual
Property Rights Policy.

Khronos makes no, and expressly disclaims any, representations or warranties,
express or implied, regarding this specification, including, without limitation:
Expand All @@ -461,12 +462,11 @@ employees, agents or representatives be liable for any damages, whether direct,
indirect, special or consequential damages for lost revenues, lost profits, or
otherwise, arising from or in connection with these materials.

Vulkan is a registered trademark and Khronos, OpenXR, SPIR, SPIR-V, SYCL, WebGL,
WebCL, OpenVX, OpenVG, EGL, COLLADA, glTF, NNEF, OpenKODE, OpenKCAM, StreamInput,
OpenWF, OpenSL ES, OpenMAX, OpenMAX AL, OpenMAX IL, OpenMAX DL, OpenML and DevU are
trademarks of The Khronos Group Inc. ASTC is a trademark of ARM Holdings PLC,
OpenCL is a trademark of Apple Inc. and OpenGL and OpenML are registered trademarks
and the OpenGL ES and OpenGL SC logos are trademarks of Silicon Graphics
International used under license by Khronos. All other product names, trademarks,
and/or company names are used solely for identification and belong to their
respective owners.
Khronos® and Vulkan® are registered trademarks, and ANARI™, WebGL™, glTF™, NNEF™, OpenVX™,
SPIR™, SPIR‑V™, SYCL™, OpenVG™ and 3D Commerce™ are trademarks of The Khronos Group Inc.
OpenXR™ is a trademark owned by The Khronos Group Inc. and is registered as a trademark in
China, the European Union, Japan and the United Kingdom. OpenCL™ is a trademark of Apple Inc.
and OpenGL® is a registered trademark and the OpenGL ES™ and OpenGL SC™ logos are trademarks
of Hewlett Packard Enterprise used under license by Khronos. ASTC is a trademark of
ARM Holdings PLC. All other product names, trademarks, and/or company names are used solely
for identification and belong to their respective owners.