Skip to content

Fixes to IDs and retargeting. #73

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

Open
gjcope wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixes to IDs and retargeting. #73

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
16 changes: 8 additions & 8 deletions manifests/10_content_state/astronaut_comment_scope.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"summary": { "en": ["Viewer should render the model at the scene origin and two comment annotations, one targeting a point near the astronaut's glove and the other targeting a point near the astronaut's helmet. Each comment annotation has a specific camera position and view specified for it using content state scope for the annotation."] },
"items": [
{
"id": "https://example.org/iiif/scene1/page/p1/1",
"id": "https://example.org/iiif/scene1",
"type": "Scene",
"label": { "en": ["A Scene"] },
"items": [
Expand All @@ -23,7 +23,7 @@
"type": "Model",
"format": "model/gltf-binary"
},
"target": "https://example.org/iiif/scene1/page/p1/1"
"target": "https://example.org/iiif/scene1"
}
]
}
Expand All @@ -49,7 +49,7 @@
"type": "SpecificResource",
"source": [
{
"id": "https://example.org/iiif/scene1/page/p1/1",
"id": "https://example.org/iiif/scene1",
"type": "Scene"
}
],
Expand All @@ -67,7 +67,7 @@
"type": "Annotation",
"motivation": ["contentState"],
"target": {
"id": "https://example.org/iiif/scene1/page/p1/1",
"id": "https://example.org/iiif/scene1",
"type": "Scene",
"items": [
{
Expand Down Expand Up @@ -95,7 +95,7 @@
"type": "SpecificResource",
"source": [
{
"id": "https://example.org/iiif/scene1/page/p1/1",
"id": "https://example.org/iiif/scene1",
"type": "Scene"
}
],
Expand Down Expand Up @@ -133,7 +133,7 @@
"type": "SpecificResource",
"source": [
{
"id": "https://example.org/iiif/scene1/page/p1/1",
"id": "https://example.org/iiif/scene1",
"type": "Scene"
}
],
Expand All @@ -151,7 +151,7 @@
"type": "Annotation",
"motivation": ["contentState"],
"target": {
"id": "https://example.org/iiif/scene1/page/p1/1",
"id": "https://example.org/iiif/scene1",
"type": "Scene",
"items": [
{
Expand Down Expand Up @@ -179,7 +179,7 @@
"type": "SpecificResource",
"source": [
{
"id": "https://example.org/iiif/scene1/page/p1/1",
"id": "https://example.org/iiif/scene1",
"type": "Scene"
}
],
Expand Down
6 changes: 3 additions & 3 deletions manifests/10_content_state/whale_comment_scope_content_state.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"summary": { "en": ["Description TBA"] },
"items": [
{
"id": "https://example.org/iiif/scene1/page/p1/1",
"id": "https://example.org/iiif/scene1",
"type": "Scene",
"label": { "en": ["A Scene Containing a Whale Cranium and Mandible"] },
"items": [
Expand All @@ -27,7 +27,7 @@
"type": "SpecificResource",
"source": [
{
"id": "https://example.org/iiif/scene1/page/p1/1",
"id": "https://example.org/iiif/scene1",
"type": "Scene"
}
],
Expand All @@ -54,7 +54,7 @@
"type": "SpecificResource",
"source": [
{
"id": "https://example.org/iiif/scene1/page/p1/1",
"id": "https://example.org/iiif/scene1",
"type": "Scene"
}
],
Expand Down
4 changes: 2 additions & 2 deletions manifests/1_basic_model_in_scene/model_origin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"summary": { "en": ["Viewer should render the model at the scene origin, and then viewer should add default lighting and camera"] },
"items": [
{
"id": "https://example.org/iiif/scene1/page/p1/1",
"id": "https://example.org/iiif/scene1",
"type": "Scene",
"label": { "en": ["A Scene"] },
"items": [
Expand All @@ -23,7 +23,7 @@
"type": "Model",
"format": "model/gltf-binary"
},
"target": "https://example.org/iiif/scene1/page/p1/1"
"target": "https://example.org/iiif/scene1"
}
]
}
Expand Down
6 changes: 3 additions & 3 deletions manifests/1_basic_model_in_scene/model_origin_bgcolor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"@context": "http://iiif.io/api/presentation/4/context.json",
"id": "https://example.org/iiif/3d/model_origin.json",
"id": "https://example.org/iiif/3d/model_origin_bgcolor.json",
"type": "Manifest",
"label": { "en": ["Single Model with background color"] },
"summary": { "en": ["Viewer should render the model at the origin, with a background color of purple, and then viewer should add default lighting and camera"] },
"items": [
{
"id": "https://example.org/iiif/scene1/page/p1/1",
"id": "https://example.org/iiif/scene1",
"type": "Scene",
"label": { "en": ["A Scene"] },
"backgroundColor": "#FF00FE",
Expand All @@ -24,7 +24,7 @@
"type": "Model",
"format": "model/gltf-binary"
},
"target": "https://example.org/iiif/scene1/page/p1/1"
"target": "https://example.org/iiif/scene1"
}
]
}
Expand Down
10 changes: 5 additions & 5 deletions manifests/2_cameras/perspective_camera.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"@context": "http://iiif.io/api/presentation/4/context.json",
"id": "https://example.org/iiif/3d/model_origin.json",
"id": "https://example.org/iiif/3d/perspective_camera.json",
"type": "Manifest",
"label": { "en": ["Model with Explicit Perspective Camera"] },
"summary": { "en": ["Viewer should render the model at the scene origin, and the camera at the scene origin facing -Z, then add default lighting"] },
"items": [
{
"id": "https://example.org/iiif/scene1/page/p1/1",
"id": "https://example.org/iiif/scene1",
"type": "Scene",
"label": { "en": ["Scene with Model and Camera"] },
"items": [
Expand All @@ -23,18 +23,18 @@
"type": "Model",
"format": "model/gltf-binary"
},
"target": "https://example.org/iiif/scene1/page/p1/1"
"target": "https://example.org/iiif/scene1"
},
{
"id": "https://example.org/iiif/3d/anno1",
"id": "https://example.org/iiif/3d/anno2",
"type": "Annotation",
"motivation": ["painting"],
"body": {
"id": "https://example.org/iiif/3d/cameras/1",
"type": "PerspectiveCamera",
"label": {"en": ["Perspective Camera 1"]}
},
"target": "https://example.org/iiif/scene1/page/p1/1"
"target": "https://example.org/iiif/scene1"
}
]
}
Expand Down
8 changes: 4 additions & 4 deletions manifests/2_cameras/positioned_camera_lookat_anno.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"@context": "http://iiif.io/api/presentation/4/context.json",
"id": "https://example.org/iiif/3d/model_origin.json",
"id": "https://example.org/iiif/3d/positioned_camera_lookat_anno.json",
"type": "Manifest",
"label": { "en": ["Model with Explicit Perspective Camera Looking at an Annotation"] },
"summary": { "en": ["Viewer should render the model at the scene origin with a perspective camera looking in the direction of the Model Annotation, and add default lighting"] },
"items": [
{
"id": "https://example.org/iiif/scene1/page/p1/1",
"id": "https://example.org/iiif/scene1",
"type": "Scene",
"label": { "en": ["Scene with Model and Camera"] },

Expand All @@ -24,7 +24,7 @@
"type": "Model",
"format": "model/gltf-binary"
},
"target": "https://example.org/iiif/scene1/page/p1/1"
"target": "https://example.org/iiif/scene1"
},
{
"id": "https://example.org/iiif/3d/anno2",
Expand All @@ -43,7 +43,7 @@
"type": "SpecificResource",
"source": [
{
"id": "https://example.org/iiif/scene1/page/p1/1",
"id": "https://example.org/iiif/scene1",
"type": "Scene"
}
],
Expand Down
8 changes: 4 additions & 4 deletions manifests/2_cameras/positioned_camera_lookat_point.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"@context": "http://iiif.io/api/presentation/4/context.json",
"id": "https://example.org/iiif/3d/model_origin.json",
"id": "https://example.org/iiif/3d/positioned_camera_lookat_point.json",
"type": "Manifest",
"label": { "en": ["Model with Explicit Perspective Camera Looking at a Point"] },
"summary": { "en": ["Viewer should render the model at the scene origin with a perspective camera looking toward the PointSelector coordinates, and add default lighting"] },
"items": [
{
"id": "https://example.org/iiif/scene1/page/p1/1",
"id": "https://example.org/iiif/scene1",
"type": "Scene",
"label": { "en": ["Scene with a Model and Camera Looking at a Point"] },

Expand All @@ -24,7 +24,7 @@
"type": "Model",
"format": "model/gltf-binary"
},
"target": "https://example.org/iiif/scene1/page/p1/1"
"target": "https://example.org/iiif/scene1"
},
{
"id": "https://example.org/iiif/3d/anno2",
Expand All @@ -45,7 +45,7 @@
"type": "SpecificResource",
"source": [
{
"id": "https://example.org/iiif/scene1/page/p1/1",
"id": "https://example.org/iiif/scene1",
"type": "Scene"
}
],
Expand Down
10 changes: 5 additions & 5 deletions manifests/3_lights/ambient_green_light.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"@context": "http://iiif.io/api/presentation/4/context.json",
"id": "https://example.org/iiif/3d/model_origin.json",
"id": "https://example.org/iiif/3d/ambient_green_light.json",
"type": "Manifest",
"label": { "en": ["Model with Green AmbientLight"] },
"summary": { "en": ["Viewer should render the model at the scene origin with green AmbientLight, and add default camera"] },
"items": [
{
"id": "https://example.org/iiif/scene1/page/p1/1",
"id": "https://example.org/iiif/scene1",
"type": "Scene",
"label": { "en": ["Scene with Model and AmbientLight"] },
"items": [
Expand All @@ -23,20 +23,20 @@
"type": "Model",
"format": "model/gltf-binary"
},
"target": "https://example.org/iiif/scene1/page/p1/1"
"target": "https://example.org/iiif/scene1"
},
{
"id": "https://example.org/iiif/3d/anno2",
"type": "Annotation",
"motivation": ["painting"],
"body": {
"id": "https://example.org/iiif/3d/cameras/1",
"id": "https://example.org/iiif/3d/lights/1",
"type": "AmbientLight",
"label": {"en": ["Ambient Green Light"]},
"color": "#00FF00",
"intensity": {"type": "Value", "value": 0.5, "unit": "relative"}
},
"target": "https://example.org/iiif/scene1/page/p1/1"
"target": "https://example.org/iiif/scene1"
}
]
}
Expand Down
8 changes: 4 additions & 4 deletions manifests/3_lights/direction_light_lookat_positioned.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"@context": "http://iiif.io/api/presentation/4/context.json",
"id": "https://example.org/iiif/3d/model_origin.json",
"id": "https://example.org/iiif/3d/direction_light_lookat_positioned.json",
"type": "Manifest",
"label": { "en": ["Model with DirectionalLight"] },
"summary": { "en": ["Viewer should render the model at the scene origin with a DirectionalLight positioned at the point in the Scene defined by the PointSelector and facing the the Model, then add default camera"] },
"items": [
{
"id": "https://example.org/iiif/scene1/page/p1/1",
"id": "https://example.org/iiif/scene1",
"type": "Scene",
"label": { "en": ["Scene with Model and DirectionalLight"] },

Expand All @@ -24,7 +24,7 @@
"type": "Model",
"format": "model/gltf-binary"
},
"target": "https://example.org/iiif/scene1/page/p1/1"
"target": "https://example.org/iiif/scene1"
},
{
"id": "https://example.org/iiif/3d/anno2",
Expand All @@ -42,7 +42,7 @@
"target": {
"type": "SpecificResource",
"source": {
"id": "https://example.org/iiif/scene1/page/p1/1",
"id": "https://example.org/iiif/scene1",
"type": "Scene"
},
"selector": [
Expand Down
8 changes: 4 additions & 4 deletions manifests/3_lights/direction_light_transform_rotate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"@context": "http://iiif.io/api/presentation/4/context.json",
"id": "https://example.org/iiif/3d/model_origin.json",
"id": "https://example.org/iiif/3d/direction_light_transform_rotate.json",
"type": "Manifest",
"label": { "en": ["Model with Rotated DirectionalLight"] },
"summary": { "en": ["Viewer should render the model at the scene origin with a DirectionalLight rotated 30 degrees on the x axis, then add default camera"] },
"items": [
{
"id": "https://example.org/iiif/scene1/page/p1/1",
"id": "https://example.org/iiif/scene1",
"type": "Scene",
"label": { "en": ["Scene with Model and Rotated DirectionalLight"] },

Expand All @@ -24,7 +24,7 @@
"type": "Model",
"format": "model/gltf-binary"
},
"target": "https://example.org/iiif/scene1/page/p1/1"
"target": "https://example.org/iiif/scene1"
},
{
"id": "https://example.org/iiif/3d/anno2",
Expand All @@ -49,7 +49,7 @@
]
},
"target": {
"id": "https://example.org/iiif/scene1/page/p1/1",
"id": "https://example.org/iiif/scene1",
"type": "Scene"
}
}
Expand Down
4 changes: 2 additions & 2 deletions manifests/4_transform_and_position/model_position.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"summary": { "en": ["Viewer should render the model at (-1,0,1), and then viewer should add default lighting and camera"] },
"items": [
{
"id": "https://example.org/iiif/scene1/page/p1/1",
"id": "https://example.org/iiif/scene1",
"type": "Scene",
"label": { "en": ["A Scene"] },
"items": [
Expand All @@ -27,7 +27,7 @@
"type": "SpecificResource",
"source": [
{
"id": "https://example.org/iiif/scene1/page/p1/1",
"id": "https://example.org/iiif/scene1",
"type": "Scene"
}
],
Expand Down
6 changes: 3 additions & 3 deletions manifests/4_transform_and_position/model_transform_negative_scale_position.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"summary": { "en": ["Viewer should render the model twice, once at normal scale and once at normal scale but mirrored. Then the viewer should add default lighting and camera"] },
"items": [
{
"id": "https://example.org/iiif/scene1/page/p1/1",
"id": "https://example.org/iiif/scene1",
"type": "Scene",
"label": { "en": ["A Scene"] },
"items": [
Expand All @@ -27,7 +27,7 @@
"type": "SpecificResource",
"source": [
{
"id": "https://example.org/iiif/scene1/page/p1/1",
"id": "https://example.org/iiif/scene1",
"type": "Scene"
}
],
Expand Down Expand Up @@ -67,7 +67,7 @@
"type": "SpecificResource",
"source": [
{
"id": "https://example.org/iiif/scene1/page/p1/1",
"id": "https://example.org/iiif/scene1",
"type": "Scene"
}
],
Expand Down
Loading