Skip to content

Commit

Permalink
Merge pull request #1 from AnalyticalGraphicsInc/master
Browse files Browse the repository at this point in the history 
Update from original
  • Loading branch information
@slchow
slchow committed Apr 20, 2016
2 parents 6166c91 + 07a6e67 commit 624c359
Show file tree
Hide file tree
Showing 1,099 changed files with 17,856 additions and 9,285 deletions.
10 changes: 10 additions & 0 deletions .idea/runConfigurations/Run_tests.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 35 additions & 2 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,39 @@
language: node_js
node_js:
- "0.12"
- '4.3'
sudo: false
before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
script:
- npm run jsHint && npm run release
- echo 'deployPending' && echo -en 'travis_fold:start:script.deployPending\\r'
- npm run deploy-set-version -- --version $TRAVIS_BRANCH.$TRAVIS_BUILD_NUMBER
- 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 'test non-webgl' && echo -en 'travis_fold:start:script.test\\r'
- npm run test -- --exclude WebGL --browsers Electron --failTaskOnError --suppressPassed
- echo -en 'travis_fold:end:script.test\\r'

- echo 'makeZipFile' && echo -en 'travis_fold:start:script.makeZipFile\\r'
- npm run clean
- npm run makeZipFile
- npm pack
- echo -en 'travis_fold:end:script.makeZipFile\\r'

- echo 'deploy' && echo -en 'travis_fold:start:script.deploy\\r'
- npm run deploy-s3 -- -b cesium-dev -d cesium/$TRAVIS_BRANCH --confirm -c 'no-cache'
- npm run deploy-status -- --status success --message Deployed
- echo -en 'travis_fold:end:script.deploy\\r'

- echo 'test non-webgl release' && echo -en 'travis_fold:start:script test.release\\r'
- npm run test -- --exclude WebGL --browsers Electron --failTaskOnError --release --suppressPassed
- echo -en 'travis_fold:end:script test.release\\r'

- echo 'cloc' && echo -en 'travis_fold:start:script.cloc\\r'
- npm run cloc
- echo -en 'travis_fold:end:script.cloc\\r'
8 changes: 4 additions & 4 deletions Apps/CesiumViewer/CesiumViewer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ define([
'Cesium/DataSources/CzmlDataSource',
'Cesium/DataSources/GeoJsonDataSource',
'Cesium/DataSources/KmlDataSource',
'Cesium/Scene/TileMapServiceImageryProvider',
'Cesium/Scene/createTileMapServiceImageryProvider',
'Cesium/Widgets/Viewer/Viewer',
'Cesium/Widgets/Viewer/viewerCesiumInspectorMixin',
'Cesium/Widgets/Viewer/viewerDragDropMixin',
Expand All @@ -26,11 +26,11 @@ define([
CzmlDataSource,
GeoJsonDataSource,
KmlDataSource,
TileMapServiceImageryProvider,
createTileMapServiceImageryProvider,
Viewer,
viewerCesiumInspectorMixin,
viewerDragDropMixin) {
"use strict";
'use strict';

/*
* 'debug' : true/false, // Full WebGL error reporting at substantial performance cost.
Expand All @@ -47,7 +47,7 @@ define([

var imageryProvider;
if (endUserOptions.tmsImageryUrl) {
imageryProvider = new TileMapServiceImageryProvider({
imageryProvider = createTileMapServiceImageryProvider({
url : endUserOptions.tmsImageryUrl
});
}
Expand Down
Binary file modified Apps/SampleData/models/CesiumMilkTruck/CesiumMilkTruck-kmc.glb
View file
Binary file not shown.
129 changes: 36 additions & 93 deletions Apps/SampleData/models/CesiumMilkTruck/CesiumMilkTruck-kmc.gltf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -379,28 +379,19 @@
"technique": "PHONG",
"transparent": false,
"values": {
"diffuse": {
"type": 35666,
"value": [
0,
0.04050629958510399,
0.021240700036287308,
1
]
},
"shininess": {
"type": 5126,
"value": 256
},
"specular": {
"type": 35666,
"value": [
0.6499999761581421,
0.6499999761581421,
0.6499999761581421,
1
]
}
"diffuse": [
0,
0.04050629958510399,
0.021240700036287308,
1
],
"shininess": 256,
"specular": [
0.6499999761581421,
0.6499999761581421,
0.6499999761581421,
1
]
}
}
},
Expand All @@ -414,58 +405,19 @@
"technique": "PHONG",
"transparent": false,
"values": {
"diffuse": {
"type": 35678,
"value": "texture_Image0001"
},
"shininess": {
"type": 5126,
"value": 256
},
"specular": {
"type": 35666,
"value": [
0.03999999910593033,
0.03999999910593033,
0.03999999910593033,
1
]
}
"diffuse": "texture_Image0001",
"shininess": 256,
"specular": [
0.03999999910593033,
0.03999999910593033,
0.03999999910593033,
1
]
}
}
},
"name": "truck"
},
"Effect-wheels": {
"extensions": {
"KHR_materials_common": {
"doubleSided": false,
"jointCount": 0,
"technique": "PHONG",
"transparent": false,
"values": {
"diffuse": {
"type": 35678,
"value": "texture_Image0001"
},
"shininess": {
"type": 5126,
"value": 256
},
"specular": {
"type": 35666,
"value": [
0.03999999910593033,
0.03999999910593033,
0.03999999910593033,
1
]
}
}
}
},
"name": "wheels"
},
"Effect-window_trim": {
"extensions": {
"KHR_materials_common": {
Expand All @@ -474,28 +426,19 @@
"technique": "PHONG",
"transparent": false,
"values": {
"diffuse": {
"type": 35666,
"value": [
0.06400000303983688,
0.06400000303983688,
0.06400000303983688,
1
]
},
"shininess": {
"type": 5126,
"value": 256
},
"specular": {
"type": 35666,
"value": [
0.03999999910593033,
0.03999999910593033,
0.03999999910593033,
1
]
}
"diffuse": [
0.06400000303983688,
0.06400000303983688,
0.06400000303983688,
1
],
"shininess": 256,
"specular": [
0.03999999910593033,
0.03999999910593033,
0.03999999910593033,
1
]
}
}
},
Expand All @@ -513,7 +456,7 @@
"TEXCOORD_0": "accessor_136"
},
"indices": "accessor_127",
"material": "Effect-wheels",
"material": "Effect-truck",
"mode": 4
},
{
Expand All @@ -523,7 +466,7 @@
"TEXCOORD_0": "accessor_136"
},
"indices": "accessor_130",
"material": "Effect-wheels",
"material": "Effect-truck",
"mode": 4
}
]
Expand Down
14 changes: 14 additions & 0 deletions Apps/Sandcastle/CesiumSandcastle.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,3 +254,17 @@ a.linkButton:focus, a.linkButton:hover {
.CodeMirror-gutter-text {
cursor: default;
}

.gitHubIcon {
background-image: url('./images/gitHub16px.png');
width: 16px;
height: 16px;
text-align: center;
}

.shareIcon {
background-image: url('./images/share16px.png');
width: 16px;
height: 16px;
text-align: center;
}
Loading

0 comments on commit 624c359

Please sign in to comment.