Skip to content

Commit

Permalink
Merge pull request #1 from BabylonJS/master
Browse files Browse the repository at this point in the history
Syncing your fork to the original repository via the browser
  • Loading branch information
QuintusHegie committed Aug 10, 2019
2 parents fb4cf8b + 62c3921 commit 8071793
Show file tree
Hide file tree
Showing 820 changed files with 754,307 additions and 226,022 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
**Use Github issues ONLY for validated bugs**
**Use Github issues ONLY for validated bugs. PLEASE DISCUSS THEM ON THE FORUM FIRST!**

We have a really active forum to help answering questions (https://forum.babylonjs.com/)

Expand Down
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,6 @@
"assets": true
},
"editor.tabSize": 4,
"typescript.tsdk": "node_modules\\typescript\\lib"
"typescript.tsdk": "node_modules\\typescript\\lib",
"typescript.preferences.importModuleSpecifier": "relative"
}
7 changes: 6 additions & 1 deletion .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
// for the documentation about the tasks.json format
"version": "2.0.0",
"command": "gulp",
"args": ["--max-old-space-size=8192"],
"args": [
"--max-old-space-size=8192"
],
"type": "shell",
"options": {
"cwd": "${workspaceRoot}/Tools/Gulp"
Expand All @@ -17,6 +19,9 @@
"tasks": [
{
"label": "run",
"args": [
"run"
],
"group": {
"kind": "build",
"isDefault": true
Expand Down
Binary file modified Playground/LogoPBT.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
67,698 changes: 36,028 additions & 31,670 deletions Playground/babylon.d.txt

Large diffs are not rendered by default.

71,855 changes: 71,855 additions & 0 deletions Playground/babylonWebGPU.d.txt

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion Playground/css/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,15 @@ body {
display: grid;
grid-template-rows: 100%;
grid-template-columns: 100%;
align-items: center;
}

#waitLogo {
grid-column: 1;
grid-row: 1;
margin: 25%;
margin: auto;
width: 40%;
height: 40%;
}

#waitSpinner {
Expand Down
850 changes: 430 additions & 420 deletions Playground/debug.html

Large diffs are not rendered by default.

155 changes: 82 additions & 73 deletions Playground/frame.html
Original file line number Diff line number Diff line change
@@ -1,93 +1,102 @@
<!DOCTYPE html>
<html>

<head>
<title>Babylon.js Playground</title>
<link rel="shortcut icon" href="https://www.babylonjs.com/img/favicon/favicon.ico">
<link rel="manifest" href="https://www.babylonjs.com/img/favicon/manifest.json">
<meta name="msapplication-TileColor" content="#ffffff">
<meta name="msapplication-TileImage" content="https://www.babylonjs.com/img/favicon/ms-icon-144x144.png">
<meta name="msapplication-config" content="https://www.babylonjs.com/img/favicon/browserconfig.xml">
<meta name="theme-color" content="#ffffff">
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">
<head>
<title>Babylon.js Playground</title>
<link rel="shortcut icon" href="https://www.babylonjs.com/img/favicon/favicon.ico">
<link rel="manifest" href="https://www.babylonjs.com/img/favicon/manifest.json">
<meta name="msapplication-TileColor" content="#ffffff">
<meta name="msapplication-TileImage" content="https://www.babylonjs.com/img/favicon/ms-icon-144x144.png">
<meta name="msapplication-config" content="https://www.babylonjs.com/img/favicon/browserconfig.xml">
<meta name="theme-color" content="#ffffff">
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">

<script src="https://code.jquery.com/pep/0.4.2/pep.min.js"></script>
<script src="https://code.jquery.com/pep/0.4.2/pep.min.js"></script>

<script src="https://cdnjs.cloudflare.com/ajax/libs/dat-gui/0.6.2/dat.gui.min.js"></script>
<!-- Babylon.js -->
<script src="https://preview.babylonjs.com/ammo.js"></script>
<script src="https://preview.babylonjs.com/cannon.js"></script>
<script src="https://preview.babylonjs.com/Oimo.js"></script>
<script src="https://preview.babylonjs.com/earcut.min.js"></script>
<script src="https://preview.babylonjs.com/gltf_validator.js"></script>
<script src="https://preview.babylonjs.com/babylon.js"></script>
<script src="https://preview.babylonjs.com/gui/babylon.gui.min.js"></script>
<script src="https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/dat-gui/0.6.2/dat.gui.min.js"></script>
<!-- Babylon.js -->
<script src="https://preview.babylonjs.com/ammo.js"></script>
<script src="https://preview.babylonjs.com/recast.js"></script>
<script src="https://preview.babylonjs.com/cannon.js"></script>
<script src="https://preview.babylonjs.com/Oimo.js"></script>
<script src="https://preview.babylonjs.com/earcut.min.js"></script>
<script src="https://preview.babylonjs.com/gltf_validator.js"></script>
<script src="https://preview.babylonjs.com/babylon.js"></script>
<script src="https://preview.babylonjs.com/gui/babylon.gui.min.js"></script>
<script src="https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>
<script src="https://preview.babylonjs.com/nodeEditor/babylon.nodeEditor.js"></script>

<script src="https://preview.babylonjs.com/materialsLibrary/babylon.fireMaterial.min.js"></script>
<script src="https://preview.babylonjs.com/materialsLibrary/babylon.waterMaterial.min.js"></script>
<script src="https://preview.babylonjs.com/materialsLibrary/babylon.lavaMaterial.min.js"></script>
<script src="https://preview.babylonjs.com/materialsLibrary/babylon.normalMaterial.min.js"></script>
<script src="https://preview.babylonjs.com/materialsLibrary/babylon.skyMaterial.min.js"></script>
<script src="https://preview.babylonjs.com/materialsLibrary/babylon.triPlanarMaterial.min.js"></script>
<script src="https://preview.babylonjs.com/materialsLibrary/babylon.terrainMaterial.min.js"></script>
<script src="https://preview.babylonjs.com/materialsLibrary/babylon.gradientMaterial.min.js"></script>
<script src="https://preview.babylonjs.com/materialsLibrary/babylon.furMaterial.min.js"></script>
<script src="https://preview.babylonjs.com/materialsLibrary/babylon.gridMaterial.min.js"></script>
<script src="https://preview.babylonjs.com/materialsLibrary/babylon.shadowOnlyMaterial.min.js"></script>
<script src="https://preview.babylonjs.com/materialsLibrary/babylon.customMaterial.min.js"></script>
<script src="https://preview.babylonjs.com/materialsLibrary/babylon.cellMaterial.min.js"></script>
<script src="https://preview.babylonjs.com/materialsLibrary/babylon.fireMaterial.min.js"></script>
<script src="https://preview.babylonjs.com/materialsLibrary/babylon.waterMaterial.min.js"></script>
<script src="https://preview.babylonjs.com/materialsLibrary/babylon.lavaMaterial.min.js"></script>
<script src="https://preview.babylonjs.com/materialsLibrary/babylon.normalMaterial.min.js"></script>
<script src="https://preview.babylonjs.com/materialsLibrary/babylon.skyMaterial.min.js"></script>
<script src="https://preview.babylonjs.com/materialsLibrary/babylon.triPlanarMaterial.min.js"></script>
<script src="https://preview.babylonjs.com/materialsLibrary/babylon.terrainMaterial.min.js"></script>
<script src="https://preview.babylonjs.com/materialsLibrary/babylon.gradientMaterial.min.js"></script>
<script src="https://preview.babylonjs.com/materialsLibrary/babylon.furMaterial.min.js"></script>
<script src="https://preview.babylonjs.com/materialsLibrary/babylon.gridMaterial.min.js"></script>
<script src="https://preview.babylonjs.com/materialsLibrary/babylon.shadowOnlyMaterial.min.js"></script>
<script src="https://preview.babylonjs.com/materialsLibrary/babylon.customMaterial.min.js"></script>
<script src="https://preview.babylonjs.com/materialsLibrary/babylon.cellMaterial.min.js"></script>

<script src="https://preview.babylonjs.com/proceduralTexturesLibrary/babylon.brickProceduralTexture.min.js"></script>
<script src="https://preview.babylonjs.com/proceduralTexturesLibrary/babylon.cloudProceduralTexture.min.js"></script>
<script src="https://preview.babylonjs.com/proceduralTexturesLibrary/babylon.fireProceduralTexture.min.js"></script>
<script src="https://preview.babylonjs.com/proceduralTexturesLibrary/babylon.grassProceduralTexture.min.js"></script>
<script src="https://preview.babylonjs.com/proceduralTexturesLibrary/babylon.marbleProceduralTexture.min.js"></script>
<script src="https://preview.babylonjs.com/proceduralTexturesLibrary/babylon.roadProceduralTexture.min.js"></script>
<script src="https://preview.babylonjs.com/proceduralTexturesLibrary/babylon.starfieldProceduralTexture.min.js"></script>
<script src="https://preview.babylonjs.com/proceduralTexturesLibrary/babylon.woodProceduralTexture.min.js"></script>
<script
src="https://preview.babylonjs.com/proceduralTexturesLibrary/babylon.brickProceduralTexture.min.js"></script>
<script
src="https://preview.babylonjs.com/proceduralTexturesLibrary/babylon.cloudProceduralTexture.min.js"></script>
<script src="https://preview.babylonjs.com/proceduralTexturesLibrary/babylon.fireProceduralTexture.min.js"></script>
<script
src="https://preview.babylonjs.com/proceduralTexturesLibrary/babylon.grassProceduralTexture.min.js"></script>
<script
src="https://preview.babylonjs.com/proceduralTexturesLibrary/babylon.marbleProceduralTexture.min.js"></script>
<script src="https://preview.babylonjs.com/proceduralTexturesLibrary/babylon.roadProceduralTexture.min.js"></script>
<script
src="https://preview.babylonjs.com/proceduralTexturesLibrary/babylon.starfieldProceduralTexture.min.js"></script>
<script src="https://preview.babylonjs.com/proceduralTexturesLibrary/babylon.woodProceduralTexture.min.js"></script>

<script src="https://preview.babylonjs.com/postProcessesLibrary/babylon.asciiArtPostProcess.min.js"></script>
<script src="https://preview.babylonjs.com/postProcessesLibrary/babylon.digitalRainPostProcess.min.js"></script>
<script src="https://preview.babylonjs.com/postProcessesLibrary/babylon.asciiArtPostProcess.min.js"></script>
<script src="https://preview.babylonjs.com/postProcessesLibrary/babylon.digitalRainPostProcess.min.js"></script>

<script src="https://preview.babylonjs.com/loaders/babylon.glTFFileLoader.js"></script>
<script src="https://preview.babylonjs.com/loaders/babylon.objFileLoader.js"></script>
<script src="https://preview.babylonjs.com/loaders/babylon.stlFileLoader.js"></script>
<script src="https://preview.babylonjs.com/loaders/babylon.glTFFileLoader.js"></script>
<script src="https://preview.babylonjs.com/loaders/babylon.objFileLoader.js"></script>
<script src="https://preview.babylonjs.com/loaders/babylon.stlFileLoader.js"></script>

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

<script src="https://rawgit.com/BabylonJS/Extensions/master/ClonerSystem/src/babylonx.cloner.js"></script>
<script src="https://rawgit.com/BabylonJS/Extensions/master/CompoundShader/src/babylonx.CompoundShader.js"></script>
<link href="frame.css" rel="stylesheet" />
</head>
<script src="https://rawgit.com/BabylonJS/Extensions/master/ClonerSystem/src/babylonx.cloner.js"></script>
<script src="https://rawgit.com/BabylonJS/Extensions/master/CompoundShader/src/babylonx.CompoundShader.js"></script>
<link href="frame.css" rel="stylesheet" />
</head>

<body>
<canvas touch-action="none" id="renderCanvas" tabindex="1"></canvas>
<body>
<canvas touch-action="none" id="renderCanvas" tabindex="1"></canvas>

<div class="footer">
<div class="footer">
<span id="fpsLabel">FPS</span>
<div class="footerRight">
<a href="javascript:void(null);">
<img id="refresh" src="textures/icons/refresh.png" width="36" height="36" alt="Reload page" title="Reload page"/>
</a>
<a id="edit" href="#" target="_blank">
<img src="textures/icons/edit.png" width="36" height="36" alt="Edit in playground" title="Edit in playground"/>
</a>
</div>
<a href="javascript:void(null);">
<img id="refresh" src="textures/icons/refresh.png" width="36" height="36" alt="Reload page"
title="Reload page" />
</a>
<a id="edit" href="#" target="_blank">
<img src="textures/icons/edit.png" width="36" height="36" alt="Edit in playground"
title="Edit in playground" />
</a>
</div>
</div>

<script src="https://code.jquery.com/jquery.js"></script>
<script src="js/frame.js"></script>
<script src="https://code.jquery.com/jquery.js"></script>
<script src="js/frame.js"></script>

<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-41767310-2"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag() { dataLayer.push(arguments); }
gtag('js', new Date());
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-41767310-2"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag() { dataLayer.push(arguments); }
gtag('js', new Date());

gtag('config', 'UA-41767310-2');
</script>
</body>
gtag('config', 'UA-41767310-2');
</script>
</body>

</html>
</html>
104 changes: 51 additions & 53 deletions Playground/full.html
Original file line number Diff line number Diff line change
@@ -1,56 +1,54 @@
<!DOCTYPE html>
<html>

<head>
<title>Babylon.js Playground</title>
<link rel="shortcut icon" href="https://www.babylonjs.com/img/favicon/favicon.ico">
<link rel="manifest" href="https://www.babylonjs.com/img/favicon/manifest.json">
<meta name="msapplication-TileColor" content="#ffffff">
<meta name="msapplication-TileImage" content="https://www.babylonjs.com/img/favicon/ms-icon-144x144.png">
<meta name="msapplication-config" content="https://www.babylonjs.com/img/favicon/browserconfig.xml">
<meta name="theme-color" content="#ffffff">
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">

<script src="https://code.jquery.com/pep/0.4.2/pep.min.js"></script>
<!-- Babylon.js -->
<script src="https://preview.babylonjs.com/ammo.js"></script>
<script src="https://preview.babylonjs.com/cannon.js"></script>
<script src="https://preview.babylonjs.com/Oimo.js"></script>
<script src="https://preview.babylonjs.com/gltf_validator.js"></script>
<script src="https://preview.babylonjs.com/babylon.js"></script>
<script src="https://preview.babylonjs.com/gui/babylon.gui.min.js"></script>
<script src="https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>

<script src="https://preview.babylonjs.com/materialsLibrary/babylonjs.materials.min.js"></script>

<script src="https://preview.babylonjs.com/proceduralTexturesLibrary/babylonjs.proceduralTextures.min.js"></script>

<script src="https://preview.babylonjs.com/postProcessesLibrary/babylonjs.postProcess.min.js"></script>

<script src="https://preview.babylonjs.com/loaders/babylonjs.loaders.js"></script>



<script src="https://rawgit.com/BabylonJS/Extensions/master/ClonerSystem/src/babylonx.cloner.js"></script>
<script src="https://rawgit.com/BabylonJS/Extensions/master/CompoundShader/src/babylonx.CompoundShader.js"></script>
<link href="frame.css" rel="stylesheet" />
</head>

<body>
<!-- Override frame style -->
<canvas touch-action="none" id="renderCanvas" tabindex="1" style="height: 100%"></canvas>
<script src="https://code.jquery.com/jquery.js"></script>
<script src="js/frame.js"></script>

<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-41767310-2"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag() { dataLayer.push(arguments); }
gtag('js', new Date());

gtag('config', 'UA-41767310-2');
</script>
</body>

</html>
<head>
<title>Babylon.js Playground</title>
<link rel="shortcut icon" href="https://www.babylonjs.com/img/favicon/favicon.ico">
<link rel="manifest" href="https://www.babylonjs.com/img/favicon/manifest.json">
<meta name="msapplication-TileColor" content="#ffffff">
<meta name="msapplication-TileImage" content="https://www.babylonjs.com/img/favicon/ms-icon-144x144.png">
<meta name="msapplication-config" content="https://www.babylonjs.com/img/favicon/browserconfig.xml">
<meta name="theme-color" content="#ffffff">
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1">

<script src="https://code.jquery.com/pep/0.4.2/pep.min.js"></script>
<!-- Babylon.js -->
<script src="https://preview.babylonjs.com/ammo.js"></script>
<script src="https://preview.babylonjs.com/recast.js"></script>
<script src="https://preview.babylonjs.com/cannon.js"></script>
<script src="https://preview.babylonjs.com/Oimo.js"></script>
<script src="https://preview.babylonjs.com/gltf_validator.js"></script>
<script src="https://preview.babylonjs.com/babylon.js"></script>
<script src="https://preview.babylonjs.com/gui/babylon.gui.min.js"></script>
<script src="https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>
<script src="https://preview.babylonjs.com/nodeEditor/babylon.nodeEditor.js"></script>
<script src="https://preview.babylonjs.com/materialsLibrary/babylonjs.materials.min.js"></script>
<script src="https://preview.babylonjs.com/proceduralTexturesLibrary/babylonjs.proceduralTextures.min.js"></script>
<script src="https://preview.babylonjs.com/postProcessesLibrary/babylonjs.postProcess.min.js"></script>
<script src="https://preview.babylonjs.com/loaders/babylonjs.loaders.js"></script>



<script src="https://rawgit.com/BabylonJS/Extensions/master/ClonerSystem/src/babylonx.cloner.js"></script>
<script src="https://rawgit.com/BabylonJS/Extensions/master/CompoundShader/src/babylonx.CompoundShader.js"></script>
<link href="frame.css" rel="stylesheet" />
</head>

<body>
<!-- Override frame style -->
<canvas touch-action="none" id="renderCanvas" tabindex="1" style="height: 100%"></canvas>
<script src="https://code.jquery.com/jquery.js"></script>
<script src="js/frame.js"></script>

<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-41767310-2"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag() { dataLayer.push(arguments); }
gtag('js', new Date());

gtag('config', 'UA-41767310-2');
</script>
</body>

</html>
1 change: 1 addition & 0 deletions Playground/index-local.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<script src="js/libs/fileSaver.js"></script>
<!-- Dependencies -->
<script src="../dist/preview%20release/ammo.js"></script>
<script src="../dist/preview%20release/recast.js"></script>
<script src="../dist/preview%20release/cannon.js"></script>
<script src="../dist/preview%20release/Oimo.js"></script>
<script src="../dist/preview%20release/gltf_validator.js"></script>
Expand Down
Loading

0 comments on commit 8071793

Please sign in to comment.