Skip to content

Commit

Permalink
Set GLSL to 4 spaces, move redundant settings out of VSCode files.
Browse files Browse the repository at this point in the history
  • Loading branch information
emackey committed Apr 27, 2020
1 parent 44acf66 commit ffd9989
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
3 changes: 3 additions & 0 deletions .editorconfig
Expand Up @@ -10,3 +10,6 @@ insert_final_newline = true

[*.md]
trim_trailing_whitespace = false

[*.glsl]
indent_size = 4
8 changes: 2 additions & 6 deletions .vscode/settings.json
Expand Up @@ -19,11 +19,6 @@
"files.associations": {
"*.czml": "json"
},
"files.trimTrailingWhitespace": true,
"files.insertFinalNewline": true,
"editor.insertSpaces": true,
"editor.tabSize": 2,
"editor.detectIndentation": false,
"eslint.enable": true,
"javascript.format.insertSpaceAfterCommaDelimiter": true,
"javascript.format.insertSpaceAfterSemicolonInForStatements": true,
Expand All @@ -33,5 +28,6 @@
"javascript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": false,
"javascript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": false,
"javascript.format.placeOpenBraceOnNewLineForFunctions": false,
"javascript.format.placeOpenBraceOnNewLineForControlBlocks": false
"javascript.format.placeOpenBraceOnNewLineForControlBlocks": false,
"glTF.defaultV2Engine": "Cesium"
}

0 comments on commit ffd9989

Please sign in to comment.