diff options
| -rwxr-xr-x | build.sh | 34 | ||||
| -rw-r--r-- | src/main.c | 7 | ||||
| -rw-r--r-- | src/sector.c | 2 | ||||
| -rw-r--r-- | src/shell.html | 83 |
4 files changed, 110 insertions, 16 deletions
@@ -5,15 +5,22 @@ cd ${0%/*} # go to project root NAME="main" DEBUG_FLAGS="-std=c99 -Wall -Wextra -g -pedantic -DDEBUG" -# PROD_FLAGS="-std=c99 ???" +PROD_FLAGS="-std=c99 -O2" SDL_FLAGS="`sdl2-config --cflags --libs`" -FLAGS="$DEBUG_FLAGS $SDL_FLAGS -lm" +LIB_FLAGS="-lm" + +FLAGS="$DEBUG_FLAGS $SDL_FLAGS $LIB_FLAGS" SRC="src" OBJ="obj" BIN="bin" FILES="files" RUN=0 +WEB=0 + +function __web__ { + WEB=1 +} function __run__ { RUN=1 @@ -25,7 +32,7 @@ function __leak__ { } function __prod__ { - FLAGS="$PROD_FLAGS $SDL_FLAGS" + FLAGS="$PROD_FLAGS $SDL_FLAGS $LIB_FLAGS" } function __clean__ { @@ -45,13 +52,20 @@ then __$1__ fi -gcc -o $OBJ/main.o -c $SRC/main.c $FLAGS -gcc -o $OBJ/player.o -c $SRC/player.c $FLAGS -gcc -o $OBJ/sector.o -c $SRC/sector.c $FLAGS +if { [[ $WEB -eq 0 ]]; } 2> /dev/null; then + gcc -o $OBJ/main.o -c $SRC/main.c $FLAGS + gcc -o $OBJ/player.o -c $SRC/player.c $FLAGS + gcc -o $OBJ/sector.o -c $SRC/sector.c $FLAGS -gcc -o $BIN/$NAME $OBJ/*.o $FLAGS + gcc -o $BIN/$NAME $OBJ/*.o $FLAGS -if ! { [[ $RUN -eq 0 ]]; } 2> /dev/null -then - $VALGRND $BIN/$NAME + if ! { [[ $RUN -eq 0 ]]; } 2> /dev/null; then + $VALGRND $BIN/$NAME + fi +else + emcc -o $BIN/portal-engine.html $SRC/*.c \ + $PROD_FLAGS $LIB_FLAGS \ + -s USE_SDL=2 -s ASYNCIFY \ + --shell-file $SRC/shell.html \ + --preload-file $FILES/map_clear.txt fi @@ -36,11 +36,6 @@ int main(void) SDL_Window *window = NULL; map_t map = {0}; - if(SDL_ShowCursor(SDL_DISABLE) < 0) { - log_error(LOG_INPUT, "SDL_ShowCursor: %s", SDL_GetError()); - } - - if(SDL_Init(SDL_INIT_VIDEO) != 0) { log_critical(LOG_VIDEO, "SDL_Init: %s", SDL_GetError()); goto exit; @@ -59,6 +54,8 @@ int main(void) log_critical(LOG_VIDEO, "SDL_GetWindowSurface %s", SDL_GetError()); goto exit; } + + SDL_SetRelativeMouseMode(SDL_TRUE); // --------------------------------------------- // if(map_load(&map, "files/map_clear.txt")) diff --git a/src/sector.c b/src/sector.c index a76b698..c315382 100644 --- a/src/sector.c +++ b/src/sector.c @@ -34,7 +34,7 @@ int map_draw(map_t *map, int SW, int SH) head = (head+1) % MAX_QUEUE; struct render_info now = queue[head]; - if(sect_rendered[now.sectno] >= 30) continue; + if(sect_rendered[now.sectno] >= 5) continue; struct sector *sect = &map->sectors[now.sectno]; for(size_t i = 0; i < sect->nverts; i++) diff --git a/src/shell.html b/src/shell.html new file mode 100644 index 0000000..03321c7 --- /dev/null +++ b/src/shell.html @@ -0,0 +1,83 @@ +<!DOCTYPE html> +<html lang="en-us"> + <head> + <meta charset="utf-8"> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> + <title>Pendulum</title> + <style> + .el { margin: 5px; } + div.el { float: left; } + textarea.el { font-family: monospace; width: 100%; } + canvas.el { border: 0px none; background-color: black; } + </style> + </head> + <body> + <div class="el" id="status">Downloading...</div> + + <div class="el"> + <canvas id="canvas" oncontextmenu="event.preventDefault()" tabindex=-1></canvas> + </div> + + <textarea class="el" id="output" rows="12"></textarea> + + <script type='text/javascript'> + var statusElement = document.getElementById('status'); + + var Module = { + attachGLFWEventsToCanvas: true, + preRun: [], + postRun: [], + arguments: [], + 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 + } + }; + })(), + 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.last.text) return; + var now = Date.now(); + Module.setStatus.last.time = now; + Module.setStatus.last.text = text; + 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'); + Module.setStatus = function(text) { + if (text) console.error('[post-exception status] ' + text); + }; + }; + </script> + {{{ SCRIPT }}} + </body> +</html> +d |