-
Notifications
You must be signed in to change notification settings - Fork 1.2k
The KHR_materials_variants extension #1681
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
emackey
merged 26 commits into
KhronosGroup:master
from
zellski:ext/zell-fb-asset-variants
Aug 26, 2020
Merged
Changes from 2 commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
b529179
Initial draft.
ebe3189
Updates.
9033116
Consistant naming.
ee0d8ad
Rename back, tweak.
b7c68e3
Tweaks.
fd070c3
Some further verbiage.
92771ff
Add formal schema.
ca97835
Merge branch 'master' into ext/zell-fb-asset-variants
69b7edf
Merge remote-tracking branch 'upstream/master' into ext/zell-fb-asset…
8e5d8b1
Language tweaks, update Renee's contact info.
f0ab429
One more try.
a9bee21
Clarifications, expansion.
23915e9
Rename as khronos extension KHR_variant_materials
jercytryn 07c109b
Rename extension KHR_variant_materials -> KHR_materials_variants
jercytryn 46b16fc
Fix typos, non-normative disclaimers, and clarify tag order behavior …
jercytryn 17fe9bd
Simplify extension to focus on wholesale static variant configuration…
jercytryn 910746f
Fix example melded models
jercytryn b84ae8a
Clarifying note on no active variant
jercytryn fc9b8d9
Update README.md for alt text.
60be860
Apply 3D Commerce patch to schemas and spec.
09a22ce
Updated README, removed examples, and fixed mappings in spec along wi…
sleroux 26d2629
Add new language defining mappings usage within viewer applications
jercytryn 8543426
No relative paths and fix typo
jercytryn 9bc4e4e
Bridge verb
jercytryn 9049ea8
Change to top-down language to describe the specifics of the schema p…
jercytryn 8af11ea
one more try
jercytryn File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 0 additions & 11 deletions
11
extensions/2.0/Khronos/KHR_materials_variants/examples/chair/README.md
This file was deleted.
Oops, something went wrong.
Binary file removed
BIN
-1.75 MB
extensions/2.0/Khronos/KHR_materials_variants/examples/chair/chairs.glb
Binary file not shown.
Binary file removed
BIN
-246 KB
extensions/2.0/Khronos/KHR_materials_variants/examples/chair/chairs.jpg
Binary file not shown.
Binary file removed
BIN
-1.74 MB
extensions/2.0/Khronos/KHR_materials_variants/examples/chair/red_fabric_oak_legs.glb
Binary file not shown.
Binary file removed
BIN
-1.74 MB
extensions/2.0/Khronos/KHR_materials_variants/examples/chair/red_fabric_walnut_legs.glb
Binary file not shown.
Binary file removed
BIN
-1.74 MB
extensions/2.0/Khronos/KHR_materials_variants/examples/chair/white_fabric_oak_legs.glb
Binary file not shown.
Binary file removed
BIN
-1.74 MB
extensions/2.0/Khronos/KHR_materials_variants/examples/chair/white_fabric_walnut_legs.glb
Binary file not shown.
11 changes: 0 additions & 11 deletions
11
extensions/2.0/Khronos/KHR_materials_variants/examples/helmet/README.md
This file was deleted.
Oops, something went wrong.
Binary file removed
BIN
-213 KB
extensions/2.0/Khronos/KHR_materials_variants/examples/helmet/dry.jpg
Binary file not shown.
Binary file removed
BIN
-4.97 MB
extensions/2.0/Khronos/KHR_materials_variants/examples/helmet/helmet.glb
Binary file not shown.
Binary file removed
BIN
-4.97 MB
extensions/2.0/Khronos/KHR_materials_variants/examples/helmet/helmet_combined.glb
Binary file not shown.
Binary file removed
BIN
-3.85 MB
extensions/2.0/Khronos/KHR_materials_variants/examples/helmet/helmet_wet.glb
Binary file not shown.
Binary file removed
BIN
-603 KB
extensions/2.0/Khronos/KHR_materials_variants/examples/helmet/helmets.jpg
Binary file not shown.
Binary file removed
BIN
-9.69 KB
extensions/2.0/Khronos/KHR_materials_variants/examples/helmet/screenshot.jpg
Binary file not shown.
Binary file removed
BIN
-378 KB
extensions/2.0/Khronos/KHR_materials_variants/examples/helmet/wet.jpg
Binary file not shown.
11 changes: 0 additions & 11 deletions
11
extensions/2.0/Khronos/KHR_materials_variants/examples/shoes/README.md
This file was deleted.
Oops, something went wrong.
Binary file removed
BIN
-5.13 MB
extensions/2.0/Khronos/KHR_materials_variants/examples/shoes/beach.glb
Binary file not shown.
Binary file removed
BIN
-5.13 MB
extensions/2.0/Khronos/KHR_materials_variants/examples/shoes/midnight.glb
Binary file not shown.
Binary file removed
BIN
-833 KB
extensions/2.0/Khronos/KHR_materials_variants/examples/shoes/photo.png
Binary file not shown.
Binary file removed
BIN
-7.47 MB
extensions/2.0/Khronos/KHR_materials_variants/examples/shoes/shoes.glb
Binary file not shown.
Binary file removed
BIN
-5.08 MB
extensions/2.0/Khronos/KHR_materials_variants/examples/shoes/street.glb
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 0 additions & 33 deletions
33
.../KHR_materials_variants/schema/mesh.primitive.KHR_materials_variants.mappings.schema.json
This file was deleted.
Oops, something went wrong.
44 changes: 44 additions & 0 deletions
44
...0/Khronos/KHR_materials_variants/schema/mesh.primitive.KHR_materials_variants.schema.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| { | ||
| "$schema": "http://json-schema.org/draft-04/schema", | ||
| "title": "KHR_materials_variants mesh primitive extension", | ||
| "type": "object", | ||
| "allOf": [ { "$ref": "../../glTFProperty.schema.json" } ], | ||
emackey marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| "properties": { | ||
| "mappings": { | ||
| "type": "array", | ||
| "description": "A list of material to variant mappings", | ||
| "gltf_detailedDescription": "An array of object values that associate an indexed material to a set of variants.", | ||
| "items": { | ||
| "type": "object", | ||
| "properties": { | ||
| "variants": { | ||
| "uniqueItems": true, | ||
| "type": "array", | ||
| "description": "An array of variant index values.", | ||
| "items": { | ||
| "allOf": [ {"$ref": "../../glTFid.schema.json" } ] | ||
| }, | ||
| "minItems": 1, | ||
| "gltf_detailedDescription": "An array of index values that reference variants defined in the glTF root's extension object." | ||
| }, | ||
| "material": { | ||
| "allOf": [ { "$ref": "../../glTFid.schema.json" } ], | ||
| "description": "The material associated with the set of variants.", | ||
| "gltf_detailedDescription": "A reference to the material associated with the given array of variants." | ||
| }, | ||
| "name": { | ||
| "type": "string", | ||
| "description": "The user-defined name of this variant material mapping.", | ||
| "gltf_detailedDescription": "The optional user-defined name of this variant material mapping. This is not necessarily unique." | ||
| }, | ||
| "extras": { | ||
| "type": "object" | ||
| }, | ||
| "extensions": { } | ||
| }, | ||
| "required": [ "variants", "material" ] | ||
| } | ||
| } | ||
| }, | ||
| "required": [ "mappings" ] | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.