Skip to content

Commit

Permalink
Merge pull request #1 from BabylonJS/master - update fork
Browse files Browse the repository at this point in the history
update fork

never test to pull request just to update (as seen here https://www.youtube.com/watch?v=bTaFAqJ6bjE ), sorry if i do something wrong...
  • Loading branch information
Vinc3r committed Jun 22, 2017
2 parents 6027df2 + 2990b5c commit d3dbeab
Show file tree
Hide file tree
Showing 1,488 changed files with 499,479 additions and 325,096 deletions.
40 changes: 39 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,17 @@ TestResults
*.sln.docstates
*.map

# javascript files
src/**/*.js
src/**/*.d.ts
loaders/src/**/*.js
materialsLibrary/src/**/*.js
proceduralTexturesLibrary/src/**/*.js
postProcessLibrary/src/**/*.js
inspector/src/**/*.js
serializers/src/**/*.js
gui/src/**/*.js

# Build results
[Dd]ebug/
[Rr]elease/
Expand Down Expand Up @@ -104,6 +115,19 @@ ClientBin
*.dbmdl
Generated_Code #added for RIA/Silverlight projects

# OS or Editor folders
*.DS_Store
._*
Thumbs.db
.cache
.tmproj
nbproject
*.sublime-project
*.sublime-workspace
.directory
build
.history

# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
_UpgradeReport_Files/
Expand All @@ -121,10 +145,24 @@ UpgradeLog*.XML

# Do not ignore loaders/obj
!loaders/*
**/node_modules
node_modules

# for JetBrains IDE
.idea

# for VSCode
.vscode
.vs
.tempChromeProfileForDebug
.temp
*.js.map
*.js.fx
*.d.ts
!dist/**/*.d.ts
!lib.d.ts

# local dev
localDev/src/*
/dist/preview release/babylon.custom.js
/dist/preview release/babylon.custom.max.js
/localDev/src/index.js
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: node_js
node_js:
- "4.1"
- "6"
before_script:
- npm install -g gulp
- cd ./Tools/Gulp
Expand Down
122 changes: 122 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
{
"version": "0.1.0",
"configurations": [
{
"name": "Launch sandbox (Chrome)",
"type": "chrome",
"request": "launch",
"url": "http://localhost:1338/sandbox/index-local.html",
"webRoot": "${workspaceRoot}/",
"sourceMaps": true,
"preLaunchTask": "run",
"userDataDir": "${workspaceRoot}/.tempChromeProfileForDebug",
"runtimeArgs": [
"--enable-unsafe-es3-apis"
]
},
{
"name": "Launch playground (Chrome)",
"type": "chrome",
"request": "launch",
"url": "http://localhost:1338/Playground/index-local.html",
"webRoot": "${workspaceRoot}/",
"sourceMaps": true,
"preLaunchTask": "run",
"userDataDir": "${workspaceRoot}/.tempChromeProfileForDebug",
"runtimeArgs": [
"--enable-unsafe-es3-apis"
]
},
{
"name": "Launch playground (Chrome+WebGL 1.0 forced)",
"type": "chrome",
"request": "launch",
"url": "http://localhost:1338/Playground/index-local.html",
"webRoot": "${workspaceRoot}/",
"sourceMaps": true,
"preLaunchTask": "run",
"userDataDir": "${workspaceRoot}/.tempChromeProfileForDebug",
"runtimeArgs": [
"--disable-es3-apis"
]
},
{
"name": "Launch Materials Library (Chrome)",
"type": "chrome",
"request": "launch",
"url": "http://localhost:1338/materialsLibrary/index.html",
"webRoot": "${workspaceRoot}/",
"sourceMaps": true,
"preLaunchTask": "run",
"userDataDir": "${workspaceRoot}/.tempChromeProfileForDebug",
"runtimeArgs": [
"--enable-unsafe-es3-apis"
]
},
{
"name": "Launch Post Processes Library (Chrome)",
"type": "chrome",
"request": "launch",
"url": "http://localhost:1338/postProcessLibrary/index.html",
"webRoot": "${workspaceRoot}/",
"sourceMaps": true,
"preLaunchTask": "run",
"userDataDir": "${workspaceRoot}/.tempChromeProfileForDebug",
"runtimeArgs": [
"--enable-unsafe-es3-apis"
]
},
{
"name": "Launch Procedural Textures Library (Chrome)",
"type": "chrome",
"request": "launch",
"url": "http://localhost:1338/proceduralTexturesLibrary/index.html",
"webRoot": "${workspaceRoot}/",
"sourceMaps": true,
"preLaunchTask": "run",
"userDataDir": "${workspaceRoot}/.tempChromeProfileForDebug",
"runtimeArgs": [
"--enable-unsafe-es3-apis"
]
},
{
"name": "Launch Inspector (Chrome)",
"type": "chrome",
"request": "launch",
"url": "http://localhost:1338/inspector/index.html",
"webRoot": "${workspaceRoot}/",
"sourceMaps": true,
"preLaunchTask": "run",
"userDataDir": "${workspaceRoot}/.tempChromeProfileForDebug",
"runtimeArgs": [
"--enable-unsafe-es3-apis"
]
},
{
"name": "Launch Local Dev (Chrome)",
"type": "chrome",
"request": "launch",
"url": "http://localhost:1338/localDev/index.html",
"webRoot": "${workspaceRoot}/",
"sourceMaps": true,
"preLaunchTask": "run",
"userDataDir": "${workspaceRoot}/.tempChromeProfileForDebug",
"runtimeArgs": [
"--enable-unsafe-es3-apis"
]
},
{
"name": "Launch Build Validation (Chrome)",
"type": "chrome",
"request": "launch",
"url": "http://localhost:1338/tests/validation/index.html",
"webRoot": "${workspaceRoot}/",
"sourceMaps": true,
"preLaunchTask": "run",
"userDataDir": "${workspaceRoot}/.tempChromeProfileForDebug",
"runtimeArgs": [
"--enable-unsafe-es3-apis"
]
}
]
}
39 changes: 39 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
// Place your settings in this file to overwrite default and user settings.
{
// Configure glob patterns for excluding files and folders.
"files.exclude": {
"**/.git": true,
"**/.svn": true,
"**/.hg": true,
"**/.DS_Store": true,
"**/.vs": true,
"**/.tempChromeProfileForDebug": true,
"**/node_modules": true,
"**/temp": true,
"**/.temp": true,
"**/*.d.ts": true,
"**/*.js.map": true,
"**/*.js.fx": true,
"**/*.js": {
"when":"$(basename).ts"
}
},
"files.associations": {
"*.fx": "glsl"
},
"search.exclude": {
"**/node_modules": true,
"**/bower_components": true,
"**/.vs": true,
"**/.tempChromeProfileForDebug": true,
"**/.temp": true,
"**/dist": true,
"**/*.map": true,
"**/*.js": {
"when":"$(basename).ts"
},
"**/*.d.ts": true,
"assets":true
},
"typescript.check.workspaceVersion": false
}
44 changes: 44 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
// 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": [],
"showOutput": "always",
"options": {
"cwd": "${workspaceRoot}/Tools/Gulp"
},
"tasks": [
{
"taskName": "run",
// Hijack Test Command for easy shortcut
"isTestCommand": true,
"isBackground": true,
"problemMatcher": {
"owner": "typescript",
"fileLocation": "relative",
"pattern": {
"regexp": "^([^\\s].*)\\((\\d+|\\,\\d+|\\d+,\\d+,\\d+,\\d+)\\):\\s+(error|warning|info)\\s+(TS\\d+)\\s*:\\s*(.*)$",
"file": 1,
"location": 2,
"severity": 3,
"code": 4,
"message": 5
},
"watching": {
"activeOnStart": true,
"beginsPattern": "Starting \\'watch\\'",
"endsPattern": "Finished \\'run\\'"
}
}
},
{
"taskName": "typescript-all",
"isBuildCommand": true,
"problemMatcher": [
"$tsc"
]
}
]
}
Loading

0 comments on commit d3dbeab

Please sign in to comment.