From 12833b9c9379c76abab2b55a19709220110960d6 Mon Sep 17 00:00:00 2001 From: HifiExperiments Date: Tue, 6 Jul 2021 19:13:33 -0700 Subject: [PATCH] CR and percent decoding --- .../entities/src/EntityItemProperties.cpp | 4 ++-- .../src/material-networking/TextureCache.cpp | 2 +- .../procedural/src/procedural/Procedural.h | 2 +- .../procedural/ProceduralMaterialCache.cpp | 20 +++++++++---------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp index fe4c960bd6..945804a0fc 100644 --- a/libraries/entities/src/EntityItemProperties.cpp +++ b/libraries/entities/src/EntityItemProperties.cpp @@ -1380,8 +1380,8 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const { /*@jsdoc * The "Web" {@link Entities.EntityType|EntityType} displays a browsable web page. Each user views their own copy * of the web page: if one user navigates to another page on the entity, other users do not see the change; if a video is being - * played, users don't see it in sync. Internally, a Web Entity is rendered as a non-repeating, upside down texture, so additional - * transformations may be necessary if you reference a web entity texture by UUID. It has properties in addition to the common + * played, users don't see it in sync. Internally, a Web entity is rendered as a non-repeating, upside down texture, so additional + * transformations may be necessary if you reference a Web entity texture by UUID. It has properties in addition to the common * {@link Entities.EntityProperties|EntityProperties}. * * @typedef {object} Entities.EntityProperties-Web diff --git a/libraries/material-networking/src/material-networking/TextureCache.cpp b/libraries/material-networking/src/material-networking/TextureCache.cpp index 489692e3e2..0307e38cc9 100644 --- a/libraries/material-networking/src/material-networking/TextureCache.cpp +++ b/libraries/material-networking/src/material-networking/TextureCache.cpp @@ -254,7 +254,7 @@ NetworkTexturePointer TextureCache::getTexture(const QUrl& url, image::TextureUs if (url.scheme() == RESOURCE_SCHEME) { return getResourceTexture(url); } - QString decodedURL = url.toDisplayString(QUrl::FullyDecoded); + QString decodedURL = QUrl::fromPercentEncoding(url.toEncoded()); if (decodedURL.startsWith("{")) { return getTextureByUUID(decodedURL); } diff --git a/libraries/procedural/src/procedural/Procedural.h b/libraries/procedural/src/procedural/Procedural.h index d6971e3cdf..39c619c687 100644 --- a/libraries/procedural/src/procedural/Procedural.h +++ b/libraries/procedural/src/procedural/Procedural.h @@ -40,7 +40,7 @@ const size_t MAX_PROCEDURAL_TEXTURE_CHANNELS{ 4 }; * If a procedural material contains a vertex shader, the bounding box of the material entity is used to cull the object to which the material is applied. * @property {string} fragmentShaderURL - A link to a fragment shader. Currently, only GLSL shaders are supported. The shader must implement a different method depending on the version. * shaderUrl is an alias. - * @property {string[]} channels=[] - An array of input texture URLs or entity IDs. Currently, up to 4 are supported. An entity ID may be that of an Image or a Web entity. + * @property {string[]} channels=[] - An array of input texture URLs or entity IDs. Currently, up to 4 are supported. An entity ID may be that of an Image or Web entity. * @property {ProceduralUniforms} uniforms={} - A {@link ProceduralUniforms} object containing all the custom uniforms to be passed to the shader. */ diff --git a/libraries/procedural/src/procedural/ProceduralMaterialCache.cpp b/libraries/procedural/src/procedural/ProceduralMaterialCache.cpp index 58fec1f002..d99f74769c 100644 --- a/libraries/procedural/src/procedural/ProceduralMaterialCache.cpp +++ b/libraries/procedural/src/procedural/ProceduralMaterialCache.cpp @@ -150,13 +150,13 @@ NetworkMaterialResource::ParsedMaterials NetworkMaterialResource::parseMaterialF * @property {number|string} scattering - The scattering, range 0.0 – 1.0. * Set to "fallthrough" to fall through to the material below. "hifi_pbr" model only. * @property {string} emissiveMap - The URL of the emissive texture image, or an entity ID. An entity ID may be that of an - * Image or a Web entity. Set to "fallthrough" to fall through to the material below. + * Image or Web entity. Set to "fallthrough" to fall through to the material below. * "hifi_pbr" model only. * @property {string} albedoMap - The URL of the albedo texture image, or an entity ID. An entity ID may be that of an Image - * or a Web entity. Set to "fallthrough" to fall through to the material below. "hifi_pbr" + * or Web entity. Set to "fallthrough" to fall through to the material below. "hifi_pbr" * model only. * @property {string} opacityMap - The URL of the opacity texture image, or an entity ID. An entity ID may be that of an Image - * or a Web entity. Set the value the same as the albedoMap value for transparency. + * or Web entity. Set the value the same as the albedoMap value for transparency. * "hifi_pbr" model only. * @property {string} opacityMapMode - The mode defining the interpretation of the opacity map. Values can be: *