Merge pull request #1 from emackey/gltf-1.99

Merge master into glTF 2.0

.editorconfig

@@ -10,3 +10,6 @@ insert_final_newline = true
 
 [*.md]
 trim_trailing_whitespace = false
+
+[package.json]
+indent_size = 2

.eslintignore

@@ -0,0 +1,9 @@
+Apps/HelloWorld.html
+Apps/Sandcastle/ThirdParty/**
+Build/**
+Documentation/**
+Source/Shaders/**
+Source/ThirdParty/**
+Source/Workers/cesiumWorkerBootstrapper.js
+ThirdParty/**
+Tools/**

.eslintrc.json

@@ -0,0 +1,6 @@
+{
+    "extends": "./Tools/eslint-config-cesium/browser.js",
+    "rules": {
+        "no-unused-vars": ["error", {"vars": "all", "args": "none"}]
+    }
+}

.gitignore

@@ -5,6 +5,7 @@
 /cesium-*.tgz
 .DS_Store
 Thumbs.db
+.eslintcache
 
 /Apps/CesiumViewer/Gallery/gallery-index.js
 
@@ -16,11 +17,13 @@ Thumbs.db
 /Source/Shaders/*.js
 /Source/Shaders/*/*.js
 /Source/Shaders/*/*/*.js
+/Source/ThirdParty/Shaders/*.js
 
 /Specs/SpecList.js
 
 /node_modules
 npm-debug.log
+npm-debug.log.*
 
 # WebStorm user-specific
 .idea/workspace.xml

.npmignore

@@ -7,6 +7,7 @@
 /.project
 /.settings
 /.travis.yml
+/.vscode
 /Apps
 /Build/minifyShaders.state
 /Build/Stubs

.travis.yml

@@ -11,11 +11,12 @@ script:
   - npm run deploy-status -- --status pending --message 'Waiting for build'
   - echo -en 'travis_fold:end:script.deployPending\\r'
 
-  - echo 'jsHint' && echo -en 'travis_fold:start:script.jsHint\\r'
-  - npm run jsHint -- --failTaskOnError
-  - echo -en 'travis_fold:end:script.jsHint\\r'
+  - echo 'eslint' && echo -en 'travis_fold:start:script.eslint\\r'
+  - npm run eslint
+  - echo -en 'travis_fold:end:script.eslint\\r'
 
   - echo 'test webgl-stub' && echo -en 'travis_fold:start:script.test\\r'
+  - npm run build
   - npm run test -- --browsers Electron --webgl-stub --failTaskOnError --suppressPassed
   - echo -en 'travis_fold:end:script.test\\r'
 

.vscode/settings.json

@@ -27,7 +27,7 @@
     "editor.insertSpaces": true,
     "editor.tabSize": 4,
     "editor.detectIndentation": false,
-    "jshint.enable": true,
+    "eslint.enable": true,
     "javascript.format.insertSpaceAfterCommaDelimiter": true,
     "javascript.format.insertSpaceAfterSemicolonInForStatements": true,
     "javascript.format.insertSpaceBeforeAndAfterBinaryOperators": true,

Apps/.jshintrc

@@ -1,4 +1,62 @@
 {
-  "extends": "../.jshintrc",
-  "jasmine": false
+  "bitwise": false,
+  "camelcase": false,
+  "curly": true,
+  "eqeqeq": true,
+  "forin": true,
+  "freeze": true,
+  "immed": true,
+  "latedef": false,
+  "newcap": true,
+  "noarg": true,
+  "noempty": true,
+  "nonbsp": true,
+  "nonew": true,
+  "plusplus": false,
+  "quotmark": false,
+  "undef": true,
+  "unused": "vars",
+  "strict": true,
+  "asi": false,
+  "boss": false,
+  "debug": false,
+  "eqnull": false,
+  "esnext": false,
+  "moz": false,
+  "evil": false,
+  "expr": false,
+  "funcscope": false,
+  "globalstrict": false,
+  "iterator": false,
+  "lastsemic": false,
+  "laxbreak": false,
+  "laxcomma": false,
+  "loopfunc": false,
+  "multistr": true,
+  "noyield": false,
+  "notypeof": false,
+  "proto": false,
+  "scripturl": false,
+  "shadow": false,
+  "sub": false,
+  "supernew": false,
+  "validthis": false,
+  "browser": true,
+  "browserify": false,
+  "couch": false,
+  "devel": true,
+  "dojo": false,
+  "jasmine": false,
+  "jquery": false,
+  "mocha": true,
+  "mootools": false,
+  "node": false,
+  "nonstandard": false,
+  "prototypejs": false,
+  "qunit": false,
+  "rhino": false,
+  "shelljs": false,
+  "worker": false,
+  "wsh": false,
+  "yui": false
 }

Apps/CesiumViewer/CesiumViewer.js

@@ -63,7 +63,7 @@ define([
         var message = formatError(exception);
         console.error(message);
         if (!document.querySelector('.cesium-widget-errorPanel')) {
-            window.alert(message);
+            window.alert(message); //eslint-disable-line no-alert
         }
         return;
     }
@@ -166,6 +166,7 @@ define([
         }
     }
 
+    var camera = viewer.camera;
     function saveCamera() {
         var position = camera.positionCartographic;
         var hpr = '';
@@ -178,7 +179,6 @@ define([
 
     var updateTimer;
     if (endUserOptions.saveCamera !== 'false') {
-        var camera = viewer.camera;
         camera.moveStart.addEventListener(function() {
             if (!defined(updateTimer)) {
                 updateTimer = window.setInterval(saveCamera, 1000);

Apps/CesiumViewer/CesiumViewerStartup.js

@@ -1,4 +1,5 @@
 /*global require*/
+/*eslint-disable strict*/
 require({
     baseUrl : '.',
     paths : {

Apps/Sandcastle/.eslintrc.json

@@ -0,0 +1,15 @@
+{
+    "extends": "../../.eslintrc.json",
+    "globals": {
+        "JSON": true,
+        "require": true,
+        "console": true,
+        "Sandcastle": true,
+        "Cesium": true
+    },
+    "rules": {
+        "no-alert": ["off"],
+        "no-implicit-globals": "off",
+        "no-unused-vars": ["off"]
+    }
+}

Apps/Sandcastle/CesiumSandcastle.css

@@ -136,12 +136,6 @@ html, body {
     border: none;
     width: 100%;
     height: 100%;
-    -moz-transition-property: -moz-transform;
-    -moz-transition-duration: 0.5s;
-    -moz-transform-origin: 200px 150px;
-    -webkit-transition-property: -webkit-transform;
-    -webkit-transition-duration: 0.5s;
-    -webkit-transform-origin: 200px 150px;
     transition-property: transform;
     transition-duration: 0.5s;
     transform-origin: 200px 150px;
@@ -150,8 +144,6 @@ html, body {
 .makeThumbnail {
     width: 900px;
     height: 600px;
-    -moz-transform: scale(0.25);
-    -webkit-transform: scale(0.25);
     transform: scale(0.25);
 }
 

Apps/Sandcastle/CesiumSandcastle.js

@@ -139,7 +139,7 @@ require({
     var subtabs = {};
     var docError = false;
     var galleryError = false;
-    var notFound = false;
+    var deferredLoadError = false;
     var galleryTooltipTimer;
     var activeGalleryTooltipDemo;
     var demoTileHeightRule = findCssStyle('.demoTileThumbnail');
@@ -367,6 +367,7 @@ require({
         }
         // make a copy of the options, JSHint modifies the object it's given
         var options = JSON.parse(JSON.stringify(sandcastleJsHintOptions));
+        /*eslint-disable new-cap*/
         if (!JSHINT(getScriptFromEditor(false), options)) {
             var hints = JSHINT.errors;
             for (i = 0, len = hints.length; i < len; ++i) {
@@ -378,6 +379,7 @@ require({
                 }
             }
         }
+        /*eslint-enable new-cap*/
     }
 
     function scheduleHint() {
@@ -695,7 +697,7 @@ require({
     }
 
     function loadFromGallery(demo) {
-        notFound = false;
+        deferredLoadError = false;
         document.getElementById('saveAsFile').download = demo.name + '.html';
         registry.byId('description').set('value', decodeHTML(demo.description).replace(/\\n/g, '\n'));
         registry.byId('label').set('value', decodeHTML(demo.label).replace(/\\n/g, '\n'));
@@ -806,8 +808,8 @@ require({
                 if (galleryError) {
                     appendConsole('consoleError', 'Error loading gallery, please run the build script.', true);
                 }
-                if (notFound) {
-                    appendConsole('consoleLog', 'Unable to load demo named ' + queryObject.src.replace('.html', '') + '\n', true);
+                if (deferredLoadError) {
+                    appendConsole('consoleLog', 'Unable to load demo named ' + queryObject.src.replace('.html', '') + '. Redirecting to HelloWorld.\n', true);
                 }
             }
         } else if (Cesium.defined(e.data.log)) {
@@ -883,6 +885,8 @@ require({
         scheduleHintNoChange();
     });
 
+    var searchContainer;
+
     function hideSearchContainer() {
         if (dom.byId('searchContainer')) {
             var innerPanel = registry.byId('innerPanel');
@@ -1060,15 +1064,10 @@ require({
             url : 'gallery/' + name + '.html',
             handleAs : 'text',
             error : function(error) {
-                if (error.status === 404) {
                     loadFromGallery(gallery_demos[hello_world_index])
                         .then(function() {
-                            notFound = true;
+                            deferredLoadError = true;
                         });
-                } else {
-                    galleryError = true;
-                    appendConsole('consoleError', error, true);
-                }
             }
         });
     }
@@ -1294,7 +1293,6 @@ require({
         });
     }
 
-    var searchContainer;
     when(promise).then(function() {
         dom.byId('searchDemos').appendChild(galleryErrorMsg);
         searchContainer = registry.byId('searchContainer');