From 1a42722d99119526fbe0819433f973f22d27ea08 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 1 Mar 2018 10:50:40 +1300 Subject: [PATCH] Fix Material roughnessMap etc. JSDoc --- .../src/model-networking/MaterialCache.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libraries/model-networking/src/model-networking/MaterialCache.cpp b/libraries/model-networking/src/model-networking/MaterialCache.cpp index d1172560a1..de5b3023ae 100644 --- a/libraries/model-networking/src/model-networking/MaterialCache.cpp +++ b/libraries/model-networking/src/model-networking/MaterialCache.cpp @@ -119,16 +119,16 @@ NetworkMaterialResource::ParsedMaterials NetworkMaterialResource::parseJSONMater * @property {string} albedoMap - URL of albedo texture image. * @property {string} opacityMap - URL of opacity texture image. Set value the same as the albedoMap value for * transparency. - * @property {string} roughnessMap - URL of roughness texture image. - * @property {string} glossMap - Synonym for roughnessMap. - * @property {string} metallicMap - URL of metallic texture image. - * @property {string} specularMap - Synonym for metallicMap. - * @property {string} normalMap - URL of normal texture image. - * @property {string} bumpMap - Synonym for normalMap. + * @property {string} roughnessMap - URL of roughness texture image. Can use this or glossMap, but not both. + * @property {string} glossMap - URL of gloss texture image. Can use this or roughnessMap, but not both. + * @property {string} metallicMap - URL of metallic texture image. Can use this or specularMap, but not both. + * @property {string} specularMap - URL of specular texture image. Can use this or metallicMap, but not both. + * @property {string} normalMap - URL of normal texture image. Can use this or bumpMap, but not both. + * @property {string} bumpMap - URL of bump texture image. Can use this or normalMap, but not both. * @property {string} occlusionMap - URL of occlusion texture image. * @property {string} scatteringMap - URL of scattering texture image. Only used if normalMap or * bumpMap is specified. - * @property {string} lightMap - URL of light texture image. Currently not used. + * @property {string} lightMap - URL of light map texture image. Currently not used. */ // Note: See MaterialEntityItem.h for default values used in practice. std::pair> NetworkMaterialResource::parseJSONMaterial(const QJsonObject& materialJSON) {