Skip to content

Commit 2d5674c

Browse files
phenry20phenry20
authored
Merge pull request #1 from BabylonJS/master
Pull upstream
2 parents bb2f213 + 2ac37c6 commit 2d5674c

File tree

1,042 files changed

+466315
-352329
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,042 files changed

+466315
-352329
lines changed

‎.travis.yml‎

Lines changed: 0 additions & 64 deletions
This file was deleted.

‎.vscode/launch.json‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,21 @@
4545
"name": "Launch sandbox (Chrome)",
4646
"type": "chrome",
4747
"request": "launch",
48-
"url": "http://localhost:1338/sandbox/index-local.html",
48+
"url": "http://localhost:1338/sandbox/public/index-local.html",
49+
"webRoot": "${workspaceRoot}/",
50+
"sourceMaps": true,
51+
"preLaunchTask": "run",
52+
"userDataDir": "${workspaceRoot}/.tempChromeProfileForDebug",
53+
"runtimeArgs": [
54+
"--enable-unsafe-es3-apis"
55+
]
56+
},
57+
{
58+
"name": "Launch sandbox (Edge)",
59+
"type": "edge",
60+
"version": "dev",
61+
"request": "launch",
62+
"url": "http://localhost:1338/sandbox/public/index-local.html",
4963
"webRoot": "${workspaceRoot}/",
5064
"sourceMaps": true,
5165
"preLaunchTask": "run",

‎Playground/css/index.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ body {
418418
-ms-user-select: none;
419419
user-select: none;
420420
position: relative;
421-
z-index: 5;
421+
z-index: 11;
422422
}
423423

424424
.navbar a {

‎Playground/debug.html‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
<script src="https://preview.babylonjs.com/libktx.js"></script>
5858
<script src="https://preview.babylonjs.com/babylon.max.js"></script>
5959
<script src="https://preview.babylonjs.com/gui/babylon.gui.js"></script>
60-
<script src="https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>
6160
<script src="https://preview.babylonjs.com/nodeEditor/babylon.nodeEditor.js"></script>
6261
<!-- Babylon.js -->
6362
<script src="https://preview.babylonjs.com/materialsLibrary/babylon.fireMaterial.min.js"></script>
@@ -100,6 +99,8 @@
10099

101100
<script src="https://preview.babylonjs.com/serializers/babylonjs.serializers.js"></script>
102101

102+
<script src="https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>
103+
103104
<!-- Extensions -->
104105
<script
105106
src="https://rawcdn.githack.com/BabylonJS/Extensions/f43ab677b4bca0a6ab77132d3f785be300382760/ClonerSystem/src/babylonx.cloner.js"
@@ -172,6 +173,9 @@
172173
<div class="option checked noSubSelect" id="editorButton1280">Editor
173174
<i class="fa fa-check-square" aria-hidden="true"></i>
174175
</div>
176+
<div class="option noSubSelect" id="ctrlsToggle1280">CTRL+S to save
177+
<i class="fa fa-square" aria-hidden="true"></i>
178+
</div>
175179
<div class="option noSubSelect" id="fullscreenButton1280">Fullscreen</div>
176180
<div class="option noSubSelect" id="editorFullscreenButton1280">Editor Fullscreen</div>
177181
<div class="option noSubSelect" id="formatButton1280">Format code</div>
@@ -252,6 +256,9 @@
252256
<div class="option checked noSubSelect" id="editorButton1024">Editor
253257
<i class="fa fa-check-square" aria-hidden="true"></i>
254258
</div>
259+
<div class="option noSubSelect" id="ctrlsToggle1024">CTRL+S to save
260+
<i class="fa fa-square" aria-hidden="true"></i>
261+
</div>
255262
<div class="option noSubSelect" id="fullscreenButton1024">Fullscreen</div>
256263
<div class="option noSubSelect" id="editorFullscreenButton1024">Editor Fullscreen</div>
257264
<div class="option noSubSelect" id="formatButton1024">Format code</div>
@@ -339,6 +346,9 @@
339346
<div style="display: none;" class="option checked noSubSelect" id="editorButtonMobile">Editor
340347
<i class="fa fa-check-square" aria-hidden="true"></i>
341348
</div>
349+
<div style="display: none;" class="option noSubSelect" id="ctrlsToggleMobile">CTRL+S to save
350+
<i class="fa fa-square" aria-hidden="true"></i>
351+
</div>
342352
<div style="display: none;" class="option nosubselect" id="fullscreenButtonMobile"
343353
style="display: none">Fullscreen</div>
344354
<div style="display: none;" class="option nosubselect" id="editorFullscreenButtonMobile"

‎Playground/frame.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
<script src="https://preview.babylonjs.com/earcut.min.js"></script>
2929
<script src="https://preview.babylonjs.com/babylon.js"></script>
3030
<script src="https://preview.babylonjs.com/gui/babylon.gui.min.js"></script>
31-
<script src="https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>
3231
<script src="https://preview.babylonjs.com/nodeEditor/babylon.nodeEditor.js"></script>
3332
<!-- Babylon.js -->
3433
<script src="https://preview.babylonjs.com/materialsLibrary/babylon.fireMaterial.min.js"></script>
@@ -71,6 +70,8 @@
7170

7271
<script src="https://preview.babylonjs.com/serializers/babylonjs.serializers.min.js"></script>
7372

73+
<script src="https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>
74+
7475
<!-- Extensions -->
7576
<script
7677
src="https://rawcdn.githack.com/BabylonJS/Extensions/f43ab677b4bca0a6ab77132d3f785be300382760/ClonerSystem/src/babylonx.cloner.js"

‎Playground/full.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,15 @@
1818
<script src="https://preview.babylonjs.com/libktx.js"></script>
1919
<script src="https://preview.babylonjs.com/babylon.js"></script>
2020
<script src="https://preview.babylonjs.com/gui/babylon.gui.min.js"></script>
21-
<script src="https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>
2221
<script src="https://preview.babylonjs.com/nodeEditor/babylon.nodeEditor.js"></script>
2322
<script src="https://preview.babylonjs.com/materialsLibrary/babylonjs.materials.min.js"></script>
2423
<script src="https://preview.babylonjs.com/proceduralTexturesLibrary/babylonjs.proceduralTextures.min.js">
2524
</script>
2625
<script src="https://preview.babylonjs.com/postProcessesLibrary/babylonjs.postProcess.min.js"></script>
2726
<script src="https://preview.babylonjs.com/loaders/babylonjs.loaders.js"></script>
2827

28+
<script src="https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>
29+
2930
<!-- Extensions -->
3031
<script
3132
src="https://rawcdn.githack.com/BabylonJS/Extensions/f43ab677b4bca0a6ab77132d3f785be300382760/ClonerSystem/src/babylonx.cloner.js"

‎Playground/index-local.html‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@
9191
</div>
9292
<div class="option checked noSubSelect" id="editorButton1280">Editor
9393
<i class="fa fa-check-square" aria-hidden="true"></i>
94+
</div>
95+
<div class="option noSubSelect" id="ctrlsToggle1280">CTRL+S to save
96+
<i class="fa fa-square" aria-hidden="true"></i>
9497
</div>
9598
<div class="option noSubSelect" id="fullscreenButton1280">Fullscreen</div>
9699
<div class="option noSubSelect" id="editorFullscreenButton1280">Editor Fullscreen</div>
@@ -176,6 +179,9 @@
176179
<div class="option checked noSubSelect" id="editorButton1024">Editor
177180
<i class="fa fa-check-square" aria-hidden="true"></i>
178181
</div>
182+
<div class="option noSubSelect" id="ctrlsToggle1024">CTRL+S to save
183+
<i class="fa fa-square" aria-hidden="true"></i>
184+
</div>
179185
<div class="option noSubSelect" id="fullscreenButton1024">Fullscreen</div>
180186
<div class="option noSubSelect" id="editorFullscreenButton1024">Editor Fullscreen</div>
181187
<div class="option noSubSelect" id="formatButton1024">Format code</div>
@@ -263,6 +269,9 @@
263269
<div style="display: none;" class="option checked noSubSelect" id="editorButtonMobile">Editor
264270
<i class="fa fa-check-square" aria-hidden="true"></i>
265271
</div>
272+
<div style="display: none;" class="option noSubSelect" id="ctrlsToggleMobile">CTRL+S to save
273+
<i class="fa fa-square" aria-hidden="true"></i>
274+
</div>
266275
<div style="display: none;" class="option nosubselect" id="fullscreenButtonMobile"
267276
style="display: none">Fullscreen</div>
268277
<div style="display: none;" class="option nosubselect" id="editorFullscreenButtonMobile"

‎Playground/index.html‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@
7171
<div class="option checked noSubSelect" id="editorButton1280">Editor
7272
<i class="fa fa-check-square" aria-hidden="true"></i>
7373
</div>
74+
<div class="option noSubSelect" id="ctrlsToggle1280">CTRL+S to save
75+
<i class="fa fa-square" aria-hidden="true"></i>
76+
</div>
7477
<div class="option noSubSelect" id="fullscreenButton1280">Fullscreen</div>
7578
<div class="option noSubSelect" id="editorFullscreenButton1280">Editor Fullscreen</div>
7679
<div class="option noSubSelect" id="formatButton1280">Format code</div>
@@ -157,6 +160,9 @@
157160
<div class="option checked noSubSelect" id="editorButton1024">Editor
158161
<i class="fa fa-check-square" aria-hidden="true"></i>
159162
</div>
163+
<div class="option noSubSelect" id="ctrlsToggle1024">CTRL+S to save
164+
<i class="fa fa-square" aria-hidden="true"></i>
165+
</div>
160166
<div class="option noSubSelect" id="fullscreenButton1024">Fullscreen</div>
161167
<div class="option noSubSelect" id="editorFullscreenButton1024">Editor Fullscreen</div>
162168
<div class="option noSubSelect" id="formatButton1024">Format code</div>
@@ -244,6 +250,9 @@
244250
<div style="display: none;" class="option checked noSubSelect" id="editorButtonMobile">Editor
245251
<i class="fa fa-check-square" aria-hidden="true"></i>
246252
</div>
253+
<div style="display: none;" class="option noSubSelect" id="ctrlsToggleMobile">CTRL+S to save
254+
<i class="fa fa-square" aria-hidden="true"></i>
255+
</div>
247256
<div style="display: none;" class="option nosubselect" id="fullscreenButtonMobile"
248257
style="display: none">Fullscreen</div>
249258
<div style="display: none;" class="option nosubselect" id="editorFullscreenButtonMobile"
@@ -398,14 +407,14 @@ <h1>Examples<img id="examplesButtonClose" src="/css/img/clearButton.svg"></h1>
398407
<!-- Babylon.js -->
399408
<script src="https://preview.babylonjs.com/babylon.js"></script>
400409
<script src="https://preview.babylonjs.com/gui/babylon.gui.min.js"></script>
401-
<script src="https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>
402410
<script src="https://preview.babylonjs.com/nodeEditor/babylon.nodeEditor.js"></script>
403411
<script src="https://preview.babylonjs.com/materialsLibrary/babylonjs.materials.min.js"></script>
404412
<script src="https://preview.babylonjs.com/proceduralTexturesLibrary/babylonjs.proceduralTextures.min.js">
405413
</script>
406414
<script src="https://preview.babylonjs.com/postProcessesLibrary/babylonjs.postProcess.min.js"></script>
407415
<script src="https://preview.babylonjs.com/loaders/babylonjs.loaders.min.js"></script>
408416
<script src="https://preview.babylonjs.com/serializers/babylonjs.serializers.min.js"></script>
417+
<script src="https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>
409418

410419
<!-- Dependencies -->
411420
<script src="https://preview.babylonjs.com/ammo.js"></script>

‎Playground/indexStable.html‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@
7272
<div class="option checked noSubSelect" id="editorButton1280">Editor
7373
<i class="fa fa-check-square" aria-hidden="true"></i>
7474
</div>
75+
<div class="option noSubSelect" id="ctrlsToggle1280">CTRL+S to save
76+
<i class="fa fa-square" aria-hidden="true"></i>
77+
</div>
7578
<div class="option noSubSelect" id="fullscreenButton1280">Fullscreen</div>
7679
<div class="option noSubSelect" id="editorFullscreenButton1280">Editor Fullscreen</div>
7780
<div class="option noSubSelect" id="formatButton1280">Format code</div>
@@ -155,6 +158,9 @@
155158
<div class="option checked noSubSelect" id="editorButton1024">Editor
156159
<i class="fa fa-check-square" aria-hidden="true"></i>
157160
</div>
161+
<div class="option noSubSelect" id="ctrlsToggle1024">CTRL+S to save
162+
<i class="fa fa-square" aria-hidden="true"></i>
163+
</div>
158164
<div class="option noSubSelect" id="fullscreenButton1024">Fullscreen</div>
159165
<div class="option noSubSelect" id="editorFullscreenButton1024">Editor Fullscreen</div>
160166
<div class="option noSubSelect" id="formatButton1024">Format code</div>
@@ -231,7 +237,10 @@
231237
</div>
232238
<div style="display: none;" class="option checked noSubSelect" id="editorButtonMobile">Editor
233239
<i class="fa fa-check-square" aria-hidden="true"></i>
234-
</div>
240+
</div>
241+
<div style="display: none;" class="option noSubSelect" id="ctrlsToggleMobile">CTRL+S to save
242+
<i class="fa fa-square" aria-hidden="true"></i>
243+
</div>
235244
<div style="display: none;" class="option nosubselect" id="fullscreenButtonMobile"
236245
style="display: none">Fullscreen</div>
237246
<div style="display: none;" class="option nosubselect" id="editorFullscreenButtonMobile"
@@ -378,12 +387,12 @@ <h1>Examples<img id="examplesButtonClose" src="/css/img/clearButton.svg"></h1>
378387
<!-- Babylon.js -->
379388
<script src="https://cdn.babylonjs.com/babylon.js"></script>
380389
<script src="https://cdn.babylonjs.com/gui/babylon.gui.min.js"></script>
381-
<script src="https://cdn.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>
382390
<script src="https://cdn.babylonjs.com/materialsLibrary/babylonjs.materials.min.js"></script>
383391
<script src="https://cdn.babylonjs.com/proceduralTexturesLibrary/babylonjs.proceduralTextures.min.js"></script>
384392
<script src="https://cdn.babylonjs.com/postProcessesLibrary/babylonjs.postProcess.min.js"></script>
385393
<script src="https://cdn.babylonjs.com/loaders/babylonjs.loaders.js"></script>
386394
<script src="https://cdn.babylonjs.com/serializers/babylonjs.serializers.min.js"></script>
395+
<script src="https://cdn.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>
387396

388397
<!-- Monaco -->
389398
<script src="/node_modules/monaco-editor/dev/vs/loader.js"></script>

0 commit comments

Comments
 (0)