First merge from Sample-Models

kellycode · Dec 20, 2023 · 932003f · 932003f
1 parent f9e4f0e
commit 932003f
Show file tree

Hide file tree

Showing 123 changed files with 4,893 additions and 17 deletions.
diff --git a/.reuse/dep5 b/.reuse/dep5
@@ -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
@@ -151,6 +156,11 @@ 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
@@ -187,6 +197,11 @@ Copyright:
  2023 Public domain
 License: CC0
 
+Files: Models/DirectionalLight/*
+Copyright: 
+ 2020 Public
+License: CC0-1.0
+
 Files: Models/DragonAttenuation/*
 Copyright: 
  1996 Stanford University Computer Graphics Laboratory
@@ -244,11 +259,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
@@ -367,6 +394,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
@@ -398,6 +430,11 @@ Copyright:
  2020 Microsoft
 License: CC0-1.0
 
+Files: Models/SheenTestGrid/*
+Copyright: 
+ 2023 Public
+License: CC0-1.0
+
 Files: Models/SimpleInstancing/*
 Copyright: 
  2023 Public
@@ -539,3 +576,8 @@ Copyright:
  2017 Public
 License: CC0-1.0
 
+Files: Models/XmpMetadataRoundedCube/*
+Copyright: 
+ 2021 Adam Morris
+License: CC-BY-4.0
+
diff --git a/Models/ABeautifulGame/README.md b/Models/ABeautifulGame/README.md
@@ -4,6 +4,12 @@
 
 [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.

diff --git a/Models/AnisotropyBarnLamp/README.md b/Models/AnisotropyBarnLamp/README.md
@@ -4,6 +4,18 @@
 
 [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.

diff --git a/Models/AnisotropyDiscTest/README.md b/Models/AnisotropyDiscTest/README.md
@@ -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.

diff --git a/Models/AnisotropyRotationTest/README.md b/Models/AnisotropyRotationTest/README.md
@@ -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.
@@ -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

diff --git a/Models/AnisotropyStrengthTest/README.md b/Models/AnisotropyStrengthTest/README.md
@@ -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.

diff --git a/Models/AttenuationTest/README.md b/Models/AttenuationTest/README.md
@@ -4,6 +4,12 @@
 
 [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.

diff --git a/Models/CarbonFibre/LICENSE.md b/Models/CarbonFibre/LICENSE.md
@@ -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
diff --git a/Models/CarbonFibre/README.body.md b/Models/CarbonFibre/README.body.md
@@ -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)
diff --git a/Models/CarbonFibre/README.md b/Models/CarbonFibre/README.md
@@ -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
+
+&copy; 2023, Wayfair. [CC BY 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)
+
+ - Eric Chadwick for Models and Textures
+
+#### Assembled by modelmetadata
diff --git a/Models/CarbonFibre/glTF-Binary/CarbonFibre.glb b/Models/CarbonFibre/glTF-Binary/CarbonFibre.glb
diff --git a/Models/CarbonFibre/glTF/CarbonFibre.bin b/Models/CarbonFibre/glTF/CarbonFibre.bin