fix zoom

.github/workflows/weekly-branch-promotions.yml

@@ -1,58 +1,59 @@
-name: 🔁 Branch Promotions
+name: 🔁 Weekly Branch Promotions
 
 on:
   schedule:
-    - cron: "0 6 * * 1,4" # Lundi et Jeudi à 6h UTC (design → develop)
-    - cron: "0 6 * * 1" # Lundi à 6h UTC (develop → main)
+    - cron: "0 6 * * 1"
   workflow_dispatch:
-    inputs:
-      promotion:
-        description: "Which promotion to run"
-        required: true
-        type: choice
-        options:
-          - design-to-develop
-          - develop-to-main
-          - both
 
 permissions:
   contents: read
   pull-requests: write
 
 concurrency:
-  group: branch-promotions
+  group: weekly-branch-promotions
   cancel-in-progress: false
 
 jobs:
-  design-to-develop:
-    name: Open design → develop
+  open-promotion-pr:
+    name: Open ${{ matrix.head }} → ${{ matrix.base }}
     runs-on: ubuntu-latest
-    if: |
-      (github.event_name == 'schedule') ||
-      (github.event_name == 'workflow_dispatch' && (github.event.inputs.promotion == 'design-to-develop' || github.event.inputs.promotion == 'both'))
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - head: develop
+            base: design
+            title: "chore: merge develop into design"
+          - head: design
+            base: main
+            title: "chore: merge design into main"
+
     steps:
       - name: ⬇️ Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
       - name: 🔁 Open promotion PR
         env:
           GH_TOKEN: ${{ github.token }}
+          BASE_BRANCH: ${{ matrix.base }}
+          HEAD_BRANCH: ${{ matrix.head }}
+          PR_TITLE: ${{ matrix.title }}
         run: |
           set -euo pipefail
 
-          git fetch origin develop design
+          git fetch origin "$BASE_BRANCH" "$HEAD_BRANCH"
 
-          if git merge-base --is-ancestor origin/design origin/develop; then
-            echo "No promotion needed: develop already contains design."
+          if git merge-base --is-ancestor "origin/$HEAD_BRANCH" "origin/$BASE_BRANCH"; then
+            echo "No promotion needed: $BASE_BRANCH already contains $HEAD_BRANCH."
             exit 0
           fi
 
           existing_pr="$(gh pr list \
             --state open \
-            --base develop \
-            --head "$GITHUB_REPOSITORY_OWNER:design" \
+            --base "$BASE_BRANCH" \
+            --head "$GITHUB_REPOSITORY_OWNER:$HEAD_BRANCH" \
             --json number \
             --jq '.[0].number // empty')"
 
@@ -62,50 +63,7 @@ jobs:
           fi
 
           gh pr create \
-            --base develop \
-            --head design \
-            --title "chore: merge design into develop" \
-            --body "Automated promotion PR from \`design\` to \`develop\`."
-
-  develop-to-main:
-    name: Open develop → main
-    runs-on: ubuntu-latest
-    if: |
-      (github.event_name == 'schedule' && github.event.schedule == '0 6 * * 1') ||
-      (github.event_name == 'workflow_dispatch' && (github.event.inputs.promotion == 'develop-to-main' || github.event.inputs.promotion == 'both'))
-    steps:
-      - name: ⬇️ Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: 🔁 Open promotion PR
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          set -euo pipefail
-
-          git fetch origin main develop
-
-          if git merge-base --is-ancestor origin/develop origin/main; then
-            echo "No promotion needed: main already contains develop."
-            exit 0
-          fi
-
-          existing_pr="$(gh pr list \
-            --state open \
-            --base main \
-            --head "$GITHUB_REPOSITORY_OWNER:develop" \
-            --json number \
-            --jq '.[0].number // empty')"
-
-          if [ -n "$existing_pr" ]; then
-            echo "Promotion PR already open: #$existing_pr."
-            exit 0
-          fi
-
-          gh pr create \
-            --base main \
-            --head develop \
-            --title "chore: merge develop into main" \
-            --body "Automated weekly promotion PR from \`develop\` to \`main\`."
+            --base "$BASE_BRANCH" \
+            --head "$HEAD_BRANCH" \
+            --title "$PR_TITLE" \
+            --body "Automated weekly promotion PR from \`$HEAD_BRANCH\` to \`$BASE_BRANCH\`."

README.md

@@ -143,7 +143,6 @@ WS  ws://localhost:8000/ws
 | `docs/technical/hand-tracking.md`       | Webcam, backend/browser MediaPipe, glove, and gesture flow |
 | `docs/technical/zustand.md`             | Game, settings, and subtitle stores                        |
 | `docs/technical/three-debugging.md`     | DevTools workflow for stepping into Three.js internals     |
-| `docs/technical/map-performance.md`     | Map draw-call bottlenecks and optimization notes           |
 | `docs/technical/editor.md`              | Editor implementation details                              |
 | `docs/technical/animation.md`           | Animated, explodable, and reusable 3D model components     |
 | `docs/user/features.md`                 | Implemented feature inventory                              |

docs/technical/map-performance.md

@@ -1,51 +0,0 @@
-# Map Performance Notes
-
-This document tracks the current map-rendering performance pass.
-
-## Current Runtime Path
-
-- `public/map.json` is the source of map transforms.
-- `src/world/GameMap.tsx` renders regular visual map nodes.
-- `src/world/vegetation/VegetationSystem.tsx` already instances dense vegetation.
-- `src/world/map-instancing/MapInstancingSystem.tsx` instances selected repeated static map assets.
-- `src/world/GameMapCollision.tsx` keeps terrain collision separate for the player octree.
-
-## Main Bottlenecks Found
-
-The most important signal is draw calls, not only triangle count.
-
-| Model            | Instances | Meshes / primitives | Notes                                                            |
-| ---------------- | --------: | ------------------: | ---------------------------------------------------------------- |
-| `generateur`     |         3 |                3152 | Worst draw-call offender. Needs asset-side mesh merging.         |
-| `lafabrik`       |         4 |                  56 | Moderate draw calls, heavy 2048 texture set.                     |
-| `ecole`          |         1 |                 107 | One material but many primitives; should be merged.              |
-| `fermeverticale` |         3 |                   1 | Geometry is fine; textures are large for the visible complexity. |
-
-`generateur` is especially expensive because three visible instances can multiply thousands of primitives into thousands of draw calls. Instancing reduces repeated instance cost, but the source asset still needs a cleaner export.
-
-## Current Code-Side Optimization
-
-Repeated static assets are configured in:
-
-```txt
-src/world/map-instancing/mapInstancingConfig.ts
-```
-
-Those names are excluded from the regular `GameMap` clone path, then rendered by `MapInstancingSystem` with `THREE.InstancedMesh`.
-
-This keeps the existing map authoring format while reducing repeated draw calls for selected assets.
-
-## Asset-Side Follow-Up
-
-Design/export should prioritize:
-
-1. Merge `generateur` meshes from 3152 primitives to a small number of material groups.
-2. Reduce `lafabrik` texture count and downscale flat/low-detail maps.
-3. Merge `ecole` primitives because it uses a single material.
-4. Prefer runtime `.glb` or compressed runtime textures when the pipeline supports it.
-
-## Safety Rules
-
-- Do not instance `terrain` for player collision without validating `Octree.fromGraphNode` support.
-- Do not replace repair-game models with optimized map models unless repair node names are preserved.
-- Dispose only GPU resources created locally. Do not dispose textures or geometries owned by `useGLTF`'s cache.

eslint.config.js

@@ -7,7 +7,7 @@ import tseslint from "typescript-eslint";
 import { defineConfig, globalIgnores } from "eslint/config";
 
 export default defineConfig([
-  globalIgnores(["dist", "POC-grass"]),
+  globalIgnores(["dist"]),
   {
     files: ["**/*.{ts,tsx}"],
     extends: [