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

Second Sync Update #86

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
69 changes: 68 additions & 1 deletion .reuse/dep5
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,11 @@ Copyright:
2017 Public
License: CC0-1.0

Files: Models/CarbonFibre/*
Copyright:
2023 Wayfair
License: CC-BY-4.0

Files: Models/CesiumMan/*
Copyright:
2017 Cesium
Expand All @@ -151,11 +156,26 @@ Copyright:
2015 Cesium
License: LicenseRef-CC-BY-TM AND LicenseRef-LegalMark-Cesium

Files: Models/ChairDamaskPurplegold/*
Copyright:
2021 Wayfair
License: CC-BY-4.0

Files: Models/ClearCoatCarPaint/*
Copyright:
2023 Public
License: CC0-1.0

Files: Models/ClearcoatRing/*
Copyright:
2022 UX3D
License: CC-BY-4.0

Files: Models/ClearcoatSphere/*
Copyright:
2022 UX3D
License: CC-BY-4.0

Files: Models/ClearCoatTest/*
Copyright:
2020 Analytical Graphics, Inc.
Expand Down Expand Up @@ -185,7 +205,12 @@ License: CC-BY-4.0 AND CC-BY-NC-4.0
Files: Models/DiffuseTransmissionTeacup/*
Copyright:
2023 Public domain
License: CC0
License: CC0-1.0

Files: Models/DirectionalLight/*
Copyright:
2020 Public
License: CC0-1.0

Files: Models/DragonAttenuation/*
Copyright:
Expand Down Expand Up @@ -244,11 +269,23 @@ Copyright:
2023 Public
License: CC0-1.0

Files: Models/glTFPotOfCoals/*
Copyright:
2023 Darmstadt Graphics Group GmbH
2015 Khronos Group
2017 Khronos Group
License: CC-BY-4.0 AND LicenseRef-LegalMark-Khronos

Files: Models/InterpolationTest/*
Copyright:
2017 Public
License: CC0-1.0

Files: Models/IORTestGrid/*
Copyright:
2023 Public
License: CC0-1.0

Files: Models/IridescenceAbalone/*
Copyright:
2015 Abby Crawford
Expand Down Expand Up @@ -367,6 +404,11 @@ Copyright:
2017 Unknown
License: CC-BY-4.0

Files: Models/PrimitiveModeNormalsTest/*
Copyright:
2020 public
License: CC0-1.0

Files: Models/RecursiveSkeletons/*
Copyright:
2017 Cesium
Expand Down Expand Up @@ -398,6 +440,16 @@ Copyright:
2020 Microsoft
License: CC0-1.0

Files: Models/SheenHighHeel/*
Copyright:
2021 UX3D
License: CC-BY-4.0

Files: Models/SheenTestGrid/*
Copyright:
2023 Public
License: CC0-1.0

Files: Models/SimpleInstancing/*
Copyright:
2023 Public
Expand Down Expand Up @@ -453,6 +505,11 @@ Copyright:
2017 UX3D
License: CC0-1.0

Files: Models/SuzanneMorphSparse/*
Copyright:
2020 Public
License: CC0-1.0

Files: Models/TextureCoordinateTest/*
Copyright:
2017 Analytical Graphics, Inc.
Expand Down Expand Up @@ -494,6 +551,11 @@ Copyright:
2021 Analytical Graphics, Inc.
License: CC-BY-4.0

Files: Models/TransmissionSuzanne/*
Copyright:
2022 UX3D
License: CC-BY-4.0

Files: Models/TransmissionTest/*
Copyright:
2020 Public
Expand Down Expand Up @@ -539,3 +601,8 @@ Copyright:
2017 Public
License: CC0-1.0

Files: Models/XmpMetadataRoundedCube/*
Copyright:
2021 Adam Morris
License: CC-BY-4.0

4 changes: 2 additions & 2 deletions .reuse/dep5.error
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* Unused licenses:
* Used licenses: Apache-2.0, CC-BY-4.0, CC-BY-NC-4.0, CC0-1.0, LicenseRef-3DRT-Testing, LicenseRef-Adobe-Stock, LicenseRef-CC-BY-TM, LicenseRef-CRYENGINE-Agreement, LicenseRef-LegalMark-Cesium, LicenseRef-LegalMark-Khronos, LicenseRef-LegalMark-UX3D, LicenseRef-Poser-EULA, LicenseRef-Stanford-Graphics, SCEA
* Read errors: 0
* Files with copyright information: 1400 / 1400
* Files with license information: 1400 / 1400
* Files with copyright information: 1652 / 1652
* Files with license information: 1652 / 1652

Congratulations! Your project is compliant with version 3.0 of the REUSE Specification :-)
5,755 changes: 4,078 additions & 1,677 deletions .reuse/reuse.spdx

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions Models/ABeautifulGame/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@

[showcase](../../Models-showcase.md), [video](../../Models-video.md), [extension](../../Models-extension.md)

## Extensions Used

* KHR_materials_transmission
* KHR_materials_volume

## Summary

Chess set using transmission and volume.
Expand Down
8 changes: 8 additions & 0 deletions Models/AnisotropyBarnLamp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@

[showcase](../../Models-showcase.md), [extension](../../Models-extension.md)

## Extensions Used

* KHR_materials_anisotropy
* KHR_materials_clearcoat
* KHR_materials_emissive_strength
* KHR_materials_transmission
* KHR_materials_volume

## Summary

Wayfair AnisotropyBarnLamp model using anisotropy, clearcoat, emissive_strength, transmission, volume, and basisu extensions.
Expand Down
4 changes: 4 additions & 0 deletions Models/AnisotropyDiscTest/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@

[extension](../../Models-extension.md), [testing](../../Models-testing.md)

## Extensions Used

* KHR_materials_anisotropy

## Summary

This model tests the texturemap for KHR_materials_anisotropy.
Expand Down
15 changes: 15 additions & 0 deletions Models/AnisotropyRotationTest/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@

[extension](../../Models-extension.md), [testing](../../Models-testing.md)

## Extensions Used

* KHR_materials_anisotropy

## Summary

This model tests rotational offsets for KHR_materials_anisotropy.
Expand Down Expand Up @@ -32,6 +36,17 @@ This model tests rotational offsets for [`KHR_materials_anisotropy`](https://git

- Finally, one mesh in the upper-right marked "Normal map of grooves" has no anisotropy applied at all. It has a (somewhat grainy) normal texture applied with a series of vertical grooves, intended to approximate the look of very coarse horizontal anisotropy. It will not look exactly the same as its neighbors, but a bright light source in the environment should still spread out horizontally like its neighbors.

## IBL Example

![IBL screenshot](screenshot/ibl-example.png)

With a full IBL reflection environment, the model should show horizontal stretching. It may appear similar to the screenshot above.

## Incorrect Rotation Example

![rotation failure screenshot](screenshot/fail-example.png)

In the above image, the six "Basic Anisotropy" meshes are correct. But on the left side, both the texture-based rotation and JSON-based rotation are incorrect, and in the lower-right, the combination of both is also incorrect. These test meshes use a 30-degree clockwise slant in the tangent vectors that is intended to be undone by a 30-degree counter-clockwise rotation in the material. However in this image, a 60-degree clockwise rotation is visible on all three of these meshes, indicating that the material rotated the opposite way.


## Legal
Expand Down
4 changes: 4 additions & 0 deletions Models/AnisotropyStrengthTest/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@

[extension](../../Models-extension.md), [testing](../../Models-testing.md)

## Extensions Used

* KHR_materials_anisotropy

## Summary

This model tests the strength parameter for KHR_materials_anisotropy.
Expand Down
5 changes: 5 additions & 0 deletions Models/AttenuationTest/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@

[testing](../../Models-testing.md), [extension](../../Models-extension.md)

## Extensions Used

* KHR_materials_transmission
* KHR_materials_volume

## Summary

Tests the interactions between attenuation, thickness, and scale.
Expand Down
15 changes: 15 additions & 0 deletions Models/CarbonFibre/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# LICENSE file for the model: Carbon Fibre Ball

All files in this directory tree are licensed as indicated below.

* All files directly associated with the model including all text, image and binary files:

* [CC BY 4.0 International]("https://creativecommons.org/licenses/by/4.0/legalcode") [SPDX license identifier: "CC-BY-4.0"]

* This file and all other metadocumentation files including "metadata.json":

* [Creative Commons Attribtution 4.0 International]("https://creativecommons.org/licenses/by/4.0/legalcode") [SPDX license identifier: "CC-BY-4.0"]

Full license text of these licenses are available at the links above

#### Generated by modelmetadata
13 changes: 13 additions & 0 deletions Models/CarbonFibre/README.body.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
## Screenshot

![screenshot](screenshot/screenshot_large.jpg)

Screenshot from the [glTF Sample Viewer](https://github.khronos.org/glTF-Sample-Viewer-Release/) with the Wide Street environment light.

## Description

This model is a sphere using the glTF extension [`KHR_materials_anisotropy`](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_anisotropy) to create a carbon fibre material.

The normalTexture is a higher resolution than the others to preserve more details in the shapes of individual fibres. The anisotropyTexture could in theory be only 4x4 pixels however that tends to introduce upscale artifacts.

![textures](screenshot/textures.jpg)
42 changes: 42 additions & 0 deletions Models/CarbonFibre/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Carbon Fibre Ball

## Tags

[extension](../../Models-extension.md), [issues](../../Models-issues.md)

## Extensions Used

* KHR_materials_anisotropy

## Summary

Example of clearcoat applied to a ball with a simulated carbon fiber surface.

## Operations

* [Display](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/CarbonFibre/glTF-Binary/CarbonFibre.glb) in SampleViewer
* [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/CarbonFibre/glTF-Binary/CarbonFibre.glb)
* [Model Directory](./)

## Screenshot

![screenshot](screenshot/screenshot_large.jpg)

Screenshot from the [glTF Sample Viewer](https://github.khronos.org/glTF-Sample-Viewer-Release/) with the Wide Street environment light.

## Description

This model is a sphere using the glTF extension [`KHR_materials_anisotropy`](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_anisotropy) to create a carbon fibre material.

The normalTexture is a higher resolution than the others to preserve more details in the shapes of individual fibres. The anisotropyTexture could in theory be only 4x4 pixels however that tends to introduce upscale artifacts.

![textures](screenshot/textures.jpg)


## Legal

© 2023, Wayfair. [CC BY 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)

- Eric Chadwick for Models and Textures

#### Assembled by modelmetadata
Binary file added Models/CarbonFibre/glTF-Binary/CarbonFibre.glb
Binary file not shown.
Binary file added Models/CarbonFibre/glTF/CarbonFibre.bin
Binary file not shown.
Loading
Loading