From b6690065b215e36935f88e2d45b7877fcc152563 Mon Sep 17 00:00:00 2001 From: "Leonard Daly (Daly Realism)" Date: Wed, 20 Dec 2023 19:40:06 -0800 Subject: [PATCH] Renamed models to agree with folder --- Models/ABeautifulGame/README.md | 1 - Models/AnisotropyBarnLamp/README.md | 4 --- Models/AttenuationTest/README.md | 1 - Models/ChairDamaskPurplegold/README.md | 14 +++++++++ ...Damask.gltf => ChairDamaskPurplegold.gltf} | 0 Models/ClearCoatCarPaint/README.md | 4 +-- Models/DiffuseTransmissionTeacup/README.md | 7 ++++- ...acup.glb => DiffuseTransmissionTeacup.glb} | Bin ...up.gltf => DiffuseTransmissionTeacup.gltf} | 0 Models/DirectionalLight/README.md | 1 + Models/DragonAttenuation/README.md | 2 -- Models/GlamVelvetSofa/README.md | 5 +--- Models/GlassHurricaneCandleHolder/README.md | 1 - Models/GlassVaseFlowers/README.md | 1 - Models/IORTestGrid/README.md | 3 -- Models/IridescenceDielectricSpheres/README.md | 1 - Models/IridescenceLamp/README.md | 2 -- Models/IridescenceMetallicSpheres/README.md | 1 - Models/IridescenceSuzanne/README.md | 4 --- Models/IridescentDishWithOlives/README.md | 3 -- Models/LightsPunctualLamp/README.md | 1 - Models/Models-core.md | 2 +- Models/Models-extension.md | 4 +-- Models/Models-issues.md | 2 +- Models/Models-showcase.md | 2 +- Models/Models-testing.md | 4 +-- Models/Models.md | 6 ++-- Models/MosquitoInAmber/README.md | 2 -- Models/SheenChair/README.md | 3 +- Models/SheenCloth/README.md | 2 +- Models/SheenTestGrid/README.md | 1 + Models/SpecGlossVsMetalRough/README.md | 1 + Models/SpecularSilkPouf/README.md | 4 +-- Models/StainedGlassLamp/README.md | 4 --- Models/TextureTransformMultiTest/README.md | 3 +- Models/ToyCar/README.md | 3 -- Models/TransmissionRoughnessTest/README.md | 2 -- Models/TransmissionTest/README.md | 1 - Models/UnlitTest/README.md | 1 + Models/VirtualCity/README.md | 3 +- .../glTF-Binary/{VC.glb => VirtualCity.glb} | Bin .../glTF-Draco/{VC.gltf => VirtualCity.gltf} | 0 .../{VC.gltf => VirtualCity.gltf} | 0 .../glTF/{VC.gltf => VirtualCity.gltf} | 0 Models/XmpMetadataRoundedCube/README.md | 7 ++++- .../{xmp.glb => XmpMetadataRoundedCube.glb} | Bin .../{xmp.gltf => XmpMetadataRoundedCube.gltf} | 0 Models/model-index.json | 18 +++++------ util/model.php | 16 +++++----- util/modelmetadata.php | 28 ++++++++++++++---- 50 files changed, 89 insertions(+), 86 deletions(-) rename Models/ChairDamaskPurplegold/glTF/{SheenDamask.gltf => ChairDamaskPurplegold.gltf} (100%) rename Models/DiffuseTransmissionTeacup/glTF-Binary/{teacup.glb => DiffuseTransmissionTeacup.glb} (100%) rename Models/DiffuseTransmissionTeacup/glTF/{teacup.gltf => DiffuseTransmissionTeacup.gltf} (100%) rename Models/VirtualCity/glTF-Binary/{VC.glb => VirtualCity.glb} (100%) rename Models/VirtualCity/glTF-Draco/{VC.gltf => VirtualCity.gltf} (100%) rename Models/VirtualCity/glTF-Embedded/{VC.gltf => VirtualCity.gltf} (100%) rename Models/VirtualCity/glTF/{VC.gltf => VirtualCity.gltf} (100%) rename Models/XmpMetadataRoundedCube/glTF-Binary/{xmp.glb => XmpMetadataRoundedCube.glb} (100%) rename Models/XmpMetadataRoundedCube/glTF/{xmp.gltf => XmpMetadataRoundedCube.gltf} (100%) diff --git a/Models/ABeautifulGame/README.md b/Models/ABeautifulGame/README.md index ccdc248b..a9bf3559 100644 --- a/Models/ABeautifulGame/README.md +++ b/Models/ABeautifulGame/README.md @@ -7,7 +7,6 @@ ## Extensions Used * KHR_materials_transmission - * KHR_materials_volume ## Summary diff --git a/Models/AnisotropyBarnLamp/README.md b/Models/AnisotropyBarnLamp/README.md index f69c60a5..24b8ca20 100644 --- a/Models/AnisotropyBarnLamp/README.md +++ b/Models/AnisotropyBarnLamp/README.md @@ -7,13 +7,9 @@ ## Extensions Used * KHR_materials_anisotropy - * KHR_materials_clearcoat - * KHR_materials_emissive_strength - * KHR_materials_transmission - * KHR_materials_volume ## Summary diff --git a/Models/AttenuationTest/README.md b/Models/AttenuationTest/README.md index d98b581a..22d29bf3 100644 --- a/Models/AttenuationTest/README.md +++ b/Models/AttenuationTest/README.md @@ -7,7 +7,6 @@ ## Extensions Used * KHR_materials_transmission - * KHR_materials_volume ## Summary diff --git a/Models/ChairDamaskPurplegold/README.md b/Models/ChairDamaskPurplegold/README.md index 33d8fbed..dce52356 100644 --- a/Models/ChairDamaskPurplegold/README.md +++ b/Models/ChairDamaskPurplegold/README.md @@ -4,6 +4,20 @@ [extension](../../Models-extension.md), [issues](../../Models-issues.md) +## Extensions + +### Required + +* KHR_materials_sheen +* KHR_texture_transform + +### Used + +* KHR_materials_sheen +* KHR_texture_transform +* KHR_materials_sheen +* KHR_texture_transform + ## Summary Use of sheen to create a high-end small seat (damask). diff --git a/Models/ChairDamaskPurplegold/glTF/SheenDamask.gltf b/Models/ChairDamaskPurplegold/glTF/ChairDamaskPurplegold.gltf similarity index 100% rename from Models/ChairDamaskPurplegold/glTF/SheenDamask.gltf rename to Models/ChairDamaskPurplegold/glTF/ChairDamaskPurplegold.gltf diff --git a/Models/ClearCoatCarPaint/README.md b/Models/ClearCoatCarPaint/README.md index 61ef15df..f0c5d026 100644 --- a/Models/ClearCoatCarPaint/README.md +++ b/Models/ClearCoatCarPaint/README.md @@ -9,13 +9,13 @@ ### Required * KHR_texture_transform - * KHR_materials_clearcoat ### Used * KHR_texture_transform - +* KHR_materials_clearcoat +* KHR_texture_transform * KHR_materials_clearcoat ## Summary diff --git a/Models/DiffuseTransmissionTeacup/README.md b/Models/DiffuseTransmissionTeacup/README.md index 0bea4ae8..1fddf620 100644 --- a/Models/DiffuseTransmissionTeacup/README.md +++ b/Models/DiffuseTransmissionTeacup/README.md @@ -4,13 +4,18 @@ [showcase](../../Models-showcase.md), [extension](../../Models-extension.md) +## Extensions Used + +* KHR_materials_diffuse_transmission + ## Summary DiffuseTransmissionTeacup model using Diffuse Transmission extension. ## Operations -* [Display](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/DiffuseTransmissionTeacup/glTF/DiffuseTransmissionTeacup.gltf) in SampleViewer +* [Display](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/DiffuseTransmissionTeacup/glTF-Binary/DiffuseTransmissionTeacup.glb) in SampleViewer +* [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/DiffuseTransmissionTeacup/glTF-Binary/DiffuseTransmissionTeacup.glb) * [Model Directory](./) ## Screenshot diff --git a/Models/DiffuseTransmissionTeacup/glTF-Binary/teacup.glb b/Models/DiffuseTransmissionTeacup/glTF-Binary/DiffuseTransmissionTeacup.glb similarity index 100% rename from Models/DiffuseTransmissionTeacup/glTF-Binary/teacup.glb rename to Models/DiffuseTransmissionTeacup/glTF-Binary/DiffuseTransmissionTeacup.glb diff --git a/Models/DiffuseTransmissionTeacup/glTF/teacup.gltf b/Models/DiffuseTransmissionTeacup/glTF/DiffuseTransmissionTeacup.gltf similarity index 100% rename from Models/DiffuseTransmissionTeacup/glTF/teacup.gltf rename to Models/DiffuseTransmissionTeacup/glTF/DiffuseTransmissionTeacup.gltf diff --git a/Models/DirectionalLight/README.md b/Models/DirectionalLight/README.md index 1aa1f8fb..5811df72 100644 --- a/Models/DirectionalLight/README.md +++ b/Models/DirectionalLight/README.md @@ -12,6 +12,7 @@ ### Used +* KHR_lights_punctual * KHR_lights_punctual ## Summary diff --git a/Models/DragonAttenuation/README.md b/Models/DragonAttenuation/README.md index 47d78fc1..347b4913 100644 --- a/Models/DragonAttenuation/README.md +++ b/Models/DragonAttenuation/README.md @@ -7,9 +7,7 @@ ## Extensions Used * KHR_materials_transmission - * KHR_materials_volume - * KHR_materials_variants ## Summary diff --git a/Models/GlamVelvetSofa/README.md b/Models/GlamVelvetSofa/README.md index dfa72877..e8e2602d 100644 --- a/Models/GlamVelvetSofa/README.md +++ b/Models/GlamVelvetSofa/README.md @@ -13,13 +13,10 @@ ### Used * KHR_texture_transform - +* KHR_texture_transform * KHR_materials_sheen - * KHR_materials_specular - * KHR_materials_variants - * KHR_lights_punctual ## Summary diff --git a/Models/GlassHurricaneCandleHolder/README.md b/Models/GlassHurricaneCandleHolder/README.md index bdf8c613..46e5bd99 100644 --- a/Models/GlassHurricaneCandleHolder/README.md +++ b/Models/GlassHurricaneCandleHolder/README.md @@ -7,7 +7,6 @@ ## Extensions Used * KHR_materials_transmission - * KHR_materials_volume ## Summary diff --git a/Models/GlassVaseFlowers/README.md b/Models/GlassVaseFlowers/README.md index 19a95213..870e7944 100644 --- a/Models/GlassVaseFlowers/README.md +++ b/Models/GlassVaseFlowers/README.md @@ -7,7 +7,6 @@ ## Extensions Used * KHR_materials_transmission - * KHR_materials_volume ## Summary diff --git a/Models/IORTestGrid/README.md b/Models/IORTestGrid/README.md index 4788505c..185e883c 100644 --- a/Models/IORTestGrid/README.md +++ b/Models/IORTestGrid/README.md @@ -7,11 +7,8 @@ ## Extensions Used * KHR_materials_transmission - * KHR_materials_volume - * KHR_materials_specular - * KHR_materials_ior ## Summary diff --git a/Models/IridescenceDielectricSpheres/README.md b/Models/IridescenceDielectricSpheres/README.md index d9189607..97face71 100644 --- a/Models/IridescenceDielectricSpheres/README.md +++ b/Models/IridescenceDielectricSpheres/README.md @@ -7,7 +7,6 @@ ## Extensions Used * KHR_materials_ior - * KHR_materials_iridescence ## Summary diff --git a/Models/IridescenceLamp/README.md b/Models/IridescenceLamp/README.md index 81a0e945..a93d02fb 100644 --- a/Models/IridescenceLamp/README.md +++ b/Models/IridescenceLamp/README.md @@ -7,9 +7,7 @@ ## Extensions Used * KHR_materials_transmission - * KHR_materials_volume - * KHR_materials_iridescence ## Summary diff --git a/Models/IridescenceMetallicSpheres/README.md b/Models/IridescenceMetallicSpheres/README.md index aabc9c89..8e8abc6c 100644 --- a/Models/IridescenceMetallicSpheres/README.md +++ b/Models/IridescenceMetallicSpheres/README.md @@ -7,7 +7,6 @@ ## Extensions Used * KHR_materials_ior - * KHR_materials_iridescence ## Summary diff --git a/Models/IridescenceSuzanne/README.md b/Models/IridescenceSuzanne/README.md index 74e1f975..3a9380a2 100644 --- a/Models/IridescenceSuzanne/README.md +++ b/Models/IridescenceSuzanne/README.md @@ -7,13 +7,9 @@ ## Extensions Used * KHR_lights_punctual - * KHR_materials_ior - * KHR_materials_transmission - * KHR_materials_volume - * KHR_materials_iridescence ## Summary diff --git a/Models/IridescentDishWithOlives/README.md b/Models/IridescentDishWithOlives/README.md index 17a1f7d4..14b28a24 100644 --- a/Models/IridescentDishWithOlives/README.md +++ b/Models/IridescentDishWithOlives/README.md @@ -7,11 +7,8 @@ ## Extensions Used * KHR_materials_ior - * KHR_materials_iridescence - * KHR_materials_transmission - * KHR_materials_volume ## Summary diff --git a/Models/LightsPunctualLamp/README.md b/Models/LightsPunctualLamp/README.md index cc832d17..b93d2e4a 100644 --- a/Models/LightsPunctualLamp/README.md +++ b/Models/LightsPunctualLamp/README.md @@ -7,7 +7,6 @@ ## Extensions Used * KHR_materials_transmission - * KHR_lights_punctual ## Summary diff --git a/Models/Models-core.md b/Models/Models-core.md index efe0013d..459fe21d 100644 --- a/Models/Models-core.md +++ b/Models/Models-core.md @@ -78,7 +78,7 @@ Models that only use the core glTF V2.0 features and capabilities. | [Two Sided Plane](TwoSidedPlane/README.md)
[![Two Sided Plane](TwoSidedPlane/screenshot/screenshot.jpg)](TwoSidedPlane/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/TwoSidedPlane/glTF/TwoSidedPlane.gltf) | A plane having the two sided material parameter enabled.
Credit:
© 2017, UX3D. [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)
- Norbert Nopper for Everything | | [Unicode❤♻Test](Unicode❤♻Test/README.md)
[![Unicode❤♻Test](Unicode❤♻Test/screenshot/screenshot.png)](Unicode❤♻Test/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/Unicode❤♻Test/glTF-Binary/Unicode❤♻Test.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/Unicode❤♻Test/glTF-Binary/Unicode❤♻Test.glb) | A sample with Unicode characters in file, material, and mesh names
Credit:
© 2017, Public. [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)
- Viktor Kovács for Everything | | [Vertex Color Test](VertexColorTest/README.md)
[![Vertex Color Test](VertexColorTest/screenshot/screenshot.png)](VertexColorTest/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/VertexColorTest/glTF-Binary/VertexColorTest.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/VertexColorTest/glTF-Binary/VertexColorTest.glb) | Tests if vertex colors are supported.
Credit:
© 2018, Analytical Graphics, Inc.. [CC BY 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)
- Ed Mackey for Everything | -| [Virtual City](VirtualCity/README.md)
[![Virtual City](VirtualCity/screenshot/screenshot.gif)](VirtualCity/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/VirtualCity/glTF/VirtualCity.gltf) | The 'Virtual City' model was graciously contributed by the folks at 3DRT.
Credit:
© 2017, 3DRT. [3DRT license with allowances for glTF Testing]()
- 3DRT for Everything | +| [Virtual City](VirtualCity/README.md)
[![Virtual City](VirtualCity/screenshot/screenshot.gif)](VirtualCity/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/VirtualCity/glTF-Binary/VirtualCity.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/VirtualCity/glTF-Binary/VirtualCity.glb) | The 'Virtual City' model was graciously contributed by the folks at 3DRT.
Credit:
© 2017, 3DRT. [3DRT license with allowances for glTF Testing]()
- 3DRT for Everything | | [Water Bottle](WaterBottle/README.md)
[![Water Bottle](WaterBottle/screenshot/screenshot.jpg)](WaterBottle/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/WaterBottle/glTF-Binary/WaterBottle.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/WaterBottle/glTF-Binary/WaterBottle.glb) | Basic metal/roughness water bottle.
Credit:
© 2017, Public. [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)
- Microsoft for Everything | --- diff --git a/Models/Models-extension.md b/Models/Models-extension.md index 0cdce08a..4c10c8b3 100644 --- a/Models/Models-extension.md +++ b/Models/Models-extension.md @@ -28,7 +28,7 @@ Models that use one or more extensions. | [Clear Coat Car Paint](ClearCoatCarPaint/README.md)
[![Clear Coat Car Paint](ClearCoatCarPaint/screenshot/screenshot.jpg)](ClearCoatCarPaint/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/ClearCoatCarPaint/glTF-Binary/ClearCoatCarPaint.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/ClearCoatCarPaint/glTF-Binary/ClearCoatCarPaint.glb) | This model is a sphere using the glTF ClearCoat extension overtop a car paint base material.
Credit:
© 2023, Public. [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)
- Eric Chadwick for Everything | | [KHR_materials_clearcoat Test](ClearCoatTest/README.md)
[![KHR_materials_clearcoat Test](ClearCoatTest/screenshot/screenshot.jpg)](ClearCoatTest/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/ClearCoatTest/glTF-Binary/ClearCoatTest.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/ClearCoatTest/glTF-Binary/ClearCoatTest.glb) | Tests if the KHR_materials_clearcoat extension is supported properly.
Credit:
© 2020, Analytical Graphics, Inc.. [CC BY 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)
- Ed Mackey for Everything | | [Clearcoat Wicker](ClearcoatWicker/README.md)
[![Clearcoat Wicker](ClearcoatWicker/screenshot/screenshot.jpg)](ClearcoatWicker/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/ClearcoatWicker/glTF-Binary/ClearcoatWicker.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/ClearcoatWicker/glTF-Binary/ClearcoatWicker.glb) | This model is a sphere using the glTF ClearCoat to create a wicker material covered with a wrinkled plastic clearcoat material.
Credit:
© 2023, Public. [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)
- Eric Chadwick for Everything | -| [DiffuseTransmissionTeacup](DiffuseTransmissionTeacup/README.md)
[![DiffuseTransmissionTeacup](DiffuseTransmissionTeacup/screenshot/screenshot.jpg)](DiffuseTransmissionTeacup/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/DiffuseTransmissionTeacup/glTF/DiffuseTransmissionTeacup.gltf) | DiffuseTransmissionTeacup model using Diffuse Transmission extension.
Credit:
© 2023, Public domain. [CC0 No Rights Reserved](https://creativecommons.org/share-your-work/public-domain/cc0)
- Eric Chadwick for Models and Textures | +| [DiffuseTransmissionTeacup](DiffuseTransmissionTeacup/README.md)
[![DiffuseTransmissionTeacup](DiffuseTransmissionTeacup/screenshot/screenshot.jpg)](DiffuseTransmissionTeacup/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/DiffuseTransmissionTeacup/glTF-Binary/DiffuseTransmissionTeacup.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/DiffuseTransmissionTeacup/glTF-Binary/DiffuseTransmissionTeacup.glb) | DiffuseTransmissionTeacup model using Diffuse Transmission extension.
Credit:
© 2023, Public domain. [CC0 No Rights Reserved](https://creativecommons.org/share-your-work/public-domain/cc0)
- Eric Chadwick for Models and Textures | | [Dragon Attenuation](DragonAttenuation/README.md)
[![Dragon Attenuation](DragonAttenuation/screenshot/screenshot.jpg)](DragonAttenuation/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/DragonAttenuation/glTF-Binary/DragonAttenuation.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/DragonAttenuation/glTF-Binary/DragonAttenuation.glb) | Dragon with background, using material variants, transmission, and volume.
Credit:
© 1996, Stanford University Computer Graphics Laboratory. [Stanford Graphics Library](https://graphics.stanford.edu/data/3Dscanrep/)
- Stanford University Computer Graphics Laboratory for Original dragon model
© 2017, Morgan McGuire. [Stanford Graphics Library](https://graphics.stanford.edu/data/3Dscanrep/)
- Morgan McGuire's Computer Graphics Archive for Conversion and clean up
© 2021, Public. [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)
- Adobe for Cloth backdrop | | [Emissive Strength Test](EmissiveStrengthTest/README.md)
[![Emissive Strength Test](EmissiveStrengthTest/screenshot/screenshot.jpg)](EmissiveStrengthTest/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/EmissiveStrengthTest/glTF-Binary/EmissiveStrengthTest.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/EmissiveStrengthTest/glTF-Binary/EmissiveStrengthTest.glb) | Tests if the KHR_materials_emissive_strength extension is supported properly.
Credit:
© 2022, AGI. [CC BY 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)
- Ed Mackey for Everything | | [Environment Test](EnvironmentTest/README.md)
[![Environment Test](EnvironmentTest/screenshot/screenshot.jpg)](EnvironmentTest/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/EnvironmentTest/glTF/EnvironmentTest.gltf) | A simple scene with metal and dielectric spheres that range between 0 and 1 roughness. Useful for testing environment lighting.
Credit:
© 2017, Adobe. [Adobe Stock License](https://stock.adobe.com/license-terms?prev_url=detail&comparison-full#enhanced-license-terms)
- Adobe for Everything | @@ -62,7 +62,7 @@ Models that use one or more extensions. | [Transmission Roughness Test](TransmissionRoughnessTest/README.md)
[![Transmission Roughness Test](TransmissionRoughnessTest/screenshot/screenshot.jpg)](TransmissionRoughnessTest/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/TransmissionRoughnessTest/glTF-Binary/TransmissionRoughnessTest.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/TransmissionRoughnessTest/glTF-Binary/TransmissionRoughnessTest.glb) | Tests the interaction between roughness and IOR.
Credit:
© 2021, Analytical Graphics, Inc.. [CC BY 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)
- Ed Mackey for Everything | | [Transmission Test](TransmissionTest/README.md)
[![Transmission Test](TransmissionTest/screenshot/screenshot.jpg)](TransmissionTest/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/TransmissionTest/glTF-Binary/TransmissionTest.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/TransmissionTest/glTF-Binary/TransmissionTest.glb) | Tests if the KHR_materials_transmission extension is supported properly.
Credit:
© 2020, Public. [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)
- Adobe for Everything | | [Unlit Test](UnlitTest/README.md)
[![Unlit Test](UnlitTest/screenshot/screenshot.png)](UnlitTest/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/UnlitTest/glTF-Binary/UnlitTest.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/UnlitTest/glTF-Binary/UnlitTest.glb) | Tests if the KHR_materials_unlit extension is supported properly.
Credit:
© 2019, Analytical Graphics, Inc.. [CC BY 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)
- Ed Mackey for Everything | -| [Xmp Metadata Rounded Cube](XmpMetadataRoundedCube/README.md)
[![Xmp Metadata Rounded Cube](XmpMetadataRoundedCube/screenshot/screenshot.jpg)](XmpMetadataRoundedCube/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/XmpMetadataRoundedCube/glTF/XmpMetadataRoundedCube.gltf) | Test of the XMP metadata extension - KHR_xmp_json_ld.
Credit:
© 2021, Adam Morris. [CC BY 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)
- Adam Morris for Everything | +| [Xmp Metadata Rounded Cube](XmpMetadataRoundedCube/README.md)
[![Xmp Metadata Rounded Cube](XmpMetadataRoundedCube/screenshot/screenshot.jpg)](XmpMetadataRoundedCube/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/XmpMetadataRoundedCube/glTF-Binary/XmpMetadataRoundedCube.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/XmpMetadataRoundedCube/glTF-Binary/XmpMetadataRoundedCube.glb) | Test of the XMP metadata extension - KHR_xmp_json_ld.
Credit:
© 2021, Adam Morris. [CC BY 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)
- Adam Morris for Everything | --- ### Copyright diff --git a/Models/Models-issues.md b/Models/Models-issues.md index 3311fbc0..c005797a 100644 --- a/Models/Models-issues.md +++ b/Models/Models-issues.md @@ -27,7 +27,7 @@ Models with one or more issues with respect to ownership, license, or markings. | [Directional Light](DirectionalLight/README.md)
[![Directional Light](DirectionalLight/screenshot/screenshot.png)](DirectionalLight/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/DirectionalLight/glTF-Binary/DirectionalLight.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/DirectionalLight/glTF-Binary/DirectionalLight.glb) | Verification of light calculations
Credit:
© 2020, Public. [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)
- Rickard Sahlin for Everything | | [Primitive Mode Normals Test](PrimitiveModeNormalsTest/README.md)
[![Primitive Mode Normals Test](PrimitiveModeNormalsTest/screenshot/screenshot.png)](PrimitiveModeNormalsTest/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/PrimitiveModeNormalsTest/glTF/PrimitiveModeNormalsTest.gltf) | Tests rendering of points, lines, and triangles with and without normals.
Credit:
© 2020, public. [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)
- Unknown for Everything | | [Recursive Skeletons](RecursiveSkeletons/README.md)
[![Recursive Skeletons](RecursiveSkeletons/screenshot/screenshot.jpg)](RecursiveSkeletons/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/RecursiveSkeletons/glTF-Binary/RecursiveSkeletons.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/RecursiveSkeletons/glTF-Binary/RecursiveSkeletons.glb) | Tests unusual skinning cases with reused meshes and recursive skeletons.
Credit:
© 2017, Cesium. [CC BY 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)
- Cesium for Everything | -| [Xmp Metadata Rounded Cube](XmpMetadataRoundedCube/README.md)
[![Xmp Metadata Rounded Cube](XmpMetadataRoundedCube/screenshot/screenshot.jpg)](XmpMetadataRoundedCube/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/XmpMetadataRoundedCube/glTF/XmpMetadataRoundedCube.gltf) | Test of the XMP metadata extension - KHR_xmp_json_ld.
Credit:
© 2021, Adam Morris. [CC BY 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)
- Adam Morris for Everything | +| [Xmp Metadata Rounded Cube](XmpMetadataRoundedCube/README.md)
[![Xmp Metadata Rounded Cube](XmpMetadataRoundedCube/screenshot/screenshot.jpg)](XmpMetadataRoundedCube/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/XmpMetadataRoundedCube/glTF-Binary/XmpMetadataRoundedCube.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/XmpMetadataRoundedCube/glTF-Binary/XmpMetadataRoundedCube.glb) | Test of the XMP metadata extension - KHR_xmp_json_ld.
Credit:
© 2021, Adam Morris. [CC BY 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)
- Adam Morris for Everything | --- ### Copyright diff --git a/Models/Models-showcase.md b/Models/Models-showcase.md index 1a563a52..02d97685 100644 --- a/Models/Models-showcase.md +++ b/Models/Models-showcase.md @@ -20,7 +20,7 @@ Models that are featured in some glTF/Khronos publicity. | [A Beautiful Game](ABeautifulGame/README.md)
[![A Beautiful Game](ABeautifulGame/screenshot/screenshot.jpg)](ABeautifulGame/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/ABeautifulGame/glTF/ABeautifulGame.gltf) | Chess set using transmission and volume.
Credit:
© 2020, ASWF. [CC BY 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)
- MaterialX Project for Original model
© 2022, Ed Mackey. [CC BY 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)
- Ed Mackey for Conversion to glTF | | [Anisotropy Barn Lamp](AnisotropyBarnLamp/README.md)
[![Anisotropy Barn Lamp](AnisotropyBarnLamp/screenshot/screenshot.jpg)](AnisotropyBarnLamp/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/AnisotropyBarnLamp/glTF-Binary/AnisotropyBarnLamp.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/AnisotropyBarnLamp/glTF-Binary/AnisotropyBarnLamp.glb) | Wayfair AnisotropyBarnLamp model using anisotropy, clearcoat, emissive_strength, transmission, volume, and basisu extensions.
Credit:
© 2023, Copyright 2023 Wayfair, LLC. [CC BY 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)
- Eric Chadwick for Everything | | [Damaged Helmet](DamagedHelmet/README.md)
[![Damaged Helmet](DamagedHelmet/screenshot/screenshot.png)](DamagedHelmet/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/DamagedHelmet/glTF-Binary/DamagedHelmet.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/DamagedHelmet/glTF-Binary/DamagedHelmet.glb) | Flight helmet with damage
Credit:
© 2018, ctxwing. [CC BY 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)
- ctxwing for Rebuild and conversion to glTF
© 2016, theblueturtle_. [CC BY-NC 4.0 International](https://creativecommons.org/licenses/by-nc/4.0/legalcode)
- theblueturtle_ for Earlier version of model | -| [DiffuseTransmissionTeacup](DiffuseTransmissionTeacup/README.md)
[![DiffuseTransmissionTeacup](DiffuseTransmissionTeacup/screenshot/screenshot.jpg)](DiffuseTransmissionTeacup/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/DiffuseTransmissionTeacup/glTF/DiffuseTransmissionTeacup.gltf) | DiffuseTransmissionTeacup model using Diffuse Transmission extension.
Credit:
© 2023, Public domain. [CC0 No Rights Reserved](https://creativecommons.org/share-your-work/public-domain/cc0)
- Eric Chadwick for Models and Textures | +| [DiffuseTransmissionTeacup](DiffuseTransmissionTeacup/README.md)
[![DiffuseTransmissionTeacup](DiffuseTransmissionTeacup/screenshot/screenshot.jpg)](DiffuseTransmissionTeacup/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/DiffuseTransmissionTeacup/glTF-Binary/DiffuseTransmissionTeacup.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/DiffuseTransmissionTeacup/glTF-Binary/DiffuseTransmissionTeacup.glb) | DiffuseTransmissionTeacup model using Diffuse Transmission extension.
Credit:
© 2023, Public domain. [CC0 No Rights Reserved](https://creativecommons.org/share-your-work/public-domain/cc0)
- Eric Chadwick for Models and Textures | | [Dragon Attenuation](DragonAttenuation/README.md)
[![Dragon Attenuation](DragonAttenuation/screenshot/screenshot.jpg)](DragonAttenuation/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/DragonAttenuation/glTF-Binary/DragonAttenuation.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/DragonAttenuation/glTF-Binary/DragonAttenuation.glb) | Dragon with background, using material variants, transmission, and volume.
Credit:
© 1996, Stanford University Computer Graphics Laboratory. [Stanford Graphics Library](https://graphics.stanford.edu/data/3Dscanrep/)
- Stanford University Computer Graphics Laboratory for Original dragon model
© 2017, Morgan McGuire. [Stanford Graphics Library](https://graphics.stanford.edu/data/3Dscanrep/)
- Morgan McGuire's Computer Graphics Archive for Conversion and clean up
© 2021, Public. [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)
- Adobe for Cloth backdrop | | [Flight Helmet](FlightHelmet/README.md)
[![Flight Helmet](FlightHelmet/screenshot/screenshot.jpg)](FlightHelmet/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/FlightHelmet/glTF/FlightHelmet.gltf) | Displayed flight helmet on a wooden stand.
Credit:
© 2018, Public. [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)
- Gary Hsu for Conversion from Maya | | [Glass Hurricane Candle Holder](GlassHurricaneCandleHolder/README.md)
[![Glass Hurricane Candle Holder](GlassHurricaneCandleHolder/screenshot/screenshot.jpg)](GlassHurricaneCandleHolder/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/GlassHurricaneCandleHolder/glTF-Binary/GlassHurricaneCandleHolder.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/GlassHurricaneCandleHolder/glTF-Binary/GlassHurricaneCandleHolder.glb) | Glass holder using Materials Tranmission and Materials Volume extensions.
Credit:
© 2021, Wayfair, LLC. [CC BY 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)
- Eric Chadwick for Model and textures
© 2015, Khronos Group. [Khronos Trademark or Logo]()
- Non-copyrightable logo for Khronos logo
© 2017, Khronos Group. [Khronos Trademark or Logo]()
- Non-copyrightable logo for glTF logo | diff --git a/Models/Models-testing.md b/Models/Models-testing.md index 9af3a3a4..e3fc1f1b 100644 --- a/Models/Models-testing.md +++ b/Models/Models-testing.md @@ -98,9 +98,9 @@ Models that are used for testing various features or capabilities of importers, | [Unicode❤♻Test](Unicode❤♻Test/README.md)
[![Unicode❤♻Test](Unicode❤♻Test/screenshot/screenshot.png)](Unicode❤♻Test/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/Unicode❤♻Test/glTF-Binary/Unicode❤♻Test.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/Unicode❤♻Test/glTF-Binary/Unicode❤♻Test.glb) | A sample with Unicode characters in file, material, and mesh names
Credit:
© 2017, Public. [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)
- Viktor Kovács for Everything | | [Unlit Test](UnlitTest/README.md)
[![Unlit Test](UnlitTest/screenshot/screenshot.png)](UnlitTest/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/UnlitTest/glTF-Binary/UnlitTest.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/UnlitTest/glTF-Binary/UnlitTest.glb) | Tests if the KHR_materials_unlit extension is supported properly.
Credit:
© 2019, Analytical Graphics, Inc.. [CC BY 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)
- Ed Mackey for Everything | | [Vertex Color Test](VertexColorTest/README.md)
[![Vertex Color Test](VertexColorTest/screenshot/screenshot.png)](VertexColorTest/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/VertexColorTest/glTF-Binary/VertexColorTest.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/VertexColorTest/glTF-Binary/VertexColorTest.glb) | Tests if vertex colors are supported.
Credit:
© 2018, Analytical Graphics, Inc.. [CC BY 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)
- Ed Mackey for Everything | -| [Virtual City](VirtualCity/README.md)
[![Virtual City](VirtualCity/screenshot/screenshot.gif)](VirtualCity/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/VirtualCity/glTF/VirtualCity.gltf) | The 'Virtual City' model was graciously contributed by the folks at 3DRT.
Credit:
© 2017, 3DRT. [3DRT license with allowances for glTF Testing]()
- 3DRT for Everything | +| [Virtual City](VirtualCity/README.md)
[![Virtual City](VirtualCity/screenshot/screenshot.gif)](VirtualCity/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/VirtualCity/glTF-Binary/VirtualCity.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/VirtualCity/glTF-Binary/VirtualCity.glb) | The 'Virtual City' model was graciously contributed by the folks at 3DRT.
Credit:
© 2017, 3DRT. [3DRT license with allowances for glTF Testing]()
- 3DRT for Everything | | [Water Bottle](WaterBottle/README.md)
[![Water Bottle](WaterBottle/screenshot/screenshot.jpg)](WaterBottle/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/WaterBottle/glTF-Binary/WaterBottle.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/WaterBottle/glTF-Binary/WaterBottle.glb) | Basic metal/roughness water bottle.
Credit:
© 2017, Public. [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)
- Microsoft for Everything | -| [Xmp Metadata Rounded Cube](XmpMetadataRoundedCube/README.md)
[![Xmp Metadata Rounded Cube](XmpMetadataRoundedCube/screenshot/screenshot.jpg)](XmpMetadataRoundedCube/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/XmpMetadataRoundedCube/glTF/XmpMetadataRoundedCube.gltf) | Test of the XMP metadata extension - KHR_xmp_json_ld.
Credit:
© 2021, Adam Morris. [CC BY 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)
- Adam Morris for Everything | +| [Xmp Metadata Rounded Cube](XmpMetadataRoundedCube/README.md)
[![Xmp Metadata Rounded Cube](XmpMetadataRoundedCube/screenshot/screenshot.jpg)](XmpMetadataRoundedCube/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/XmpMetadataRoundedCube/glTF-Binary/XmpMetadataRoundedCube.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/XmpMetadataRoundedCube/glTF-Binary/XmpMetadataRoundedCube.glb) | Test of the XMP metadata extension - KHR_xmp_json_ld.
Credit:
© 2021, Adam Morris. [CC BY 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)
- Adam Morris for Everything | --- ### Copyright diff --git a/Models/Models.md b/Models/Models.md index df73cd01..9d11abe1 100644 --- a/Models/Models.md +++ b/Models/Models.md @@ -52,7 +52,7 @@ All models listed alphabetically. | [Corset](Corset/README.md)
[![Corset](Corset/screenshot/screenshot.jpg)](Corset/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/Corset/glTF-Binary/Corset.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/Corset/glTF-Binary/Corset.glb) |
Credit:
© 2017, UX3D. [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)
- Microsoft for Everything | | [Cube](Cube/README.md)
[![Cube](Cube/screenshot/screenshot.jpg)](Cube/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/Cube/glTF/Cube.gltf) | A cube with non-smoothed faces.
Credit:
© 2017, UX3D. [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)
- Norbert Nopper for Everything | | [Damaged Helmet](DamagedHelmet/README.md)
[![Damaged Helmet](DamagedHelmet/screenshot/screenshot.png)](DamagedHelmet/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/DamagedHelmet/glTF-Binary/DamagedHelmet.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/DamagedHelmet/glTF-Binary/DamagedHelmet.glb) | Flight helmet with damage
Credit:
© 2018, ctxwing. [CC BY 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)
- ctxwing for Rebuild and conversion to glTF
© 2016, theblueturtle_. [CC BY-NC 4.0 International](https://creativecommons.org/licenses/by-nc/4.0/legalcode)
- theblueturtle_ for Earlier version of model | -| [DiffuseTransmissionTeacup](DiffuseTransmissionTeacup/README.md)
[![DiffuseTransmissionTeacup](DiffuseTransmissionTeacup/screenshot/screenshot.jpg)](DiffuseTransmissionTeacup/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/DiffuseTransmissionTeacup/glTF/DiffuseTransmissionTeacup.gltf) | DiffuseTransmissionTeacup model using Diffuse Transmission extension.
Credit:
© 2023, Public domain. [CC0 No Rights Reserved](https://creativecommons.org/share-your-work/public-domain/cc0)
- Eric Chadwick for Models and Textures | +| [DiffuseTransmissionTeacup](DiffuseTransmissionTeacup/README.md)
[![DiffuseTransmissionTeacup](DiffuseTransmissionTeacup/screenshot/screenshot.jpg)](DiffuseTransmissionTeacup/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/DiffuseTransmissionTeacup/glTF-Binary/DiffuseTransmissionTeacup.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/DiffuseTransmissionTeacup/glTF-Binary/DiffuseTransmissionTeacup.glb) | DiffuseTransmissionTeacup model using Diffuse Transmission extension.
Credit:
© 2023, Public domain. [CC0 No Rights Reserved](https://creativecommons.org/share-your-work/public-domain/cc0)
- Eric Chadwick for Models and Textures | | [Directional Light](DirectionalLight/README.md)
[![Directional Light](DirectionalLight/screenshot/screenshot.png)](DirectionalLight/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/DirectionalLight/glTF-Binary/DirectionalLight.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/DirectionalLight/glTF-Binary/DirectionalLight.glb) | Verification of light calculations
Credit:
© 2020, Public. [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)
- Rickard Sahlin for Everything | | [Dragon Attenuation](DragonAttenuation/README.md)
[![Dragon Attenuation](DragonAttenuation/screenshot/screenshot.jpg)](DragonAttenuation/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/DragonAttenuation/glTF-Binary/DragonAttenuation.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/DragonAttenuation/glTF-Binary/DragonAttenuation.glb) | Dragon with background, using material variants, transmission, and volume.
Credit:
© 1996, Stanford University Computer Graphics Laboratory. [Stanford Graphics Library](https://graphics.stanford.edu/data/3Dscanrep/)
- Stanford University Computer Graphics Laboratory for Original dragon model
© 2017, Morgan McGuire. [Stanford Graphics Library](https://graphics.stanford.edu/data/3Dscanrep/)
- Morgan McGuire's Computer Graphics Archive for Conversion and clean up
© 2021, Public. [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)
- Adobe for Cloth backdrop | | [Duck](Duck/README.md)
[![Duck](Duck/screenshot/screenshot.png)](Duck/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/Duck/glTF-Binary/Duck.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/Duck/glTF-Binary/Duck.glb) | The COLLADA duck. One texture.
Credit:
© 2006, Sony. [SCEA Shared Source License, Version 1.0](https://spdx.org/licenses/SCEA.html)
- Sony for Everything | @@ -123,9 +123,9 @@ All models listed alphabetically. | [Unicode❤♻Test](Unicode❤♻Test/README.md)
[![Unicode❤♻Test](Unicode❤♻Test/screenshot/screenshot.png)](Unicode❤♻Test/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/Unicode❤♻Test/glTF-Binary/Unicode❤♻Test.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/Unicode❤♻Test/glTF-Binary/Unicode❤♻Test.glb) | A sample with Unicode characters in file, material, and mesh names
Credit:
© 2017, Public. [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)
- Viktor Kovács for Everything | | [Unlit Test](UnlitTest/README.md)
[![Unlit Test](UnlitTest/screenshot/screenshot.png)](UnlitTest/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/UnlitTest/glTF-Binary/UnlitTest.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/UnlitTest/glTF-Binary/UnlitTest.glb) | Tests if the KHR_materials_unlit extension is supported properly.
Credit:
© 2019, Analytical Graphics, Inc.. [CC BY 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)
- Ed Mackey for Everything | | [Vertex Color Test](VertexColorTest/README.md)
[![Vertex Color Test](VertexColorTest/screenshot/screenshot.png)](VertexColorTest/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/VertexColorTest/glTF-Binary/VertexColorTest.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/VertexColorTest/glTF-Binary/VertexColorTest.glb) | Tests if vertex colors are supported.
Credit:
© 2018, Analytical Graphics, Inc.. [CC BY 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)
- Ed Mackey for Everything | -| [Virtual City](VirtualCity/README.md)
[![Virtual City](VirtualCity/screenshot/screenshot.gif)](VirtualCity/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/VirtualCity/glTF/VirtualCity.gltf) | The 'Virtual City' model was graciously contributed by the folks at 3DRT.
Credit:
© 2017, 3DRT. [3DRT license with allowances for glTF Testing]()
- 3DRT for Everything | +| [Virtual City](VirtualCity/README.md)
[![Virtual City](VirtualCity/screenshot/screenshot.gif)](VirtualCity/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/VirtualCity/glTF-Binary/VirtualCity.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/VirtualCity/glTF-Binary/VirtualCity.glb) | The 'Virtual City' model was graciously contributed by the folks at 3DRT.
Credit:
© 2017, 3DRT. [3DRT license with allowances for glTF Testing]()
- 3DRT for Everything | | [Water Bottle](WaterBottle/README.md)
[![Water Bottle](WaterBottle/screenshot/screenshot.jpg)](WaterBottle/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/WaterBottle/glTF-Binary/WaterBottle.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/WaterBottle/glTF-Binary/WaterBottle.glb) | Basic metal/roughness water bottle.
Credit:
© 2017, Public. [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)
- Microsoft for Everything | -| [Xmp Metadata Rounded Cube](XmpMetadataRoundedCube/README.md)
[![Xmp Metadata Rounded Cube](XmpMetadataRoundedCube/screenshot/screenshot.jpg)](XmpMetadataRoundedCube/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/XmpMetadataRoundedCube/glTF/XmpMetadataRoundedCube.gltf) | Test of the XMP metadata extension - KHR_xmp_json_ld.
Credit:
© 2021, Adam Morris. [CC BY 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)
- Adam Morris for Everything | +| [Xmp Metadata Rounded Cube](XmpMetadataRoundedCube/README.md)
[![Xmp Metadata Rounded Cube](XmpMetadataRoundedCube/screenshot/screenshot.jpg)](XmpMetadataRoundedCube/README.md)
[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/XmpMetadataRoundedCube/glTF-Binary/XmpMetadataRoundedCube.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/XmpMetadataRoundedCube/glTF-Binary/XmpMetadataRoundedCube.glb) | Test of the XMP metadata extension - KHR_xmp_json_ld.
Credit:
© 2021, Adam Morris. [CC BY 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)
- Adam Morris for Everything | --- ### Copyright diff --git a/Models/MosquitoInAmber/README.md b/Models/MosquitoInAmber/README.md index 8fa452f9..f191aa97 100644 --- a/Models/MosquitoInAmber/README.md +++ b/Models/MosquitoInAmber/README.md @@ -7,9 +7,7 @@ ## Extensions Used * KHR_materials_transmission - * KHR_materials_ior - * KHR_materials_volume ## Summary diff --git a/Models/SheenChair/README.md b/Models/SheenChair/README.md index 212b1c67..ea6901eb 100644 --- a/Models/SheenChair/README.md +++ b/Models/SheenChair/README.md @@ -13,9 +13,8 @@ ### Used * KHR_texture_transform - +* KHR_texture_transform * KHR_materials_sheen - * KHR_materials_variants ## Summary diff --git a/Models/SheenCloth/README.md b/Models/SheenCloth/README.md index d96acd2c..8ef4830a 100644 --- a/Models/SheenCloth/README.md +++ b/Models/SheenCloth/README.md @@ -13,7 +13,7 @@ ### Used * KHR_texture_transform - +* KHR_texture_transform * KHR_materials_sheen ## Summary diff --git a/Models/SheenTestGrid/README.md b/Models/SheenTestGrid/README.md index f1314cb8..e8b43793 100644 --- a/Models/SheenTestGrid/README.md +++ b/Models/SheenTestGrid/README.md @@ -12,6 +12,7 @@ ### Used +* KHR_materials_sheen * KHR_materials_sheen ## Summary diff --git a/Models/SpecGlossVsMetalRough/README.md b/Models/SpecGlossVsMetalRough/README.md index 07f039d0..18b84335 100644 --- a/Models/SpecGlossVsMetalRough/README.md +++ b/Models/SpecGlossVsMetalRough/README.md @@ -12,6 +12,7 @@ ### Used +* KHR_materials_pbrSpecularGlossiness * KHR_materials_pbrSpecularGlossiness ## Summary diff --git a/Models/SpecularSilkPouf/README.md b/Models/SpecularSilkPouf/README.md index ace953cb..beeef88e 100644 --- a/Models/SpecularSilkPouf/README.md +++ b/Models/SpecularSilkPouf/README.md @@ -9,13 +9,13 @@ ### Required * KHR_materials_specular - * KHR_materials_sheen ### Used * KHR_materials_specular - +* KHR_materials_sheen +* KHR_materials_specular * KHR_materials_sheen ## Summary diff --git a/Models/StainedGlassLamp/README.md b/Models/StainedGlassLamp/README.md index 47b97d04..f8edeec9 100644 --- a/Models/StainedGlassLamp/README.md +++ b/Models/StainedGlassLamp/README.md @@ -7,13 +7,9 @@ ## Extensions Used * KHR_materials_transmission - * KHR_materials_clearcoat - * KHR_materials_variants - * KHR_materials_ior - * KHR_materials_volume ## Summary diff --git a/Models/TextureTransformMultiTest/README.md b/Models/TextureTransformMultiTest/README.md index 0f8dd2a9..85525b42 100644 --- a/Models/TextureTransformMultiTest/README.md +++ b/Models/TextureTransformMultiTest/README.md @@ -13,9 +13,8 @@ ### Used * KHR_texture_transform - +* KHR_texture_transform * KHR_materials_unlit - * KHR_materials_clearcoat ## Summary diff --git a/Models/ToyCar/README.md b/Models/ToyCar/README.md index 175d3f4d..e1271304 100644 --- a/Models/ToyCar/README.md +++ b/Models/ToyCar/README.md @@ -7,11 +7,8 @@ ## Extensions Used * KHR_texture_transform - * KHR_materials_clearcoat - * KHR_materials_transmission - * KHR_materials_sheen ## Summary diff --git a/Models/TransmissionRoughnessTest/README.md b/Models/TransmissionRoughnessTest/README.md index 138e516a..2ed33fa5 100644 --- a/Models/TransmissionRoughnessTest/README.md +++ b/Models/TransmissionRoughnessTest/README.md @@ -7,9 +7,7 @@ ## Extensions Used * KHR_materials_transmission - * KHR_materials_ior - * KHR_materials_volume ## Summary diff --git a/Models/TransmissionTest/README.md b/Models/TransmissionTest/README.md index 5e0b3c24..c114a54b 100644 --- a/Models/TransmissionTest/README.md +++ b/Models/TransmissionTest/README.md @@ -7,7 +7,6 @@ ## Extensions Used * KHR_materials_transmission - * KHR_xmp ## Summary diff --git a/Models/UnlitTest/README.md b/Models/UnlitTest/README.md index f85c9a27..2498fb9d 100644 --- a/Models/UnlitTest/README.md +++ b/Models/UnlitTest/README.md @@ -12,6 +12,7 @@ ### Used +* KHR_materials_unlit * KHR_materials_unlit ## Summary diff --git a/Models/VirtualCity/README.md b/Models/VirtualCity/README.md index c2b2cb05..08eadce9 100644 --- a/Models/VirtualCity/README.md +++ b/Models/VirtualCity/README.md @@ -10,7 +10,8 @@ The 'Virtual City' model was graciously contributed by the folks at 3DRT. ## Operations -* [Display](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/VirtualCity/glTF/VirtualCity.gltf) in SampleViewer +* [Display](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/VirtualCity/glTF-Binary/VirtualCity.glb) in SampleViewer +* [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/VirtualCity/glTF-Binary/VirtualCity.glb) * [Model Directory](./) ## Screenshot diff --git a/Models/VirtualCity/glTF-Binary/VC.glb b/Models/VirtualCity/glTF-Binary/VirtualCity.glb similarity index 100% rename from Models/VirtualCity/glTF-Binary/VC.glb rename to Models/VirtualCity/glTF-Binary/VirtualCity.glb diff --git a/Models/VirtualCity/glTF-Draco/VC.gltf b/Models/VirtualCity/glTF-Draco/VirtualCity.gltf similarity index 100% rename from Models/VirtualCity/glTF-Draco/VC.gltf rename to Models/VirtualCity/glTF-Draco/VirtualCity.gltf diff --git a/Models/VirtualCity/glTF-Embedded/VC.gltf b/Models/VirtualCity/glTF-Embedded/VirtualCity.gltf similarity index 100% rename from Models/VirtualCity/glTF-Embedded/VC.gltf rename to Models/VirtualCity/glTF-Embedded/VirtualCity.gltf diff --git a/Models/VirtualCity/glTF/VC.gltf b/Models/VirtualCity/glTF/VirtualCity.gltf similarity index 100% rename from Models/VirtualCity/glTF/VC.gltf rename to Models/VirtualCity/glTF/VirtualCity.gltf diff --git a/Models/XmpMetadataRoundedCube/README.md b/Models/XmpMetadataRoundedCube/README.md index b4c1c324..0c3ba688 100644 --- a/Models/XmpMetadataRoundedCube/README.md +++ b/Models/XmpMetadataRoundedCube/README.md @@ -4,13 +4,18 @@ [extension](../../Models-extension.md), [issues](../../Models-issues.md), [testing](../../Models-testing.md) +## Extensions Used + +* KHR_xmp_json_ld + ## Summary Test of the XMP metadata extension - KHR_xmp_json_ld. ## Operations -* [Display](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/XmpMetadataRoundedCube/glTF/XmpMetadataRoundedCube.gltf) in SampleViewer +* [Display](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/XmpMetadataRoundedCube/glTF-Binary/XmpMetadataRoundedCube.glb) in SampleViewer +* [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/XmpMetadataRoundedCube/glTF-Binary/XmpMetadataRoundedCube.glb) * [Model Directory](./) ## Description diff --git a/Models/XmpMetadataRoundedCube/glTF-Binary/xmp.glb b/Models/XmpMetadataRoundedCube/glTF-Binary/XmpMetadataRoundedCube.glb similarity index 100% rename from Models/XmpMetadataRoundedCube/glTF-Binary/xmp.glb rename to Models/XmpMetadataRoundedCube/glTF-Binary/XmpMetadataRoundedCube.glb diff --git a/Models/XmpMetadataRoundedCube/glTF/xmp.gltf b/Models/XmpMetadataRoundedCube/glTF/XmpMetadataRoundedCube.gltf similarity index 100% rename from Models/XmpMetadataRoundedCube/glTF/xmp.gltf rename to Models/XmpMetadataRoundedCube/glTF/XmpMetadataRoundedCube.gltf diff --git a/Models/model-index.json b/Models/model-index.json index cfdfa41f..288092a1 100644 --- a/Models/model-index.json +++ b/Models/model-index.json @@ -301,7 +301,7 @@ "screenshot": "screenshot/screenshot.jpg", "tags": ["extension","issues"], "variants": { - "glTF": "SheenDamask.gltf" + "glTF": "ChairDamaskPurplegold.gltf" } }, { @@ -371,8 +371,8 @@ "screenshot": "screenshot/screenshot.jpg", "tags": ["showcase","extension"], "variants": { - "glTF": "teacup.gltf", - "glTF-Binary": "teacup.glb" + "glTF": "DiffuseTransmissionTeacup.gltf", + "glTF-Binary": "DiffuseTransmissionTeacup.glb" } }, { @@ -1089,10 +1089,10 @@ "screenshot": "screenshot/screenshot.gif", "tags": ["core","testing"], "variants": { - "glTF": "VC.gltf", - "glTF-Binary": "VC.glb", - "glTF-Draco": "VC.gltf", - "glTF-Embedded": "VC.gltf" + "glTF": "VirtualCity.gltf", + "glTF-Binary": "VirtualCity.glb", + "glTF-Draco": "VirtualCity.gltf", + "glTF-Embedded": "VirtualCity.gltf" } }, { @@ -1112,8 +1112,8 @@ "screenshot": "screenshot/screenshot.jpg", "tags": ["extension","issues","testing"], "variants": { - "glTF": "xmp.gltf", - "glTF-Binary": "xmp.glb" + "glTF": "XmpMetadataRoundedCube.gltf", + "glTF-Binary": "XmpMetadataRoundedCube.glb" } } ] diff --git a/util/model.php b/util/model.php index 280f160c..29db17ed 100644 --- a/util/model.php +++ b/util/model.php @@ -109,15 +109,15 @@ if (!$runArgs['dry-run']) { // If requested load the user input metadata for each model. -if ($useUserModelData) { - $modelMetadata = getModelData(); - $allModels = updateModelsMetadata ($allModels, $modelMetadata, $listings); -} + if ($useUserModelData) { + $modelMetadata = getModelData(); + $allModels = updateModelsMetadata ($allModels, $modelMetadata, $listings); + } // If requested load the user tag settings for each model. -if ($useUserModelTags) { - $modelTagData = getModelTagData(); - $allModels = updateModelsTags ($allModels, $modelTagData, $listings); -} + if ($useUserModelTags) { + $modelTagData = getModelTagData(); + $allModels = updateModelsTags ($allModels, $modelTagData, $listings); + } } // Update all model support files diff --git a/util/modelmetadata.php b/util/modelmetadata.php index 30027245..8999d86a 100644 --- a/util/modelmetadata.php +++ b/util/modelmetadata.php @@ -278,7 +278,7 @@ public function load ($path, $file='metadata') { $this->hasError = false; } else { if ($this->debugOutput >= $this->DebugDetail) - print "Loading $fullFile and storing in ->metadata\n"; + print "Loading |$fullFile| and storing in ->metadata\n"; $this->metadata = $this->_readJson ($fullFile); $this->isCurrent = true; if ($this->debugOutput >= $this->DebugDetail) @@ -429,28 +429,41 @@ public function writeReadme ($tagListings=null) { $readme[] = '# ' . $this->modelName; $readme[] = "## Tags"; $readme[] = $tagString; + if (count($this->metadata['extensions']['Used']) > 0 || count($this->metadata['extensions']['Required']) > 0) { + //print " --- Extensions ..."; + $extList = []; if (count($this->metadata['extensions']['Required']) == 0) { + //print " Used"; $readme[] = "## Extensions Used"; for ($ii=0; $iimetadata['extensions']['Used']); $ii++) { - $readme[] = "* " . $this->metadata['extensions']['Used'][$ii]; + $extList[] = "* " . $this->metadata['extensions']['Used'][$ii]; } + $readme[] = join("\n", $extList); + } else if (count($this->metadata['extensions']['Used']) == 0) { + //print " Required"; $readme[] = "## Extensions Required"; for ($ii=0; $iimetadata['extensions']['Required']); $ii++) { - $readme[] = "* " . $this->metadata['extensions']['Required'][$ii]; + $extList[] = "* " . $this->metadata['extensions']['Required'][$ii]; } + $readme[] = join("\n", $extList); + } else { + //print " Both"; $readme[] = "## Extensions"; $readme[] = "### Required"; for ($ii=0; $iimetadata['extensions']['Required']); $ii++) { - $readme[] = "* " . $this->metadata['extensions']['Required'][$ii]; + $extList[] = "* " . $this->metadata['extensions']['Required'][$ii]; } + $readme[] = join("\n", $extList); $readme[] = "### Used"; for ($ii=0; $iimetadata['extensions']['Used']); $ii++) { - $readme[] = "* " . $this->metadata['extensions']['Used'][$ii]; + $extList[] = "* " . $this->metadata['extensions']['Used'][$ii]; } + $readme[] = join("\n", $extList); } + //print "\n"; } $readme[] = "## Summary"; $readme[] = $this->metadata['summary']; @@ -688,6 +701,7 @@ private function _getExtensionsList($pathGlTF) { // Save off the stuff from the Extensions structure if (isset($glTF['extensionsUsed'])) { $extensions['Used'] = $glTF['extensionsUsed']; + //print "-- " . join(', ', $glTF['extensionsUsed']) . "\n"; } if (isset($glTF['extensionsRequired'])) { $extensions['Required'] = $glTF['extensionsRequired']; @@ -857,7 +871,9 @@ private function _updateMetadata () { // Reads the JSON model metadata file and returns the data structure private function _readJson ($fullFile) { - $jsonString = file_get_contents ($fullFile); + $localName = str_replace ('%20', ' ', $fullFile); + //print "Processing |$localName|\n"; + $jsonString = file_get_contents ($localName); if ($jsonString == '') { $jsonString = $this->metaJson; }