From 8d03c0e5fc39ac57935e7a77d8b8f99ba3f6aba8 Mon Sep 17 00:00:00 2001 From: Sean Lilley Date: Fri, 31 May 2019 09:03:51 -0400 Subject: [PATCH 1/2] Add clarying doc about node transformation additive vs. replacement --- Source/DataSources/ModelGraphics.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/DataSources/ModelGraphics.js b/Source/DataSources/ModelGraphics.js index 0e357b380c86..6026ad383832 100644 --- a/Source/DataSources/ModelGraphics.js +++ b/Source/DataSources/ModelGraphics.js @@ -46,7 +46,7 @@ define([ * @param {Property} [options.incrementallyLoadTextures=true] Determine if textures may continue to stream in after the model is loaded. * @param {Property} [options.runAnimations=true] A boolean Property specifying if glTF animations specified in the model should be started. * @param {Property} [options.clampAnimations=true] A boolean Property specifying if glTF animations should hold the last pose for time durations with no keyframes. - * @param {PropertyBag} [options.nodeTransformations] An object, where keys are names of nodes, and values are {@link TranslationRotationScale} Properties describing the transformation to apply to that node. + * @param {PropertyBag} [options.nodeTransformations] An object, where keys are names of nodes, and values are {@link TranslationRotationScale} Properties describing the transformation to apply to that node. The transformation is applied before the node's existing transformation as specified in the glTF, and does not replace the node's existing transformation. * @param {Property} [options.shadows=ShadowMode.ENABLED] An enum Property specifying whether the model casts or receives shadows from each light source. * @param {Property} [options.heightReference=HeightReference.NONE] A Property specifying what the height is relative to. * @param {Property} [options.distanceDisplayCondition] A Property specifying at what distance from the camera that this model will be displayed. @@ -201,6 +201,7 @@ define([ /** * Gets or sets the set of node transformations to apply to this model. This is represented as an {@link PropertyBag}, where keys are * names of nodes, and values are {@link TranslationRotationScale} Properties describing the transformation to apply to that node. + * The transformation is applied before the node's existing transformation as specified in the glTF, and does not replace the node's existing transformation. * @memberof ModelGraphics.prototype * @type {PropertyBag} */ From ecde985c5a678ce01c943cdb999bc51c86642b7b Mon Sep 17 00:00:00 2001 From: Sean Lilley Date: Fri, 31 May 2019 09:18:22 -0400 Subject: [PATCH 2/2] Fix --- Source/DataSources/ModelGraphics.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/DataSources/ModelGraphics.js b/Source/DataSources/ModelGraphics.js index 6026ad383832..2039fa13944e 100644 --- a/Source/DataSources/ModelGraphics.js +++ b/Source/DataSources/ModelGraphics.js @@ -46,7 +46,7 @@ define([ * @param {Property} [options.incrementallyLoadTextures=true] Determine if textures may continue to stream in after the model is loaded. * @param {Property} [options.runAnimations=true] A boolean Property specifying if glTF animations specified in the model should be started. * @param {Property} [options.clampAnimations=true] A boolean Property specifying if glTF animations should hold the last pose for time durations with no keyframes. - * @param {PropertyBag} [options.nodeTransformations] An object, where keys are names of nodes, and values are {@link TranslationRotationScale} Properties describing the transformation to apply to that node. The transformation is applied before the node's existing transformation as specified in the glTF, and does not replace the node's existing transformation. + * @param {PropertyBag} [options.nodeTransformations] An object, where keys are names of nodes, and values are {@link TranslationRotationScale} Properties describing the transformation to apply to that node. The transformation is applied after the node's existing transformation as specified in the glTF, and does not replace the node's existing transformation. * @param {Property} [options.shadows=ShadowMode.ENABLED] An enum Property specifying whether the model casts or receives shadows from each light source. * @param {Property} [options.heightReference=HeightReference.NONE] A Property specifying what the height is relative to. * @param {Property} [options.distanceDisplayCondition] A Property specifying at what distance from the camera that this model will be displayed. @@ -201,7 +201,7 @@ define([ /** * Gets or sets the set of node transformations to apply to this model. This is represented as an {@link PropertyBag}, where keys are * names of nodes, and values are {@link TranslationRotationScale} Properties describing the transformation to apply to that node. - * The transformation is applied before the node's existing transformation as specified in the glTF, and does not replace the node's existing transformation. + * The transformation is applied after the node's existing transformation as specified in the glTF, and does not replace the node's existing transformation. * @memberof ModelGraphics.prototype * @type {PropertyBag} */