BlueGit

projects-timfalken-com meteors

chore: rebuild game.js (t1143)

timfa Grok Bot · pushed by timfa

Authored 2026-11-13 · 4 days ago

Hash
bcc86cb6130168af1eefdf906046c0da46282bd8
Parent
eff6e439
1 file changed +126 −27
build/game.js +126 −27
@@ -1299,7 +1299,9 @@ var I18N_CATALOG = {
1299 1299 "block.forge-slag": "Forge slag",
1300 1300 "block.forge-spark": "Forge spark",
1301 1301 "block.forge-brass": "Forge brass",
1302 "block.forge-soot": "Forge soot"
1302 "block.forge-soot": "Forge soot",
1303 "error.webgl": "This game needs WebGL. Please try another browser, or turn on hardware acceleration.",
1304 "error.startFailed": "Could not start the game."
1303 1305 },
1304 1306 "nl": {
1305 1307 "menu.tagline": "Drie op een rij, en je blokjes krijgen raketmotoren.",
@@ -1578,7 +1580,9 @@ var I18N_CATALOG = {
1578 1580 "block.forge-slag": "Forge-slak",
1579 1581 "block.forge-spark": "Forge-vonk",
1580 1582 "block.forge-brass": "Forge-messing",
1581 "block.forge-soot": "Forge-roet"
1583 "block.forge-soot": "Forge-roet",
1584 "error.webgl": "Dit spel heeft WebGL nodig. Probeer een andere browser, of zet hardwareversnelling aan.",
1585 "error.startFailed": "Het spel kon niet worden gestart."
1582 1586 },
1583 1587 "de": {
1584 1588 "menu.tagline": "Drei in einer Reihe — und deine Blöcke bekommen Raketenantrieb.",
@@ -1857,7 +1861,9 @@ var I18N_CATALOG = {
1857 1861 "block.forge-slag": "Forge-Schlacke",
1858 1862 "block.forge-spark": "Forge-Funke",
1859 1863 "block.forge-brass": "Forge-Messing",
1860 "block.forge-soot": "Forge-Ruß"
1864 "block.forge-soot": "Forge-Ruß",
1865 "error.webgl": "Dieses Spiel benötigt WebGL. Bitte verwende einen anderen Browser oder aktiviere die Hardwarebeschleunigung.",
1866 "error.startFailed": "Das Spiel konnte nicht gestartet werden."
1861 1867 },
1862 1868 "fr": {
1863 1869 "menu.tagline": "Trois d’affilée, et tes blocs s’équipent de propulseurs.",
@@ -2136,7 +2142,9 @@ var I18N_CATALOG = {
2136 2142 "block.forge-slag": "Forge scorie",
2137 2143 "block.forge-spark": "Forge étincelle",
2138 2144 "block.forge-brass": "Forge laiton",
2139 "block.forge-soot": "Forge suie"
2145 "block.forge-soot": "Forge suie",
2146 "error.webgl": "Ce jeu a besoin de WebGL. Essayez un autre navigateur, ou activez l’accélération matérielle.",
2147 "error.startFailed": "Impossible de lancer le jeu."
2140 2148 },
2141 2149 "ja": {
2142 2150 "menu.tagline": "三つ揃えると、ブロックにロケットが点火します。",
@@ -2415,7 +2423,9 @@ var I18N_CATALOG = {
2415 2423 "block.forge-slag": "フォージのスラグ",
2416 2424 "block.forge-spark": "フォージの火花",
2417 2425 "block.forge-brass": "フォージの真鍮",
2418 "block.forge-soot": "フォージの煤"
2426 "block.forge-soot": "フォージの煤",
2427 "error.webgl": "このゲームにはWebGLが必要です。別のブラウザを使うか、ハードウェアアクセラレーションを有効にしてください。",
2428 "error.startFailed": "ゲームを開始できませんでした。"
2419 2429 },
2420 2430 "zh": {
2421 2431 "menu.tagline": "三个一排,你的方块就会装上火箭。",
@@ -2694,7 +2704,9 @@ var I18N_CATALOG = {
2694 2704 "block.forge-slag": "Forge炉渣",
2695 2705 "block.forge-spark": "Forge火花",
2696 2706 "block.forge-brass": "Forge黄铜",
2697 "block.forge-soot": "Forge煤烟"
2707 "block.forge-soot": "Forge煤烟",
2708 "error.webgl": "本游戏需要 WebGL。请尝试其他浏览器,或开启硬件加速。",
2709 "error.startFailed": "无法开始游戏。"
2698 2710 },
2699 2711 "ko": {
2700 2712 "menu.tagline": "세 개를 나란히 맞추면 블록에 로켓이 점화됩니다.",
@@ -2973,7 +2985,9 @@ var I18N_CATALOG = {
2973 2985 "block.forge-slag": "Forge 슬래그",
2974 2986 "block.forge-spark": "Forge 불꽃",
2975 2987 "block.forge-brass": "Forge 황동",
2976 "block.forge-soot": "Forge 그을음"
2988 "block.forge-soot": "Forge 그을음",
2989 "error.webgl": "이 게임은 WebGL이 필요합니다. 다른 브라우저를 사용하거나 하드웨어 가속을 켜 주세요.",
2990 "error.startFailed": "게임을 시작할 수 없습니다."
2977 2991 },
2978 2992 "pl": {
2979 2993 "menu.tagline": "Trzy w rzędzie, a twoje klocki dostają napęd rakietowy.",
@@ -3252,7 +3266,9 @@ var I18N_CATALOG = {
3252 3266 "block.forge-slag": "Forge żużel",
3253 3267 "block.forge-spark": "Forge iskra",
3254 3268 "block.forge-brass": "Forge mosiądz",
3255 "block.forge-soot": "Forge sadza"
3269 "block.forge-soot": "Forge sadza",
3270 "error.webgl": "Ta gra wymaga WebGL. Spróbuj innej przeglądarki albo włącz akcelerację sprzętową.",
3271 "error.startFailed": "Nie udało się uruchomić gry."
3256 3272 },
3257 3273 "ru": {
3258 3274 "menu.tagline": "Три в ряд — и твои блоки получают ракетные двигатели.",
@@ -3531,7 +3547,9 @@ var I18N_CATALOG = {
3531 3547 "block.forge-slag": "Forge (шлак)",
3532 3548 "block.forge-spark": "Forge (искра)",
3533 3549 "block.forge-brass": "Forge (латунь)",
3534 "block.forge-soot": "Forge (сажа)"
3550 "block.forge-soot": "Forge (сажа)",
3551 "error.webgl": "Этой игре нужен WebGL. Попробуйте другой браузер или включите аппаратное ускорение.",
3552 "error.startFailed": "Не удалось начать игру."
3535 3553 },
3536 3554 "es": {
3537 3555 "menu.tagline": "Tres en raya, y tus bloques ganan motores cohete.",
@@ -3810,7 +3828,9 @@ var I18N_CATALOG = {
3810 3828 "block.forge-slag": "Forge escoria",
3811 3829 "block.forge-spark": "Forge chispa",
3812 3830 "block.forge-brass": "Forge latón",
3813 "block.forge-soot": "Forge hollín"
3831 "block.forge-soot": "Forge hollín",
3832 "error.webgl": "Este juego necesita WebGL. Prueba con otro navegador o activa la aceleración por hardware.",
3833 "error.startFailed": "No se pudo iniciar el juego."
3814 3834 }
3815 3835 },
3816 3836 "errors": {
@@ -11546,12 +11566,19 @@ function onPlay ()
11546 11566 {
11547 11567 if (app.mode === 'playing')
11548 11568 { return; }
11569 clearStartError();
11549 11570 openPlanetSelect('solo');
11550 11571 }
11551 11572
11552 11573 function startPlay (opts)
11553 11574 {
11554 11575 opts = opts || {};
11576 var planetMod = typeof Planet !== 'undefined' ? Planet : PlanetMod;
11577 var planet = opts.planet || planetMod.planetById(selectedPlanetId());
11578 var miss = opts.missChance;
11579 if (typeof miss !== 'number' || !isFinite(miss))
11580 { miss = planetMod.missChance(planet); }
11581
11555 11582 hideEl('menu');
11556 11583 hideEl('game-over');
11557 11584 hideEl('online-panel');
@@ -11563,14 +11590,13 @@ function startPlay (opts)
11563 11590 hideEl('designer-edit');
11564 11591 if (typeof Designer !== 'undefined' && Designer.closeModal)
11565 11592 { Designer.closeModal(); }
11566 showEl('hud');
11593 // Do not show the HUD until the scene is on screen. Showing it first
11594 // left the default "Terra" / "0" labels on a blank starfield when
11595 // `new Scene` threw (WebGL unavailable) after inserting a transparent
11596 // canvas — the t1143 live blank-screen report.
11567 11597
11568 var planetMod = typeof Planet !== 'undefined' ? Planet : PlanetMod;
11569 app.planet = opts.planet || planetMod.planetById(selectedPlanetId());
11570 var miss = opts.missChance;
11571 if (typeof miss !== 'number' || !isFinite(miss))
11572 { miss = planetMod.missChance(app.planet); }
11573 app.core = new GameCore(app.planet, Math.random, miss);
11598 app.planet = planet;
11599 app.core = new GameCore(planet, Math.random, miss);
11574 11600 if (app.debugPhysics)
11575 11601 { app.core.debugInvariants = true; }
11576 11602 app.mode = 'playing';
@@ -11609,16 +11635,24 @@ function startPlay (opts)
11609 11635 app.scene.destroy();
11610 11636 app.scene = null;
11611 11637 }
11612 app.scene = new Scene(app.fieldX, app.fieldY, app.fieldW, app.fieldH);
11613 app.scene.backgroundColor = { r: 12, g: 16, b: 32 };
11614 app.scene.renderBackground = true;
11615 game.loadScene(app.scene);
11616
11617 buildCells();
11618 app.manager = app.scene.addObject(makeManager());
11619 if (!app.spectating)
11620 { bindPointer(app.scene.canvas); }
11621 refreshHud();
11638 try
11639 {
11640 app.scene = new Scene(app.fieldX, app.fieldY, app.fieldW, app.fieldH);
11641 app.scene.backgroundColor = { r: 12, g: 16, b: 32 };
11642 app.scene.renderBackground = true;
11643 game.loadScene(app.scene);
11644 buildCells();
11645 app.manager = app.scene.addObject(makeManager());
11646 if (!app.spectating)
11647 { bindPointer(app.scene.canvas); }
11648 refreshHud();
11649 showEl('hud');
11650 }
11651 catch (err)
11652 {
11653 abortStartPlay(err);
11654 return;
11655 }
11622 11656 if (app.online || app.offline)
11623 11657 { showEl('minis'); }
11624 11658 else
@@ -11630,6 +11664,70 @@ function startPlay (opts)
11630 11664 { beginPlaySession(opts.offline ? 'offline' : 'solo'); }
11631 11665 }
11632 11666
11667 function removeOrphanPlayCanvases ()
11668 {
11669 // Scene's constructor inserts a body canvas, then GLContext may throw,
11670 // leaving a transparent leftover that hides nothing and shows stars.
11671 var nodes = document.querySelectorAll('body > canvas');
11672 for (var i = 0; i < nodes.length; i++)
11673 {
11674 if (nodes[i].parentNode)
11675 { nodes[i].parentNode.removeChild(nodes[i]); }
11676 }
11677 }
11678
11679 function abortStartPlay (err)
11680 {
11681 if (typeof console !== 'undefined' && console.error)
11682 { console.error('startPlay failed', err); }
11683 try
11684 {
11685 unbindPointer();
11686 if (app.scene && app.scene.destroy)
11687 { app.scene.destroy(); }
11688 }
11689 catch (e) { /* ignore cleanup errors */ }
11690 app.scene = null;
11691 app.core = null;
11692 app.manager = null;
11693 app.mode = 'menu';
11694 app.online = false;
11695 app.offline = false;
11696 app.battle = null;
11697 app.cells = [];
11698 removeOrphanPlayCanvases();
11699 hideEl('hud');
11700 hideEl('minis');
11701 hideEl('planet-select');
11702 showEl('menu');
11703 refreshMenuAccount();
11704 var box = document.getElementById('start-error');
11705 if (box)
11706 {
11707 var msg = (err && err.message) ? String(err.message) : '';
11708 var webgl = /webgl/i.test(msg);
11709 if (typeof I18n !== 'undefined')
11710 { box.textContent = I18n.t(webgl ? 'error.webgl' : 'error.startFailed'); }
11711 else
11712 {
11713 box.textContent = webgl
11714 ? 'This game needs WebGL. Please try another browser, or turn on hardware acceleration.'
11715 : 'Could not start the game.';
11716 }
11717 box.hidden = false;
11718 }
11719 }
11720
11721 function clearStartError ()
11722 {
11723 var box = document.getElementById('start-error');
11724 if (box)
11725 {
11726 box.hidden = true;
11727 box.textContent = '';
11728 }
11729 }
11730
11633 11731 function teardownPlay ()
11634 11732 {
11635 11733 unbindPointer();
@@ -11667,6 +11765,7 @@ function teardownPlay ()
11667 11765
11668 11766 function returnToMenu ()
11669 11767 {
11768 clearStartError();
11670 11769 if (app.online && typeof Online !== 'undefined')
11671 11770 {
11672 11771 // Online matches do not dump you back to the solo menu:
@@ -1299,7 +1299,9 @@ var I18N_CATALOG = {
1299 "block.forge-slag": "Forge slag",
1299 "block.forge-slag": "Forge slag",
1300 "block.forge-spark": "Forge spark",
1300 "block.forge-spark": "Forge spark",
1301 "block.forge-brass": "Forge brass",
1301 "block.forge-brass": "Forge brass",
1302 "block.forge-soot": "Forge soot"
1302 "block.forge-soot": "Forge soot",
1303 "error.webgl": "This game needs WebGL. Please try another browser, or turn on hardware acceleration.",
1304 "error.startFailed": "Could not start the game."
1303 },
1305 },
1304 "nl": {
1306 "nl": {
1305 "menu.tagline": "Drie op een rij, en je blokjes krijgen raketmotoren.",
1307 "menu.tagline": "Drie op een rij, en je blokjes krijgen raketmotoren.",
@@ -1578,7 +1580,9 @@ var I18N_CATALOG = {
1578 "block.forge-slag": "Forge-slak",
1580 "block.forge-slag": "Forge-slak",
1579 "block.forge-spark": "Forge-vonk",
1581 "block.forge-spark": "Forge-vonk",
1580 "block.forge-brass": "Forge-messing",
1582 "block.forge-brass": "Forge-messing",
1581 "block.forge-soot": "Forge-roet"
1583 "block.forge-soot": "Forge-roet",
1584 "error.webgl": "Dit spel heeft WebGL nodig. Probeer een andere browser, of zet hardwareversnelling aan.",
1585 "error.startFailed": "Het spel kon niet worden gestart."
1582 },
1586 },
1583 "de": {
1587 "de": {
1584 "menu.tagline": "Drei in einer Reihe — und deine Blöcke bekommen Raketenantrieb.",
1588 "menu.tagline": "Drei in einer Reihe — und deine Blöcke bekommen Raketenantrieb.",
@@ -1857,7 +1861,9 @@ var I18N_CATALOG = {
1857 "block.forge-slag": "Forge-Schlacke",
1861 "block.forge-slag": "Forge-Schlacke",
1858 "block.forge-spark": "Forge-Funke",
1862 "block.forge-spark": "Forge-Funke",
1859 "block.forge-brass": "Forge-Messing",
1863 "block.forge-brass": "Forge-Messing",
1860 "block.forge-soot": "Forge-Ruß"
1864 "block.forge-soot": "Forge-Ruß",
1865 "error.webgl": "Dieses Spiel benötigt WebGL. Bitte verwende einen anderen Browser oder aktiviere die Hardwarebeschleunigung.",
1866 "error.startFailed": "Das Spiel konnte nicht gestartet werden."
1861 },
1867 },
1862 "fr": {
1868 "fr": {
1863 "menu.tagline": "Trois d’affilée, et tes blocs s’équipent de propulseurs.",
1869 "menu.tagline": "Trois d’affilée, et tes blocs s’équipent de propulseurs.",
@@ -2136,7 +2142,9 @@ var I18N_CATALOG = {
2136 "block.forge-slag": "Forge scorie",
2142 "block.forge-slag": "Forge scorie",
2137 "block.forge-spark": "Forge étincelle",
2143 "block.forge-spark": "Forge étincelle",
2138 "block.forge-brass": "Forge laiton",
2144 "block.forge-brass": "Forge laiton",
2139 "block.forge-soot": "Forge suie"
2145 "block.forge-soot": "Forge suie",
2146 "error.webgl": "Ce jeu a besoin de WebGL. Essayez un autre navigateur, ou activez l’accélération matérielle.",
2147 "error.startFailed": "Impossible de lancer le jeu."
2140 },
2148 },
2141 "ja": {
2149 "ja": {
2142 "menu.tagline": "三つ揃えると、ブロックにロケットが点火します。",
2150 "menu.tagline": "三つ揃えると、ブロックにロケットが点火します。",
@@ -2415,7 +2423,9 @@ var I18N_CATALOG = {
2415 "block.forge-slag": "フォージのスラグ",
2423 "block.forge-slag": "フォージのスラグ",
2416 "block.forge-spark": "フォージの火花",
2424 "block.forge-spark": "フォージの火花",
2417 "block.forge-brass": "フォージの真鍮",
2425 "block.forge-brass": "フォージの真鍮",
2418 "block.forge-soot": "フォージの煤"
2426 "block.forge-soot": "フォージの煤",
2427 "error.webgl": "このゲームにはWebGLが必要です。別のブラウザを使うか、ハードウェアアクセラレーションを有効にしてください。",
2428 "error.startFailed": "ゲームを開始できませんでした。"
2419 },
2429 },
2420 "zh": {
2430 "zh": {
2421 "menu.tagline": "三个一排,你的方块就会装上火箭。",
2431 "menu.tagline": "三个一排,你的方块就会装上火箭。",
@@ -2694,7 +2704,9 @@ var I18N_CATALOG = {
2694 "block.forge-slag": "Forge炉渣",
2704 "block.forge-slag": "Forge炉渣",
2695 "block.forge-spark": "Forge火花",
2705 "block.forge-spark": "Forge火花",
2696 "block.forge-brass": "Forge黄铜",
2706 "block.forge-brass": "Forge黄铜",
2697 "block.forge-soot": "Forge煤烟"
2707 "block.forge-soot": "Forge煤烟",
2708 "error.webgl": "本游戏需要 WebGL。请尝试其他浏览器,或开启硬件加速。",
2709 "error.startFailed": "无法开始游戏。"
2698 },
2710 },
2699 "ko": {
2711 "ko": {
2700 "menu.tagline": "세 개를 나란히 맞추면 블록에 로켓이 점화됩니다.",
2712 "menu.tagline": "세 개를 나란히 맞추면 블록에 로켓이 점화됩니다.",
@@ -2973,7 +2985,9 @@ var I18N_CATALOG = {
2973 "block.forge-slag": "Forge 슬래그",
2985 "block.forge-slag": "Forge 슬래그",
2974 "block.forge-spark": "Forge 불꽃",
2986 "block.forge-spark": "Forge 불꽃",
2975 "block.forge-brass": "Forge 황동",
2987 "block.forge-brass": "Forge 황동",
2976 "block.forge-soot": "Forge 그을음"
2988 "block.forge-soot": "Forge 그을음",
2989 "error.webgl": "이 게임은 WebGL이 필요합니다. 다른 브라우저를 사용하거나 하드웨어 가속을 켜 주세요.",
2990 "error.startFailed": "게임을 시작할 수 없습니다."
2977 },
2991 },
2978 "pl": {
2992 "pl": {
2979 "menu.tagline": "Trzy w rzędzie, a twoje klocki dostają napęd rakietowy.",
2993 "menu.tagline": "Trzy w rzędzie, a twoje klocki dostają napęd rakietowy.",
@@ -3252,7 +3266,9 @@ var I18N_CATALOG = {
3252 "block.forge-slag": "Forge żużel",
3266 "block.forge-slag": "Forge żużel",
3253 "block.forge-spark": "Forge iskra",
3267 "block.forge-spark": "Forge iskra",
3254 "block.forge-brass": "Forge mosiądz",
3268 "block.forge-brass": "Forge mosiądz",
3255 "block.forge-soot": "Forge sadza"
3269 "block.forge-soot": "Forge sadza",
3270 "error.webgl": "Ta gra wymaga WebGL. Spróbuj innej przeglądarki albo włącz akcelerację sprzętową.",
3271 "error.startFailed": "Nie udało się uruchomić gry."
3256 },
3272 },
3257 "ru": {
3273 "ru": {
3258 "menu.tagline": "Три в ряд — и твои блоки получают ракетные двигатели.",
3274 "menu.tagline": "Три в ряд — и твои блоки получают ракетные двигатели.",
@@ -3531,7 +3547,9 @@ var I18N_CATALOG = {
3531 "block.forge-slag": "Forge (шлак)",
3547 "block.forge-slag": "Forge (шлак)",
3532 "block.forge-spark": "Forge (искра)",
3548 "block.forge-spark": "Forge (искра)",
3533 "block.forge-brass": "Forge (латунь)",
3549 "block.forge-brass": "Forge (латунь)",
3534 "block.forge-soot": "Forge (сажа)"
3550 "block.forge-soot": "Forge (сажа)",
3551 "error.webgl": "Этой игре нужен WebGL. Попробуйте другой браузер или включите аппаратное ускорение.",
3552 "error.startFailed": "Не удалось начать игру."
3535 },
3553 },
3536 "es": {
3554 "es": {
3537 "menu.tagline": "Tres en raya, y tus bloques ganan motores cohete.",
3555 "menu.tagline": "Tres en raya, y tus bloques ganan motores cohete.",
@@ -3810,7 +3828,9 @@ var I18N_CATALOG = {
3810 "block.forge-slag": "Forge escoria",
3828 "block.forge-slag": "Forge escoria",
3811 "block.forge-spark": "Forge chispa",
3829 "block.forge-spark": "Forge chispa",
3812 "block.forge-brass": "Forge latón",
3830 "block.forge-brass": "Forge latón",
3813 "block.forge-soot": "Forge hollín"
3831 "block.forge-soot": "Forge hollín",
3832 "error.webgl": "Este juego necesita WebGL. Prueba con otro navegador o activa la aceleración por hardware.",
3833 "error.startFailed": "No se pudo iniciar el juego."
3814 }
3834 }
3815 },
3835 },
3816 "errors": {
3836 "errors": {
@@ -11546,12 +11566,19 @@ function onPlay ()
11546{
11566{
11547 if (app.mode === 'playing')
11567 if (app.mode === 'playing')
11548 { return; }
11568 { return; }
11569 clearStartError();
11549 openPlanetSelect('solo');
11570 openPlanetSelect('solo');
11550}
11571}
11551
11572
11552function startPlay (opts)
11573function startPlay (opts)
11553{
11574{
11554 opts = opts || {};
11575 opts = opts || {};
11576 var planetMod = typeof Planet !== 'undefined' ? Planet : PlanetMod;
11577 var planet = opts.planet || planetMod.planetById(selectedPlanetId());
11578 var miss = opts.missChance;
11579 if (typeof miss !== 'number' || !isFinite(miss))
11580 { miss = planetMod.missChance(planet); }
11581
11555 hideEl('menu');
11582 hideEl('menu');
11556 hideEl('game-over');
11583 hideEl('game-over');
11557 hideEl('online-panel');
11584 hideEl('online-panel');
@@ -11563,14 +11590,13 @@ function startPlay (opts)
11563 hideEl('designer-edit');
11590 hideEl('designer-edit');
11564 if (typeof Designer !== 'undefined' && Designer.closeModal)
11591 if (typeof Designer !== 'undefined' && Designer.closeModal)
11565 { Designer.closeModal(); }
11592 { Designer.closeModal(); }
11566 showEl('hud');
11593 // Do not show the HUD until the scene is on screen. Showing it first
11594 // left the default "Terra" / "0" labels on a blank starfield when
11595 // `new Scene` threw (WebGL unavailable) after inserting a transparent
11596 // canvas — the t1143 live blank-screen report.
11567
11597
11568 var planetMod = typeof Planet !== 'undefined' ? Planet : PlanetMod;
11598 app.planet = planet;
11569 app.planet = opts.planet || planetMod.planetById(selectedPlanetId());
11599 app.core = new GameCore(planet, Math.random, miss);
11570 var miss = opts.missChance;
11571 if (typeof miss !== 'number' || !isFinite(miss))
11572 { miss = planetMod.missChance(app.planet); }
11573 app.core = new GameCore(app.planet, Math.random, miss);
11574 if (app.debugPhysics)
11600 if (app.debugPhysics)
11575 { app.core.debugInvariants = true; }
11601 { app.core.debugInvariants = true; }
11576 app.mode = 'playing';
11602 app.mode = 'playing';
@@ -11609,16 +11635,24 @@ function startPlay (opts)
11609 app.scene.destroy();
11635 app.scene.destroy();
11610 app.scene = null;
11636 app.scene = null;
11611 }
11637 }
11612 app.scene = new Scene(app.fieldX, app.fieldY, app.fieldW, app.fieldH);
11638 try
11613 app.scene.backgroundColor = { r: 12, g: 16, b: 32 };
11639 {
11614 app.scene.renderBackground = true;
11640 app.scene = new Scene(app.fieldX, app.fieldY, app.fieldW, app.fieldH);
11615 game.loadScene(app.scene);
11641 app.scene.backgroundColor = { r: 12, g: 16, b: 32 };
11616
11642 app.scene.renderBackground = true;
11617 buildCells();
11643 game.loadScene(app.scene);
11618 app.manager = app.scene.addObject(makeManager());
11644 buildCells();
11619 if (!app.spectating)
11645 app.manager = app.scene.addObject(makeManager());
11620 { bindPointer(app.scene.canvas); }
11646 if (!app.spectating)
11621 refreshHud();
11647 { bindPointer(app.scene.canvas); }
11648 refreshHud();
11649 showEl('hud');
11650 }
11651 catch (err)
11652 {
11653 abortStartPlay(err);
11654 return;
11655 }
11622 if (app.online || app.offline)
11656 if (app.online || app.offline)
11623 { showEl('minis'); }
11657 { showEl('minis'); }
11624 else
11658 else
@@ -11630,6 +11664,70 @@ function startPlay (opts)
11630 { beginPlaySession(opts.offline ? 'offline' : 'solo'); }
11664 { beginPlaySession(opts.offline ? 'offline' : 'solo'); }
11631}
11665}
11632
11666
11667function removeOrphanPlayCanvases ()
11668{
11669 // Scene's constructor inserts a body canvas, then GLContext may throw,
11670 // leaving a transparent leftover that hides nothing and shows stars.
11671 var nodes = document.querySelectorAll('body > canvas');
11672 for (var i = 0; i < nodes.length; i++)
11673 {
11674 if (nodes[i].parentNode)
11675 { nodes[i].parentNode.removeChild(nodes[i]); }
11676 }
11677}
11678
11679function abortStartPlay (err)
11680{
11681 if (typeof console !== 'undefined' && console.error)
11682 { console.error('startPlay failed', err); }
11683 try
11684 {
11685 unbindPointer();
11686 if (app.scene && app.scene.destroy)
11687 { app.scene.destroy(); }
11688 }
11689 catch (e) { /* ignore cleanup errors */ }
11690 app.scene = null;
11691 app.core = null;
11692 app.manager = null;
11693 app.mode = 'menu';
11694 app.online = false;
11695 app.offline = false;
11696 app.battle = null;
11697 app.cells = [];
11698 removeOrphanPlayCanvases();
11699 hideEl('hud');
11700 hideEl('minis');
11701 hideEl('planet-select');
11702 showEl('menu');
11703 refreshMenuAccount();
11704 var box = document.getElementById('start-error');
11705 if (box)
11706 {
11707 var msg = (err && err.message) ? String(err.message) : '';
11708 var webgl = /webgl/i.test(msg);
11709 if (typeof I18n !== 'undefined')
11710 { box.textContent = I18n.t(webgl ? 'error.webgl' : 'error.startFailed'); }
11711 else
11712 {
11713 box.textContent = webgl
11714 ? 'This game needs WebGL. Please try another browser, or turn on hardware acceleration.'
11715 : 'Could not start the game.';
11716 }
11717 box.hidden = false;
11718 }
11719}
11720
11721function clearStartError ()
11722{
11723 var box = document.getElementById('start-error');
11724 if (box)
11725 {
11726 box.hidden = true;
11727 box.textContent = '';
11728 }
11729}
11730
11633function teardownPlay ()
11731function teardownPlay ()
11634{
11732{
11635 unbindPointer();
11733 unbindPointer();
@@ -11667,6 +11765,7 @@ function teardownPlay ()
11667
11765
11668function returnToMenu ()
11766function returnToMenu ()
11669{
11767{
11768 clearStartError();
11670 if (app.online && typeof Online !== 'undefined')
11769 if (app.online && typeof Online !== 'undefined')
11671 {
11770 {
11672 // Online matches do not dump you back to the solo menu:
11771 // Online matches do not dump you back to the solo menu: