Skip to content

Commit cd64cd1

Browse files
Remove environmentMapProperty and move content to profile
1 parent 47704e0 commit cd64cd1

1 file changed

Lines changed: 18 additions & 28 deletions

File tree

source/presentation/4.0/model.md

Lines changed: 18 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -843,7 +843,7 @@ A Directional Light _MAY_ have the following additional properties: [lookAt](#lo
843843
Image-Based Lights illuminate objects in a Scene using lighting information derived from an image, typically a panoramic environment map. They simulate complex, realistic lighting without a specific direction or position.
844844

845845
__Properties__<br/>
846-
An Image-Based Light _MUST_ have the following properties: [environmentMap](#environmentMap) and [environmentMapProjection](#environmentMapProjection).<br/><br/>
846+
An Image-Based Light _MUST_ have the following properties: [environmentMap](#environmentMap).<br/><br/>
847847
{: .note}
848848

849849
{% include api/code_header.html %}
@@ -854,9 +854,9 @@ An Image-Based Light _MUST_ have the following properties: [environmentMap](#env
854854
"environmentMap": {
855855
"id": "https://example.org/iiif/light/3/environment.hdr",
856856
"type": "Image",
857-
"format": "image/vnd.radiance"
857+
"format": "image/vnd.radiance",
858+
"profile": "equirectangular"
858859
},
859-
"environmentMapProjection": "equirectangular",
860860
"intensity": {
861861
"type": "Quantity",
862862
"quantityValue": 0.5,
@@ -1436,9 +1436,9 @@ The value _MUST_ be a positive floating point number.
14361436
### environmentMap
14371437
{: #environmentMap}
14381438

1439-
A content resource representing the environment map image used by an [ImageBasedLight](#ImageBasedLight). The image provides omnidirectional lighting information and may use high dynamic range (HDR) encoding.
1439+
A content resource representing the environment map image used by an [ImageBasedLight](#ImageBasedLight). The image provides omnidirectional lighting information and may use high dynamic range (HDR) encoding. The projection type of the image, such as equirectangular or cubic, is specified via the `profile` property.
14401440

1441-
The value _MUST_ be a JSON object representing an Image which _MUST_ have the `id` and `type` properties, and _SHOULD_ have the `format` property.
1441+
The value _MUST_ be a JSON object representing an Image which _MUST_ have the `id`, `type`, and `profile` properties, and _SHOULD_ have the `format` property.
14421442

14431443
* An Image-Based Light _MUST_ have the `environmentMap` property.<br/>
14441444
Clients _SHOULD_ process `environmentMap` on an Image-Based Light.
@@ -1449,28 +1449,8 @@ The value _MUST_ be a JSON object representing an Image which _MUST_ have the `i
14491449
"id": "https://example.org/iiif/light/3/environment.hdr",
14501450
"type": "Image",
14511451
"format": "image/vnd.radiance"
1452-
},
1453-
```
1454-
1455-
### environmentMapProjection
1456-
{: #environmentMapProjection}
1457-
1458-
The projection type used to create the image represented by the `environmentMap` property of an [ImageBasedLight](#ImageBasedLight). This specification defines values in the table below for projection types. Other values for additional projection types may be defined externally as an [extension][prezi30-ldce].
1459-
1460-
The value _MUST_ be a string.
1461-
1462-
* An Image-Based Light _MUST_ have the `environmentMapProjection` property.<br/>
1463-
Clients _SHOULD_ process `environmentMapProjection` on an Image-Based Light.
1464-
1465-
| Value | Description |
1466-
| ----- | ----------- |
1467-
| `equirectangular` | The image uses equirectangular projection, mapping a full spherical environment onto a 2:1 rectangular image. |
1468-
| `cubic` | The image uses cube map projection, representing the environment as six square faces of a cube. |
1469-
{: .api-table #table-environmentmapprojection}
1470-
1471-
{% include api/code_header.html %}
1472-
``` json-doc
1473-
{ "environmentMapProjection": "equirectangular" }
1452+
"profile": "equirectangular"
1453+
}
14741454
```
14751455

14761456

@@ -2144,13 +2124,23 @@ The value must be a JSON object, with the `id` and `type` properties. The value
21442124

21452125
A schema or named set of functionality available from the resource. The profile can further clarify the `type` and/or `format` of an external resource or service, allowing clients to customize their handling of the resource that has the `profile` property.
21462126

2147-
The value _MUST_ be a string, either taken from the [profiles registry][registry-profiles] or a full URI.
2127+
When `profile` is used in a resource [referenced][prezi30-terminology] by the `environmentMap` property, the specification defines values in the table below for environment map projection types. Other values for additional projection types may be taken from the [profiles registry][registry-profiles] or as a full URI.
21482128

2129+
The value _MUST_ be a string, either taken from the [profiles registry][registry-profiles], a full URI, or from the table below.
2130+
2131+
* Resources [referenced][prezi30-terminology] by the `environmentMap` property _MUST_ have the `profile` property.<br/>
2132+
Clients _SHOULD_ process the `profile` of an environment map.
21492133
* Resources [referenced][prezi30-terminology] by the `seeAlso` or `service` properties _SHOULD_ have the `profile` property.<br/>
21502134
Clients _SHOULD_ process the `profile` of a service or external resource.
21512135
* Other types of resource _MAY_ have the `profile` property.<br/>
21522136
Clients _MAY_ process the `profile` of other types of resource.
21532137

2138+
| Value | Description |
2139+
| ----- | ----------- |
2140+
| `equirectangular` | For environment map, the image uses equirectangular projection, mapping a full spherical environment onto a 2:1 rectangular image. |
2141+
| `cubic` | For environment map, the image uses cube map projection, representing the environment as six square faces of a cube. |
2142+
{: .api-table #table-profile}
2143+
21542144
{% include api/code_header.html %}
21552145
``` json-doc
21562146
{ "profile": "https://example.org/profile/statuary" }

0 commit comments

Comments
 (0)