Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge from upstream #7

Merged
merged 197 commits into from
Sep 18, 2019
Merged
Changes from 1 commit
Commits
Show all changes
197 commits
Select commit Hold shift + click to select a range
79b8d26
Bump Jasmine timeout to hopefully make CI more stable..
mramato Apr 4, 2019
c7ae01d
empty objects in options have been replaced
Apr 29, 2019
dc7d8aa
feat: expose getByName method for dataSourceCollection
jony89 May 17, 2019
b3d6143
fix: add my name to contributers
jony89 May 17, 2019
23e00a5
add changes
jony89 May 17, 2019
8d7aee9
Merge branch 'master' into master
jony89 May 22, 2019
501a874
EMPTY_OBJECT removed from context.js file in Renderer folder
Jun 23, 2019
c8cdeea
chore(package): update globby to version 10.0.0
greenkeeper[bot] Jun 29, 2019
36303ac
Merge pull request #1 from AnalyticalGraphicsInc/master
ppoulainpro Jul 9, 2019
da16e80
chore(package): update karma-chrome-launcher to version 3.0.0
greenkeeper[bot] Jul 12, 2019
73ef586
Fix #7990
ppoulainpro Jul 15, 2019
d5361a9
update changes and contributors list.
ppoulainpro Jul 15, 2019
2193253
add pull request #7998
ppoulainpro Jul 15, 2019
0d99b52
Merge branch 'master' into patch-7990
ppoulainpro Jul 15, 2019
bf7b5e8
Fix test condition on frameState.shadowState
ppoulainpro Jul 17, 2019
a7bf2bc
Merge pull request #7996 from AnalyticalGraphicsInc/greenkeeper/karma…
mramato Jul 30, 2019
3d4121b
Merge pull request #7972 from AnalyticalGraphicsInc/greenkeeper/globb…
mramato Jul 30, 2019
7bd5d7d
Cleanup
lilleyse Jul 30, 2019
30d215b
Merge pull request #7998 from ppoulainpro/patch-7990
lilleyse Jul 31, 2019
d25beb5
Updated CHANGES, package.json and Ion.js for the release
tfili Aug 1, 2019
927b4bf
Fixed Sandcastle example
tfili Aug 1, 2019
fc8c9b0
Fix Spelling Error
TJKoury Aug 3, 2019
7d1ce7c
Add missing Cesium GS contributors
Aug 5, 2019
b5bf139
Updates all spelling errors in file
TJKoury Aug 5, 2019
9a78ad4
Update Contributors.md
TJKoury Aug 5, 2019
3882e85
index option for adding primitive to PrimitiveCollection
Aug 5, 2019
4d9c6c6
Update PrimitiveCollection.js
Aug 5, 2019
a3ab91d
Update CHANGES.md
Aug 5, 2019
7a6d4b0
Merge pull request #8041 from AnalyticalGraphicsInc/primitive-index
likangning93 Aug 5, 2019
8e19a19
Merge pull request #8039 from AnalyticalGraphicsInc/missing-contrib
Aug 6, 2019
54acd32
Update release schedule
tfili Aug 8, 2019
453b3ff
Fixed Hidden Point Primitive Bug
ProjectBarks Aug 13, 2019
6e143a6
Update CHANGES.md & CONTRIBUTORS.md
ProjectBarks Aug 13, 2019
dd35bd7
Zero point size and position for point primitive
ProjectBarks Aug 13, 2019
144e6dd
Disable HDR
ProjectBarks Aug 13, 2019
066f279
Updated CHANGES.md + CONTRIBUTORS.md
ProjectBarks Aug 13, 2019
823253c
Fixed selection filtering for bloom
ProjectBarks Aug 13, 2019
02b52dc
Disable FXAA & Increase default SSE based off devicePixelRatio
ProjectBarks Aug 13, 2019
0666ca2
update changes
ProjectBarks Aug 13, 2019
226e190
Fix linting
ProjectBarks Aug 13, 2019
635781d
Add device pixel ratio change
ProjectBarks Aug 13, 2019
653da9c
Update contributors
ProjectBarks Aug 14, 2019
a7214ed
Update contributors
ProjectBarks Aug 14, 2019
e22fac0
Update tone mapping
ProjectBarks Aug 14, 2019
196dee1
move comments
ProjectBarks Aug 14, 2019
8699d8a
Fix ES Lint
ProjectBarks Aug 14, 2019
352989a
Rename file for simplicity
ProjectBarks Aug 14, 2019
eec352f
Reword CHANGES.md
ProjectBarks Aug 14, 2019
653d6f9
Fix Tests
ProjectBarks Aug 14, 2019
79f4e13
Updated CHANGES.md
ProjectBarks Aug 14, 2019
194b08a
Switch where aces tone mapping occurs
ProjectBarks Aug 14, 2019
7b7d287
remove old tone mapping
ProjectBarks Aug 14, 2019
97f5a37
add newline
ProjectBarks Aug 14, 2019
8bc7a82
Merge pull request #8055 from ProjectBarks/disable-HDR
lilleyse Aug 14, 2019
0a10886
Merge branch 'master' into image-res-fxaa-option-change
mramato Aug 15, 2019
424ae03
Finalize changes
ProjectBarks Aug 15, 2019
8403b4b
fix time dynamic wheels sandcastle path
ProjectBarks Aug 15, 2019
a4d2330
Updated changes.md
ProjectBarks Aug 15, 2019
f18342d
Re-enable Chrome for travis builds
mramato Aug 15, 2019
445d157
Merge pull request #7713 from AnalyticalGraphicsInc/ci-timeout
mramato Aug 15, 2019
4908bf7
Add Matthew Amato to Contributors under Cesium GS.
mramato Aug 15, 2019
8678d0a
Merge branch 'master' into bloom-post-select-feature
ProjectBarks Aug 15, 2019
3267f8e
Merge branch 'master' into hidden-point-primitive-fix
ProjectBarks Aug 15, 2019
9311c11
Undo changes to Changes.md
ProjectBarks Aug 15, 2019
8ef7ef1
Merge pull request #8066 from ProjectBarks/fix-sandcastle-wheels
mramato Aug 15, 2019
559de8e
Merge pull request #8069 from AnalyticalGraphicsInc/chrome-works-again
Aug 15, 2019
2623dfe
first fix iteration
ProjectBarks Aug 15, 2019
a03eec7
KHR_texture_transform shouldn't emulate sampler repeat options.
emackey Aug 15, 2019
2ce5079
Merge remote-tracking branch 'origin/master' into tex-transform-repeat
emackey Aug 15, 2019
7c1736e
CHANGES.md
emackey Aug 15, 2019
075cd8b
Update CHANGES.md
ProjectBarks Aug 15, 2019
c7ad216
Fix Material KTX & CRN loading
ProjectBarks Aug 15, 2019
a615a7a
Merge pull request #8064 from ProjectBarks/image-provider-kbx-crn-fix
mramato Aug 15, 2019
64fe0e2
Merge remote-tracking branch 'origin/master' into tex-transform-repeat
emackey Aug 15, 2019
9a95efe
Fix Providers handling resources and URLs
ProjectBarks Aug 15, 2019
dc4cda5
Fix linting
ProjectBarks Aug 15, 2019
fe61b00
fix spec to be a proper test
ProjectBarks Aug 15, 2019
0623d06
Merge branch 'image-res-fxaa-option-change' of projectbarks.github.co…
ProjectBarks Aug 15, 2019
24edf9b
Finish merge
ProjectBarks Aug 15, 2019
e1ad91a
Merge branch 'master' into hidden-point-primitive-fix
mramato Aug 16, 2019
60c1e76
Merge branch 'master' into bloom-post-select-feature
ProjectBarks Aug 16, 2019
5eaae35
Tweak doc
Aug 16, 2019
d2c7b93
Merge branch 'master' into options-updated
Aug 16, 2019
1490ff9
Merge pull request #8054 from ProjectBarks/hidden-point-primitive-fix
Aug 16, 2019
9341106
Fix URL in Tests
ProjectBarks Aug 16, 2019
58e54ae
Merge branch 'master' into material-gamma-fix
ProjectBarks Aug 16, 2019
792ba7e
Merge branch 'master' into bloom-post-select-feature
ProjectBarks Aug 16, 2019
47ca9b2
Merge branch 'master' into tex-transform-repeat
lilleyse Aug 16, 2019
4537d32
Merge pull request #8056 from ProjectBarks/bloom-post-select-feature
Aug 16, 2019
e9faeee
Merge branch 'master' into tex-transform-repeat
lilleyse Aug 16, 2019
b2ff155
Merge branch 'master' into material-gamma-fix
ProjectBarks Aug 16, 2019
36e95c6
Merge pull request #8079 from ProjectBarks/imagery-provider-resource-fix
mramato Aug 16, 2019
d6d7381
Merge pull request #8076 from AnalyticalGraphicsInc/tex-transform-repeat
lilleyse Aug 16, 2019
6a9520f
Revert SSE + Device Pixel Ratio Changes
ProjectBarks Aug 16, 2019
c5ce9a4
Merge branch 'master' into image-res-fxaa-option-change
ProjectBarks Aug 16, 2019
cb532c2
Fix post processing
ProjectBarks Aug 16, 2019
6f0445e
Merge branch 'image-res-fxaa-option-change' of projectbarks.github.co…
ProjectBarks Aug 16, 2019
452c592
wrapping passes around primitive.show master switch
loshjawrence Aug 16, 2019
1c054e3
SSE + Resolution Change
ProjectBarks Aug 16, 2019
c279498
Finish univeral SSE
ProjectBarks Aug 16, 2019
f57d47c
fix ES lint
ProjectBarks Aug 16, 2019
0faff3c
updated changes.md
ProjectBarks Aug 16, 2019
809cedb
update comments
ProjectBarks Aug 19, 2019
3cad538
Fix globe size
ProjectBarks Aug 19, 2019
fbc7abf
fix PostProcessingStage test
ProjectBarks Aug 19, 2019
aabe1e8
adding additional fix spotted by dennisadams
loshjawrence Aug 19, 2019
8627c3d
lint
loshjawrence Aug 19, 2019
f74214c
Merge pull request #8057 from ProjectBarks/image-res-fxaa-option-change
lilleyse Aug 19, 2019
71af8de
Add Toolbar <div> to Sandcastle Examples
ptrgags Aug 19, 2019
ef429f3
Add my username to CONTRIBUTORS.md
ptrgags Aug 19, 2019
2bda171
Merge pull request #7793 from abuDarda97/options-updated
Aug 19, 2019
09189fe
Disable Clipping planes in 3D or CV
ProjectBarks Aug 19, 2019
d1e460a
Merge pull request #8085 from AnalyticalGraphicsInc/missing-toolbar
lilleyse Aug 19, 2019
29ee781
Fix tests
ProjectBarks Aug 19, 2019
f8a917d
Revert Globe Changes
ProjectBarks Aug 19, 2019
6409628
remove debugging artifact
ProjectBarks Aug 19, 2019
6cdb7fd
Revert changes.md
ProjectBarks Aug 19, 2019
f5f1a77
Remove Fixed in "CHANGES.md"
ProjectBarks Aug 19, 2019
70eede9
Update CHANGES.md
ProjectBarks Aug 19, 2019
e0b0ff7
Merge pull request #8087 from ProjectBarks/fix-scenemode-sandcastle
mramato Aug 19, 2019
8e8b178
chore(package): update yargs to version 14.0.0
greenkeeper[bot] Aug 19, 2019
98778d8
fixes
ProjectBarks Aug 20, 2019
12ed70c
Merge branch 'material-gamma-fix' of projectbarks.github.com:ProjectB…
ProjectBarks Aug 20, 2019
ee04cfb
Merge pull request #8091 from AnalyticalGraphicsInc/greenkeeper/yargs…
mramato Aug 20, 2019
9dbf976
handle more edge cases
ProjectBarks Aug 22, 2019
fe5f47d
Materials can be a fusion of 1
ProjectBarks Aug 22, 2019
1f6b14d
Remove un-needed variable
ProjectBarks Aug 22, 2019
86e8bf7
Make quad tree consistent
ProjectBarks Aug 22, 2019
e6f9adc
Rename screenspaceErrorPixelRatio to pixelRatio
ProjectBarks Aug 22, 2019
e288261
Small changes
ProjectBarks Aug 22, 2019
ef6c87c
Merge pull request #8077 from ProjectBarks/material-gamma-fix
lilleyse Aug 22, 2019
c43c7ef
Fix unit tests
ProjectBarks Aug 22, 2019
6b04fed
fix eslint
ProjectBarks Aug 22, 2019
6452d5d
Update QuadtreePrimitiveSpec.js
ProjectBarks Aug 22, 2019
29a508a
Merge pull request #8083 from ProjectBarks/sse-res-fix
mramato Aug 23, 2019
303fced
Merge pull request #8081 from AnalyticalGraphicsInc/bugfix-8074
Aug 23, 2019
66caea0
Stop actually requesting full screen in unit tests
mramato Aug 24, 2019
08b42e6
Merge branch 'master' into master
jony89 Aug 26, 2019
8a34f9d
Update CONTRIBUTORS.md
jony89 Aug 26, 2019
7658bc7
Update DataSourceCollection.js
jony89 Aug 26, 2019
d20023c
Merge pull request #7849 from jony89/master
emackey Aug 26, 2019
ee41a82
Use parent tilesets's tilesetVersion if it's set and none on the child.
mramato Aug 26, 2019
b0c49bf
Merge pull request #8108 from AnalyticalGraphicsInc/tileset-version
lilleyse Aug 26, 2019
dc9afaf
Fix GEE terrain negative altitude handling
mramato Aug 26, 2019
b317784
Update CHANGES
mramato Aug 26, 2019
cbf2ecb
Merge pull request #8104 from AnalyticalGraphicsInc/stop-it
Aug 26, 2019
0ac1a9f
Fix collection add() docs
Aug 27, 2019
7baf036
Revert incorrect doc for PrimitiveCollection.add
Aug 27, 2019
a1565d9
Merge pull request #8111 from AnalyticalGraphicsInc/doc-fix
mramato Aug 27, 2019
b9fe8f3
Replace jscoverage with karma-coverage
mramato Aug 28, 2019
cb496c6
Run coverage as part of unit tests during CI
mramato Aug 28, 2019
a77b2b9
Polygon graphics document default values updated
Aug 29, 2019
c243d42
Coverage changes after review.
mramato Aug 30, 2019
e0e010a
Merge pull request #8115 from AnalyticalGraphicsInc/coverage
Aug 30, 2019
d0af657
Get rid of defineSuite
mramato Aug 31, 2019
10bfa55
missing default values for heightReference and extrudedHeightReferenc…
Sep 1, 2019
002d4f0
Merge pull request #8109 from AnalyticalGraphicsInc/gee-heights
tfili Sep 3, 2019
37095c2
Update CHANGES, Ion.js and package.json for 1.61 release
Sep 3, 2019
6768136
Update tutorial links
Sep 3, 2019
426308a
Do not tonemap when unlit
Sep 3, 2019
7596da4
Fix color test
Sep 3, 2019
3febbfe
Merge pull request #8126 from AnalyticalGraphicsInc/index-links
mramato Sep 3, 2019
772e1ab
Separate srgb and tonemapping
lilleyse Sep 3, 2019
f999167
Merge pull request #8128 from AnalyticalGraphicsInc/unlit
Sep 3, 2019
8e45c62
Update AGI tileset
lilleyse Sep 3, 2019
64cc4dc
Merge pull request #8132 from AnalyticalGraphicsInc/agi-tileset
Sep 3, 2019
4729112
Merge branch 'master' into patch-1
Sep 5, 2019
e28ce86
Merge pull request #8036 from TJKoury/patch-1
Sep 5, 2019
fca7235
Merge pull request #8120 from AnalyticalGraphicsInc/jazzy
Sep 5, 2019
f3620a2
Fix link in CONTRIBUTORS.md
ptrgags Sep 6, 2019
385d29e
Merge pull request #8139 from AnalyticalGraphicsInc/fix-contributor-link
mramato Sep 6, 2019
b386f6e
Added FXAA Sandcastle example
IanLilleyT Sep 10, 2019
fd1e3ee
Added Ian Lilley to CONTRIBUTORS.md
IanLilleyT Sep 10, 2019
e11e594
Merge pull request #8145 from AnalyticalGraphicsInc/fxaa-sandcastle
lilleyse Sep 10, 2019
d316e5b
added hdr toggle sandcastle example
IanLilleyT Sep 10, 2019
26ccbe2
Changed name from HDR to High Dynamic Range
IanLilleyT Sep 10, 2019
6341643
Fixed inconsistent spacing around semicolons
IanLilleyT Sep 10, 2019
1305430
fixed trailing commas
IanLilleyT Sep 11, 2019
3ff84bd
Merge pull request #8147 from AnalyticalGraphicsInc/fxaa-sandcastle
lilleyse Sep 11, 2019
60785ef
Added resolution scaling sandcastle example
IanLilleyT Sep 11, 2019
305c88b
code style fixes
IanLilleyT Sep 11, 2019
5322b62
changed useDevicePixelResolution to useBrowserRecommendedResolution
IanLilleyT Sep 11, 2019
948dd50
Remove newline which sandcastle will add automatically
lilleyse Sep 11, 2019
d9e06b0
Merge pull request #8151 from AnalyticalGraphicsInc/resolution-scalin…
lilleyse Sep 11, 2019
48a631e
changed non-HDR atmosphere exposure constant back to an older value t…
IanLilleyT Sep 11, 2019
0c29ae0
Added entry to CHANGES.md
IanLilleyT Sep 12, 2019
453084d
Merge pull request #8153 from AnalyticalGraphicsInc/atmosphereHighDyn…
lilleyse Sep 12, 2019
4392819
remove wild </div> from Label jsdoc
nmschulte-aviture Sep 13, 2019
ccd1507
don't require cesium individual source classes in sandcastle app
Sep 13, 2019
c7f07cb
remove useless argument of ScreenSpaceEventHandler
bbbbx Sep 14, 2019
4f2af8d
add myself to the contributors file
bbbbx Sep 14, 2019
39fcb26
Run sortRequires, remove many unused modules
mramato Sep 16, 2019
013e0ae
Merge pull request #8167 from AnalyticalGraphicsInc/sort-requires
mramato Sep 16, 2019
a92cf4c
Merge pull request #8158 from AnalyticalGraphicsInc/no-source-in-sand…
Sep 17, 2019
26d87ea
Merge pull request #8119 from abuDarda97/PolygonGraphicsDoc
Sep 18, 2019
e05f30c
Merge pull request #8157 from Aviture/fix-label-doc
Sep 18, 2019
b5fec75
Merge pull request #8160 from bbbbx/fix-ScreenSpaceEventHandler
Sep 18, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updates all spelling errors in file
TJKoury authored Aug 5, 2019
commit b5bf13925efbe0dab2d0758fac6a6db5f43d8396
12 changes: 6 additions & 6 deletions Source/DataSources/DataSourceDisplay.js
Original file line number Diff line number Diff line change
@@ -99,23 +99,23 @@ define([
this._onDataSourceAdded(undefined, defaultDataSource);
this._defaultDataSource = defaultDataSource;

var removeDefaultDataSoureListener;
var removeDefaultDataSourceListener;
var removeDataSourceCollectionListener;
if (!primitivesAdded) {
var that = this;
var addPrimitives = function() {
scene.primitives.add(primitives);
scene.groundPrimitives.add(groundPrimitives);
removeDefaultDataSoureListener();
removeDefaultDataSourceListener();
removeDataSourceCollectionListener();
that._removeDefaultDataSourceListener = undefined;
that._removeDataSourceCollectionListener = undefined;
};
removeDefaultDataSoureListener = defaultDataSource.entities.collectionChanged.addEventListener(addPrimitives);
removeDefaultDataSourceListener = defaultDataSource.entities.collectionChanged.addEventListener(addPrimitives);
removeDataSourceCollectionListener = dataSourceCollection.dataSourceAdded.addEventListener(addPrimitives);
}

this._removeDefaultDataSourceListener = removeDefaultDataSoureListener;
this._removeDefaultDataSourceListener = removeDefaultDataSourceListener;
this._removeDataSourceCollectionListener = removeDataSourceCollectionListener;

this._ready = false;
@@ -225,8 +225,8 @@ define([
}
this._onDataSourceRemoved(undefined, this._defaultDataSource);

if (defined(this._removeDefaultDataSoureListener)) {
this._removeDefaultDataSoureListener();
if (defined(this._removeDefaultDataSourceListener)) {
this._removeDefaultDataSourceListener();
this._removeDataSourceCollectionListener();
} else {
this._scene.primitives.remove(this._primitives);