From 0bee5edc47c6e7eb0c58a321c5aeddf78b6a3d07 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sat, 22 Jun 2019 08:41:30 +1200 Subject: [PATCH] Fix documentation of Material's albedo and emissive property values --- .../src/material-networking/MaterialCache.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libraries/material-networking/src/material-networking/MaterialCache.cpp b/libraries/material-networking/src/material-networking/MaterialCache.cpp index af1a868647..4f6d149fbe 100644 --- a/libraries/material-networking/src/material-networking/MaterialCache.cpp +++ b/libraries/material-networking/src/material-networking/MaterialCache.cpp @@ -114,15 +114,16 @@ NetworkMaterialResource::ParsedMaterials NetworkMaterialResource::parseJSONMater * @property {string} model="hifi_pbr" - Different material models support different properties and rendering modes. * Supported models are: "hifi_pbr". * @property {string} name="" - A name for the material. Supported by all material models. - * @property {Color|RGBS|string} emissive - The emissive color, i.e., the color that the material emits. A {@link Color} value - * is treated as sRGB. A {@link RGBS} value can be either RGB or sRGB. + * @property {ColorFloat|RGBS|string} emissive - The emissive color, i.e., the color that the material emits. A + * {@link ColorFloat} value is treated as sRGB and must have component values in the range 0.0 — + * 1.0. A {@link RGBS} value can be either RGB or sRGB. * Set to "fallthrough" to fall through to the material below. "hifi_pbr" model only. * @property {number|string} opacity=1.0 - The opacity, range 0.01.0. * Set to "fallthrough" to fall through to the material below. "hifi_pbr" model only. * @property {boolean|string} unlit=false - If true, the material is not lit, otherwise it is. * Set to "fallthrough" to fall through to the material below. "hifi_pbr" model only. - * @property {Color|RGBS|string} albedo - The albedo color. A {@link Color} value is treated as sRGB. A {@link RGBS} value can - * be either RGB or sRGB. + * @property {ColorFloat|RGBS|string} albedo - The albedo color. A {@link ColorFloat} value is treated as sRGB and must have + * component values in the range 0.01.0. A {@link RGBS} value can be either RGB or sRGB. * Set to "fallthrough" to fall through to the material below. "hifi_pbr" model only. * @property {number|string} roughness - The roughness, range 0.01.0. * Set to "fallthrough" to fall through to the material below. "hifi_pbr" model only.