Merge branch 'master' into ibl

Author: lilleyse

.idea/codeStyles/Project.xml

@@ -18,6 +18,7 @@ Change Log
 
 ##### Fixes :wrench:
 * Fixed issue causing polyline to look wavy depending on the position of the camera [#7209](https://github.com/AnalyticalGraphicsInc/cesium/pull/7209)
+* Fixed translucency issues for dynamic geometry entities. [#7364](https://github.com/AnalyticalGraphicsInc/cesium/issues/7364)
 
 ### 1.51 - 2018-11-01
 

CHANGES.md

@@ -117,6 +117,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
    * [Chris Cooper](https://github.com/chris-cooper)
    * [Andrew McDowell](https://github.com/madole)
    * [Tony Luk](https://github.com/impactblue573)
+   * [Daniel Cooper](https://github.com/moodragon46)
 * [GeoFS](https://www.geo-fs.com)
    * [Xavier Tassin](https://github.com/xtassin/)
 

CONTRIBUTORS.md

@@ -9,7 +9,7 @@ define([
     'use strict';
 
     var defaultTokenCredit;
-    var defaultAccessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI3OTM1ODdhMS1hOTliLTRkZDYtYmI4Ny0wYmM0MzI2ZDU4NTAiLCJpZCI6MjU5LCJzY29wZXMiOlsiYXNyIiwiZ2MiXSwiaWF0IjoxNTQxMDk4NzIxfQ.AqAyuEacuEItRBMDBPpwmhJXEjyZB0b69L3ixapXcF0';
+    var defaultAccessToken = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI3ODRkMGNmYS1iYmMwLTQ5MjgtYTYzOC1lYzMzNDk2YjIyMGUiLCJpZCI6MjU5LCJzY29wZXMiOlsiYXNyIiwiZ2MiXSwiaWF0IjoxNTQzODQ5NzQ1fQ.80vzOtxheq1XsMJOKrSRdh3ybJu1XttfE7P47UxGxpY';
 
     /**
      * Default settings for accessing the Cesium ion API.

Source/Core/Ion.js

@@ -139,7 +139,7 @@ define([
         }
 
         var button = event.button;
-        screenSpaceEventHandler._buttonDown = button;
+        screenSpaceEventHandler._buttonDown[button] = true;
 
         var screenSpaceEventType;
         if (button === MouseButton.LEFT) {
@@ -176,29 +176,7 @@ define([
         position : new Cartesian2()
     };
 
-    function handleMouseUp(screenSpaceEventHandler, event) {
-        if (!canProcessMouseEvent(screenSpaceEventHandler)) {
-            return;
-        }
-
-        var button = event.button;
-        screenSpaceEventHandler._buttonDown = undefined;
-
-        var screenSpaceEventType;
-        var clickScreenSpaceEventType;
-        if (button === MouseButton.LEFT) {
-            screenSpaceEventType = ScreenSpaceEventType.LEFT_UP;
-            clickScreenSpaceEventType = ScreenSpaceEventType.LEFT_CLICK;
-        } else if (button === MouseButton.MIDDLE) {
-            screenSpaceEventType = ScreenSpaceEventType.MIDDLE_UP;
-            clickScreenSpaceEventType = ScreenSpaceEventType.MIDDLE_CLICK;
-        } else if (button === MouseButton.RIGHT) {
-            screenSpaceEventType = ScreenSpaceEventType.RIGHT_UP;
-            clickScreenSpaceEventType = ScreenSpaceEventType.RIGHT_CLICK;
-        } else {
-            return;
-        }
-
+    function cancelMouseEvent(screenSpaceEventHandler, screenSpaceEventType, clickScreenSpaceEventType, event) {
         var modifier = getModifier(event);
 
         var action = screenSpaceEventHandler.getInputAction(screenSpaceEventType, modifier);
@@ -228,6 +206,31 @@ define([
         }
     }
 
+    function handleMouseUp(screenSpaceEventHandler, event) {
+        if (!canProcessMouseEvent(screenSpaceEventHandler)) {
+            return;
+        }
+
+        var button = event.button;
+
+        if (button !== MouseButton.LEFT && button !== MouseButton.MIDDLE && button !== MouseButton.RIGHT){
+            return;
+        }
+
+        if(screenSpaceEventHandler._buttonDown[MouseButton.LEFT]){
+            cancelMouseEvent(screenSpaceEventHandler, ScreenSpaceEventType.LEFT_UP, ScreenSpaceEventType.LEFT_CLICK, event);
+            screenSpaceEventHandler._buttonDown[MouseButton.LEFT] = false;
+        }
+        if(screenSpaceEventHandler._buttonDown[MouseButton.MIDDLE]){
+            cancelMouseEvent(screenSpaceEventHandler, ScreenSpaceEventType.MIDDLE_UP, ScreenSpaceEventType.MIDDLE_CLICK, event);
+            screenSpaceEventHandler._buttonDown[MouseButton.MIDDLE] = false;
+        }
+        if(screenSpaceEventHandler._buttonDown[MouseButton.RIGHT]){
+            cancelMouseEvent(screenSpaceEventHandler, ScreenSpaceEventType.RIGHT_UP, ScreenSpaceEventType.RIGHT_CLICK, event);
+            screenSpaceEventHandler._buttonDown[MouseButton.RIGHT] = false;
+        }
+    }
+
     var mouseMoveEvent = {
         startPosition : new Cartesian2(),
         endPosition : new Cartesian2()
@@ -254,7 +257,9 @@ define([
 
         Cartesian2.clone(position, previousPosition);
 
-        if (defined(screenSpaceEventHandler._buttonDown)) {
+        if (screenSpaceEventHandler._buttonDown[MouseButton.LEFT] ||
+            screenSpaceEventHandler._buttonDown[MouseButton.MIDDLE] ||
+            screenSpaceEventHandler._buttonDown[MouseButton.RIGHT]) {
             event.preventDefault();
         }
     }
@@ -403,9 +408,9 @@ define([
         var clickAction;
         var pinching = screenSpaceEventHandler._isPinching;
 
-        if (numberOfTouches !== 1 && screenSpaceEventHandler._buttonDown === MouseButton.LEFT) {
+        if (numberOfTouches !== 1 && screenSpaceEventHandler._buttonDown[MouseButton.LEFT]) {
             // transitioning from single touch, trigger UP and might trigger CLICK
-            screenSpaceEventHandler._buttonDown = undefined;
+            screenSpaceEventHandler._buttonDown[MouseButton.LEFT] = false;
             action = screenSpaceEventHandler.getInputAction(ScreenSpaceEventType.LEFT_UP, modifier);
 
             if (defined(action)) {
@@ -454,7 +459,7 @@ define([
             Cartesian2.clone(position, screenSpaceEventHandler._primaryStartPosition);
             Cartesian2.clone(position, screenSpaceEventHandler._primaryPreviousPosition);
 
-            screenSpaceEventHandler._buttonDown = MouseButton.LEFT;
+            screenSpaceEventHandler._buttonDown[MouseButton.LEFT] = true;
 
             action = screenSpaceEventHandler.getInputAction(ScreenSpaceEventType.LEFT_DOWN, modifier);
 
@@ -539,7 +544,7 @@ define([
         var numberOfTouches = positions.length;
         var action;
 
-        if (numberOfTouches === 1 && screenSpaceEventHandler._buttonDown === MouseButton.LEFT) {
+        if (numberOfTouches === 1 && screenSpaceEventHandler._buttonDown[MouseButton.LEFT]) {
             // moving single touch
             var position = positions.values[0];
             Cartesian2.clone(position, screenSpaceEventHandler._primaryPosition);
@@ -658,7 +663,11 @@ define([
      */
     function ScreenSpaceEventHandler(element) {
         this._inputEvents = {};
-        this._buttonDown = undefined;
+        this._buttonDown = {
+            LEFT: false,
+            MIDDLE: false,
+            RIGHT: false
+        };
         this._isPinching = false;
         this._lastSeenTouchEvent = -ScreenSpaceEventHandler.mouseEmulationIgnoreMilliseconds;
 

Source/Core/ScreenSpaceEventHandler.js

@@ -107,7 +107,7 @@ define([
             if (isColorAppearance) {
                 appearance = new PerInstanceColorAppearance({
                     closed: closed,
-                    flat : !(onTerrain && geometryUpdater._supportsMaterialsforEntitiesOnTerrain)
+                    flat : onTerrain && !geometryUpdater._supportsMaterialsforEntitiesOnTerrain
                 });
             } else {
                 var material = MaterialProperty.getValue(time, fillMaterialProperty, this._material);

Source/DataSources/DynamicGeometryUpdater.js

@@ -98,7 +98,7 @@ define([
      * </p>
      *
      * @param {Object} options Object with the following properties:
-     * @param {String} [options.name] The glTF animation name that identifies the animation. Must be defined if <code>options.id</code> is <code>undefined</code>.
+     * @param {String} [options.name] The glTF animation name that identifies the animation. Must be defined if <code>options.index</code> is <code>undefined</code>.
      * @param {Number} [options.index] The glTF animation index that identifies the animation. Must be defined if <code>options.name</code> is <code>undefined</code>.
      * @param {JulianDate} [options.startTime] The scene time to start playing the animation.  When this is <code>undefined</code>, the animation starts at the next frame.
      * @param {Number} [options.delay=0.0] The delay, in seconds, from <code>startTime</code> to start playing.

Source/Scene/ModelAnimationCollection.js

@@ -111,6 +111,9 @@ define([
         } else {
             for (j = 1; j < length; ++j) {
                 name = getLastStageName(composite.get(j));
+                if (!defined(dependencies[name])) {
+                    dependencies[name] = {};
+                }
                 dependencies[name][originalDependency] = true;
             }
         }

Source/Scene/PostProcessStageTextureCache.js

@@ -17,7 +17,6 @@ vec3 czm_gammaCorrect(vec3 color) {
 vec4 czm_gammaCorrect(vec4 color) {
 #ifdef HDR
     color.rgb = pow(color.rgb, vec3(czm_gamma));
-    color.a = pow(color.a, 1.0 / czm_gamma);
 #endif
     return color;
 }

Source/Shaders/Builtin/Functions/gammaCorrect.glsl

@@ -216,10 +216,28 @@ defineSuite([
         expect(handler.anyButtonDown).toEqual(true);
 
         simulateMouseUp(options);
-        expect(handler.anyButtonDown).toEqual(true);
 
         options.button = MouseButtons.LEFT;
         simulateMouseUp(options);
+
+        expect(handler.anyButtonDown).toEqual(false);
+    });
+
+    it('cancels anyButtonDown on any button up', function() {
+        expect(handler.anyButtonDown).toEqual(false);
+
+        var options = {
+            button : MouseButtons.LEFT,
+            clientX : 0,
+            clientY : 0
+        };
+        simulateMouseDown(options);
+
+        options.button = MouseButtons.RIGHT;
+        simulateMouseDown(options);
+
+        simulateMouseUp(options);
+
         expect(handler.anyButtonDown).toEqual(false);
     });
 

Specs/Scene/CameraEventAggregatorSpec.js

@@ -27,6 +27,7 @@ define([
             _surface : {},
             tileLoadedEvent : new Event(),
             imageryLayersUpdatedEvent : new Event(),
+            _terrainProvider : undefined,
             terrainProviderChanged : new Event(),
             destroy : function() {}
         };
@@ -42,7 +43,11 @@ define([
         globe.terrainProviderChanged = new Event();
         defineProperties(globe, {
             terrainProvider : {
+                get : function() {
+                    return this._terrainProvider;
+                },
                 set : function(value) {
+                    this._terrainProvider = value;
                     this.terrainProviderChanged.raiseEvent(value);
                 }
             }

Specs/createGlobe.js

@@ -15,7 +15,8 @@ var gulpTap = require('gulp-tap');
 var rimraf = require('rimraf');
 var glslStripComments = require('glsl-strip-comments');
 var mkdirp = require('mkdirp');
-var eventStream = require('event-stream');
+var mergeStream = require('merge-stream');
+var streamToPromise = require('stream-to-promise');
 var gulp = require('gulp');
 var gulpInsert = require('gulp-insert');
 var gulpZip = require('gulp-zip');
@@ -304,7 +305,7 @@ gulp.task('makeZipFile', gulp.series('release', function() {
 
     var indexSrc = gulp.src('index.release.html').pipe(gulpRename('index.html'));
 
-    return eventStream.merge(builtSrc, staticSrc, indexSrc)
+    return mergeStream(builtSrc, staticSrc, indexSrc)
         .pipe(gulpTap(function(file) {
             // Work around an issue with gulp-zip where archives generated on Windows do
             // not properly have their directory executable mode set.
@@ -1227,7 +1228,7 @@ function buildSandcastle() {
         })
         .pipe(gulp.dest('Build/Apps/Sandcastle'));
 
-    return streamToPromise(eventStream.merge(appStream, imageStream));
+    return streamToPromise(mergeStream(appStream, imageStream));
 }
 
 function buildCesiumViewer() {
@@ -1264,7 +1265,7 @@ function buildCesiumViewer() {
     promise = promise.then(function() {
         var copyrightHeader = fs.readFileSync(path.join('Source', 'copyrightHeader.js'));
 
-        var stream = eventStream.merge(
+        var stream = mergeStream(
             gulp.src(cesiumViewerStartup)
                 .pipe(gulpInsert.prepend(copyrightHeader))
                 .pipe(gulpReplace('../../Source', '.'))
@@ -1334,11 +1335,3 @@ function requirejsOptimize(name, config) {
         });
     });
 }
-
-function streamToPromise(stream) {
-    return new Promise(function(resolve, reject) {
-        stream.on('finish', resolve);
-        stream.on('end', resolve);
-        stream.on('error', reject);
-    });
-}

gulpfile.js

@@ -1,6 +1,6 @@
 {
   "name": "cesium",
-  "version": "1.51.0",
+  "version": "1.52.0",
   "description": "CesiumJS is a JavaScript library for creating 3D globes and 2D maps in a web browser without a plugin.",
   "homepage": "http://cesiumjs.org",
   "license": "Apache-2.0",
@@ -41,7 +41,6 @@
     "compression": "^1.6.2",
     "eslint": "^5.2.0",
     "eslint-plugin-html": "^4.0.2",
-    "event-stream": "^4.0.1",
     "express": "^4.15.0",
     "globby": "^8.0.1",
     "glsl-strip-comments": "^1.0.0",
@@ -65,10 +64,12 @@
     "karma-requirejs": "^1.1.0",
     "karma-safari-launcher": "^1.0.0",
     "karma-spec-reporter": "^0.0.32",
+    "merge-stream": "^1.0.1",
     "mime": "^2.0.3",
     "mkdirp": "^0.5.1",
     "request": "^2.79.0",
     "rimraf": "^2.6.1",
+    "stream-to-promise": "^2.2.0",
     "yargs": "^12.0.1"
   },
   "scripts": {