Skip to content

Commit

Permalink
Full update of ManderinOrange & Actions (KhronosGroup#23)
Browse files Browse the repository at this point in the history
* Action testing

* Action testing

* Action development

* Reduced false error reports

* Improved workflow

* Improved option handling

* Update LICENSE and Repo processing

* Adding workflow commit

* Workflow update + model README improvements

* Updating generated Repo indices

* Testing actions, failure condition

* Updated README for Triangle

* More auto-generated READMEs + workflow improvements

* More model README conversions

* Fixed JSON error

* Updated workflow YML

* Debugging auto-generated files

* Debugging auto-generated files [2]

* Debugging auto-generated files [3]

* Debugging auto-generated files [4]

* Updated AntiqueCamera

* Adding files for ManderinOrange

* Fixing screenshot reference for ManderinOrange

* Auto-creation of model files

* Fixed auto-generated link

* Fixed auto-generated link [2]

* Fixed auto-generated link [3]

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
DRx3D and github-actions[bot] authored Aug 5, 2023
1 parent 411b4da commit 49d7935
Show file tree
Hide file tree
Showing 40 changed files with 877 additions and 340 deletions.
6 changes: 6 additions & 0 deletions .reuse/dep5
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,12 @@ Copyright:
2021 DGG
License: CC-BY-4.0

Files: Models/MandarinOrange/*
Copyright:
2015 zamdreamer
2023 Wayfair
License: CC-BY-4.0

Files: Models/MaterialsVariantsShoe/*
Copyright:
2021 Shopify
Expand Down
4 changes: 2 additions & 2 deletions Models/AntiqueCamera/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ Static model of old camera on a tripod. [Issues: non-Khronos mark]

## Screenshot

![screenshot](screenshot/screenshot.png)
![screenshot](screenshot/screenshot.jpg)

## Description

_None provided._
Static model of old camera on a tripod, with UX3D logo on one of the legs.

## Legal

Expand Down
2 changes: 1 addition & 1 deletion Models/Avocado/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ A natural object created with Core glTF 2.0

## Description

_None provided._
A cut avocado showing the pit and flesh, using a hand-painted texture.

## Legal

Expand Down
2 changes: 1 addition & 1 deletion Models/BarramundiFish/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ A fish created with Core glTF 2.0

## Description

_None provided._
A fish created with Core glTF 2.0.

## Legal

Expand Down
4 changes: 2 additions & 2 deletions Models/BoomBox/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ A common object with glowing front panel created with Core glTF 2.0.

## Screenshot

![screenshot](screenshot/screenshot.jpg)
![screenshot](screenshot/screenshot_large.jpg)

## Description

_None provided._
A portable radio with glowing front panel created with Core glTF 2.0.

## Legal

Expand Down
4 changes: 2 additions & 2 deletions Models/BoomBoxWithAxes/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ Shows X, Y, and Z axis default orientations.

## Screenshot

![screenshot](screenshot/screenshot.jpg)
![screenshot](screenshot/screenshot_large.jpg)

## Description

_None provided._
A portable radio with glowing front panel created with Core glTF 2.0, with an axis tripod above it showing the XYZ axis orientations.

## Legal

Expand Down
2 changes: 1 addition & 1 deletion Models/Box/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ One mesh and one material. Start with this.

## Description

_None provided._
Simple cube model.

## Legal

Expand Down
2 changes: 1 addition & 1 deletion Models/BoxInterleaved/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Box example with interleaved position and normal attributes.

## Description

_None provided._
Box example with interleaved position and normal attributes.

## Legal

Expand Down
2 changes: 1 addition & 1 deletion Models/BoxTextured/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Box with a power-of-2 texture. [Issues: non-Khronos mark]

## Description

_None provided._
Box with a power-of-2 texture, using the Cesium logo.

## Legal

Expand Down
2 changes: 1 addition & 1 deletion Models/BrainStem/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Animations. Skins.

## Description

_None provided._
Articulated robot with animation and hierarchy.

## Legal

Expand Down
2 changes: 1 addition & 1 deletion Models/CesiumMan/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Textured. Animations. Skins. [Issues: non-Khronos mark]

## Description

_None provided._
Animated and skinned character with the Cesium logo.

## Legal

Expand Down
2 changes: 1 addition & 1 deletion Models/CesiumMilkTruck/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Textured. Multiple nodes/meshes. Animations. [Issues: non-Khronos mark]

## Description

_None provided._
Textured. Multiple nodes/meshes. Animations. Cesium logo.

## Legal

Expand Down
2 changes: 1 addition & 1 deletion Models/Corset/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

## Description

_None provided._
A female fabric mannequin with a corset and a collar.

## Legal

Expand Down
2 changes: 1 addition & 1 deletion Models/Cube/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ A cube with non-smoothed faces.

## Description

_None provided._
A cube with non-smoothed faces.

## Legal

Expand Down
2 changes: 1 addition & 1 deletion Models/FlightHelmet/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Displayed flight helmet on a wooden stand.

## Description

_None provided._
USAAF A-11 Flying Helmet on a wooden stand with realistic high resolution textures.

## Legal

Expand Down
2 changes: 1 addition & 1 deletion Models/InterpolationTest/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ A sample with three different animation interpolations

## Description

_None provided._
A sample with three different animation interpolations.

## Legal

Expand Down
2 changes: 1 addition & 1 deletion Models/Lantern/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Old wooden street light.

## Description

_None provided._
Old wooden street light.

## Legal

Expand Down
17 changes: 17 additions & 0 deletions Models/MandarinOrange/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# LICENSE file for the model: MandarinOrange

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"]

* [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
4 changes: 4 additions & 0 deletions Models/MeshPrimitiveModes/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ An example that shows rendering modes that are supported for mesh primitives in

![screenshot](screenshot/screenshot.png)

## Description

Seven mesh primitive types: Points, Lines, Line Loops, Line Strips, Triangles, Triangle Strips, Triangle Fans.

## Structure

The example contains seven meshes, each with one mesh primitive. All mesh primitives have the same vertex positions, forming a regular hexagon:
Expand Down
2 changes: 1 addition & 1 deletion Models/MetalRoughSpheres/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Tests various metal and roughness values (texture mapped).

## Description

_None provided._
Tests various metal and roughness values (texture mapped).

## Legal

Expand Down
126 changes: 63 additions & 63 deletions Models/Models-core.md

Large diffs are not rendered by default.

75 changes: 38 additions & 37 deletions Models/Models-extension.md

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions Models/Models-issues.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ Models with one or more issues with respect to ownership, license, or markings.

| Model | Description |
|---------|-------------|
| [Antique Camera](AntiqueCamera/README.md)<br>[![Antique Camera](AntiqueCamera/screenshot/screenshot.png)](./Models/AntiqueCamera/README.md)<br>[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/AntiqueCamera/glTF-Binary/AntiqueCamera.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/AntiqueCamera/glTF-Binary/AntiqueCamera.glb) | Static model of old camera on a tripod. [Issues: non-Khronos mark]<br>Credit:<br>&copy; 2018, UX3D. [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)<br> - Maximillan Kamps for Everything<br>&copy; 2017, UX3D. [UX3D Trademark or Logo]()<br> - Non-copyrightable logo for UX3D logo |
| [Box Textured](BoxTextured/README.md)<br>[![Box Textured](BoxTextured/screenshot/screenshot.png)](./Models/BoxTextured/README.md)<br>[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/BoxTextured/glTF-Binary/BoxTextured.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/BoxTextured/glTF-Binary/BoxTextured.glb) | Box with a power-of-2 texture. [Issues: non-Khronos mark]<br>Credit:<br>&copy; 2017, Cesium. [CC-BY 4.0 International with Trademark Limitations]()<br> - Cesium for Everything<br>&copy; 2015, Cesium. [Cesium Trademark or Logo]()<br> - Non-copyrightable logo for Cesium logo |
| [Box Textured not 2^N](BoxTexturedNonPowerOfTwo/README.md)<br>[![Box Textured not 2^N](BoxTexturedNonPowerOfTwo/screenshot/screenshot.png)](./Models/BoxTexturedNonPowerOfTwo/README.md)<br>[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/BoxTexturedNonPowerOfTwo/glTF-Binary/BoxTexturedNonPowerOfTwo.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/BoxTexturedNonPowerOfTwo/glTF-Binary/BoxTexturedNonPowerOfTwo.glb) | Box with a non-power-of-2 (NPOT) texture. Not all implementations support NPOT textures. [Issues: non-Khronos mark]<br>Credit:<br>&copy; 2017, Cesium. [CC-BY 4.0 International with Trademark Limitations]()<br> - Cesium for Everything<br>&copy; 2015, Cesium. [Cesium Trademark or Logo]()<br> - Non-copyrightable logo for Cesium logo |
| [Cesium Man](CesiumMan/README.md)<br>[![Cesium Man](CesiumMan/screenshot/screenshot.gif)](./Models/CesiumMan/README.md)<br>[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/CesiumMan/glTF-Binary/CesiumMan.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/CesiumMan/glTF-Binary/CesiumMan.glb) | Textured. Animations. Skins. [Issues: non-Khronos mark]<br>Credit:<br>&copy; 2017, Cesium. [CC-BY 4.0 International with Trademark Limitations]()<br> - Cesium for Everything<br>&copy; 2015, Cesium. [Cesium Trademark or Logo]()<br> - Non-copyrightable logo for Cesium logo |
| [Cesium Milk Truck](CesiumMilkTruck/README.md)<br>[![Cesium Milk Truck](CesiumMilkTruck/screenshot/screenshot.gif)](./Models/CesiumMilkTruck/README.md)<br>[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/CesiumMilkTruck/glTF-Binary/CesiumMilkTruck.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/CesiumMilkTruck/glTF-Binary/CesiumMilkTruck.glb) | Textured. Multiple nodes/meshes. Animations. [Issues: non-Khronos mark]<br>Credit:<br>&copy; 2017, Cesium. [CC-BY 4.0 International with Trademark Limitations]()<br> - Cesium for Everything<br>&copy; 2015, Cesium. [Cesium Trademark or Logo]()<br> - Non-copyrightable logo for Cesium logo |
| [Antique Camera](AntiqueCamera/README.md)<br>[![Antique Camera](AntiqueCamera/screenshot/screenshot.jpg)](AntiqueCamera/README.md)<br>[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/AntiqueCamera/glTF-Binary/AntiqueCamera.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/AntiqueCamera/glTF-Binary/AntiqueCamera.glb) | Static model of old camera on a tripod. [Issues: non-Khronos mark]<br>Credit:<br>&copy; 2018, UX3D. [CC0 1.0 Universal](https://creativecommons.org/publicdomain/zero/1.0/legalcode)<br> - Maximillan Kamps for Everything<br>&copy; 2017, UX3D. [UX3D Trademark or Logo]()<br> - Non-copyrightable logo for UX3D logo |
| [Box Textured](BoxTextured/README.md)<br>[![Box Textured](BoxTextured/screenshot/screenshot.png)](BoxTextured/README.md)<br>[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/BoxTextured/glTF-Binary/BoxTextured.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/BoxTextured/glTF-Binary/BoxTextured.glb) | Box with a power-of-2 texture. [Issues: non-Khronos mark]<br>Credit:<br>&copy; 2017, Cesium. [CC-BY 4.0 International with Trademark Limitations]()<br> - Cesium for Everything<br>&copy; 2015, Cesium. [Cesium Trademark or Logo]()<br> - Non-copyrightable logo for Cesium logo |
| [Box Textured not 2^N](BoxTexturedNonPowerOfTwo/README.md)<br>[![Box Textured not 2^N](BoxTexturedNonPowerOfTwo/screenshot/screenshot.png)](BoxTexturedNonPowerOfTwo/README.md)<br>[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/BoxTexturedNonPowerOfTwo/glTF-Binary/BoxTexturedNonPowerOfTwo.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/BoxTexturedNonPowerOfTwo/glTF-Binary/BoxTexturedNonPowerOfTwo.glb) | Box with a non-power-of-2 (NPOT) texture. Not all implementations support NPOT textures. [Issues: non-Khronos mark]<br>Credit:<br>&copy; 2017, Cesium. [CC-BY 4.0 International with Trademark Limitations]()<br> - Cesium for Everything<br>&copy; 2015, Cesium. [Cesium Trademark or Logo]()<br> - Non-copyrightable logo for Cesium logo |
| [Cesium Man](CesiumMan/README.md)<br>[![Cesium Man](CesiumMan/screenshot/screenshot.gif)](CesiumMan/README.md)<br>[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/CesiumMan/glTF-Binary/CesiumMan.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/CesiumMan/glTF-Binary/CesiumMan.glb) | Textured. Animations. Skins. [Issues: non-Khronos mark]<br>Credit:<br>&copy; 2017, Cesium. [CC-BY 4.0 International with Trademark Limitations]()<br> - Cesium for Everything<br>&copy; 2015, Cesium. [Cesium Trademark or Logo]()<br> - Non-copyrightable logo for Cesium logo |
| [Cesium Milk Truck](CesiumMilkTruck/README.md)<br>[![Cesium Milk Truck](CesiumMilkTruck/screenshot/screenshot.gif)](CesiumMilkTruck/README.md)<br>[Show](https://github.khronos.org/glTF-Sample-Viewer-Release/?model=https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/CesiumMilkTruck/glTF-Binary/CesiumMilkTruck.glb) -- [Download GLB](https://raw.GithubUserContent.com/KhronosGroup/glTF-Sample-Assets/main/./Models/CesiumMilkTruck/glTF-Binary/CesiumMilkTruck.glb) | Textured. Multiple nodes/meshes. Animations. [Issues: non-Khronos mark]<br>Credit:<br>&copy; 2017, Cesium. [CC-BY 4.0 International with Trademark Limitations]()<br> - Cesium for Everything<br>&copy; 2015, Cesium. [Cesium Trademark or Logo]()<br> - Non-copyrightable logo for Cesium logo |
---

### Copyright
Expand All @@ -30,4 +30,4 @@ Models with one or more issues with respect to ownership, license, or markings.

**License:** [Creative Commons Attribtution 4.0 International](https://creativecommons.org/licenses/by/4.0/legalcode)

#### Generated by modelmetadata v1.2.17
#### Generated by modelmetadata
Loading

0 comments on commit 49d7935

Please sign in to comment.