noctx 3d changes / remove browserfs

pmp-p · pmp-p · commit 1496b0d7a016 · 2025-03-09T08:05:24.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,13 +6,13 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     env:
-        SDK_VERSION: 3.1.61.2bi
+        SDK_VERSION: 3.1.61.5bi
         SYS_PYTHON: /usr/bin/python3
         SDKROOT: /opt/python-wasm-sdk
         PACKAGES: emsdk pygame
         BUILD_STATIC: emsdk
         STATIC: false
-        BUILDS: 3.12 3.13 3.14
+        BUILDS: 3.12 3.13
         CYTHON: Cython-3.0.11-py2.py3-none-any.whl
         LD_VENDOR: -sUSE_GLFW=3
         LOPTS: -Os -g0
diff --git a/packages.d/pygame/pygame.sh b/packages.d/pygame/pygame.sh
@@ -311,7 +311,14 @@ echo "FIXME: build wheel"
 
 SDL2="-sUSE_ZLIB=1 -sUSE_BZIP2=1 -sUSE_LIBPNG"
 SDL2="$SDL2 -sUSE_FREETYPE -sUSE_SDL=2 -sUSE_SDL_MIXER=2 -lSDL2 -L/opt/python-wasm-sdk/devices/emsdk/usr/lib"
-SDL2="$SDL2 -lSDL2_image -lSDL2_gfx -lSDL2_mixer -lSDL2_mixer_ogg -lSDL2_ttf"
+
+if echo $EMFLAVOUR|grep -q ^4
+then
+    SDL2="$SDL2 -lSDL2_image -lSDL2_gfx -lSDL2_mixer -lSDL2_mixer-ogg -lSDL2_ttf"
+else
+    SDL2="$SDL2 -lSDL2_image -lSDL2_gfx -lSDL2_mixer -lSDL2_mixer_ogg -lSDL2_ttf"
+fi
+
 SDL2="$SDL2 -lvorbis -logg -lwebp -lwebpdemux -ljpeg -lpng -lharfbuzz -lfreetype"
 SDL2="$SDL2 -lssl -lcrypto -lffi -lbz2 -lz -ldl -lm"
 
diff --git a/static/noctx.tmpl b/static/noctx.tmpl
@@ -1,4 +1,4 @@
-<html lang="en-us"><script src="{{cookiecutter.cdn}}pythons.js" type=module id="site" data-python="python{{cookiecutter.PYBUILD}}" data-LINES=42 data-COLUMNS=132 data-os="vtx,fs,snd,gui" async defer>#<!--
+<html lang="en-us"><script src="{{cookiecutter.cdn}}pythons.js" type=module id="site" data-python="python{{cookiecutter.PYBUILD}}" data-LINES=42 data-COLUMNS=132 data-os="vtx,snd,gui" async defer>#<!--
 
 print("""
 Loading {{cookiecutter.title}} from {{cookiecutter.archive}}.apk
@@ -54,13 +54,11 @@ def uy(*argv):
 # do not rename
 async def custom_site():
     import embed
-
     platform.document.body.style.background = "#7f7f7f"
 
     platform.window.transfer.hidden = true
     platform.window.canvas.style.visibility = "visible"
 
-    apk = "{{cookiecutter.archive}}.apk"
 
     bundle = "{{cookiecutter.archive}}"
 
@@ -69,28 +67,16 @@ async def custom_site():
     appdir.mkdir()
 
 
-    # mount apk
-
-    cfg = {
-        "io": "url",
-        "type":"mount",
-        "mount" : {
-            "point" : appdir.as_posix(),
-            "path" : "/",
-        }
-
-    }
-
-    track = platform.window.MM.prepare(apk, json.dumps(cfg))
+    # unpack filesystem from compressed archive
+    import tarfile
+    async with platform.fopen("{{cookiecutter.archive}}.tar.gz", "rb") as archive:
+        tar = tarfile.open(fileobj=archive, mode="r:gz")
+        tar.extractall(path=appdir.as_posix(), filter='tar')
+        tar.close()
 
     marginx = ux(.020) # 20%
     marginy = uy(.045) # 45%
 
-    print(" /////////////////////////////////////////////////////////: ")
-    # wait until zip mount + overlayfs is complete
-    while not track.ready:
-        await asyncio.sleep(.1)
-
 
     # preloader will change dir and prepend it to sys.path
     platform.run_main(PyConfig, loaderhome= appdir / "assets", loadermain=None)
@@ -186,13 +172,17 @@ config = {
     _sdl2 : "canvas",
     user_canvas : 0,
     user_canvas_managed : 0,
+    gui_divider : 2,
     ume_block : {{cookiecutter.ume_block}},
     can_close : {{cookiecutter.can_close}},
     archive : "{{cookiecutter.archive}}",
-    gui_debug : 3,
+    gui_debug : 2,
     cdn : "{{cookiecutter.cdn}}",
     autorun : {{cookiecutter.autorun}},
-    PYBUILD : "{{cookiecutter.PYBUILD}}"
+    PYBUILD : "{{cookiecutter.PYBUILD}}",
+    fb_ar   :  1.77,
+    fb_width : "{{cookiecutter.width}}",
+    fb_height : "{{cookiecutter.height}}"
 }
 
 </script>
@@ -316,6 +306,12 @@ height="1px"
     oncontextmenu="event.preventDefault()" tabindex=1>
     </canvas>
 
+    <canvas class="emscripten" id="canvas3d"
+width="{{cookiecutter.width}}px"
+height="{{cookiecutter.height}}px"
+    oncontextmenu="event.preventDefault()" tabindex=1 hidden>
+    </canvas>
+
     <div id=html></div>
 
     <div id=crt  class=bottomright >
@@ -375,6 +371,10 @@ frameborder="1"
 
     <script type="application/javascript">
 
+    globalThis.__canvas_resized = (self, ecw, ech) => {
+        console.warn("TODO: panda3d canvas monitor", self, ecw, ech)
+    }
+
     async function custom_onload(debug_hidden) {
         // this is called before anythinh python is loaded
         // make your js customization here
diff --git a/static/pythons.js b/static/pythons.js
@@ -650,8 +650,6 @@ function feat_gui(debug_hidden) {
         return new_canvas
     }
 
-
-
     if (!canvas2d) {
         canvas2d =  add_canvas("canvas")
         canvas2d.style.position = "absolute"
@@ -675,11 +673,9 @@ console.warn("TODO: user defined canvas")
         canvas3d.style.position = "absolute"
         canvas3d.style.bottom = "0px"
         canvas3d.style.left = "0px"
-
     }
     vm.canvas3d = canvas3d
 
-
     canvas.addEventListener("click", MM.focus_handler)
 /*
 
@@ -787,26 +783,19 @@ console.warn("TODO: user defined canvas")
         const canvas = vm.canvas3d
         divider = divider || 1
         if ( (canvas.width==1) && (canvas.height==1) ){
-            console.log("canvas context not set yet")
+            console.log("Canvas3D: context not set yet")
             setTimeout(window_canvas_adjust_3d, 100, divider);
             return;
         }
 
-        if (!vm.config.fb_ar) {
-            vm.config.fb_width = canvas.width
-            vm.config.fb_height = canvas.height
-            vm.config.fb_ar  =  canvas.width / canvas.height
-        }
-
-
         var want_w
         var want_h
 
         const ar = vm.config.fb_ar
 
         const dpr = window.devicePixelRatio
         if (dpr != 1 )
-            console.warn("Unsupported device pixel ratio", dpr)
+            console.warn("Canvas3D: Unsupported device pixel ratio", dpr)
 
         // default is maximize
         // default is maximize
@@ -817,7 +806,7 @@ console.warn("TODO: user defined canvas")
 
 
         if (vm.config.debug)
-            console.log("window3D[DEBUG:CORRECTED]:", want_w, want_h, ar, divider)
+            console.log("Canvas3D:", want_w, want_h, ar, divider)
 
         // keep fb ratio
         want_w = Math.trunc(want_w / divider )
@@ -863,43 +852,28 @@ console.warn("TODO: user defined canvas")
 
     }
 
-    function window_resize_3d(gui_divider) {
-        setTimeout(window_canvas_adjust_3d, 200, gui_divider);
-        setTimeout(window.focus, 300);
-    }
-
-    function window_resize_2d(gui_divider) {
-        // don't interfere if program want to handle canvas placing/resizing
-        if (vm.config.user_canvas_managed)
-            return vm.config.user_canvas_managed
-
-        if (!window.canvas) {
-            console.warn("777: No canvas defined")
-            return
-        }
-
-        setTimeout(window_canvas_adjust, 200, gui_divider);
-        setTimeout(window.focus, 300);
-    }
-
+    function window_resize() {
+        // TODO: need special management for 3D ctx
+        if (vm.config.user_canvas_managed==3) {
+            setTimeout(window_canvas_adjust_3d, 100, vm.config.gui_divider);
+        } else {
+            // don't interfere if program want to handle canvas placing/resizing
+            if (vm.config.user_canvas_managed)
+                return vm.config.user_canvas_managed
 
+            if (!window.canvas) {
+                console.warn("777: No canvas defined")
+                return
+            }
+            setTimeout(window_canvas_adjust, 100, vm.config.gui_divider);
 
-    function window_resize_event() {
-        // special management for 3D ctx
-        if (vm.config.user_canvas_managed==3) {
-            window_resize(vm.config.gui_divider)
-            return
         }
-        window_resize(vm.config.gui_divider)
+        setTimeout(window.focus, 100);
     }
-
-    window.addEventListener('resize', window_resize_event);
-    if (vm.config.user_canvas_managed==3)
-        window.window_resize = window_resize_3d
-    else
-        window.window_resize = window_resize_2d
+    globalThis.window_resize = window_resize
 
     vm.canvas = canvas2d || canvas3d
+    window.addEventListener('resize', window_resize);
     return vm.canvas
 }
 
