Skip to content

Commit

Permalink
Merge pull request #1 from BabylonJS/WebGPU
Browse files Browse the repository at this point in the history
Merge from origin
  • Loading branch information
ottoville committed Jul 31, 2020
2 parents 74b5d3b + 3bd010d commit 8fbdda8
Show file tree
Hide file tree
Showing 1,399 changed files with 1,557,512 additions and 539,375 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -199,4 +199,6 @@ gui/dist/
/Viewer/tests/tsc
/Viewer/tests/tsc.cmd
/Viewer/tests/tsserver
/Viewer/tests/tsserver.cmd
/Viewer/tests/tsserver.cmd
# Local Netlify folder
.netlify
10 changes: 10 additions & 0 deletions .gitpod.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
FROM gitpod/workspace-full-vnc

USER gitpod

RUN sudo apt-get update && \
sudo apt-get install -yq chromium-browser firefox && \
sudo rm -rf /var/lib/apt/lists/*

ENV CHROME_BIN=/usr/bin/chromium-browser
ENV BROWSER="Chrome_Without_Sandbox"
14 changes: 14 additions & 0 deletions .gitpod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
image:
file: .gitpod.Dockerfile
tasks:
- command: gp await-port 1338 && sleep 3 && gp preview $(gp url 1338)/sandbox/index-local.html
- before: >
cd Tools/Gulp &&
npm i typescript gulp@4.0.0 -g &&
npm install
command: npm run start
ports:
- port: 1338
onOpen: ignore
- port: 3000
onOpen: ignore
8 changes: 8 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
pull_request_rules:
- name: Automatic merge
conditions:
- label=automerge
- status-success=CI
actions:
merge:
method: merge
87 changes: 67 additions & 20 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,21 @@
"runtimeArgs": [
"--enable-unsafe-es3-apis"
]
},
},
{
"name": "Launch Node Material Editor (Edge)",
"type": "edge",
"version": "dev",
"request": "launch",
"url": "http://localhost:1338/nodeEditor/public/index-local.html",
"webRoot": "${workspaceRoot}/",
"sourceMaps": true,
"preLaunchTask": "run",
"userDataDir": "${workspaceRoot}/.tempChromeProfileForDebug",
"runtimeArgs": [
"--enable-unsafe-es3-apis"
]
},
{
"name": "Launch Viewer (Chrome)",
"type": "chrome",
Expand Down Expand Up @@ -53,6 +67,20 @@
"--enable-unsafe-es3-apis"
]
},
{
"name": "Launch playground (Edge)",
"type": "edge",
"version": "dev",
"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",
Expand All @@ -66,6 +94,19 @@
"--disable-es3-apis"
]
},
{
"name": "Launch playground (Chrome+SSL+Public address)",
"type": "chrome",
"request": "launch",
"url": "https://localhost:1338/Playground/index-local.html",
"webRoot": "${workspaceRoot}/",
"sourceMaps": true,
"preLaunchTask": "start-public-ssl",
"userDataDir": "${workspaceRoot}/.tempChromeProfileForDebug",
"runtimeArgs": [
"--disable-es3-apis"
]
},
{
"name": "Launch Materials Library (Chrome)",
"type": "chrome",
Expand Down Expand Up @@ -130,6 +171,20 @@
"runtimeArgs": [
"--enable-unsafe-es3-apis"
]
},
{
"name": "Launch Local Dev (Edge)",
"type": "edge",
"version": "dev",
"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 Local Dev - Worker mode (Chrome)",
Expand Down Expand Up @@ -157,20 +212,6 @@
"--enable-unsafe-es3-apis"
]
},
{
"name": "Launch Local Dev (Experimental Firefox)",
"type": "firefox",
"request": "launch",
"reAttach": true,
"url": "http://localhost:1338/localDev/index.html",
"pathMappings": [
{
"url": "http://localhost:1338",
"path": "${workspaceFolder}"
}
],
"preLaunchTask": "run"
},
{
"name": "Launch Build Validation (Chrome)",
"type": "chrome",
Expand All @@ -183,14 +224,20 @@
"runtimeArgs": [
"--enable-unsafe-es3-apis"
]
},
},
{
"name": "Launch Build Validation (Firefox)",
"type": "firefox",
"name": "Launch Build Validation (Edge)",
"type": "edge",
"version": "dev",
"request": "launch",
"reAttach": true,
"url": "http://localhost:1338/tests/validation/index.html",
"webRoot": "${workspaceRoot}/",
"url": "http://localhost:1338/tests/validation/index.html"
"sourceMaps": true,
"preLaunchTask": "run",
"userDataDir": "${workspaceRoot}/.tempChromeProfileForDebug",
"runtimeArgs": [
"--enable-unsafe-es3-apis"
]
},
{
"name": "Launch memory checks (Chrome)",
Expand Down
26 changes: 25 additions & 1 deletion .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"background": {
"activeOnStart": true,
"beginsPattern": "Starting \\'watchCore\\'",
"endsPattern": "Watching for file changes"
"endsPattern": "changes"
}
}
},
Expand Down Expand Up @@ -69,6 +69,30 @@
}
],
"isBackground": true
},
{
"label": "start-public-ssl",
"type": "npm",
"script": "start-public-ssl",
"path": "Tools/Gulp/",
"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
},
"background": {
"activeOnStart": true,
"beginsPattern": "Starting \\'watchCore\\'",
"endsPattern": "Watching for file changes"
}
}
}
]
}
1 change: 1 addition & 0 deletions CNAME.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
babylonjs.com
1 change: 1 addition & 0 deletions Playground/_redirects
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/pg/* /index.html 200
Binary file added Playground/css/img/clear_button.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 8fbdda8

Please sign in to comment.