-
Notifications
You must be signed in to change notification settings - Fork 3.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '3d-tiles' into tilesets-z-up
- Loading branch information
Showing
114 changed files
with
2,705 additions
and
641 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,21 @@ | ||
| { | ||
| // Use IntelliSense to learn about possible Node.js debug attributes. | ||
| // Hover to view descriptions of existing attributes. | ||
| // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 | ||
| "version": "0.2.0", | ||
| "configurations": [ | ||
| { | ||
| "type": "node", | ||
| "request": "launch", | ||
| "name": "Launch Program", | ||
| "program": "${workspaceRoot}\\server.js", | ||
| "cwd": "${workspaceRoot}" | ||
| }, | ||
| { | ||
| "type": "node", | ||
| "request": "attach", | ||
| "name": "Attach to Process", | ||
| "port": 5858 | ||
| } | ||
| ] | ||
| } |
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,30 @@ | ||
| // Cesium project settings for VSCode. | ||
| { | ||
| "files.exclude": { | ||
| "**/.git": true, | ||
| ".idea": true, | ||
| ".metadata": true, | ||
| "Build": true, | ||
| "Instrumented": true, | ||
| "**/Cesium-*.zip": true, | ||
| "**/cesium-*.tgz": true, | ||
| "**/.DS_Store": true, | ||
| "**/Thumbs.db": true, | ||
|
|
||
| "Apps/Sandcastle/jsHintOption?.js": true, | ||
| "Apps/Sandcastle/gallery/gallery-inde?.js": true, | ||
|
|
||
| "Source/Cesiu?.js": true, | ||
| "Source/Shaders/**/*.js": true, | ||
|
|
||
| "Specs/SpecLis?.js": true, | ||
| "node_modules": true, | ||
| "npm-debu?.log": true | ||
| }, | ||
| "files.trimTrailingWhitespace": true, | ||
| "files.insertFinalNewline": true, | ||
| "editor.insertSpaces": true, | ||
| "editor.tabSize": 4, | ||
| "editor.detectIndentation": false, | ||
| "jshint.enable": true | ||
| } |
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,32 @@ | ||
| { | ||
| // See https://go.microsoft.com/fwlink/?LinkId=733558 | ||
| // for the documentation about the tasks.json format | ||
| "version": "0.1.0", | ||
| "command": "gulp", | ||
| "isShellCommand": true, | ||
| "args": [ | ||
| "--no-color" | ||
| ], | ||
| "tasks": [ | ||
| { | ||
| "taskName": "build", | ||
| "args": [], | ||
| "isBuildCommand": true, | ||
| "isBackground": false, | ||
| "problemMatcher": [ | ||
| "$lessCompile", | ||
| "$tsc", | ||
| "$jshint" | ||
| ] | ||
| }, | ||
| { | ||
| "taskName": "test", | ||
| "args": [], | ||
| "isTestCommand": true | ||
| }, | ||
| { | ||
| "taskName": "build-watch", | ||
| "isBackground": true | ||
| } | ||
| ] | ||
| } |
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
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 |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| # VSCode Guide | ||
|
|
||
| 1. Install [VSCode](https://code.visualstudio.com/). | ||
|
|
||
| 2. If you haven't already, install `gulp-cli` globally, with | ||
| `npm install -g gulp-cli` from a bash prompt. This does not require | ||
| administrative rights, and places a `gulp` shim into your path that will | ||
| invoke a copy of gulp from the local project folder. This is needed for | ||
| VSCode's build tasks to work with Cesium. | ||
|
|
||
| 3. Click `File -> Open Folder...` and open the Cesium root folder. | ||
|
|
||
| ## Shell Integration (optional) | ||
|
|
||
| VSCode has an integrated shell, exposed on Windows by pressing CTRL-\` (CTRL-backtick). | ||
| You may want to switch this to be a git bash shell by default. If so, click | ||
| File -> Preferences -> Settings... and enter `integrated.shell` into the search | ||
| box. Choose the appropriate key for your operating system, for example | ||
| `terminal.integrated.shell.windows` for Windows, and click the edit icon. | ||
| The default setting will be copied to your user settings. The default for | ||
| Windows is `"C:\\Windows\\system32\\cmd.exe"`. Change this to point to your | ||
| git bash install. For example: | ||
|
|
||
| ``` | ||
| { | ||
| "terminal.integrated.shell.windows": "C:\\Program Files\\Git\\bin\\bash.exe" | ||
| } | ||
| ``` | ||
|
|
||
| Note that on Windows, the git bash desktop icon points at a different exe file, | ||
| one that forces a separate (non-integrated) window to pop open outside of VSCode. | ||
| Make sure you are pointed at the correct exe as shown above, with Git 2.0.0 or | ||
| higher installed, to get the correct integrated shell behavior. | ||
|
|
||
| ## VSCode Plugins (mostly optional) | ||
|
|
||
| Click on the extensions icon, or press CTRL-SHIFT-X to see the list of installed | ||
| VSCode extensions. While we don't officially endorse any particular 3rd-party | ||
| plugin, there are some that appear to be quite useful to Cesium. Just enter | ||
| the desired plugin name in the search box and click install. You will need to | ||
| restart VSCode after you are done installing plugins. | ||
|
|
||
| * **jshint** by Dirk Baeumer -- This plugin picks up on Cesium's own jsHint settings, | ||
| and will warn of any violations. The Cesium main repository should pass jsHint | ||
| using the Cesium jsHint settings with no warnings and no errors. Proposed | ||
| contributions to Cesium that introduce jsHint warnings will need to be corrected | ||
| before they are accepted. | ||
|
|
||
| * **Shader languages support for VS Code** by slevesque -- This plugin provides | ||
| syntax highlighting for Cesium's shader code. | ||
|
|
||
| * **Prettify JSON** by Mohsen Azimi -- This seems generally useful. | ||
|
|
||
| ## VSCode Tasks and Files | ||
|
|
||
| You can launch any of Cesium's npm tasks from within VSCode by pressing | ||
| CTRL-P and typing `task ` (with a trailing space). Autocomplete will | ||
| offer the list of npm tasks for you to run. The first time you do this, | ||
| allow a moment for it to read the available tasks from the gulpfile. | ||
|
|
||
| You can also jump to any source file with the same CTRL-P keypress | ||
| followed by the name of the file. | ||
|
|
||
| ## Building Cesium | ||
|
|
||
| Cesium has a number of GLSL shaders and auto-generated files that must be | ||
| built before Cesium can be used. The simplest way in VSCode is to type | ||
| `CTRL-P` `task build` to trigger a single build. | ||
|
|
||
| You can also start the build watcher with `CTRL-P` `task build-watch`. This | ||
| leaves a watcher running until you exit VSCode, that will automatically | ||
| update any shaders or auto-generated files to reflect changes to Cesium as | ||
| you save them. | ||
|
|
||
| Keep in mind that `build-watch` will quietly terminate when | ||
| you quit VSCode, so should be restarted manually on next launch. |
Oops, something went wrong.