9 files changed, 219 insertions, 58 deletions

@@ -1,21 +1,11 @@
 cmake_minimum_required (VERSION 3.1)
 project (mazeoflife)
 
-#set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -sUSE_SDL=2 -sUSE_SDL_NET=2 -sUSE_SDL_TTF=2")
-
-set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
-
-find_package(SDL2 REQUIRED)
-find_package(SDL2_ttf REQUIRED)
-find_package(SDL2_net REQUIRED)
-
-include_directories(
-  ${SDL2_INCLUDE_DIR}
-  ${SDL2_TTF_INCLUDE_DIR}
-  ${SDL2_NET_INCLUDE_DIRS}
-)
+set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -sUSE_SDL=2 -sUSE_SDL_TTF=2 -pthread")
+set(CMAKE_EXECUTABLE_SUFFIX ".html")
 
 add_executable(mazeoflife hslist.cpp hs_state.cpp mazeoflife.cpp util.cpp titlestate.cpp gamestate.cpp)
 set_property(TARGET mazeoflife PROPERTY CXX_STANDARD 17)
 set_property(TARGET mazeoflife PROPERTY CXX_STANDARD_REQUIRED ON)
-target_link_libraries(mazeoflife ${SDL2_LIBRARY} ${SDL2_TTF_LIBRARY} ${SDL2_NET_LIBRARIES})
+set_property(TARGET mazeoflife PROPERTY LINK_FLAGS "--preload-file resources -lidbfs.js -sALLOW_MEMORY_GROWTH")
+target_link_libraries(mazeoflife ${SDL2_LIBRARY} ${SDL2_TTF_LIBRARY})
@@ -9,9 +9,11 @@
 #include <iostream>
 #include <list>
 #include <memory>
+#include <mutex>
 #include <random>
 #include <set>
 #include <sstream>
+#include <thread>
 #include <tuple>
 #include <unordered_map>
 #include <unordered_set>
@@ -450,34 +452,31 @@ std::unique_ptr<State> startNewLevel(int level,
 
 class LoadGameState : public State {
  public:
-  LoadGameState(int level) : level_(level) {}
-
-  std::unique_ptr<State> operator()(Game& game) {
+  LoadGameState(Game& game, int level) : level_(level) {
     std::ostringstream wintitle;
     wintitle << "Maze Of Life - Level " << level_;
     SDL_SetWindowTitle(game.window.get(), wintitle.str().c_str());
 
     // Randomly place the player in a corner
-    int playerx, playery;
     switch (std::uniform_int_distribution(0, 3)(game.rng)) {
       case 0: {
-        playerx = 1;
-        playery = 1;
+        playerx_ = 1;
+        playery_ = 1;
         break;
       }
       case 1: {
-        playerx = 1;
-        playery = HEIGHT - 2;
+        playerx_ = 1;
+        playery_ = HEIGHT - 2;
         break;
       }
       case 2: {
-        playerx = WIDTH - 2;
-        playery = HEIGHT - 2;
+        playerx_ = WIDTH - 2;
+        playery_ = HEIGHT - 2;
         break;
       }
       case 3: {
-        playerx = WIDTH - 2;
-        playery = 1;
+        playerx_ = WIDTH - 2;
+        playery_ = 1;
         break;
       }
     }
@@ -503,18 +502,34 @@ class LoadGameState : public State {
     SDL_RenderPresent(game.renderer.get());
 
     // Do 50 gens of Conway
-    std::unique_ptr<GameBoard> board =
-        std::make_unique<GameBoard>(game, level_, playerx, playery);
+    std::thread([&] {
+      std::unique_ptr<GameBoard> board =
+          std::make_unique<GameBoard>(game, level_, playerx_, playery_);
+
+      std::lock_guard boardGuard(boardMutex_);
+      board_.swap(board);
+    }).detach();
+  }
+
+  std::unique_ptr<State> operator()(Game& game) {
+    std::lock_guard boardGuard(boardMutex_);
+    if (board_) {
+      return startNewLevel(level_, std::move(board_), playerx_, playery_);
+    }
 
     // Wait a bit
-    SDL_Delay(500);
+    // SDL_Delay(500);
 
     // Start the level
-    return startNewLevel(level_, std::move(board), playerx, playery);
+    return nullptr;
   }
 
  private:
   int level_;
+  int playerx_;
+  int playery_;
+  std::unique_ptr<GameBoard> board_;
+  std::mutex boardMutex_;
 };
 
 class PlayGameState : public State {
@@ -600,7 +615,7 @@ class PlayGameState : public State {
         }
 
         if (trymove && move(to_x, to_y)) {
-          return std::make_unique<LoadGameState>(level_ + 1);
+          return std::make_unique<LoadGameState>(game, level_ + 1);
         }
       }
     }
@@ -641,6 +656,6 @@ std::unique_ptr<State> startNewLevel(int level,
                                          playery);
 }
 
-std::unique_ptr<State> GameState::operator()(Game&) {
-  return std::make_unique<LoadGameState>(0);
+std::unique_ptr<State> GameState::operator()(Game& game) {
+  return std::make_unique<LoadGameState>(game, 0);
 }
@@ -12,6 +12,10 @@
 #include "titlestate.h"
 #include "util.h"
 
+#ifdef __EMSCRIPTEN__
+#include <emscripten.h>
+#endif
+
 HighscoreList::HighscoreList(std::vector<Highscore> hslist) : hslist_(hslist) {
   resetRanks();
 }
@@ -118,10 +122,18 @@ int HighscoreList::addHighscore(Highscore h) {
 }
 
 void HighscoreList::writeToFile() {
-  std::ofstream hsfile(getDataFile());
-  hsfile << hslist_.size() << std::endl;
+  {
+    std::ofstream hsfile(getDataFile());
+    hsfile << hslist_.size() << std::endl;
 
-  for (const Highscore& h : hslist_) {
-    hsfile << h.getName() << std::endl << h.getLevel() << std::endl;
+    for (const Highscore& h : hslist_) {
+      hsfile << h.getName() << std::endl << h.getLevel() << std::endl;
+    }
   }
+
+#ifdef __EMSCRIPTEN__
+  EM_ASM(FS.syncfs(function(err){
+      // Error
+  }););
+#endif
 }
@@ -0,0 +1,143 @@
+<!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: 1px solid black; background-color: transparent; position: absolute; top: 0; left: 0; }
+
+      .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()" tabindex=-1></canvas>
+    </div>
+    <hr/>
+    <div class="emscripten">
+      <input type="checkbox" id="resize">Resize canvas
+      <input type="checkbox" id="pointerLock" checked>Lock/hide mouse pointer
+      &nbsp;&nbsp;&nbsp;
+      <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 = {
+        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, "&amp;");
+            //text = text.replace(/</g, "&lt;");
+            //text = text.replace(/>/g, "&gt;");
+            //text = text.replace('\n', '<br>', 'g');
+            console.log(text);
+            if (element) {
+              element.value += text + "\n";
+              element.scrollTop = element.scrollHeight; // focus on bottom
+            }
+          };
+        })(),
+        canvas: (() => {
+          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", (e) => { alert('WebGL context lost. You will need to reload the page.'); e.preventDefault(); }, false);
+
+          return canvas;
+        })(),
+        setStatus: (text) => {
+          if (!Module.setStatus.last) Module.setStatus.last = { time: Date.now(), text: '' };
+          if (text === Module.setStatus.last.text) return;
+          var m = text.match(/([^(]+)\((\d+(\.\d+)?)\/(\d+)\)/);
+          var now = Date.now();
+          if (m && now - Module.setStatus.last.time < 30) return; // if this is a progress update, skip it if too soon
+          Module.setStatus.last.time = now;
+          Module.setStatus.last.text = text;
+          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: (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 = () => {
+        Module.setStatus('Exception thrown, see JavaScript console');
+        spinnerElement.style.display = 'none';
+        Module.setStatus = (text) => {
+          if (text) console.error('[post-exception status] ' + text);
+        };
+      };
+    </script>
+    <script async type="text/javascript" src="mazeoflife.js"></script>
+  </body>
+</html>
@@ -59,6 +59,11 @@ int main(int, char**) {
   game.state = std::make_unique<TitleState>(game);
 
 #ifdef __EMSCRIPTEN__
+  EM_ASM(FS.mkdir('/offline'); FS.mount(IDBFS, {}, '/offline');
+         FS.syncfs(true, function(err){
+                             // Error
+                         }););
+
   emscripten_set_main_loop_arg(main_loop, &game, 0, 1);
 #else
   for (;;) {
@@ -15,7 +15,6 @@ struct Game {
 
   sdl_wrapper sdl;
   ttf_wrapper ttf;
-  net_wrapper net;
 
   window_ptr window;
   renderer_ptr renderer;
@@ -2,7 +2,6 @@
 #define SDL_H_A2226476
 
 #include <SDL.h>
-#include <SDL_net.h>
 #include <SDL_ttf.h>
 
 #include <memory>
@@ -17,11 +16,6 @@ class ttf_error : public std::logic_error {
   ttf_error() : std::logic_error(TTF_GetError()) {}
 };
 
-class net_error : public std::logic_error {
- public:
-  net_error() : std::logic_error(SDLNet_GetError()) {}
-};
-
 class sdl_wrapper {
  public:
   sdl_wrapper() {
@@ -50,20 +44,6 @@ class ttf_wrapper {
   ~ttf_wrapper() { TTF_Quit(); }
 };
 
-class net_wrapper {
- public:
-  net_wrapper() {
-    if (SDLNet_Init() == -1) {
-      net_error ex;
-      SDLNet_Quit();
-
-      throw ex;
-    }
-  }
-
-  ~net_wrapper() { SDLNet_Quit(); }
-};
-
 class window_deleter {
  public:
   void operator()(SDL_Window* ptr) { SDL_DestroyWindow(ptr); }
@@ -14,10 +14,21 @@ std::unique_ptr<State> TitleState::operator()(Game& game) {
 
   SDL_RenderClear(game.renderer.get());
   SDL_RenderCopy(game.renderer.get(), background_.get(), NULL, NULL);
+
+#ifdef __EMSCRIPTEN__
+  applyTexture(game.renderer.get(), pointer_.get(), 136,
+               selection_ == 0 ? 316 : (selection_ == 1 ? 350 : 381));
+
+  SDL_Rect eSpace = {164, 412, 79, 33};
+  SDL_SetRenderDrawColor(game.renderer.get(), 255, 255, 255, 255);
+  SDL_RenderFillRect(game.renderer.get(), &eSpace);
+#else
   applyTexture(game.renderer.get(), pointer_.get(), 136,
                selection_ == 0
                    ? 316
                    : (selection_ == 1 ? 350 : (selection_ == 2 ? 381 : 417)));
+#endif
+
   SDL_RenderPresent(game.renderer.get());
 
   while (SDL_PollEvent(&e)) {
@@ -27,7 +38,11 @@ std::unique_ptr<State> TitleState::operator()(Game& game) {
     } else if (e.type == SDL_KEYDOWN) {
       if ((e.key.keysym.sym == SDLK_UP) && (selection_ != 0)) {
         selection_--;
+#ifdef __EMSCRIPTEN__
+      } else if ((e.key.keysym.sym == SDLK_DOWN) && (selection_ != 2)) {
+#else
       } else if ((e.key.keysym.sym == SDLK_DOWN) && (selection_ != 3)) {
+#endif
         selection_++;
       } else if (e.key.keysym.sym == SDLK_RETURN) {
         switch (selection_) {
@@ -32,6 +32,8 @@ font_ptr loadFont(int size) {
 std::string getDataFile() {
 #ifdef WINDOWS
   char* dir = getenv("USERPROFILE");
+#elif __EMSCRIPTEN__
+  const char* dir = "/offline";
 #else
   char* dir = getenv("HOME");
 #endif