From 0cf4141d7dddfcaf5399bc99306a7426b561953c Mon Sep 17 00:00:00 2001 From: Cosmic Linden Date: Mon, 4 Mar 2024 14:44:41 -0800 Subject: secondlife/viewer#712: Add/update test plans for PBR terrain composition --- doc/testplans/pbr_terrain_composition.md | 59 ++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 doc/testplans/pbr_terrain_composition.md (limited to 'doc/testplans/pbr_terrain_composition.md') diff --git a/doc/testplans/pbr_terrain_composition.md b/doc/testplans/pbr_terrain_composition.md new file mode 100644 index 0000000000..127fe950a8 --- /dev/null +++ b/doc/testplans/pbr_terrain_composition.md @@ -0,0 +1,59 @@ +# PBR Terrain Composition + +## Feature Availability + +PBR Terrain is visible for all viewers with the PBR Terrain feature, regardless of if the feature flag is enabled. + +There is only one set of four asset IDs applied to the terrain. In other words, unlike PBR materials on prims, there is no fallback texture set for viewers that do not support PBR terrain. Viewers without support will view terrain as blank (solid grey or white). + +## Editing Terrain Composition + +All tests in this section assume the PBR terrain feature flag is enabled, and that the user has appropriate permissions to modify the terrain textures. + +### Feature Availability + +When the PBR terrain feature flag is disabled: + +- The "PBR Metallic Roughness" checkbox should not be visible +- The user should not be able to apply PBR terrain to the region, only textures. + +When the PBR terrain feature flag is enabled: + +- The "PBR Metallic Roughness" checkbox should be visible +- The user should be able to apply PBR terrain or textures to the region, depending on if the "PBR Metallic Roughness" checkbox is checked. + +### Current Composition Type + +When the Region/Estate floater is opened to the terrain Tab, the current terrain should be shown in the four swatches, and the "PBR Metallic Roughness" checkbox should be checked or unchecked accordingly. + +- If it is texture terrain, the "PBR Metallic Roughness" checkbox should be unchecked, and the floater should display the four textures applied to the terrain. +- If it is material terrain, the "PBR Metallic Roughness" checkbox should be checked, and the floater should display the four materials applied to the terrain. + +### Toggling Composition Type + +When toggling the "PBR Metallic Roughness" checkbox to the opposite value, which does not correspond to the current terrain type, one of the following sets of four terrain swatches will be displayed: + +- The default textures/materials + - For textures, this is the default terrain texture set + - For materials, this is blank/null, but this is subject to change +- The previously applied texture/material set + - History is available on a best-effort basis only. In particular, the history does not persist on viewer restart. + +When toggling back the "PBR Metallic Roughness" checkbox to the original value, assuming nothing else has changed, then the current terrain should be shown in the four swatches again. + +### Saving Composition + +A user with appropriate permissions can change and save the textures or materials to the terrain. If the "PBR Metallic Roughness" checkbox is checked, the user applies materials, otherwise the user applies textures. + +Saving may fail for the following reasons: + +- A terrain or material texture is invalid or null +- A terrain texture is greater than 1024 resolution (Subject to change. See https://github.com/secondlife/viewer/issues/760) + +Unlike a viewer without PBR terrain support, the new viewer will no longer treat textures with alpha channels as invalid. + +## Graphics Features + +Texture terrain with transparency will render as opaque. Parts of the texture that would be partially transparent will instead display as a mix of the color and black, depending on how transparent the texture is. + +See [PBR Terrain Feature Gating](./pbr_terrain_feature_gating.md) for supported PBR terrain features. -- cgit v1.2.3 From 1a539523e292aa28fe8e07e9f30d70acb4e67b8f Mon Sep 17 00:00:00 2001 From: Cosmic Linden Date: Wed, 13 Mar 2024 16:18:19 -0700 Subject: secondlife/viewer#76: Update test plan to specify that terrain composition labels should match the current context --- doc/testplans/pbr_terrain_composition.md | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc/testplans/pbr_terrain_composition.md') diff --git a/doc/testplans/pbr_terrain_composition.md b/doc/testplans/pbr_terrain_composition.md index 127fe950a8..524583aa7a 100644 --- a/doc/testplans/pbr_terrain_composition.md +++ b/doc/testplans/pbr_terrain_composition.md @@ -29,6 +29,8 @@ When the Region/Estate floater is opened to the terrain Tab, the current terrain - If it is texture terrain, the "PBR Metallic Roughness" checkbox should be unchecked, and the floater should display the four textures applied to the terrain. - If it is material terrain, the "PBR Metallic Roughness" checkbox should be checked, and the floater should display the four materials applied to the terrain. +In addition, where possible, textual labels and descriptions in the tab should make sense given the current value of the "PBR Metallic Roughness" checkbox. If the checkbox is unchecked, the labels should refer to textures. If the checkbox is checked, the labels should refer to materials. + ### Toggling Composition Type When toggling the "PBR Metallic Roughness" checkbox to the opposite value, which does not correspond to the current terrain type, one of the following sets of four terrain swatches will be displayed: -- cgit v1.2.3 From 72987ac256c8c906eb51d002942332279250284a Mon Sep 17 00:00:00 2001 From: Cosmic Linden Date: Fri, 15 Mar 2024 12:48:45 -0700 Subject: secondlife/viewer#760: Update test plan for terrain texture max resolution validation --- doc/testplans/pbr_terrain_composition.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/testplans/pbr_terrain_composition.md') diff --git a/doc/testplans/pbr_terrain_composition.md b/doc/testplans/pbr_terrain_composition.md index 524583aa7a..8cc5560f64 100644 --- a/doc/testplans/pbr_terrain_composition.md +++ b/doc/testplans/pbr_terrain_composition.md @@ -50,7 +50,7 @@ A user with appropriate permissions can change and save the textures or material Saving may fail for the following reasons: - A terrain or material texture is invalid or null -- A terrain texture is greater than 1024 resolution (Subject to change. See https://github.com/secondlife/viewer/issues/760) +- A terrain texture is greater than the max texture upload resolution Unlike a viewer without PBR terrain support, the new viewer will no longer treat textures with alpha channels as invalid. -- cgit v1.2.3 From cc6175274c9520b61d7b87f124168e8a85e3bc48 Mon Sep 17 00:00:00 2001 From: Cosmic Linden Date: Fri, 15 Mar 2024 16:14:13 -0700 Subject: secondlife/viewer#906: Fix broken test plan link --- doc/testplans/pbr_terrain_composition.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/testplans/pbr_terrain_composition.md') diff --git a/doc/testplans/pbr_terrain_composition.md b/doc/testplans/pbr_terrain_composition.md index 8cc5560f64..05431ab4bf 100644 --- a/doc/testplans/pbr_terrain_composition.md +++ b/doc/testplans/pbr_terrain_composition.md @@ -58,4 +58,4 @@ Unlike a viewer without PBR terrain support, the new viewer will no longer treat Texture terrain with transparency will render as opaque. Parts of the texture that would be partially transparent will instead display as a mix of the color and black, depending on how transparent the texture is. -See [PBR Terrain Feature Gating](./pbr_terrain_feature_gating.md) for supported PBR terrain features. +See [PBR Terrain Appearance](./pbr_terrain_appearance.md) for supported PBR terrain features. -- cgit v1.2.3 From 3caf96b9ad10bb3c6afe5b067697809ecee51e90 Mon Sep 17 00:00:00 2001 From: Cosmic Linden Date: Mon, 18 Mar 2024 13:26:41 -0700 Subject: secondlife/viewer#1006: Update test plan --- doc/testplans/pbr_terrain_composition.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'doc/testplans/pbr_terrain_composition.md') diff --git a/doc/testplans/pbr_terrain_composition.md b/doc/testplans/pbr_terrain_composition.md index 05431ab4bf..0e721c064a 100644 --- a/doc/testplans/pbr_terrain_composition.md +++ b/doc/testplans/pbr_terrain_composition.md @@ -37,7 +37,7 @@ When toggling the "PBR Metallic Roughness" checkbox to the opposite value, which - The default textures/materials - For textures, this is the default terrain texture set - - For materials, this is blank/null, but this is subject to change + - For materials, this is all blank materials, but this is subject to change - The previously applied texture/material set - History is available on a best-effort basis only. In particular, the history does not persist on viewer restart. @@ -47,11 +47,15 @@ When toggling back the "PBR Metallic Roughness" checkbox to the original value, A user with appropriate permissions can change and save the textures or materials to the terrain. If the "PBR Metallic Roughness" checkbox is checked, the user applies materials, otherwise the user applies textures. +The user should not be allowed to set the texture or material swatches to null. + Saving may fail for the following reasons: -- A terrain or material texture is invalid or null +- A terrain or material texture is invalid - A terrain texture is greater than the max texture upload resolution +If saving the terrain fails for any reason, the terrain should not be updated. + Unlike a viewer without PBR terrain support, the new viewer will no longer treat textures with alpha channels as invalid. ## Graphics Features -- cgit v1.2.3 From e2a3edf6daed276d82767ce070dbbaf1d42dc427 Mon Sep 17 00:00:00 2001 From: Cosmic Linden Date: Tue, 19 Mar 2024 16:13:04 -0700 Subject: secondlife/viewer-issues#82: Update test plan --- doc/testplans/pbr_terrain_composition.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/testplans/pbr_terrain_composition.md') diff --git a/doc/testplans/pbr_terrain_composition.md b/doc/testplans/pbr_terrain_composition.md index 0e721c064a..87c1d47780 100644 --- a/doc/testplans/pbr_terrain_composition.md +++ b/doc/testplans/pbr_terrain_composition.md @@ -60,6 +60,6 @@ Unlike a viewer without PBR terrain support, the new viewer will no longer treat ## Graphics Features -Texture terrain with transparency will render as opaque. Parts of the texture that would be partially transparent will instead display as a mix of the color and black, depending on how transparent the texture is. +Texture terrain with transparency is not permitted to be applied in the viewer. See [PBR Terrain Appearance](./pbr_terrain_appearance.md) for supported PBR terrain features. -- cgit v1.2.3 From 72594038c0ede691f9be293b636fd9c6e1b7e0ee Mon Sep 17 00:00:00 2001 From: Cosmic Linden Date: Wed, 20 Mar 2024 17:11:20 -0700 Subject: secondlife/viewer#1027: Update test plan --- doc/testplans/pbr_terrain_composition.md | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc/testplans/pbr_terrain_composition.md') diff --git a/doc/testplans/pbr_terrain_composition.md b/doc/testplans/pbr_terrain_composition.md index 87c1d47780..1cd26a0ded 100644 --- a/doc/testplans/pbr_terrain_composition.md +++ b/doc/testplans/pbr_terrain_composition.md @@ -63,3 +63,7 @@ Unlike a viewer without PBR terrain support, the new viewer will no longer treat Texture terrain with transparency is not permitted to be applied in the viewer. See [PBR Terrain Appearance](./pbr_terrain_appearance.md) for supported PBR terrain features. + +## Minimap + +The minimap should display the terrain with appropriate textures and colors. -- cgit v1.2.3 From e2da41a75901ec2b0a97a92721043737b2bc057c Mon Sep 17 00:00:00 2001 From: Cosmic Linden Date: Wed, 3 Apr 2024 10:28:19 -0700 Subject: secondlife/viewer#773: Improve test plan for PBR terrain feature flag --- doc/testplans/pbr_terrain_composition.md | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'doc/testplans/pbr_terrain_composition.md') diff --git a/doc/testplans/pbr_terrain_composition.md b/doc/testplans/pbr_terrain_composition.md index 1cd26a0ded..aadd97a94b 100644 --- a/doc/testplans/pbr_terrain_composition.md +++ b/doc/testplans/pbr_terrain_composition.md @@ -12,6 +12,13 @@ All tests in this section assume the PBR terrain feature flag is enabled, and th ### Feature Availability +On the client, the advanced setting `RenderTerrainPBREnabled` is the PBR terrain feature flag. + +The PBR terrain feature flag should be set automatically when logging in/teleporting to a new region. + +- The flag should be enabled on regions where the PBR terrain feature is enabled +- Otherwise the flag should be disabled + When the PBR terrain feature flag is disabled: - The "PBR Metallic Roughness" checkbox should not be visible -- cgit v1.2.3