Skip to content
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.

Sign up for GitHub

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

Drop revision number from profile.version #709

Merged
merged 1 commit into from
Sep 9, 2016
Merged

Drop revision number from profile.version #709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion COLLADA2GLTF/profiles/webgl-1.0/GLTFWebGL_1_0_Profile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ namespace GLTF
{
auto id = std::make_shared<JSONObject>();
id->setString("api", "WebGL");
id->setString("version", "1.0.2");
id->setString("version", "1.0");

return id;
}
Expand Down
16 changes: 8 additions & 8 deletions specification/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1109,7 +1109,7 @@ Only the `version` property is required. For example,
"premultipliedAlpha": true,
"profile" : {
"api" : "WebGL",
"version" : "1.0.3",
"version" : "1.0",
"extras" : {
"Application specific" : "The extra object can contain any properties."
}
Expand Down Expand Up @@ -1177,7 +1177,7 @@ For more information on glTF extensions, consult the [extensions registry specif
* [`functions`](#reference-technique.states.functions)
* [`texture`](#reference-texture)

This property reference applies to the WebGL 1.0.3 profile. See `version` and `api` properties on ['asset.profile'](#reference-asset.profile).
This property reference applies to the WebGL 1.0 profile. See `version` and `api` properties on ['asset.profile'](#reference-asset.profile).

> In the future, other profiles, such as OpenGL, are expected.

Expand Down Expand Up @@ -1554,7 +1554,7 @@ Metadata about the glTF asset.
|**copyright**|`string`|A copyright message suitable for display to credit the content creator.|No|
|**generator**|`string`|Tool that generated this glTF model. Useful for debugging.|No|
|**premultipliedAlpha**|`boolean`|Specifies if the shaders were generated with premultiplied alpha.|No, default: `false`|
|**profile**|[`asset.profile`](#reference-asset.profile)|Specifies the target rendering API and version, e.g., WebGL 1.0.3.|No, default: `{}`|
|**profile**|[`asset.profile`](#reference-asset.profile)|Specifies the target rendering API and version, e.g., WebGL 1.0.|No, default: `{}`|
|**version**|`string`|The glTF version.| :white_check_mark: Yes|
|**extensions**|`object`|Dictionary object with extension-specific objects.|No|
|**extras**|`any`|Application-specific data.|No|
Expand Down Expand Up @@ -1588,7 +1588,7 @@ Specifies if the shaders were generated with premultiplied alpha.

### asset.profile

Specifies the target rendering API and version, e.g., WebGL 1.0.3.
Specifies the target rendering API and version, e.g., WebGL 1.0.

* **Type**: [`asset.profile`](#reference-asset.profile)
* **Required**: No, default: `{}`
Expand Down Expand Up @@ -1620,14 +1620,14 @@ Application-specific data.
<a name="reference-asset.profile"></a>
## asset.profile

Specifies the target rendering API and version, e.g., WebGL 1.0.3.
Specifies the target rendering API and version, e.g., WebGL 1.0.

**Properties**

| |Type|Description|Required|
|---|----|-----------|--------|
|**api**|`string`|Specifies the target rendering API.|No, default: `"WebGL"`|
|**version**|`string`|The API version.|No, default: `"1.0.3"`|
|**version**|`string`|The API version.|No, default: `"1.0"`|
|**extensions**|`object`|Dictionary object with extension-specific objects.|No|
|**extras**|`any`|Application-specific data.|No|

Expand All @@ -1644,10 +1644,10 @@ Specifies the target rendering API.

### profile.version

The API version.
The API version. Must be of the form `major_number.minor_number`, where the numbers have one or more digits.

* **Type**: `string`
* **Required**: No, default: `"1.0.3"`
* **Required**: No, default: `"1.0"`

### profile.extensions

Expand Down
6 changes: 4 additions & 2 deletions specification/schema/asset.profile.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema" : "http://json-schema.org/draft-03/schema",
"title" : "profile",
"type" : "object",
"description" : "Specifies the target rendering API and version, e.g., WebGL 1.0.3.",
"description" : "Specifies the target rendering API and version, e.g., WebGL 1.0.",
"extends" : { "$ref" : "glTFProperty.schema.json" },
"properties" : {
"api" : {
Expand All @@ -13,7 +13,9 @@
"version" : {
"type" : "string",
"description" : "The API version.",
"default" : "1.0.3"
"default" : "1.0",
"pattern" : "^\\d+\\.\\d+$",
"gltf_detailedDescription" : "The API version. Must be of the form `major_number.minor_number`, where the numbers have one or more digits."
}
},
"additionalProperties" : false
Expand Down