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

Upgrade to Cesium 1.15 #3

Merged
merged 392 commits into from
Nov 2, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
392 commits
Select commit Hold shift + click to select a range
e3801f7
Merge branch 'boxOutlineGeometry-cleanup' of github.com:ggetz/cesium …
ggetz Oct 14, 2015
aa38a9d
Deprecate EllipsoidPrimitive, RectanglePrimitive, and Polygon
mramato Oct 14, 2015
b7b89ae
Redo PolygonOutlineGeometry Fix
ggetz Oct 14, 2015
9100963
Do not use the index of the max value of an unsigned short. Fixing te…
bagnell Oct 14, 2015
464c984
Merge pull request #3085 from AnalyticalGraphicsInc/out-with-the-old
pjcozzi Oct 14, 2015
3c22be6
fixed issue in unit test
ggetz Oct 14, 2015
a050e21
Merge remote-tracking branch 'origin/master' into boxOutlineGeometry-…
ggetz Oct 14, 2015
946b9b5
Update Context tests but it looks like OES_standard_derivatives and E…
bagnell Oct 14, 2015
e218e9d
geocoder uses flyto logic
Oct 14, 2015
4e2c188
Corrected Spelling error
ggetz Oct 14, 2015
29dfda4
Merge pull request #3073 from ggetz/boxOutlineGeometry-cleanup
pjcozzi Oct 14, 2015
b285714
Minor cleanup
mramato Oct 14, 2015
629dd79
Add Webstorm tasks.xml to ignore file.
mramato Oct 14, 2015
48c3fb3
Merge pull request #3089 from AnalyticalGraphicsInc/sort-requires
pjcozzi Oct 14, 2015
e887a4b
Disable problematic extensions.
bagnell Oct 14, 2015
2dc5950
Merge pull request #3087 from AnalyticalGraphicsInc/geocoderIDL
bagnell Oct 14, 2015
7aadb33
Organization changes
lilleyse Oct 14, 2015
3d0d05f
Merge remote-tracking branch 'lilleyse/webgl2' into webgl2
lilleyse Oct 14, 2015
9eada79
Fix instancing tests.
bagnell Oct 14, 2015
ade74c3
Added new function getPixelDimensions
ggetz Oct 14, 2015
f03edf2
Added unit tests for new functions
ggetz Oct 14, 2015
41f2ac8
Merge branch 'master' into getPixelSize-width-height
ggetz Oct 14, 2015
d9e25a4
Updated CHANGES
ggetz Oct 14, 2015
5444396
Added preprocessing of KHR_materials_common extension
Oct 14, 2015
c1138ee
Merge remote-tracking branch 'agi/master'
Oct 14, 2015
d951171
Merge branch 'master' into glTF-1.0
Oct 14, 2015
ea0b96b
Fixed comment.
Oct 14, 2015
0205165
Set shuttle ring to max angle when multiplier is too large.
mramato Oct 14, 2015
0590911
Merge pull request #3041 from AnalyticalGraphicsInc/webstorm
Oct 14, 2015
1cb239c
Merge branch 'master' into getPixelSize-width-height
ggetz Oct 14, 2015
933834c
Merge pull request #3093 from AnalyticalGraphicsInc/shuttle-ring-fix
pjcozzi Oct 14, 2015
6880345
Fix more tests and fix polyline collections indices.
bagnell Oct 14, 2015
a8f60fe
fixed deprecated tag
ggetz Oct 14, 2015
0e9e069
Fix frag depth test.
bagnell Oct 14, 2015
21d8260
Fixed a bunch of warnings and used constants.
Oct 14, 2015
85bc2ed
Merge remote-tracking branch 'agi/master'
Oct 14, 2015
3c3920c
Merge branch 'master' into glTF-1.0
Oct 14, 2015
b98bdb4
Set defaultToWebgl2 to false
lilleyse Oct 14, 2015
493879e
fixed getPixleDimensions functions
ggetz Oct 14, 2015
2177db6
fixed unit tests
ggetz Oct 14, 2015
312bc79
Removed test model and fixed error.
Oct 14, 2015
1889f69
Changes occurences of getPixelSize to getPixelDimensions
ggetz Oct 14, 2015
9575172
Tweak example
pjcozzi Oct 14, 2015
a060729
Tweak example again
pjcozzi Oct 14, 2015
69eedcb
Tweak doc
pjcozzi Oct 14, 2015
89dcdec
Tweak tests
pjcozzi Oct 14, 2015
30c3f5d
Fixed occurences of getPixelDimensions
ggetz Oct 14, 2015
423cffd
Merge remote-tracking branch 'refs/remotes/origin/getPixelSize-width-…
ggetz Oct 14, 2015
89b8736
Added vertex shader generation.
Oct 14, 2015
51c5b94
Merge pull request #3091 from ggetz/getPixelSize-width-height
pjcozzi Oct 14, 2015
7f14148
Added ability to load a generated shader directly from the source str…
Oct 14, 2015
e459999
Minor updates from review.
bagnell Oct 14, 2015
795d72c
Added uniforms to fragment shader.
Oct 15, 2015
900788a
Depricated Scene/HeadingPitchRange and added Core/HeadingPitchRange
ggetz Oct 15, 2015
99ca7d6
Added unit tests
ggetz Oct 15, 2015
7c75a12
More updates from review.
bagnell Oct 15, 2015
6e75213
Fix jsHint errors.
bagnell Oct 15, 2015
49a768a
Changed occurences of Scene/HeadingPitchRange to Core/HeadingPitchRange
ggetz Oct 15, 2015
20aaf79
Pretty much nothing.
Oct 15, 2015
397c70f
fixed spellin error
ggetz Oct 15, 2015
56eadbd
Updated CHANGES
ggetz Oct 15, 2015
ac691a5
Tweak comments
pjcozzi Oct 15, 2015
aff4b8a
Merge pull request #3096 from ggetz/HeadingPitchRange-to-core
pjcozzi Oct 15, 2015
da9eb87
More updates from review.
bagnell Oct 15, 2015
74e1a44
Fix jsHint errors.
bagnell Oct 15, 2015
4fa8c23
changed jsonp to loadJsonp
ggetz Oct 15, 2015
6b200e6
init new setview params
Oct 15, 2015
92638fc
Fixed mispelling
ggetz Oct 15, 2015
5fc31cc
Check if instanced arrays are supported in draw test.
bagnell Oct 15, 2015
12931c9
Adds majority of fragment shader generation. Still need to finish poi…
Oct 15, 2015
807a42a
begin cleanup private functions
Oct 15, 2015
6d8700e
Merge pull request #3094 from lilleyse/webgl2
pjcozzi Oct 15, 2015
f01ca03
Added point and spot lights. All shader generation is untested.
Oct 15, 2015
110ab96
Shaders now compile. Still need to add diffuse light.
Oct 15, 2015
d61326a
testing
Oct 15, 2015
2b22c48
fix tests
Oct 15, 2015
abedc25
Finished up shader generation. Still need to do skinning and handle t…
Oct 15, 2015
57748bb
added spec for loadJsonp
ggetz Oct 15, 2015
c6d1b86
Got skinning to work.
Oct 15, 2015
3e00723
fix view rectangle
Oct 15, 2015
58263ec
camera flight only orientation change
Oct 15, 2015
56ed580
Got alpha working for colors.
Oct 15, 2015
5885d2b
fix camera flight spec
Oct 15, 2015
71fc767
new tests
Oct 15, 2015
c51e84a
Updated unit test
ggetz Oct 15, 2015
de5feba
Added double sided support.
Oct 15, 2015
2b8eb90
Fixed missing semicolon
ggetz Oct 15, 2015
da28456
update doc and changes
Oct 15, 2015
4f34c00
Removed Whitespace
ggetz Oct 15, 2015
ad6710b
add to changes
Oct 15, 2015
c6dd5b7
Merge branch 'master' into cameraSetView
Oct 15, 2015
bc71f39
Updated Proxy Spec
ggetz Oct 15, 2015
8af4d8c
Merge pull request #3098 from ggetz/jsonp-rename
mramato Oct 15, 2015
fe520c8
Added phong shader.
Oct 16, 2015
f128e6a
removed unneccisary subtraction, combined high and low parameters
ggetz Oct 16, 2015
cff1e05
deprecate camera.viewRectangle
Oct 16, 2015
c30718d
Merge branch 'master' into remove-dsfun90-sub
ggetz Oct 16, 2015
c313e85
cleanup
Oct 16, 2015
a21c973
cleanup vraiables
ggetz Oct 16, 2015
7431a39
fix setview rectangle 2d
Oct 16, 2015
2891f2a
cleanup
ggetz Oct 16, 2015
14115de
cleanup default view
Oct 16, 2015
17c5a79
remove duplicate tests
Oct 16, 2015
6040510
Merge branch 'master' into cameraSetView
Oct 16, 2015
429d134
Merge pull request #3104 from ggetz/remove-dsfun90-sub
pjcozzi Oct 16, 2015
f2dedf5
Fixed a bunch of things from feedback.
Oct 16, 2015
9184670
Fixed comment.
Oct 16, 2015
7e08a7b
Initial port of build process to gulp
mramato Oct 16, 2015
ac44060
Use r.js optimizer programatically via npm module.
mramato Oct 18, 2015
a140689
Fix Node 0.10 support
mramato Oct 18, 2015
d12c5a0
Ongoing gulp work
mramato Oct 18, 2015
aecb78a
Add build-watch gulp task
mramato Oct 18, 2015
2df7d73
added tests for `CesiumTerrainProvider` and `TileMapServiceImageryPro…
keattang Oct 18, 2015
a237be3
Merge branch 'AGI-master' into signed-urls
keattang Oct 18, 2015
756ad55
added myself to contributors
keattang Oct 18, 2015
bc1ea1e
Fix almond loader.
mramato Oct 18, 2015
94328c1
Added support for node property of technique parameters. This got dir…
Oct 19, 2015
2b34d0a
Default failIfMajorPerformanceCaveat to false
mramato Oct 19, 2015
dc00f64
Fixed doc for getPixelSize and getPixelDimensions
ggetz Oct 19, 2015
c9968bc
Merge pull request #3109 from ggetz/getPixelSize-doc
pjcozzi Oct 19, 2015
96361f4
Mode shader cleanup.
Oct 19, 2015
845e253
Switch eclipse launch configurations to gulp.
mramato Oct 19, 2015
19add8c
Add `build` back as a `jsHint` dependancy.
mramato Oct 19, 2015
554faff
Fix stubs generation.
mramato Oct 19, 2015
f6cc71e
Fix BoxGeometry deprecation.
mramato Oct 20, 2015
4addf0d
createTaskProcessorWorker was not being properly excluded.
mramato Oct 20, 2015
26452fd
Fix issues with combined Workers
mramato Oct 20, 2015
1539c38
Merge pull request #3108 from AnalyticalGraphicsInc/failIfMajorPerfor…
pjcozzi Oct 20, 2015
27c6af6
Merge pull request #3110 from AnalyticalGraphicsInc/fix-deprecation
pjcozzi Oct 20, 2015
ade9627
Fix bug when using EXT_texture_filter_anisotropic extension.
bagnell Oct 20, 2015
3f34b86
Update texture coordinate range as well as the lower left coordinate …
bagnell Oct 20, 2015
3021bfa
Merge pull request #3112 from AnalyticalGraphicsInc/webgl-errors
pjcozzi Oct 20, 2015
a01081e
Merge branch 'master' into cameraSetView
bagnell Oct 21, 2015
2ba214d
Fix vertex attrib divisor getting set during vao creation
lilleyse Oct 21, 2015
4ecbbbe
Organization and extra comment
lilleyse Oct 21, 2015
581a397
Updated unit test models to glTF v1.0 (except for a test model).
Oct 21, 2015
e1f4e66
Updated Sandcastle models and example.
Oct 21, 2015
3b250dc
Merge pull request #3113 from lilleyse/vertexDivisorFix
bagnell Oct 21, 2015
62e50ba
Merge remote-tracking branch 'origin/master' into gulp
mramato Oct 21, 2015
221590d
Update CHANGES.md
mramato Oct 21, 2015
b60eec4
Minor doc/formatting/scratch variable fixes.
bagnell Oct 21, 2015
ebab05f
Merge pull request #3100 from AnalyticalGraphicsInc/cameraSetView
bagnell Oct 21, 2015
f9ebf33
Stop camera inertia when only moving small amounts.
bagnell Oct 21, 2015
4907ee1
Fixed a few errors with specular textures and a build error.
Oct 21, 2015
ddc1286
Update CHANGES.md.
bagnell Oct 21, 2015
ccd8d28
Merge pull request #3114 from AnalyticalGraphicsInc/inertia
pjcozzi Oct 21, 2015
bb839ef
Changes after review.
mramato Oct 21, 2015
f789a73
Remove unecessary type casting.
mramato Oct 21, 2015
79b230b
Fix shader minification.
mramato Oct 21, 2015
1cfa1be
Changes after review
mramato Oct 21, 2015
a3df692
Fix typo, again.
mramato Oct 22, 2015
d855fe5
Minify shaders when running `buildApps`
mramato Oct 22, 2015
6061d19
Include Shaders subdirectories.
mramato Oct 22, 2015
fd1169c
More changes after review.
mramato Oct 22, 2015
798774f
Hopefully last review comment.
mramato Oct 22, 2015
1ae0fe2
Merge pull request #3106 from AnalyticalGraphicsInc/gulp
shunter Oct 22, 2015
83e90ee
Remove old build system and associated tools.
mramato Oct 22, 2015
77d22e0
Update AMD loaders
mramato Oct 22, 2015
17f3248
Merge pull request #3115 from AnalyticalGraphicsInc/dead-ant
shunter Oct 22, 2015
6229b9c
Merge remote-tracking branch 'origin/master' into update-requirejs
mramato Oct 22, 2015
6b62787
Fixed proxying bug
keattang Oct 23, 2015
fc76503
ShaderSource and Buffer changes forwarded from 3d-tiles
lilleyse Oct 23, 2015
cf59232
Enable billboard tests with a height reference.
bagnell Oct 23, 2015
310639c
Merge pull request #3122 from AnalyticalGraphicsInc/billboard-tests
mramato Oct 23, 2015
40a21b0
Add npm-debug.log to .gitignore
mramato Oct 23, 2015
1638c3c
Merge pull request #3123 from AnalyticalGraphicsInc/update-ignore
pjcozzi Oct 23, 2015
6552144
Merge pull request #3121 from lilleyse/shader-source-cleanup
pjcozzi Oct 23, 2015
a772110
Be more lenient when processing KML coordinates
mramato Oct 23, 2015
0333e2f
Fix TestWorkers in TaskProcessorSpec.
shunter Oct 23, 2015
275d1be
Merge pull request #3124 from AnalyticalGraphicsInc/kml-stinks
pjcozzi Oct 23, 2015
eb968a1
Update RequireJS to 2.1.20
shunter Oct 23, 2015
f5ed115
Merge pull request #3107 from AnalyticalGraphicsInc/update-requirejs
shunter Oct 23, 2015
9ce6362
Frame state refactor WIP.
bagnell Oct 23, 2015
4d2bf7f
Fixed divisor issue
lilleyse Oct 25, 2015
3747fa9
fixes for failing tests
keattang Oct 26, 2015
cf9a80b
Merge branch 'AGI-master' into signed-urls
keattang Oct 26, 2015
c2649d8
Merge pull request #3126 from lilleyse/vertexDivisorFix
pjcozzi Oct 26, 2015
595bb4e
Update CHANGES
mramato Oct 26, 2015
8b50387
Continued frame state refactor.
bagnell Oct 26, 2015
87d7b61
Fix scene primitive update.
bagnell Oct 26, 2015
10256b2
Merge branch 'master' into frame-state-refactor
bagnell Oct 26, 2015
f6ecdc2
Fix ground primitives.
bagnell Oct 26, 2015
814f6af
Fix broken tests.
bagnell Oct 26, 2015
8d7b5ad
Fix more failing tests.
bagnell Oct 26, 2015
e71454c
Fix remaining failing tests.
bagnell Oct 26, 2015
efefae9
Add doc for the context and commandList properties of FrameState.
bagnell Oct 26, 2015
75a32e5
Update QuadtreePrimitive Sandcastle test.
bagnell Oct 26, 2015
ae5ae76
Merge pull request #3128 from AnalyticalGraphicsInc/frame-state-refactor
pjcozzi Oct 26, 2015
8941b29
Switch almond to a npm module since it's only used by the build process.
shunter Oct 26, 2015
3be2e22
Merge pull request #3129 from AnalyticalGraphicsInc/almond
mramato Oct 26, 2015
902adaf
Fixed development sandcastle example and tweaked constant lighting sh…
Oct 27, 2015
c4829e5
Merge remote-tracking branch 'agi/master'
Oct 27, 2015
45a3caf
Merge branch 'master' into glTF-1.0
Oct 27, 2015
6c4903f
Throw exception when we can't load a model because of an invalid exte…
Oct 27, 2015
6595b7d
Added gray material if we don't have a technique.
Oct 27, 2015
6d650e1
Merge remote-tracking branch 'origin/master' into PropellerAero-signe…
mramato Oct 27, 2015
42bbd8d
Update README.md Demo Screenshots
fantasticole Oct 27, 2015
34a7eb9
Update CONTRIBUTORS.md
fantasticole Oct 27, 2015
c68eaeb
Clean up from #2878
mramato Oct 27, 2015
091b9c7
Merge pull request #3132 from fantasticole/fantasticole-README-update
pjcozzi Oct 27, 2015
654a7a7
Fix jshint warning, unused symbols, make joinUrls private.
kring Oct 27, 2015
c73c6f9
Merge remote-tracking branch 'upstream/master' into issue2878-cleanup
kring Oct 27, 2015
99c43b6
Merge pull request #3133 from AnalyticalGraphicsInc/issue2878-cleanup
kring Oct 27, 2015
96b38a3
Fix Travis jsHint checking
mramato Oct 28, 2015
a60d242
Minor doc fixes for HeadingPitchRange.
denverpierce Oct 28, 2015
86a685a
Merge pull request #3135 from denverpierce/hpr-doc-fixes
pjcozzi Oct 28, 2015
e4648ff
Added support for new revision of KHR_materials_common extension.
Oct 28, 2015
98e0370
Merge pull request #3134 from AnalyticalGraphicsInc/fix-travis
pjcozzi Oct 28, 2015
91a1275
Fixed issue with double sided materials.
Oct 28, 2015
333b0d0
Allows us to load models with no indices.
Oct 28, 2015
db26b99
Added test for KHR_materials_common model.
Oct 28, 2015
fa760c2
clockwise -> counter-clockwise
Oct 28, 2015
33529f4
Merge pull request #3139 from AnalyticalGraphicsInc/fixEllipseOutlineDoc
pjcozzi Oct 28, 2015
6f5aaa9
Tweak
pjcozzi Oct 29, 2015
90489b5
Fixes from PR comments.
Oct 29, 2015
b539813
Fixed shader issue on Mac.
Oct 29, 2015
798cb2a
Merged
Oct 29, 2015
02be44f
Update CHANGES.md
Oct 29, 2015
e6ea58e
Added deprecation warning for CESIUM_binary_glTf and cleaned up doc c…
Oct 29, 2015
82d3433
Merge remote-tracking branch 'agi/master'
Oct 29, 2015
6462364
Merged master.
Oct 29, 2015
999f3f3
Added unit tests that tests the majority of KHR_materials_common scen…
Oct 29, 2015
b809eee
Added proposed mime types.
Oct 29, 2015
a11148b
Changed Milk Truck to use a KHR_materials_common version in Sandcastle.
Oct 29, 2015
4151533
Fixed spot lights and added tests for spot lights and transparency.
Oct 29, 2015
9d4e6c4
Clean up README.md
pjcozzi Oct 29, 2015
7da25eb
Fix picking Sandcastle example
pjcozzi Oct 29, 2015
bc2c8a6
Merge pull request #3039 from tfili/glTF-1.0
pjcozzi Oct 29, 2015
0b54492
Tweak CHANGES.md
pjcozzi Oct 29, 2015
9d99e90
Tweak CHANGES.md
pjcozzi Oct 29, 2015
e56ef8d
Fix #3144
Oct 29, 2015
1a9d73d
Tweak CHANGES.md
pjcozzi Oct 29, 2015
0419ff1
Merge pull request #3145 from AnalyticalGraphicsInc/sandcastleViewRec…
pjcozzi Oct 29, 2015
7d4ca23
Ignore the deprecated Scene version of HeadingPitchRange
mramato Oct 29, 2015
f02cb47
Fix problems with joinUrls and absolute URLs.
kring Oct 29, 2015
b1d5c09
Don't build or include Cesium Viewer as part of release.
mramato Oct 29, 2015
54254bc
Fix occasional non-clean build crash.
mramato Oct 30, 2015
9458d33
added epsilons to floating point comparisons, pollToPromise for credit
sen-lu Oct 30, 2015
46d7a7c
fixed accidental removal of new test made in 2df7d73
sen-lu Oct 30, 2015
223ed22
Merge pull request #3149 from AnalyticalGraphicsInc/no-viewer-build
pjcozzi Oct 30, 2015
28b7ed7
Merge pull request #3151 from tiffanylu/tmsSpec
pjcozzi Oct 30, 2015
c063697
Merge pull request #3148 from AnalyticalGraphicsInc/joinUrls
mramato Oct 30, 2015
c8d4fbd
Fix when.defer() usage
mramato Oct 30, 2015
a0a1446
Merge pull request #3147 from AnalyticalGraphicsInc/fix-deprecated
shunter Oct 30, 2015
b407181
Merge pull request #3152 from AnalyticalGraphicsInc/maybe-not-always
pjcozzi Oct 30, 2015
add23c4
Tweak CHANGES.md
pjcozzi Nov 2, 2015
75c1e8b
Update version to 1.15
pjcozzi Nov 2, 2015
8561ac6
Merge tag '1.15' into cesiumUpgrade-1.15
kring Nov 2, 2015
e1315aa
Fix merge conflicts.
kring Nov 2, 2015
d0856b4
Remove commented-out code.
kring Nov 2, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
15 changes: 4 additions & 11 deletions .externalToolBuilders/automaticBuild.launch
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AFTER_CLEAN_TARGETS" value="build,"/>
<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AUTO_TARGETS" value="build,"/>
<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="build,"/>
<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
<launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType">
<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Cesium"/>
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/Cesium/build.xml}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${system_path:node}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="./node_modules/gulp/bin/gulp.js build"/>
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/Cesium}"/>
</launchConfiguration>
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,20 @@ Thumbs.db
/Apps/CesiumViewer/Gallery/gallery-index.js

/Apps/Sandcastle/jsHintOptions.js
/Apps/Sandcastle/.jshintrc
/Apps/Sandcastle/gallery/gallery-index.js

/Source/Cesium.js

/Source/Shaders/*.js
/Source/Shaders/*/*.js
/Source/Shaders/*/*/*.js
!/Source/Shaders/Shaders.profile.js

/Specs/SpecList.js

/node_modules
npm-debug.log

# WebStorm user-specific
.idea/workspace.xml
.idea/tasks.xml
1 change: 1 addition & 0 deletions .idea/.name

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

13 changes: 13 additions & 0 deletions .idea/cesium.iml

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

26 changes: 26 additions & 0 deletions .idea/codeStyleSettings.xml

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

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

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

7 changes: 7 additions & 0 deletions .idea/inspectionProfiles/profiles_settings.xml

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

7 changes: 7 additions & 0 deletions .idea/jsLibraryMappings.xml

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

83 changes: 83 additions & 0 deletions .idea/jsLinters/jshint.xml

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

14 changes: 14 additions & 0 deletions .idea/libraries/cesium_node_modules.xml

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

14 changes: 14 additions & 0 deletions .idea/misc.xml

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

8 changes: 8 additions & 0 deletions .idea/modules.xml

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

6 changes: 6 additions & 0 deletions .idea/vcs.xml

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

2 changes: 2 additions & 0 deletions .idea/watcherTasks.xml

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

14 changes: 14 additions & 0 deletions .idea/webResources.xml

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

3 changes: 2 additions & 1 deletion .jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,6 @@
"shadow": false,
"sub": false,
"supernew": false,
"browser": true
"browser": true,
"predef": [ "JSON" ]
}
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ node_js:
- "0.10"
sudo: false
script:
- ant jsHint release -DnodePath=node
- npm run jsHint && npm run release
14 changes: 8 additions & 6 deletions Apps/CesiumViewer/CesiumViewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ define([
'Cesium/Core/formatError',
'Cesium/Core/getFilenameFromUri',
'Cesium/Core/Math',
'Cesium/Core/queryToObject',
'Cesium/Core/objectToQuery',
'Cesium/Core/queryToObject',
'Cesium/DataSources/CzmlDataSource',
'Cesium/DataSources/GeoJsonDataSource',
'Cesium/DataSources/KmlDataSource',
Expand All @@ -21,8 +21,8 @@ define([
formatError,
getFilenameFromUri,
CesiumMath,
queryToObject,
objectToQuery,
queryToObject,
CzmlDataSource,
GeoJsonDataSource,
KmlDataSource,
Expand Down Expand Up @@ -156,10 +156,12 @@ define([
var roll = ((splitQuery.length > 5) && (!isNaN(+splitQuery[5]))) ? CesiumMath.toRadians(+splitQuery[5]) : undefined;

viewer.camera.setView({
position: Cartesian3.fromDegrees(longitude, latitude, height),
heading: heading,
pitch: pitch,
roll: roll
destination: Cartesian3.fromDegrees(longitude, latitude, height),
orientation: {
heading: heading,
pitch: pitch,
roll: roll
}
});
}
}
Expand Down
6 changes: 4 additions & 2 deletions Apps/CesiumViewer/CesiumViewerStartup.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
require({
baseUrl : '.',
paths : {
domReady : '../../ThirdParty/requirejs-2.1.9/domReady',
domReady : '../../ThirdParty/requirejs-2.1.20/domReady',
Cesium : '../../Source'
}
}, ['CesiumViewer'], function() {
}, [
'CesiumViewer'
], function() {
});
6 changes: 3 additions & 3 deletions Apps/CesiumViewer/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<head>
<!-- Use correct character set. -->
<meta charset="utf-8">
<!-- Tell IE to use the latest, best version (or Chrome Frame if pre-IE11). -->
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
<!-- Tell IE to use the latest, best version. -->
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<!-- Make the application on mobile take up the full browser screen and disable user scaling. -->
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
<title>Cesium Viewer</title>
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<link rel="stylesheet" href="CesiumViewer.css" media="screen">
<script data-main="CesiumViewerStartup" src="../../ThirdParty/requirejs-2.1.9/require.js"></script>
<script data-main="CesiumViewerStartup" src="../../ThirdParty/requirejs-2.1.20/require.js"></script>
</head>
<body style="background: #000;">
<div id="cesiumContainer" class="fullWindow"></div>
Expand Down
4 changes: 2 additions & 2 deletions Apps/HelloWorld.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<head>
<!-- Use correct character set. -->
<meta charset="utf-8">
<!-- Tell IE to use the latest, best version (or Chrome Frame if pre-IE11). -->
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
<!-- Tell IE to use the latest, best version. -->
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<!-- Make the application on mobile take up the full browser screen and disable user scaling. -->
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
<title>Hello World!</title>
Expand Down
Binary file removed Apps/SampleData/models/CesiumAir/Cesium_Air.bgltf
Binary file not shown.
Binary file added Apps/SampleData/models/CesiumAir/Cesium_Air.glb
Binary file not shown.
Loading