-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '2.0' into emiliano/210
- Loading branch information
Showing
21 changed files
with
547 additions
and
891 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
This file contains 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
This file contains 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
This file was deleted.
Oops, something went wrong.
This file contains 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
This file contains 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
This file contains 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 |
|---|---|---|
| @@ -1,26 +1,26 @@ | ||
| { | ||
| "materials" : { | ||
| "material_id": { | ||
| "technique": "technique_id", | ||
| "values": { | ||
| "ambient": [ | ||
| 0, | ||
| 0, | ||
| 0, | ||
| 1 | ||
| ], | ||
| "diffuse": "texture_image_0", | ||
| "shininess": [38.4] | ||
| "materials": [ | ||
| { | ||
| "name": "Material0", | ||
| "pbrMetallicRoughness": { | ||
| "baseColorfactor": [ 0.5, 0.5, 0.5, 1.0 ], | ||
| "baseColorTexture": { | ||
| "index": 1, | ||
| "texCoord": 1 | ||
| }, | ||
| "metallicFactor": 1, | ||
| "roughnessFactor": 1, | ||
| "metallicRoughnessTexture": { | ||
| "index": 2, | ||
| "texCoord": 1 | ||
| } | ||
| }, | ||
| "name": "user-defined material name", | ||
| "extensions" : { | ||
| "extension_name" : { | ||
| "extension specific" : "value" | ||
| } | ||
| "normalTexture": { | ||
| "scale": 2, | ||
| "index": 3, | ||
| "texCoord": 1 | ||
| }, | ||
| "extras" : { | ||
| "Application specific" : "The extra object can contain any properties." | ||
| } | ||
| "emissiveFactor": [ 0.2, 0.1, 0.0 ] | ||
| } | ||
| } | ||
| ] | ||
| } |
This file contains 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
This file contains 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
17 changes: 17 additions & 0 deletions
17
specification/2.0/schema/material.normalTextureInfo.schema.json
This file contains 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,17 @@ | ||
| { | ||
| "$schema": "http://json-schema.org/draft-04/schema", | ||
| "title": "normalTextureInfo", | ||
| "type": "object", | ||
| "allOf": [ { "$ref": "textureInfoBase.schema.json" } ], | ||
| "properties": { | ||
| "index": {}, | ||
| "texCoord": {}, | ||
| "scale": { | ||
| "type": "number", | ||
| "description": "The scalar multiplier applied to each normal vector of the normal texture.", | ||
| "default": 1.0, | ||
| "gltf_detailedDescription": "The scalar multiplier applied to each normal vector of the texture. This value is ignored if normalTexture is not specified. This value is linear." | ||
| } | ||
| }, | ||
| "additionalProperties": false | ||
| } |
19 changes: 19 additions & 0 deletions
19
specification/2.0/schema/material.occlusionTextureInfo.schema.json
This file contains 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,19 @@ | ||
| { | ||
| "$schema": "http://json-schema.org/draft-04/schema", | ||
| "title": "occlusionTextureInfo", | ||
| "type": "object", | ||
| "allOf": [ { "$ref": "textureInfoBase.schema.json" } ], | ||
| "properties": { | ||
| "index": {}, | ||
| "texCoord": {}, | ||
| "strength": { | ||
| "type": "number", | ||
| "description": "A scalar multiplier controlling the amount of occlusion applied.", | ||
| "default": 1.0, | ||
| "minimum": 0.0, | ||
| "maximum": 1.0, | ||
| "gltf_detailedDescription": "A scalar multiplier controlling the amount of occlusion applied. A value of 0.0 means no occlusion. A value of 1.0 means full occlusion. This value is ignored if the corresponding texture is not specified. This value is linear." | ||
| } | ||
| }, | ||
| "additionalProperties": false | ||
| } |
48 changes: 48 additions & 0 deletions
48
specification/2.0/schema/material.pbrMetallicRoughness.schema.json
This file contains 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,48 @@ | ||
| { | ||
| "$schema": "http://json-schema.org/draft-04/schema", | ||
| "title": "pbrMetallicRoughness", | ||
| "type": "object", | ||
| "description": "A set of parameter values that are used to define the metallic-roughness material model from Physically-Based Rendering (PBR) methodology.", | ||
| "properties": { | ||
| "baseColorFactor": { | ||
| "type": "array", | ||
| "items": { | ||
| "type": "number", | ||
| "minimum": 0.0, | ||
| "maximum": 1.0 | ||
| }, | ||
| "description": "The material's base color factor.", | ||
| "default": [ 1.0, 1.0, 1.0, 1.0 ], | ||
| "minItems": 4, | ||
| "maxItems": 4, | ||
| "gltf_detailedDescription": "The RGBA components of the base color of the material. The fourth component (A) is the opacity of the material. These values are linear." | ||
| }, | ||
| "baseColorTexture": { | ||
| "allOf": [ { "$ref": "textureInfo.schema.json" } ], | ||
| "description": "The base color texture.", | ||
| "gltf_detailedDescription": "The base color texture. This texture contains RGB(A) components in sRGB color space. The first three components (RGB) specify the base color of the material. If the fourth component (A) is present, it represents the opacity of the material. Otherwise, an opacity of 1.0 is assumed." | ||
| }, | ||
| "metallicFactor": { | ||
| "type": "number", | ||
| "description": "The metalness of the material.", | ||
| "default": 1.0, | ||
| "minimum": 0.0, | ||
| "maximum": 1.0, | ||
| "gltf_detailedDescription": "The metalness of the material. A value of 1.0 means the material is a metal. A value of 0.0 means the material is a dielectric. Values in between are for blending between metals and dielectrics such as dirty metallic surfaces. This value is linear." | ||
| }, | ||
| "roughnessFactor": { | ||
| "type": "number", | ||
| "description": "The roughness of the material.", | ||
| "default": 1.0, | ||
| "minimum": 0.0, | ||
| "maximum": 1.0, | ||
| "gltf_detailedDescription": "The roughness of the material. A value of 1.0 means the material is completely rough. A value of 0.0 means the material is completely smooth. This value is linear." | ||
| }, | ||
| "metallicRoughnessTexture": { | ||
| "allOf": [ { "$ref": "textureInfo.schema.json" } ], | ||
| "description": "The metallic-roughness texture.", | ||
| "gltf_detailedDescription": "The metallic-roughness texture has two components. The first component (R) contains the metallic-ness of the material. The second component (G) contains the roughness of the material. These values are linear. If the third component (B) and/or the fourth component (A) are present, they are ignored." | ||
| } | ||
| }, | ||
| "additionalProperties": false | ||
| } |
Oops, something went wrong.