From 73dd2a5fb4cb43fa2a01a9d32ff94c31d1095215 Mon Sep 17 00:00:00 2001 From: lexaknyazev Date: Fri, 9 Sep 2016 15:10:38 +0400 Subject: [PATCH] Drop revision number from profile.version --- .../profiles/webgl-1.0/GLTFWebGL_1_0_Profile.cpp | 2 +- specification/README.md | 16 ++++++++-------- specification/schema/asset.profile.schema.json | 6 ++++-- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/COLLADA2GLTF/profiles/webgl-1.0/GLTFWebGL_1_0_Profile.cpp b/COLLADA2GLTF/profiles/webgl-1.0/GLTFWebGL_1_0_Profile.cpp index 61f7322396..386e26f4a0 100644 --- a/COLLADA2GLTF/profiles/webgl-1.0/GLTFWebGL_1_0_Profile.cpp +++ b/COLLADA2GLTF/profiles/webgl-1.0/GLTFWebGL_1_0_Profile.cpp @@ -628,7 +628,7 @@ namespace GLTF { auto id = std::make_shared(); id->setString("api", "WebGL"); - id->setString("version", "1.0.2"); + id->setString("version", "1.0"); return id; } diff --git a/specification/README.md b/specification/README.md index 771536df62..f1af8721bb 100644 --- a/specification/README.md +++ b/specification/README.md @@ -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." } @@ -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. @@ -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| @@ -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: `{}` @@ -1620,14 +1620,14 @@ Application-specific data. ## 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| @@ -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 diff --git a/specification/schema/asset.profile.schema.json b/specification/schema/asset.profile.schema.json index 86a39caba4..a894b5717f 100644 --- a/specification/schema/asset.profile.schema.json +++ b/specification/schema/asset.profile.schema.json @@ -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" : { @@ -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