refs CesiumGS#5152 moved properties to pointCloudShading

Source/Scene/Cesium3DTileset.js

@@ -295,24 +295,6 @@ define([
  */
  this.shadows = defaultValue(options.shadows, ShadowMode.ENABLED);
 
- /**
- * Determines whether backfaces of points / mesh are hidden
- *
- * @type {boolean}
- * @default false
- */
- var backFaceCulling = defaultValue(options.backFaceCulling, false);
- this.backFaceCulling = new ConstantProperty(backFaceCulling);
-
- /**
- * Determines whether the tileset is lighted by the sun
- *
- * @type {boolean}
- * @default true
- */
- var normalShading = defaultValue(options.normalShading, true);
- this.normalShading = new ConstantProperty(normalShading);
-
  /**
  * Determines if the tileset will be shown.
  *

Source/Scene/PointCloud.js

@@ -147,14 +147,15 @@ define([
  this._quantizedRange = 0.0;
  this._octEncodedRange = 0.0;
 
+ this._pointCloudShading = defaultValue(options.shading, {
+ backFaceCulling : false,
+ normalShading : true
+ });
+
  // Use per-point normals to hide back-facing points.
- this.backFaceCulling = false;
- bindProperty(this, 'backFaceCulling', options.backFaceCulling);
  this._backFaceCulling = this.backFaceCulling;
 
  // Whether to enable normal shading
- this.normalShading = true;
- bindProperty(this, 'normalShading', options.normalShading);
  this._normalShading = this.normalShading;
 
  this._opaqueRenderState = undefined;
@@ -248,21 +249,23 @@ define([
  set : function(value) {
  this._boundingSphere = BoundingSphere.clone(value);
  }
+ },
+
+ backFaceCulling : {
+ get : function() {
+ return this._pointCloudShading.backFaceCulling;
+ }
+ },
+
+ normalShading : {
+ get : function() {
+ return this._pointCloudShading.normalShading;
+ }
  }
  });
 
  var sizeOfUint32 = Uint32Array.BYTES_PER_ELEMENT;
 
- function bindProperty(object, field, property) {
- if (property) {
- var val = property.getValue();
- object[field] = val;
- property.definitionChanged.addEventListener(function(newValue) {
- object[field] = newValue.getValue();
- });
- }
- }
-
  function initialize(pointCloud, options) {
  var arrayBuffer = options.arrayBuffer;
  var byteOffset = defaultValue(options.byteOffset, 0);
@@ -1142,6 +1145,7 @@ define([
  } else {
  vs += ' vec3 normal = a_normal; \n';
  }
+ vs += ' vec3 view_normal = czm_normal * normal; \n';
  } else {
  vs += ' vec3 normal = vec3(1.0); \n';
  }
@@ -1168,8 +1172,7 @@ define([
  vs += ' color = color * u_highlightColor; \n';
 
  if (usesNormals && normalShading) {
- vs += ' normal = czm_normal * normal; \n' +
- ' float diffuseStrength = czm_getLambertDiffuse(czm_sunDirectionEC, normal); \n' +
+ vs += ' float diffuseStrength = czm_getLambertDiffuse(czm_sunDirectionEC, view_normal); \n' +
  ' diffuseStrength = max(diffuseStrength, 0.4); \n' + // Apply some ambient lighting
  ' color.xyz *= diffuseStrength; \n';
  }
@@ -1178,7 +1181,7 @@ define([
  ' gl_Position = czm_modelViewProjection * vec4(position, 1.0); \n';
 
  if (usesNormals && backFaceCulling) {
- vs += ' float visible = step(-normal.z, 0.0); \n' +
+ vs += ' float visible = step(-view_normal.z, 0.0); \n' +
  ' gl_Position *= visible; \n' +
  ' gl_PointSize *= visible; \n';
  }

Source/Scene/PointCloud3DTileContent.js

@@ -71,8 +71,7 @@ define([
  uniformMapLoaded : getUniformMapLoaded(this),
  batchTableLoaded : getBatchTableLoaded(this),
  pickIdLoaded : getPickIdLoaded(this),
- normalShading : tileset.normalShading,
- backfaceCulling : tileset.backfaceCulling
+ shading : tileset.pointCloudShading
  });
  }
 

Source/Scene/PointCloudShading.js

@@ -76,6 +76,22 @@ define([
  * @default 1.0
  */
  this.eyeDomeLightingRadius = defaultValue(pointCloudShading.eyeDomeLightingRadius, 1.0);
+
+ /**
+ * Determines whether backfaces of points / mesh are hidden
+ *
+ * @type {boolean}
+ * @default false
+ */
+ this.backFaceCulling = defaultValue(pointCloudShading.backFaceCulling, false);
+
+ /**
+ * Determines whether the tileset is lighted by the sun
+ *
+ * @type {boolean}
+ * @default true
+ */
+ this.normalShading = defaultValue(pointCloudShading.normalShading, true);
  }
 
  /**

Source/Scene/TimeDynamicPointCloud.js

@@ -151,6 +151,9 @@ define([
  */
  this.style = options.style;
 
+ this.normalShading = options.normalShading;
+ this.backFaceCulling = options.backFaceCulling;
+
  /**
  * The event fired to indicate that a frame failed to load. A frame may fail to load if the
  * request for its uri fails or processing fails due to invalid content.
@@ -420,7 +423,8 @@ define([
  cull : true,
  fragmentShaderLoaded : getFragmentShaderLoaded,
  uniformMapLoaded : getUniformMapLoaded(that),
- pickIdLoaded : getPickIdLoaded
+ pickIdLoaded : getPickIdLoaded,
+ shading : that.shading
  });
  return frame.pointCloud.readyPromise;
  }).otherwise(handleFrameFailure(that, uri));