Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #25 from iSpring/develop
merge develop version 0.3.3 to master
- Loading branch information
Showing
75 changed files
with
3,400 additions
and
2,666 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "typescript.check.workspaceVersion": false | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,61 @@ | ||
| window.onload = function() { | ||
| require(["world/Globe", "world/BingTiledLayer", "world/NokiaTiledLayer", "world/OsmTiledLayer", "world/SosoTiledLayer", "world/TiandituTiledLayer", "world/GoogleTiledLayer"], | ||
| function(Globe, BingTiledLayer, NokiaTiledLayer, OsmTiledLayer, SosoTiledLayer, TiandituTiledLayer, GoogleTiledLayer) { | ||
|
|
||
| function startWebGL() { | ||
| var canvas = document.getElementById("canvasId"); | ||
| window.globe = new Globe(canvas); | ||
| var mapSelector = document.getElementById("mapSelector"); | ||
| mapSelector.onchange = changeTiledLayer; | ||
| changeTiledLayer(); | ||
| } | ||
|
|
||
| function changeTiledLayer() { | ||
| var mapSelector = document.getElementById("mapSelector"); | ||
| mapSelector.blur(); | ||
| var newTiledLayer = null; | ||
| var args = null; | ||
| var value = mapSelector.value; | ||
| switch (value) { | ||
| case "bing": | ||
| newTiledLayer = new BingTiledLayer(); | ||
| break; | ||
| case "nokia": | ||
| newTiledLayer = new NokiaTiledLayer(); | ||
| break; | ||
| case "osm": | ||
| newTiledLayer = new OsmTiledLayer(); | ||
| break; | ||
| case "soso": | ||
| newTiledLayer = new SosoTiledLayer(); | ||
| break; | ||
| case "tianditu": | ||
| newTiledLayer = new TiandituTiledLayer(); | ||
| break; | ||
| default: | ||
| break; | ||
| } | ||
|
|
||
| if (newTiledLayer) { | ||
| window.globe.setTiledLayer(newTiledLayer); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| startWebGL(); | ||
| }); | ||
| require(["world/Kernel", "world/Globe", "world/layers/BingTiledLayer", "world/layers/NokiaTiledLayer", "world/layers/OsmTiledLayer", | ||
| "world/layers/SosoTiledLayer", "world/layers/TiandituTiledLayer", "world/layers/GoogleTiledLayer", "world/graphics/Atmosphere", | ||
| "world/layers/PoiLayer" | ||
| ], | ||
| function(Kernel, Globe, BingTiledLayer, NokiaTiledLayer, OsmTiledLayer, SosoTiledLayer, TiandituTiledLayer, GoogleTiledLayer, | ||
| Atmosphere, PoiLayer) { | ||
|
|
||
| window.Kernel = Kernel; | ||
|
|
||
| function startWebGL() { | ||
| var canvas = document.getElementById("canvasId"); | ||
| window.globe = new Globe(canvas); | ||
|
|
||
| var mapSelector = document.getElementById("mapSelector"); | ||
| mapSelector.onchange = changeTiledLayer; | ||
| changeTiledLayer(); | ||
|
|
||
| var atmosphere = Atmosphere.getInstance(); | ||
|
|
||
| window.globe.scene.add(atmosphere); | ||
|
|
||
| var poiLayer = new PoiLayer(); | ||
| window.globe.scene.add(poiLayer); | ||
| } | ||
|
|
||
| function changeTiledLayer() { | ||
| var mapSelector = document.getElementById("mapSelector"); | ||
| mapSelector.blur(); | ||
| var newTiledLayer = null; | ||
| var args = null; | ||
| var value = mapSelector.value; | ||
| switch (value) { | ||
| case "bing": | ||
| newTiledLayer = new BingTiledLayer(); | ||
| break; | ||
| case "nokia": | ||
| newTiledLayer = new NokiaTiledLayer(); | ||
| break; | ||
| case "osm": | ||
| newTiledLayer = new OsmTiledLayer(); | ||
| break; | ||
| case "soso": | ||
| newTiledLayer = new SosoTiledLayer(); | ||
| break; | ||
| case "tianditu": | ||
| newTiledLayer = new TiandituTiledLayer(); | ||
| break; | ||
| default: | ||
| break; | ||
| } | ||
|
|
||
| if (newTiledLayer) { | ||
| window.globe.setTiledLayer(newTiledLayer); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| startWebGL(); | ||
| }); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.