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.

Sign up for GitHub

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

Adding the KHR_materials_iridescence effect #2027

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
KHR_materials_iridescence: Set default value of thin-film IOR to 1.3 … 
…(water, alcohol, etc.)
  • Loading branch information
@PascalSchoen
PascalSchoen committed Feb 20, 2022
commit 42046fb85509af8e9e64db87da34392e932e060a
4 changes: 2 additions & 2 deletions extensions/2.0/Khronos/KHR_materials_iridescence/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ The iridescence materials are defined by adding the `KHR_materials_iridescence`
"extensions": {
"KHR_materials_iridescence": {
"iridescenceFactor": 1.0,
"iridescenceIOR": 1.8,
"iridescenceIOR": 1.3,
"iridescenceThicknessMaximum": 1200.0
}
}
Expand All @@ -56,7 +56,7 @@ All implementations should use the same calculations for the BRDF inputs. Implem
| ------------------------------------- | --------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------- | --------------------- |
| **iridescenceFactor** | `number` | The iridescence intensity. | No, default:`0.0` |
| **iridescenceTexture** | [`textureInfo`](https://www.khronos.org/registry/glTF/specs/2.0/glTF-2.0.html#reference-textureinfo) | The iridescence intensity stored in the red channel of the texture. | No |
| **iridescenceIOR** | `number` | The index of refraction of the dielectric thin-film layer. | No, default:`1.8` |
| **iridescenceIOR** | `number` | The index of refraction of the dielectric thin-film layer. | No, default:`1.3` |
| **iridescenceThicknessMinimum** | `number` | The minimum thickness of the thin-film layer given in nanometers (nm). | No, default:`100.0` |
| **iridescenceThicknessMaximum** | `number` | The maximum thickness of the thin-film layer given in nanometers (nm). | No, default:`400.0` |
| **iridescenceThicknessTexture** | [`textureInfo`](https://www.khronos.org/registry/glTF/specs/2.0/glTF-2.0.html#reference-textureinfo) | The green channel of this texture defines the thickness of the thin-film layer by blending between the minimum and maximum thickness. | No |
Expand Down