Dynamic glow effect [needs rebase]

.gitignore

@@ -8,3 +8,5 @@ __pycache__
 *.kdev4
 .kdev4/
 *.kate-swp
+*~
+*-autosave.kra

.gitmodules

@@ -6,3 +6,6 @@
 	path = external/gamecontrollerdb
 	url = https://github.com/taisei-project/SDL_GameControllerDB.git
 	branch = master
+[submodule "external/koishi"]
+	path = external/koishi
+	url = https://github.com/taisei-project/koishi

atlas/meson.build

@@ -44,6 +44,7 @@ atlases = [
     ['gray16',      [preset_png]],
     ['huge',        []],
     ['portraits',   ['--width=4096', '--height=4096']],
+    ['coroutines_temp', []],  # TODO merge this into `common` when coroutines are merged
 ]
 
 atlas_profiles = [

atlas/overrides/proj/hghost.spr

@@ -1,3 +1,2 @@
-
-w = 22
-h = 23
+w = 21
+h = 34

emscripten/preamble.js

@@ -1,22 +1,106 @@
 
-Module['preRun'].push(function() {
-    ENV["TAISEI_NOASYNC"] = "1";
-    ENV["TAISEI_NOUNLOAD"] = "1";
-    ENV["TAISEI_PREFER_SDL_VIDEODRIVERS"] = "emscripten";
-    ENV["TAISEI_RENDERER"] = "gles30";
-
-    FS.mkdir('/persistent');
-    FS.mount(IDBFS, {}, '/persistent');
-
-    // This function has been removed from Emscripten, but SDL still uses it...
-    Module['Pointer_stringify'] = function(ptr) {
-        return UTF8ToString(ptr);
-    }
+function E(id) { return document.getElementById(id); }
+
+var statusElement = E('status');
+var progressElement = E('progress');
+var spinnerElement = E('spinner');
+var canvasElement = E('canvas');
+var canvasContainerElement = E('canvasContainer');
+var logToggleElement = E('logToggle');
+var logToggleContainerElement = E('logToggleContainer');
+var logContainerElement = E('logContainer');
+var logOutputElement = E('output');
+var dlMessage = statusElement.innerText;
+logToggleElement.checked = false;
 
-    Pointer_stringify = Module['Pointer_stringify']
-    window.Pointer_stringify = Module['Pointer_stringify']
+function toggleLog() {
+    logContainerElement.hidden = !logToggleElement.checked;
+    logOutputElement.scrollTop = logOutputElement.scrollHeight;
+}
+
+var glContext = canvasElement.getContext('webgl2', {
+    'alpha' : false,
+    'antialias' : false,
+    'depth' : false,
+    'powerPreference' : 'high-performance',
+    'premultipliedAlpha' : true,
+    'preserveDrawingBuffer' : false,
+    'stencil' : false,
 });
 
+// glContext = WebGLDebugUtils.makeDebugContext(glContext);
+
+canvasElement.addEventListener("webglcontextlost", function(e) {
+    alert('WebGL context lost. You will need to reload the page.');
+    e.preventDefault();
+}, false);
+
+logOutputElement.value = ''; // clear browser cache
+
+Module = {
+    'preRun': [function() {
+        ENV["TAISEI_NOASYNC"] = "1";
+        ENV["TAISEI_NOUNLOAD"] = "1";
+        ENV["TAISEI_PREFER_SDL_VIDEODRIVERS"] = "emscripten";
+        ENV["TAISEI_RENDERER"] = "gles30";
+
+        FS.mkdir('/persistent');
+        FS.mount(IDBFS, {}, '/persistent');
+    }],
+    'postRun': [],
+    'onFirstFrame': function() {
+        canvasContainerElement.hidden = false;
+        logToggleContainerElement.style.display = "inline-block";
+        Module['setStatus']('', true);
+    },
+    'print': function(text) {
+        if (arguments.length > 1) text = Array.prototype.slice.call(arguments).join(' ');
+        console.log(text);
+        logOutputElement.value += text + "\n";
+        logOutputElement.scrollTop = logOutputElement.scrollHeight; // focus on bottom
+    },
+    'printErr': function(text) {
+        if (arguments.length > 1) text = Array.prototype.slice.call(arguments).join(' ');
+        console.error(text);
+    },
+    'canvas': canvasElement,
+    'preinitializedWebGLContext': glContext,
+    'setStatus': function(text, force) {
+        var ss = Module['setStatus'];
+        if (!text && !force) return;
+        if (!ss.last) ss.last = { time: Date.now(), text: '' };
+        if (text === ss.last.text) return;
+        var m = text.match(/([^(]+)\((\d+(\.\d+)?)\/(\d+)\)/);
+        var now = Date.now();
+        if (m && now - ss.last.time < 30) return; // if this is a progress update, skip it if too soon
+        ss.last.time = now;
+        ss.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.innerText = text.replace(/^Downloading(?: data)?\.\.\./, dlMessage).replace('...', '…');
+        console.log("[STATUS] " + statusElement.innerText);
+    },
+    'totalDependencies': 0,
+    'monitorRunDependencies': function(left) {
+        Module['totalDependencies'] = Math.max(Module['totalDependencies'], left);
+        Module['setStatus'](left ? 'Preparing… (' + (Module['totalDependencies']-left) + '/' + Module['totalDependencies'] + ')' : 'All downloads complete.');
+    }
+};
+
+window.onerror = function(error) {
+    Module['setStatus']('Error: ' + error);
+};
+
 function SyncFS(is_load, ccptr) {
     FS.syncfs(is_load, function(err) {
         Module['ccall'](
@@ -25,16 +109,6 @@ function SyncFS(is_load, ccptr) {
             [is_load, err, ccptr]
         );
     });
-};
-
-Module['preinitializedWebGLContext'] = document.getElementById('canvas').getContext('webgl2', {
-    alpha : false,
-    antialias : false,
-    depth : false,
-    powerPreference : 'high-performance',
-    premultipliedAlpha : true,
-    preserveDrawingBuffer : false,
-    stencil : false,
-});
+}
 
-// Module['preinitializedWebGLContext'] = WebGLDebugUtils.makeDebugContext(Module['preinitializedWebGLContext']);
+var debug_tables;  // closure may fail on debug builds without this

emscripten/shell.html

@@ -210,91 +210,6 @@ <h3>Note: this web port is experimental and may not perform as well as the origi
         <br/>
         Powered by&nbsp;<a href="https://emscripten.org/">Emscripten</a>
     </div>
-    <script>
-        var statusElement = document.getElementById('status');
-        var progressElement = document.getElementById('progress');
-        var spinnerElement = document.getElementById('spinner');
-        var canvasContainerElement = document.getElementById('canvasContainer');
-        var logToggleElement = document.getElementById('logToggle');
-        var logContainerElement = document.getElementById('logContainer');
-        var logOutputElement = document.getElementById('output');
-        var dlMessage = statusElement.innerText;
-        logToggleElement.checked = false;
-
-        function toggleLog() {
-            logContainerElement.hidden = !logToggleElement.checked;
-            logOutputElement.scrollTop = logOutputElement.scrollHeight;
-        }
-
-        var Taisei = {
-            preRun: [],
-            postRun: [],
-            onFirstFrame: function() {
-                canvasContainerElement.hidden = false;
-                logToggleContainer.style.display = "inline-block";
-                Taisei.setStatus('', true);
-            },
-            print: (function() {
-                logOutputElement.value = ''; // clear browser cache
-                return function(text) {
-                    if (arguments.length > 1) text = Array.prototype.slice.call(arguments).join(' ');
-                    console.log(text);
-                    logOutputElement.value += text + "\n";
-                    logOutputElement.scrollTop = logOutputElement.scrollHeight; // focus on bottom
-                };
-            })(),
-            printErr: function(text) {
-                if (arguments.length > 1) text = Array.prototype.slice.call(arguments).join(' ');
-                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, force) {
-                if (!text && !force) return;
-                if (!Taisei.setStatus.last) Taisei.setStatus.last = { time: Date.now(), text: '' };
-                if (text === Taisei.setStatus.last.text) return;
-                var m = text.match(/([^(]+)\((\d+(\.\d+)?)\/(\d+)\)/);
-                var now = Date.now();
-                if (m && now - Taisei.setStatus.last.time < 30) return; // if this is a progress update, skip it if too soon
-                Taisei.setStatus.last.time = now;
-                Taisei.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.innerText = text.replace(/^Downloading(?: data)?\.\.\./, dlMessage).replace('...', '…');
-                console.log("[STATUS] " + statusElement.innerText);
-            },
-            totalDependencies: 0,
-            monitorRunDependencies: function(left) {
-                this.totalDependencies = Math.max(this.totalDependencies, left);
-                Taisei.setStatus(left ? 'Preparing… (' + (this.totalDependencies-left) + '/' + this.totalDependencies + ')' : 'All downloads complete.');
-            }
-        };
-
-        window.onerror = function(error) {
-            Taisei.setStatus('Error: ' + error);
-        };
-    </script>
     <!--<script type="text/javascript" src="webgl-debug.js"></script>-->
     {{{ SCRIPT }}}
 </body>

meson.build

@@ -165,10 +165,12 @@ dep_m           = cc.find_library('m', required : false)
 
 dep_cglm        = subproject('cglm').get_variable('cglm_dep')
 dep_glad        = subproject('glad').get_variable('glad_dep')
+dep_koishi      = subproject('koishi').get_variable('koishi_dep')
 
 taisei_deps = [
     dep_cglm,
     dep_freetype,
+    dep_koishi,
     dep_m,
     dep_png,
     dep_sdl2,
@@ -248,6 +250,11 @@ config.set('TAISEI_BUILDCONF_HAVE_TIMESPEC', have_timespec)
 config.set('TAISEI_BUILDCONF_HAVE_INT128', cc.sizeof('__int128') == 16)
 config.set('TAISEI_BUILDCONF_HAVE_LONG_DOUBLE', cc.sizeof('long double') > 8)
 config.set('TAISEI_BUILDCONF_HAVE_POSIX', have_posix)
+config.set('TAISEI_BUILDCONF_HAVE_SINCOS', cc.has_function('sincos', dependencies : dep_m))
+
+if config.get('TAISEI_BUILDCONF_HAVE_SINCOS')
+    config.set('_GNU_SOURCE', true)
+endif
 
 if host_machine.system() == 'emscripten'
     # Emscripten bug: https://github.com/emscripten-core/emscripten/issues/10072

resources/00-taisei.pkgdir/gfx/atlas_coroutines_temp_0.tex

@@ -0,0 +1,7 @@
+# Autogenerated by the atlas packer, do not modify
+
+source = res/gfx/atlas_coroutines_temp_0.webp
+
+# -- Pasted from the global override file --
+
+anisotropy = 1

resources/00-taisei.pkgdir/gfx/part/bullet_clear.ani

@@ -0,0 +1,3 @@
+@sprite_count = 33
+
+main = 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32

resources/00-taisei.pkgdir/gfx/part/bullet_clear.frame0000.spr

@@ -0,0 +1,7 @@
+# Autogenerated by the atlas packer, do not modify
+
+texture = atlas_coroutines_temp_0
+region_x = 1609
+region_y = 2
+region_w = 163
+region_h = 163

resources/00-taisei.pkgdir/gfx/part/bullet_clear.frame0001.spr

@@ -0,0 +1,7 @@
+# Autogenerated by the atlas packer, do not modify
+
+texture = atlas_coroutines_temp_0
+region_x = 1442
+region_y = 2
+region_w = 163
+region_h = 163

resources/00-taisei.pkgdir/gfx/part/bullet_clear.frame0002.spr

@@ -0,0 +1,7 @@
+# Autogenerated by the atlas packer, do not modify
+
+texture = atlas_coroutines_temp_0
+region_x = 1776
+region_y = 2
+region_w = 163
+region_h = 163

resources/00-taisei.pkgdir/gfx/part/bullet_clear.frame0003.spr

@@ -0,0 +1,7 @@
+# Autogenerated by the atlas packer, do not modify
+
+texture = atlas_coroutines_temp_0
+region_x = 774
+region_y = 2
+region_w = 163
+region_h = 163

resources/00-taisei.pkgdir/gfx/part/bullet_clear.frame0004.spr

@@ -0,0 +1,7 @@
+# Autogenerated by the atlas packer, do not modify
+
+texture = atlas_coroutines_temp_0
+region_x = 1108
+region_y = 2
+region_w = 163
+region_h = 163

resources/00-taisei.pkgdir/gfx/part/bullet_clear.frame0005.spr

@@ -0,0 +1,7 @@
+# Autogenerated by the atlas packer, do not modify
+
+texture = atlas_coroutines_temp_0
+region_x = 607
+region_y = 2
+region_w = 163
+region_h = 163

resources/00-taisei.pkgdir/gfx/part/bullet_clear.frame0006.spr

@@ -0,0 +1,7 @@
+# Autogenerated by the atlas packer, do not modify
+
+texture = atlas_coroutines_temp_0
+region_x = 941
+region_y = 2
+region_w = 163
+region_h = 163

resources/00-taisei.pkgdir/gfx/part/bullet_clear.frame0007.spr

@@ -0,0 +1,7 @@
+# Autogenerated by the atlas packer, do not modify
+
+texture = atlas_coroutines_temp_0
+region_x = 1275
+region_y = 2
+region_w = 163
+region_h = 163

resources/00-taisei.pkgdir/gfx/part/bullet_clear.frame0008.spr

@@ -0,0 +1,7 @@
+# Autogenerated by the atlas packer, do not modify
+
+texture = atlas_coroutines_temp_0
+region_x = 1943
+region_y = 2
+region_w = 163
+region_h = 163

resources/00-taisei.pkgdir/gfx/part/bullet_clear.frame0009.spr

@@ -0,0 +1,7 @@
+# Autogenerated by the atlas packer, do not modify
+
+texture = atlas_coroutines_temp_0
+region_x = 2110
+region_y = 2
+region_w = 163
+region_h = 163

resources/00-taisei.pkgdir/gfx/part/bullet_clear.frame0010.spr

@@ -0,0 +1,7 @@
+# Autogenerated by the atlas packer, do not modify
+
+texture = atlas_coroutines_temp_0
+region_x = 2277
+region_y = 2
+region_w = 163
+region_h = 163

resources/00-taisei.pkgdir/gfx/part/bullet_clear.frame0011.spr

@@ -0,0 +1,7 @@
+# Autogenerated by the atlas packer, do not modify
+
+texture = atlas_coroutines_temp_0
+region_x = 2778
+region_y = 2
+region_w = 163
+region_h = 163