Skip to content

Commit

Permalink
Merge branch 'main' into DiffuseTransmissionTeacup
Browse files Browse the repository at this point in the history
  • Loading branch information
echadwick-artist authored Dec 22, 2023
2 parents d7f04a3 + f9e4f0e commit ecefd09
Show file tree
Hide file tree
Showing 229 changed files with 8,987 additions and 1,641 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/AssetCheck.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Asset Quality Workflow

on: [push, pull_request]

env:
CI: true

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Check out repository
uses: actions/checkout@v2

- name: Set up PHP
uses: shivammathur/setup-php@v2
with:
php-version: latest

- name: Execute PHP script
run: |
php util/model.php --no-warn --check --verbose
33 changes: 0 additions & 33 deletions .github/workflows/php.yml

This file was deleted.

25 changes: 20 additions & 5 deletions .reuse/dep5
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ Copyright:
2023 Copyright 2023 Wayfair, LLC
License: CC-BY-4.0

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

Files: Models/AnisotropyRotationTest/*
Copyright:
2023 Analytical Graphics, Inc.
Expand Down Expand Up @@ -177,6 +182,11 @@ Copyright:
2016 theblueturtle_
License: CC-BY-4.0 AND CC-BY-NC-4.0

Files: Models/DiffuseTransmissionTeacup/*
Copyright:
2023 Public domain
License: CC0

Files: Models/DragonAttenuation/*
Copyright:
1996 Stanford University Computer Graphics Laboratory
Expand Down Expand Up @@ -418,6 +428,11 @@ Copyright:
2017 Microsoft
License: CC-BY-4.0

Files: Models/SpecularSilkPouf/*
Copyright:
2023 Copyright 2023 Wayfair, LLC
License: CC-BY-4.0

Files: Models/SpecularTest/*
Copyright:
2021 Analytical Graphics, Inc.
Expand Down Expand Up @@ -509,16 +524,16 @@ Copyright:
2019 Analytical Graphics, Inc.
License: CC-BY-4.0

Files: Models/VC/*
Copyright:
2017 3DRT
License: LicenseRef-3DRT-Testing

Files: Models/VertexColorTest/*
Copyright:
2018 Analytical Graphics, Inc.
License: CC-BY-4.0

Files: Models/VirtualCity/*
Copyright:
2017 3DRT
License: LicenseRef-3DRT-Testing

Files: Models/WaterBottle/*
Copyright:
2017 Public
Expand Down
24 changes: 20 additions & 4 deletions Models/AlphaBlendModeTest/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# Alpha Blend Mode Test

## Tags

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

## Summary

Tests alpha modes and settings.

## Operations

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

## Screenshot

![screenshot](screenshot/screenshot_large.jpg)
Expand Down Expand Up @@ -60,8 +74,10 @@ In the above screenshot, the requested `alphaCutoff` value is not being respecte

In this screenshot, it appears that the rendering engine is not using the value `0.5` for the default value of `alphaCutoff` when the model does not specify a particular value. The glTF specification [names `0.5` as the default](https://github.com/KhronosGroup/glTF/blob/0890b76c62cc762ce82d4010df9bfebb1634839b/specification/2.0/schema/material.schema.json#L68), so this is a test failure.

## License Information
## Legal

© 2018, Analytical Graphics, Inc.. [CC BY 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)

- Ed Mackey for Everything

Copyright 2018 Analytical Graphics, Inc.
CC-BY 4.0 https://creativecommons.org/licenses/by/4.0/
Model and textures by Ed Mackey.
#### Assembled by modelmetadata
2 changes: 1 addition & 1 deletion Models/AlphaBlendModeTest/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
"name": "Alpha Blend Mode Test",
"path": "./Models/AlphaBlendModeTest",
"summary": "Tests alpha modes and settings.",
"createReadme": false
"createReadme": true
}
23 changes: 20 additions & 3 deletions Models/AnimatedMorphCube/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# Animated Morph Cube

## Tags

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

## Summary

Demonstrates a simple cube with two simple morph targets and an animation that transitions between them both.

## Operations

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

## Screenshot

![screenshot](screenshot/screenshot.gif)
Expand All @@ -13,7 +27,10 @@ The cube contains two morph targets in it:

The animation loops, morphing between these two states.

## License Information
## Legal

© 2017, Public. [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)

- Microsoft for Everything

[![CC0](http://i.creativecommons.org/p/zero/1.0/88x31.png)](http://creativecommons.org/publicdomain/zero/1.0/)
To the extent possible under law, Microsoft has waived all copyright and related or neighboring rights to this asset.
#### Assembled by modelmetadata
2 changes: 1 addition & 1 deletion Models/AnimatedMorphCube/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
"name": "Animated Morph Cube",
"path": "./Models/AnimatedMorphCube",
"summary": "Demonstrates a simple cube with two simple morph targets and an animation that transitions between them both.",
"createReadme": false
"createReadme": true
}
23 changes: 20 additions & 3 deletions Models/AnimatedMorphSphere/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# Animated Morph Sphere

## Tags

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

## Summary

This sample is similar to the Animated Morph Cube, but the two morph targets move many more vertices and are more extreme than with the cube.

## Operations

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

## Screenshot

![screenshot](screenshot/screenshot.gif)
Expand All @@ -14,7 +28,10 @@ The sphere contains two morph targets in it:

The animation loops, morphing between these two states.

## License Information
## Legal

© 2017, Public. [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)

- Microsoft for Everything

[![CC0](http://i.creativecommons.org/p/zero/1.0/88x31.png)](http://creativecommons.org/publicdomain/zero/1.0/)
To the extent possible under law, Microsoft has waived all copyright and related or neighboring rights to this asset.
#### Assembled by modelmetadata
2 changes: 1 addition & 1 deletion Models/AnimatedMorphSphere/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
"name": "Animated Morph Sphere",
"path": "./Models/AnimatedMorphSphere",
"summary": "This sample is similar to the Animated Morph Cube, but the two morph targets move many more vertices and are more extreme than with the cube.",
"createReadme": false
"createReadme": true
}
25 changes: 21 additions & 4 deletions Models/AnimatedTriangle/README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,33 @@
# AnimatedTriangle

## Screenshot
## Tags

![screenshot](screenshot/screenshot.gif)
[core](../../Models-core.md), [testing](../../Models-testing.md), [written](../../Models-written.md)

## Summary

This sample is similar to the Triangle, but the node has a rotation property that is modified with a simple animation

## Operations

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

## License Information
## Screenshot

Public domain ([CC0](https://creativecommons.org/publicdomain/zero/1.0/))
![screenshot](screenshot/screenshot.gif)

## Data layout

The following images show the data layout of this sample:

![simpleTriangle](screenshot/simpleTriangle.png)
![animation](screenshot/animation.png)

## Legal

© 2017, Public. [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)

- javagl for Everything

#### Assembled by modelmetadata
2 changes: 1 addition & 1 deletion Models/AnimatedTriangle/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@
"name": "AnimatedTriangle",
"path": "./Models/AnimatedTriangle",
"summary": "This sample is similar to the Triangle, but the node has a rotation property that is modified with a simple animation",
"createReadme": false
"createReadme": true
}
Binary file not shown.
15 changes: 15 additions & 0 deletions Models/AnisotropyDiscTest/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# LICENSE file for the model: Anisotropy Disc Test

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:

* [CC0 1.0 Universal]("https://creativecommons.org/publicdomain/zero/1.0/legalcode") [SPDX license identifier: "CC0-1.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
20 changes: 20 additions & 0 deletions Models/AnisotropyDiscTest/README.body.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
## Screenshot

![screenshot](screenshot/screenshot_Large.jpg)
<br/>_Screenshot from [glTF Sample Viewer](https://github.khronos.org/glTF-Sample-Viewer-Release/) with the environment Pisa._

## Description

This model tests the main texturemap for [`KHR_materials_anisotropy`](https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Khronos/KHR_materials_anisotropy). It has the following features:

- An array of base material roughness values are tested with the same texturemap each time.

- The upper-left quadrant tests a disc-shaped anisotropic pattern at a strength of about 3%.

- The upper-right quadrant tests a disc-shaped anisotropic pattern at a strength of about 10%.

- The lower-right quadrant tests a disc-shaped anisotropic pattern at a full strength.

- The lower-left quadrant tests a disc-shaped anisotropic pattern with a gradient strength, starting at zero around the edges and increasing to full strength in the center.

Per the anisotropy specification, anisotropic strength increases the material's roughness along a particular direction. Therefore, zero base roughness with full-strength anisotropy displays the most pronounced result. Full 1.0 base roughness cannot increase more, and does not show any effects from anisotropy.
45 changes: 45 additions & 0 deletions Models/AnisotropyDiscTest/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# Anisotropy Disc Test

## Tags

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

## Summary

This model tests the texturemap for KHR_materials_anisotropy.

## Operations

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

## Screenshot

![screenshot](screenshot/screenshot_Large.jpg)
<br/>_Screenshot from [glTF Sample Viewer](https://github.khronos.org/glTF-Sample-Viewer-Release/) with the environment Pisa._

## Description

This model tests the main texturemap for [`KHR_materials_anisotropy`](https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Khronos/KHR_materials_anisotropy). It has the following features:

- An array of base material roughness values are tested with the same texturemap each time.

- The upper-left quadrant tests a disc-shaped anisotropic pattern at a strength of about 3%.

- The upper-right quadrant tests a disc-shaped anisotropic pattern at a strength of about 10%.

- The lower-right quadrant tests a disc-shaped anisotropic pattern at a full strength.

- The lower-left quadrant tests a disc-shaped anisotropic pattern with a gradient strength, starting at zero around the edges and increasing to full strength in the center.

Per the anisotropy specification, anisotropic strength increases the material's roughness along a particular direction. Therefore, zero base roughness with full-strength anisotropy displays the most pronounced result. Full 1.0 base roughness cannot increase more, and does not show any effects from anisotropy.


## Legal

&copy; 2023, Public. [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)

- Eric Chadwick for Everything

#### Assembled by modelmetadata
Binary file not shown.
Loading

0 comments on commit ecefd09

Please sign in to comment.