fp: Make the website prettier, set the tab title

fp: Position and scale billboards
2023-10-17 12:30:16 +11:00 · 2023-10-17 09:00:04 +11:00
7 changed files with 61 additions and 118 deletions
--- a/External/tely
+++ b/External/tely
@ -1 +1 @@
-Subproject commit 135fd1783947016e783c141102ff6cf635f45c9f
+Subproject commit 20e554042aa9d7e2b734841746100984cc8626fe
--- a/build.bat
+++ b/build.bat
@ -7,6 +7,7 @@ set build_dir=%script_dir%\Build
 set code_dir=%script_dir%

 REM Bootstrap the build program
+mkdir %build_dir% 2>nul
 pushd %build_dir%
 cl /nologo /Z7 /W4 %code_dir%\feely_pona_build.cpp || exit /B 1
 copy feely_pona_build.exe %code_dir% 1>nul
--- a/feely_pona.cpp
+++ b/feely_pona.cpp
@ -473,11 +473,11 @@ static void FP_PlayReset(FP_Game *game, TELY_Platform *platform)
    play->tile_size        = 37;

    // NOTE: Create billboads ======================================================================
-    FP_Entity_CreateBillboard(game, Dqn_V2_InitNx2(1311, -951), FP_EntityBillboardState_Dash,        "Dash Billboard");
-    FP_Entity_CreateBillboard(game, Dqn_V2_InitNx2(1954,  855),  FP_EntityBillboardState_Attack,      "Attack Billboard");
-    FP_Entity_CreateBillboard(game, Dqn_V2_InitNx2(2047, -984),  FP_EntityBillboardState_RangeAttack, "Range Attack Billboard");
-    FP_Entity_CreateBillboard(game, Dqn_V2_InitNx2(2036, -700),  FP_EntityBillboardState_Monkey,      "Monkey Billboard");
-    FP_Entity_CreateBillboard(game, Dqn_V2_InitNx2(2098,  1171), FP_EntityBillboardState_Strafe,      "Strafe Billboard");
+    FP_Entity_CreateBillboard(game, Dqn_V2_InitNx2( 511,  451),  FP_EntityBillboardState_Dash,        "Dash Billboard");
+    FP_Entity_CreateBillboard(game, Dqn_V2_InitNx2( 511, -451),  FP_EntityBillboardState_Attack,      "Attack Billboard");
+    FP_Entity_CreateBillboard(game, Dqn_V2_InitNx2(2047, -720),  FP_EntityBillboardState_RangeAttack, "Range Attack Billboard");
+    FP_Entity_CreateBillboard(game, Dqn_V2_InitNx2(-936, -500),  FP_EntityBillboardState_Monkey,      "Monkey Billboard");
+    FP_Entity_CreateBillboard(game, Dqn_V2_InitNx2(1898,  771),  FP_EntityBillboardState_Strafe,      "Strafe Billboard");

    // NOTE: Camera ================================================================================
    play->camera.world_pos = base_mid_p - Dqn_V2_InitV2I(platform->core.window_size * .5f);
@ -496,7 +496,7 @@ void TELY_DLL_Reload(void *user_data)
 {
    TELY_Platform *platform = DQN_CAST(TELY_Platform *)user_data;
    Dqn_Library_SetPointer(platform->core.dqn_lib);
-
+    platform->func_set_window_title(DQN_STRING8("Terry Cherry"));
 }

 FP_DLL_FUNCTION
--- a/feely_pona_build.cpp
+++ b/feely_pona_build.cpp
@ -387,6 +387,22 @@ int main(int argc, char const **argv)
    uint64_t feely_pona_emscripten_timings[2] = {};
    if (target_web) {
        Dqn_String8 const raylib_emscripten_lib_name = DQN_STRING8("raylib_emscripten.a");
+        bool debug_build                             = false;
+
+        Dqn_List<Dqn_String8> build_specific_compile_flags = {};
+        if (debug_build) {
+            build_specific_compile_flags = Dqn_List_InitCArrayCopy<Dqn_String8>(scratch.arena, 32, {
+                DQN_STRING8("-s"), DQN_STRING8("ASSERTIONS=2"),
+                DQN_STRING8("-s"), DQN_STRING8("SAFE_HEAP=0"),
+                DQN_STRING8("-s"), DQN_STRING8("STACK_OVERFLOW_CHECK=2"),
+                DQN_STRING8("--profiling-funcs"), // Expose function names in stack trace
+                DQN_STRING8("-g"), // Debug symbols
+            });
+        } else {
+            build_specific_compile_flags = Dqn_List_InitCArrayCopy<Dqn_String8>(scratch.arena, 32, {
+                DQN_STRING8("-Os"), // Optimise for size
+            });
+        }

        // NOTE: Compile each raylib file separately with emcc =====================================
        {
@ -406,8 +422,7 @@ int main(int argc, char const **argv)
                build_file.input_file_path         = base_file;
                build_file.output_file_path        = Dqn_String8_InitF(scratch.allocator, "raylib_%.*s_emscripten.o", DQN_STRING_FMT(file_stem));

-                raylib_emscripten_build_context.compile_files = Dqn_Slice_InitCArrayCopy(scratch.arena, {build_file});
-                raylib_emscripten_build_context.compile_flags = Dqn_Slice_InitCArrayCopy(scratch.arena, {
+                Dqn_List<Dqn_String8> compile_flags = Dqn_List_InitCArrayCopy(scratch.arena, 32, {
                    DQN_STRING8("cmd"),
                    DQN_STRING8("/C"),
                    DQN_STRING8("emcc.bat"),
@ -417,6 +432,10 @@ int main(int argc, char const **argv)
                    DQN_STRING8("-D PLATFORM_WEB"),
                    DQN_STRING8("-D GRAPHICS_API_OPENGL_ES2"),
                });
+                Dqn_List_AddList(&compile_flags, build_specific_compile_flags);
+
+                raylib_emscripten_build_context.compile_files = Dqn_Slice_InitCArrayCopy(scratch.arena, {build_file});
+                raylib_emscripten_build_context.compile_flags = Dqn_List_ToSliceCopy(&compile_flags, scratch.arena);
                raylib_emscripten_build_context.build_dir = build_dir;
                Dqn_List_Add(&raylib_emscripten_output_files, build_file.output_file_path);

@ -458,31 +477,25 @@ int main(int argc, char const **argv)
                Dqn_CPPBuildCompileFile{{}, Dqn_FsPath_ConvertF(scratch.arena, "%.*s/feely_pona_unity_nodll.cpp", DQN_STRING_FMT(code_dir)) },
            });

-            Dqn_String8 prefix          = DQN_STRING8("Terry_Cherry");
-            build_context.compile_flags = Dqn_Slice_InitCArrayCopy(scratch.arena, {
+            Dqn_String8 output_name = DQN_STRING8("Terry_Cherry");
+            Dqn_List<Dqn_String8> compile_flags = Dqn_List_InitCArrayCopy(scratch.arena, 32, {
                DQN_STRING8("cmd"), DQN_STRING8("/C"), DQN_STRING8("emcc.bat"),
-                DQN_STRING8("-o"), Dqn_String8_InitF(scratch.allocator, "%.*s.html", DQN_STRING_FMT(prefix)),
-                DQN_STRING8("-Os"), // Optimize for size
+                DQN_STRING8("-o"), Dqn_String8_InitF(scratch.allocator, "%.*s.html", DQN_STRING_FMT(output_name)),
                DQN_STRING8("-Wall"),
                DQN_STRING8("--shell-file"), Dqn_FsPath_ConvertF(scratch.arena, "%.*s/feely_pona_emscripten_shell.html", DQN_STRING_FMT(code_dir)),
                Dqn_FsPath_ConvertF(scratch.arena, "%.*s/%.*s", DQN_STRING_FMT(build_dir), DQN_STRING_FMT(raylib_emscripten_lib_name)),
                DQN_STRING8("-s"), DQN_STRING8("USE_GLFW=3"),
-                // DQN_STRING8("-s"), DQN_STRING8("ASSERTIONS=2"),
-                // DQN_STRING8("-s"), DQN_STRING8("SAFE_HEAP=0"),
                DQN_STRING8("-s"), DQN_STRING8("TOTAL_MEMORY=512MB"),
                DQN_STRING8("-s"), DQN_STRING8("TOTAL_STACK=32MB"),
                DQN_STRING8("-s"), DQN_STRING8("ALLOW_MEMORY_GROWTH"),
-                // DQN_STRING8("-s"), DQN_STRING8("STACK_OVERFLOW_CHECK=2"),
-                // DQN_STRING8("--profiling-funcs"), // Expose function names in stack trace
-                // DQN_STRING8("-g"), // Debug symbols
-                // NOTE: Must be relative path such that fopen("Data/...") works
-                // otherwise the VFS will encode the full absolute path to the
-                // assets
                DQN_STRING8("--preload-file"), DQN_STRING8("Data"),
                DQN_STRING8("-msimd128"),
                DQN_STRING8("-msse2"),
            });
-            build_context.build_dir = build_dir;
+            Dqn_List_AddList(&compile_flags, build_specific_compile_flags);
+
+            build_context.compile_flags = Dqn_List_ToSliceCopy(&compile_flags, scratch.arena);
+            build_context.build_dir     = build_dir;

            if (dry_run) {
                Dqn_String8 cmd = Dqn_CPPBuild_ToCommandLine(build_context, Dqn_CPPBuildMode_AlwaysRebuild, scratch.allocator);
@ -492,7 +505,7 @@ int main(int argc, char const **argv)
            }

            // NOTE: Move the files to a directory
-            Dqn_String8 folder_path = Dqn_FsPath_ConvertF(scratch.arena, "%.*s/%.*s_Emscripten", DQN_STRING_FMT(build_dir), DQN_STRING_FMT(prefix));
+            Dqn_String8 folder_path = Dqn_FsPath_ConvertF(scratch.arena, "%.*s/%.*s_Emscripten", DQN_STRING_FMT(build_dir), DQN_STRING_FMT(output_name));
            if (!Dqn_Fs_DirExists(folder_path)) {
                Dqn_String8 mkdir_cmd = Dqn_String8_InitF(scratch.allocator, "mkdir %.*s", DQN_STRING_FMT(folder_path));
                Dqn_OS_ExecOrAbort(mkdir_cmd, {});
@ -506,8 +519,8 @@ int main(int argc, char const **argv)
            };

            for (Dqn_String8 file_ext : generated_file_extension) {
-                Dqn_String8 src_path  = Dqn_FsPath_ConvertF(scratch.arena, "%.*s/%.*s.%.*s", DQN_STRING_FMT(build_dir), DQN_STRING_FMT(prefix), DQN_STRING_FMT(file_ext));
-                Dqn_String8 dest_path = Dqn_FsPath_ConvertF(scratch.arena, "%.*s/%.*s.%.*s", DQN_STRING_FMT(folder_path), DQN_STRING_FMT(prefix), DQN_STRING_FMT(file_ext));
+                Dqn_String8 src_path  = Dqn_FsPath_ConvertF(scratch.arena, "%.*s/%.*s.%.*s", DQN_STRING_FMT(build_dir), DQN_STRING_FMT(output_name), DQN_STRING_FMT(file_ext));
+                Dqn_String8 dest_path = Dqn_FsPath_ConvertF(scratch.arena, "%.*s/%.*s.%.*s", DQN_STRING_FMT(folder_path), DQN_STRING_FMT(output_name), DQN_STRING_FMT(file_ext));
                Dqn_String8 cmd       = Dqn_String8_InitF(scratch.allocator, "cmd /C move /Y %.*s %.*s", DQN_STRING_FMT(src_path), DQN_STRING_FMT(dest_path));
                if (dry_run) {
                    Dqn_Print_StdLnF(Dqn_PrintStd_Out, "%.*s\n", DQN_STRING_FMT(cmd));
--- a/feely_pona_emscripten_shell.html
+++ b/feely_pona_emscripten_shell.html
@ -4,87 +4,43 @@
    <meta charset="utf-8">
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">

-    <title>raylib web game</title>
+    <title>Terry Cherry</title>

-    <meta name="title" content="raylib web game">
-    <meta name="description" content="New raylib web videogame, developed using raylib videogames library">
-    <meta name="keywords" content="raylib, games, html5, programming, C, C++, library, learn, videogames">
+    <meta name="title" content="Terry Cherry">
+    <meta name="description" content="Terry fends off the hordes of cherries">
    <meta name="viewport" content="width=device-width">

-    <!-- Open Graph metatags for sharing -->
-    <meta property="og:title" content="raylib web game">
-    <meta property="og:image:type" content="image/png">
-    <meta property="og:image" content="https://www.raylib.com/common/img/raylib_logo.png">
-    <meta property="og:site_name" content="raylib.com">
-    <meta property="og:url" content="https://www.raylib.com/games.html">
-    <meta property="og:description" content="New raylib web videogame, developed using raylib videogames library">
-
-    <!-- Twitter metatags for sharing -->
-    <meta name="twitter:card" content="summary">
-    <meta name="twitter:site" content="@raysan5">
-    <meta name="twitter:title" content="raylib web game">
-    <meta name="twitter:image" content="https://www.raylib.com/common/raylib_logo.png">
-    <meta name="twitter:url" content="https://www.raylib.com/games.html">
-    <meta name="twitter:description" content="New raylib web game, developed using raylib videogames library">
-
-    <!-- Favicon -->
-    <link rel="shortcut icon" href="https://www.raylib.com/favicon.ico">
-
    <style>
      body {
        font-family: arial;
        margin: 0;
        padding: none;
+        background: #301010;
      }

      #header {
-        width: 100%;
-        height: 80px;
-        background-color: #888888;
-      }
-
-      /* NOTE: raylib logo is embedded in the page as base64 png image */
-      #logo {
-        width:64px;
-        height:64px;
-        float:left;
-        position:relative;
-        margin:10px;
-        background-image:url('data:image/png;base64,\
-iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAIAAAAlC+aJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADs\
-MAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjExR/NCNwAAA7JJREFUaEPtk0FyWzEMQ+37X7fZhxX4\
-YY3AD1OKF1nkzTRlSBCCLeVBnvl/AUdaELOunPno1kts1kixdtEZKVs+xIxebBkZsVknn/L5nFGDLR8T4zVC9fX19S/+tTFijr\
-YK4jUjbPUtqBHpnEE6PkZD7jQZV8n5Recw1XQKciZuPaEtR6UjNs5ENVGMsBVqpPtER0ZMOhpyp8m4YL4OjD9yxsyZxnQycfMJ\
-ETNSzsRE1+dihK3YMiJmpHTW3xpmXPC6BXlCHfqnBlsjY5hxf/6EVEOM2BTEi0fYCX4ONSI6Kq3Blg/prIOMq2CsRur4KQ0x64\
-SdjOufEDEdHZGOhmz5RDHCVqhRuQ86YsVskbc+GXchLiHnFyYH+UigQDVGnImbT8hwFkgLg2qiM8JO6Ylx1FNLa3DmYwqCTsZd\
-4BPqGJG7MwKzpeiWKTKxXkLMVE3MSOmsdwxLH6Rd/wCCLSNDx6djeKfJuArGeoYamRHpaEjnCBYZVy8hZqo2GI36qPjsiOiMsB\
-XGcev4Mx9TLGTchbgEjN/uz6jGrBvDjg+LTNx8Qp2CbG2xMKgmOiPslJ4Yxx+eSnSkzlosZNwFPiHl7FRTkLNRJm4+IeVM0ymI\
-H42wE/wcKalQI4MRl4EW3p6VcRWMua8F6WjIlqZDxvVPiHQ6CjVbYkV9ohhhp/Rk1wiYgpyJ78i4CsZbjkb8Qx+ihvzu3RPaKo\
-gZkY6GlEeMsKdPSOFIC8VoOusg44L5c+T8ouOoGhWbdWJ8tMi4egkxo4hoh2yNTGf3iIyr5Lyic4bRENXo+lvDjAt4C1Hk/OKt\
-UaAj0+n4dMSZ2D+hrYJsaYh2SClG2jV9kJKKzhlGQ1SsW299Mq6C8dYZHTExo8fzieI5ivipYnYy7nwJqGKmOYyRwfiUBXITfh\
-5qSHRGWEkfqJqURgvsdHyWYv7Ko8DnYYegk3EB00cxprdrJRzFd7YQzawu8L1GMTYS/KpPaAFTkIn1EmJmspJSs5xBzSyGhlkB\
-mlxfNFiP5mw4wlbMh4F5Ddxp5jNINBdCEz9zPOC1zD7Q0HBdmXndwv0TMtydEdzlWJT4VZ8Qt9Qn4/onxMIwa5ZYGJU5yufBiC\
-jwE50AGjLCVuS8Yt4H7OgZLKK5EKOsLviEWJSL/+0uMi7gLUSBseYwqEbXvSHCec1CJvZPyHCmYQffaBBfOTCGHM2aEbZi1+gO\
-1XTWVXMnzrhAn5DSOZVsiQlHnSITKzGj6DeTcZWc/3oy7h9//PF4PL4BlvsWrb6RE+oAAAAASUVORK5CYII=');
+        height: 30px;
+        padding-left: 5px;
+        padding-right: 5px;
+        padding-top: 5px;
      }

      .emscripten { padding-right: 0; margin-left: auto; margin-right: auto; display: block; }
      div.emscripten { text-align: center; }
-      div.emscripten_border { border: 1px solid black; }
+      div.emscripten_border {  border: 0px solid black; }
+      div.emscripten_status { border: 0px solid black; }

      /* NOTE: Canvas *must not* have any border or padding, or mouse coords will be wrong */
      canvas.emscripten {
        border: 0px none;
        background: black;
-        width: 100%;
+        width: 75vw;
      }

      .spinner {
-        height: 30px;
-        width: 30px;
+        height: 15px;
+        width: 15px;
        margin: 0;
-        margin-top: 20px;
-        margin-left: 20px;
        display: inline-block;
        vertical-align: top;
        -webkit-animation: rotation .8s linear infinite;
@ -118,10 +74,10 @@ jwE50AGjLCVuS8Yt4H7OgZLKK5EKOsLviEWJSL/+0uMi7gLUSBseYwqEbXvSHCec1CJvZPyHCmYQffaB
      #status {
        display: inline-block;
        vertical-align: top;
-        margin-top: 30px;
-        margin-left: 20px;
+        margin-top: 5px;
+        margin-left: 5px;
        font-weight: bold;
-        color: rgb(40, 40, 40);
+        color: white;
      }

      #progress {
@ -133,30 +89,26 @@ jwE50AGjLCVuS8Yt4H7OgZLKK5EKOsLviEWJSL/+0uMi7gLUSBseYwqEbXvSHCec1CJvZPyHCmYQffaB
        display: inline-block;
        float: right;
        vertical-align: top;
-        margin-top: 15px;
-        margin-right: 20px;
      }

      #output {
-        width: 100%;
+        width: 90%;
        height: 140px;
        margin: 0 auto;
        margin-top: 10px;
        display: block;
        background-color: black;
-        color: rgb(37, 174, 38);
+        color: white;
        font-family: 'Lucida Console', Monaco, monospace;
        outline: none;
      }

      input[type=button] {
        background-color: lightgray;
-        border: 4px solid darkgray;
        color: black;
        text-decoration: none;
        cursor: pointer;
        width: 140px;
-        height: 50px;
      }

      input[type=button]:hover {
@ -167,18 +119,15 @@ jwE50AGjLCVuS8Yt4H7OgZLKK5EKOsLviEWJSL/+0uMi7gLUSBseYwqEbXvSHCec1CJvZPyHCmYQffaB
  </head>
  <body>
    <div id="header">
-        <a id="logo" href="https://www.raylib.com"></a>
-
        <div class="spinner" id='spinner'></div>
        <div class="emscripten" id="status">Downloading...</div>
-
        <span id='controls'>
          <span><input type="button" value="🖵 FULLSCREEN" onclick="Module.requestFullscreen(false, false)"></span>
          <span><input type="button" id="btn-audio" value="🔇 SUSPEND" onclick="toggleAudio()"></span>
        </span>

        <div class="emscripten">
-          <progress value="0" max="100" id="progress" hidden=1></progress>
+          <progress value="0" max="100" id="progress" hidden=0></progress>
        </div>
    </div>

@ -187,26 +136,6 @@ jwE50AGjLCVuS8Yt4H7OgZLKK5EKOsLviEWJSL/+0uMi7gLUSBseYwqEbXvSHCec1CJvZPyHCmYQffaB
    </div>

    <textarea id="output" rows="8"></textarea>
-
-    <script type='text/javascript' src="https://cdn.jsdelivr.net/gh/eligrey/FileSaver.js/dist/FileSaver.min.js"> </script>
-    <script type='text/javascript'>
-        function saveFileFromMEMFSToDisk(memoryFSname, localFSname)     // This can be called by C/C++ code
-        {
-            var isSafari = false; // Not supported, navigator.userAgent access is being restricted
-            //var isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
-            var data = FS.readFile(memoryFSname);
-            var blob;
-
-            if (isSafari) blob = new Blob([data.buffer], { type: "application/octet-stream" });
-            else blob = new Blob([data.buffer], { type: "application/octet-binary" });
-
-            // NOTE: SaveAsDialog is a browser setting. For example, in Google Chrome,
-            // in Settings/Advanced/Downloads section you have a setting:
-            // 'Ask where to save each file before downloading' - which you can set true/false.
-            // If you enable this setting it would always ask you and bring the SaveAsDialog
-            saveAs(blob, localFSname);
-        }
-    </script>
    <script type='text/javascript'>
        var statusElement = document.querySelector('#status');
        var progressElement = document.querySelector('#progress');
@ -296,7 +225,6 @@ jwE50AGjLCVuS8Yt4H7OgZLKK5EKOsLviEWJSL/+0uMi7gLUSBseYwqEbXvSHCec1CJvZPyHCmYQffaB
    <!-- REF: https://developers.google.com/web/updates/2018/11/web-audio-autoplay -->
    <script type='text/javascript'>
        var audioBtn = document.querySelector('#btn-audio');
-
        // An array of all contexts to resume on the page
        const audioContexList = [];
        (function() {
--- a/feely_pona_entity_create.cpp
+++ b/feely_pona_entity_create.cpp
@ -264,7 +264,7 @@ FP_EntityRenderData FP_Entity_GetRenderData(FP_Game *game, FP_EntityType type, u
        } break;

        case FP_EntityType_Billboard: {
-            result.height.meters = 12.f;
+            result.height.meters = 7.5f;
            FP_EntityBillboardState state = DQN_CAST(FP_EntityBillboardState)raw_state;
            switch (state) {
                case FP_EntityBillboardState_Attack:      result.anim_name = g_anim_names.map_billboard_attack; break;
--- a/feely_pona_unity_nodll.h
+++ b/feely_pona_unity_nodll.h
@ -92,7 +92,8 @@ DQN_MSVC_WARNING_POP
 DQN_GCC_WARNING_POP

 #if defined(DQN_PLATFORM_EMSCRIPTEN)
-#include <emscripten.h>
+#include <emscripten/emscripten.h>
+#include <emscripten/html5.h>
 #endif

 // NOTE: TELY_Platform =============================================================================
Author	SHA1	Message	Date
doyle	0030275bc9	fp: Make the website prettier, set the tab title	2023-10-17 12:30:16 +11:00
Joshalosh	629c9d9b27	fp: Position and scale billboards	2023-10-17 09:00:04 +11:00