-
Notifications
You must be signed in to change notification settings - Fork 3.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement support and add a test that pthreads can be used from main …
…HTML files that load the Emscripten application .js file from a Blob.
- Loading branch information
Showing
4 changed files
with
204 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,182 @@ | ||
| <!doctype html> | ||
| <html lang="en-us"> | ||
| <head> | ||
| <meta charset="utf-8"> | ||
| <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> | ||
| <title>Emscripten-Generated Code</title> | ||
| <style> | ||
| .emscripten { padding-right: 0; margin-left: auto; margin-right: auto; display: block; } | ||
| textarea.emscripten { font-family: monospace; width: 80%; } | ||
| div.emscripten { text-align: center; } | ||
| div.emscripten_border { border: 1px solid black; } | ||
| /* the canvas *must not* have any border or padding, or mouse coords will be wrong */ | ||
| canvas.emscripten { border: 0px none; background-color: black; } | ||
|
|
||
| .spinner { | ||
| height: 50px; | ||
| width: 50px; | ||
| margin: 0px auto; | ||
| -webkit-animation: rotation .8s linear infinite; | ||
| -moz-animation: rotation .8s linear infinite; | ||
| -o-animation: rotation .8s linear infinite; | ||
| animation: rotation 0.8s linear infinite; | ||
| border-left: 10px solid rgb(0,150,240); | ||
| border-right: 10px solid rgb(0,150,240); | ||
| border-bottom: 10px solid rgb(0,150,240); | ||
| border-top: 10px solid rgb(100,0,200); | ||
| border-radius: 100%; | ||
| background-color: rgb(200,100,250); | ||
| } | ||
| @-webkit-keyframes rotation { | ||
| from {-webkit-transform: rotate(0deg);} | ||
| to {-webkit-transform: rotate(360deg);} | ||
| } | ||
| @-moz-keyframes rotation { | ||
| from {-moz-transform: rotate(0deg);} | ||
| to {-moz-transform: rotate(360deg);} | ||
| } | ||
| @-o-keyframes rotation { | ||
| from {-o-transform: rotate(0deg);} | ||
| to {-o-transform: rotate(360deg);} | ||
| } | ||
| @keyframes rotation { | ||
| from {transform: rotate(0deg);} | ||
| to {transform: rotate(360deg);} | ||
| } | ||
|
|
||
| </style> | ||
| </head> | ||
| <body> | ||
| <hr/> | ||
| <figure style="overflow:visible;" id="spinner"><div class="spinner"></div><center style="margin-top:0.5em"><strong>emscripten</strong></center></figure> | ||
| <div class="emscripten" id="status">Downloading...</div> | ||
| <div class="emscripten"> | ||
| <progress value="0" max="100" id="progress" hidden=1></progress> | ||
| </div> | ||
| <div class="emscripten_border"> | ||
| <canvas class="emscripten" id="canvas" oncontextmenu="event.preventDefault()"></canvas> | ||
| </div> | ||
| <hr/> | ||
| <div class="emscripten"> | ||
| <input type="checkbox" id="resize">Resize canvas | ||
| <input type="checkbox" id="pointerLock" checked>Lock/hide mouse pointer | ||
| | ||
| <input type="button" value="Fullscreen" onclick="Module.requestFullscreen(document.getElementById('pointerLock').checked, | ||
| document.getElementById('resize').checked)"> | ||
| </div> | ||
|
|
||
| <hr/> | ||
| <textarea class="emscripten" id="output" rows="8"></textarea> | ||
| <hr> | ||
| <script type='text/javascript'> | ||
| var statusElement = document.getElementById('status'); | ||
| var progressElement = document.getElementById('progress'); | ||
| var spinnerElement = document.getElementById('spinner'); | ||
|
|
||
| var Module = { | ||
| preRun: [], | ||
| postRun: [], | ||
| print: (function() { | ||
| var element = document.getElementById('output'); | ||
| if (element) element.value = ''; // clear browser cache | ||
| return function(text) { | ||
| if (arguments.length > 1) text = Array.prototype.slice.call(arguments).join(' '); | ||
| // These replacements are necessary if you render to raw HTML | ||
| //text = text.replace(/&/g, "&"); | ||
| //text = text.replace(/</g, "<"); | ||
| //text = text.replace(/>/g, ">"); | ||
| //text = text.replace('\n', '<br>', 'g'); | ||
| console.log(text); | ||
| if (element) { | ||
| element.value += text + "\n"; | ||
| element.scrollTop = element.scrollHeight; // focus on bottom | ||
| } | ||
| }; | ||
| })(), | ||
| printErr: function(text) { | ||
| if (arguments.length > 1) text = Array.prototype.slice.call(arguments).join(' '); | ||
| if (0) { // XXX disabled for safety typeof dump == 'function') { | ||
| dump(text + '\n'); // fast, straight to the real console | ||
| } else { | ||
| console.error(text); | ||
| } | ||
| }, | ||
| canvas: (function() { | ||
| var canvas = document.getElementById('canvas'); | ||
|
|
||
| // As a default initial behavior, pop up an alert when webgl context is lost. To make your | ||
| // application robust, you may want to override this behavior before shipping! | ||
| // See http://www.khronos.org/registry/webgl/specs/latest/1.0/#5.15.2 | ||
| canvas.addEventListener("webglcontextlost", function(e) { alert('WebGL context lost. You will need to reload the page.'); e.preventDefault(); }, false); | ||
|
|
||
| return canvas; | ||
| })(), | ||
| setStatus: function(text) { | ||
| if (!Module.setStatus.last) Module.setStatus.last = { time: Date.now(), text: '' }; | ||
| if (text === Module.setStatus.text) return; | ||
| var m = text.match(/([^(]+)\((\d+(\.\d+)?)\/(\d+)\)/); | ||
| var now = Date.now(); | ||
| if (m && now - Date.now() < 30) return; // if this is a progress update, skip it if too soon | ||
| if (m) { | ||
| text = m[1]; | ||
| progressElement.value = parseInt(m[2])*100; | ||
| progressElement.max = parseInt(m[4])*100; | ||
| progressElement.hidden = false; | ||
| spinnerElement.hidden = false; | ||
| } else { | ||
| progressElement.value = null; | ||
| progressElement.max = null; | ||
| progressElement.hidden = true; | ||
| if (!text) spinnerElement.hidden = true; | ||
| } | ||
| statusElement.innerHTML = text; | ||
| }, | ||
| totalDependencies: 0, | ||
| monitorRunDependencies: function(left) { | ||
| this.totalDependencies = Math.max(this.totalDependencies, left); | ||
| Module.setStatus(left ? 'Preparing... (' + (this.totalDependencies-left) + '/' + this.totalDependencies + ')' : 'All downloads complete.'); | ||
| } | ||
| }; | ||
| Module.setStatus('Downloading...'); | ||
| window.onerror = function() { | ||
| Module.setStatus('Exception thrown, see JavaScript console'); | ||
| spinnerElement.style.display = 'none'; | ||
| Module.setStatus = function(text) { | ||
| if (text) Module.printErr('[post-exception status] ' + text); | ||
| }; | ||
| }; | ||
| </script> | ||
|
|
||
| <script> | ||
|
|
||
| function download(url, responseType) { | ||
| return new Promise(function(resolve, reject) { | ||
| var xhr = new XMLHttpRequest(); | ||
| xhr.open('GET', url, true); | ||
| xhr.responseType = 'blob'; | ||
| xhr.onload = function() { | ||
| resolve(xhr.response); | ||
| }; | ||
| xhr.send(null); | ||
| }); | ||
| } | ||
|
|
||
| function addToDom(scriptCodeBlob) { | ||
| return new Promise(function(resolve, reject) { | ||
| var script = document.createElement('script'); | ||
| var objectUrl = URL.createObjectURL(scriptCodeBlob); | ||
| script.src = objectUrl; | ||
| script.onload = function() { | ||
| Module['mainScriptUrlOrBlob'] = scriptCodeBlob; | ||
| URL.revokeObjectURL(objectUrl); | ||
| resolve(); | ||
| } | ||
| document.body.appendChild(script); | ||
| }); | ||
| } | ||
|
|
||
| download('hello_thread_with_blob_url.js').then(addToDom); | ||
|
|
||
| </script> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters