diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | audiotest.cpp | 101 | ||||
| -rw-r--r-- | main.cpp | 3 | ||||
| -rw-r--r-- | shell_minimal.html | 152 |
4 files changed, 256 insertions, 2 deletions
@@ -14,4 +14,4 @@ clean: browser-game: emcc --std=c++11 -O2 World.cpp -o World.bc emcc --std=c++11 -O2 main.cpp -o main.bc - emcc -O2 World.bc main.bc -o out.html -s USE_SDL=2 --preload-file coin.bmp --preload-file earth01.bmp --preload-file fonts.bmp --preload-file gridder01.bmp --preload-file guy01.bmp --preload-file guy02.bmp --preload-file gridder02.bmp --preload-file gridder03.bmp + emcc -O2 World.bc main.bc -o out.html -s USE_SDL=2 --preload-file coin.bmp --preload-file earth01.bmp --preload-file fonts.bmp --preload-file gridder01.bmp --preload-file guy01.bmp --preload-file guy02.bmp --preload-file gridder02.bmp --preload-file gridder03.bmp -s TOTAL_MEMORY=536870912 --shell-file shell_minimal.html diff --git a/audiotest.cpp b/audiotest.cpp new file mode 100644 index 0000000..f6b5a92 --- /dev/null +++ b/audiotest.cpp @@ -0,0 +1,101 @@ +//emcc -o test.html main.cpp -O2 -s USE_SDL=2 + +#include <stdlib.h> + +#if defined(_MSC_VER) +#include "SDL.h" +#else +#include "SDL2/SDL.h" +#endif + +#include <math.h> +#include <stdio.h> + +#ifdef __EMSCRIPTEN__ +#include "emscripten.h" +#endif + + + +void audiomixer(void *userdata, Uint8 *stream, int len) +{ + int samples = len / 4; + short *buf = (short*)stream; + + int i; + for (i = 0; i < samples*2; i++) + { + buf[i] = i * 655; + } +} + +int sdlstatic_init(unsigned int aSamplerate, unsigned int aBuffer) +{ + SDL_AudioSpec as; + as.freq = aSamplerate; + as.format = AUDIO_S16; + as.channels = 2; + as.samples = aBuffer; + as.callback = audiomixer; + + SDL_AudioSpec as2; + if (SDL_OpenAudio(&as, &as2) < 0) + { + return -1; + } + + SDL_PauseAudio(0); + + return 0; +} + +void mainloop() +{ + // Poll for events, and handle the ones we care about. + SDL_Event event; + while (SDL_PollEvent(&event)) + { + switch (event.type) + { + case SDL_KEYUP: + // If escape is pressed, return (and thus, quit) + switch (event.key.keysym.sym) + { + case SDLK_ESCAPE: + { + exit(0); + } + break; + } + break; + case SDL_QUIT: + SDL_CloseAudio(); + exit(0); + } + } +} + +int main(int argc, char *argv[]) +{ + printf("SDL INIT OK\n"); + if ( SDL_Init(SDL_INIT_EVERYTHING) < 0 ) + { + fprintf(stderr, "Unable to init SDL: %s\n", SDL_GetError()); + exit(1); + } + printf("SDL INIT OK\n"); + + atexit(SDL_Quit); + + sdlstatic_init(44100, 1024); + +#ifdef __EMSCRIPTEN__ + emscripten_set_main_loop(mainloop, 60, 0); +#else + while (1) + { + mainloop(); + } +#endif + return 0; +} @@ -6,6 +6,7 @@ #endif #include <SDL.h> +#include <SDL_audio.h> #include "World.h" @@ -70,8 +71,8 @@ void sdl_play_sound() // SDL_LoadWAV("music.wav", &wavSpec, &wavBuffer, &wavLength); // SDL_LoadWAV("win.wav", &wavSpec, &wavBuffer, &wavLength); -#ifndef __EMSCRIPTEN__ int success = SDL_QueueAudio(deviceId, wavBuffer, wavLength); +#ifndef __EMSCRIPTEN__ #endif //SDL_CloseAudioDevice(deviceId); diff --git a/shell_minimal.html b/shell_minimal.html new file mode 100644 index 0000000..33a28b5 --- /dev/null +++ b/shell_minimal.html @@ -0,0 +1,152 @@ +<!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> + #output{display:none;} + .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 }}} + </body> +</html> |