diff --git a/CHANGELOG.md b/CHANGELOG.md index 70f4b56..aceacc7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,24 @@ Tutte le versioni notevoli del banco di montaggio. Le date sono in formato AAAA- Ogni versione pubblicata ha la sua [release GitHub](https://github.com/cammo22/DaProdVideo/releases) con le app per Windows (portatile e installabile), Mac e Android, e va online su [GitHub Pages](https://cammo22.github.io/DaProdVideo/) come versione prova. +## [1.7.0] — 2026-10-29 · Si chiama DaProd Editor Video: banco nuovo, colore da professionisti, keyframe, maschere, titoli animati, montaggio dal testo + +- **Nome nuovo**: DaProd Editor Video. Progetti, cartelle e aggiornamenti restano gli stessi di prima. +- **Barra in stile DaProd**: logo che gira, tasto ✦ per le novità, la scheda video e il processore sempre in vista. **Una finestra sola**: se apri un progetto col programma già aperto, torna davanti quella. +- **Pagina iniziale nuova**: da dove comincio, gli ultimi progetti, come sta il PC e **Aggiusta tutto** (apertura dei file .dap/.daprod/.dpv, cartelle di lavoro, modelli AI, aggiornamenti) con l'esito di ogni passo. +- **Finale**: preset pronti (YouTube 1080p e 4K, Reel/TikTok/Shorts, Instagram quadrato, master, WhatsApp, solo audio), codec mostrati solo se il computer li sa fare, peso stimato e **coda di esportazione**. +- **Colore da professionisti**: LUT .cube (cinque nostre più le tue) con intensità, ruote lift/gamma/gain e curve RGB e luce, dalla pagina Finale o da «Colore avanzato…» nelle Proprietà. +- **La musica si abbassa sotto la voce**: segni la voce, e la musica scende e risale da sola, nel monitor e nell'esportazione. +- **Keyframe ◆** su posizione, zoom, opacità, colore, volume ed effetti, con ◀ ▶ per saltare da uno all'altro. **Maschere** a rettangolo, ellisse e Bézier, sfumate, invertite, animabili. +- **24 titoli animati** in categorie: neon, sette segmenti, terzo inferiore, notizie, ticker, karaoke, macchina da scrivere, titoli di coda, intervista, schermo finale e altri. Monitor ed esportazione identici. +- **Montaggio dal testo**: il parlato diventa testo, selezioni le parole e premi Canc; «togli i silenzi» e «togli gli ehm» con l'anteprima del tempo risparmiato. +- **LIVE**: zoom che segue il cursore e clic animati (si accendono in Altre opzioni), pannello più compatto con i misuratori sempre in vista. +- **Copie leggere automatiche** per i video pesanti (4K, HEVC, 10 bit): il monitor va liscio, l'esportazione usa l'originale. Si spengono dalle impostazioni. +- **Centro AI**: ogni modello dice che è opzionale, quanto pesa, dove gira e se va bene sul tuo computer. Niente si scarica senza che lo scegli. +- La pulsantiera ora è attaccata alla timeline, senza la fascia vuota in mezzo. +- Corretti: l'autosalvataggio che diceva «salvato» anche quando non riusciva, i modelli AI caricati due volte, errori nascosti in LIVE, la chiave Hugging Face «salvata» anche se non lo era. +- Non ancora provati a fondo su macchine diverse: Mac, monitor con DPI diversi in LIVE, modelli AI veri dentro l'app. + ## [1.6.6] — 2026-10-28 · I modelli sulla scheda video: togli i rumori ~10 volte più veloce, sfondo che segue 3 volte più veloce, Whisper più preciso Misurato sulla scheda video (RTX 4060, WebGPU) con i modelli veri, non a occhio: diff --git a/CLAUDE.md b/CLAUDE.md index 95530d6..5126001 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -198,6 +198,7 @@ Editor video "vecchio stile, moderno dentro" (ispirato a EDIUS e alle centraline clip video + audio legate, cartella "Clip uniche". **Sottotitoli dal montaggio** (`src/ui/sottotitoliRapidi.ts`): `generaSottotitoli(clip?)`, `faiParlareSottotitoli`, `nuovaRigaQui`, `stileSottotitoli`; tasto destro su clip e riga SOTT, Titoli → `tit:sott`. - **Sfondo AI a clic**: `scegliOggetto` (`ui/sfondo.ts`) prova subito un fotogramma (`provaSubito` → `provaOggetto` → `provaRitaglio`) e ne disegna la maschera sul monitor (`SceltaImmagine.maschera`, `tintaDa` in `posiziona.ts`); **OK/Invio** avvia tutta la clip, oppure si può controllare prima l'anteprima breve con `elaboraClip(id, true)`. `Ritaglio.persona` (tasti 🧍/📦, `impostaPersona`) usa MODNet per selezionare una persona specifica o SAM per un oggetto; `scaldaRitaglio` carica prima il modello. I clic sono raggruppati per oggetto (`punti[].g`) e le maschere vengono unite. I modelli reali non sono stati provati. +- **Keyframe e maschere a forma**: `Clip.anim` (`src/core/automazioni.ts`, puro) = per ogni parametro numerico (percorsi `opacity`, `gain`, `pan`, `tf.*`, `fx.*`, `fx.colore..`, `fxb.forza`, `fxb.parametri.`, `mask..`) una lista di chiavi `{f, v, modo}` (`f` = fotogrammi dall'inizio della clip; `modo` lineare/morbida/gradino verso la chiave dopo). **Senza `anim` non cambia niente**: `valutaClip(c, lf)` ritorna la clip stessa; `tfAl`, `clipOpacity`, `guadagnoClip` e `statoEffetti` leggono le linee, `sorgente()` in `piano.ts` mette in `Sorgente.clip` la clip già valutata (monitor ed export usano lo stesso conto). `tf/tfFine/via`, `opKeys`, `gainKeys` restano: un campo con la linea nuova vince solo lui (`mettiChiave` trasforma `opKeys`/`gainKeys` in chiavi equivalenti). Taglio, bordi, velocità e cambio di frequenza spostano le chiavi (`dividiAnim/spostaAnim/scalaAnim` chiamate da `montaggio.ts`). UI: `src/ui/keyframe.ts` (rombo ◆ + frecce ◀ ▶, tasto destro = modo; `cursore(…, percorso)` in `ispettore.ts`; sezione «Keyframe» per tutti gli altri parametri), rombi sul bordo basso della clip scelta in `timeline.ts`. **Maschere** (`Clip.maschere`, `src/core/maschereForma.ts`, puro): rettangolo/ellisse/Bézier in frazioni della sorgente, sfumatura/espansione/inversione, `somma`/`sottrai` in ordine; la copertura (distanza con segno) diventa una texture a un canale (`passataForma` in `compositore.ts`, `u_forma`/`u_formaOn`, unità 6, cache per `firmaMaschere`); sul monitor la modalità è `src/ui/maschereMonitor.ts` (evento `dpv:maschera`, agganciata a `posiziona.ts`). Prove: `test/unit/keyframe.test.mjs`. - **Cursore che si aggancia** (`agganciaCursore` in `src/ui/timeline.ts`): sul righello si aggancia sempre (calamita `N`), Alt lo lascia libero. - **Motore NVIDIA** (`src-tauri/src/motori.rs` + `src/media/nemo.ts`): NeMo-Speech.cpp **0.2.0** (Apache-2.0; la 0.1.0 non aveva gli archivi), programma a parte che l'app scarica dalla release di NVIDIA (`nemo-speech--{windows,macos,linux}-{x86_64,aarch64}-{cpu,cuda,vulkan,metal}`, `.sha256` a fianco) in @@ -237,3 +238,17 @@ Editor video "vecchio stile, moderno dentro" (ispirato a EDIUS e alle centraline con filtri e limitatore) sia la riproduzione sia il mixaggio. - Il lato Rust (`src-tauri/src/lib.rs`) fa solo I/O: media a pezzi, export in streaming, progetti, autosalvataggio. Su Android i percorsi sono `content://` e passano da `tauri-plugin-fs`. + + +## Novità del giro definitivo (ottobre 2026) + +- Il nome del programma sta in `src/nome.ts` (`NOME_PROGRAMMA`). +- La barra in `src/ui/barraTitolo.ts` ha logo, tasto Novità e chip hardware (`src/ui/chipHardware.ts`). +- Una sola istanza desktop: `src-tauri/src/lib.rs` passa alla finestra aperta gli argomenti del secondo avvio. +- Nella home, **Aggiusta tutto** sistema cartelle e associazioni dei progetti; le associazioni Windows sono in `src-tauri/src/associazioni.rs`. +- Finale: preset di esportazione in `src/core/esportazione.ts`, coda in `src/core/codaExport.ts`. +- Colore avanzato: LUT, curve e GPU in `src/render/lut.ts`, `src/render/curve.ts`, `src/render/coloreGpu.ts`; pannello in `src/ui/coloreAvanzato.ts`. +- Ducking in `src/core/ducking.ts`: rileva l'energia audio e abbassa le altre tracce. +- Keyframe in `src/core/automazioni.ts`; maschere in `src/core/maschereForma.ts` e `src/ui/maschereMonitor.ts`. +- Titoli HTML in `src/core/titoliHtml.ts`. +- Cursore LIVE: `src/ui/liveCursore.ts`, `src/core/zoomCursore.ts` e `src-tauri/src/cursore.rs`. diff --git a/README.md b/README.md index 5bee9cd..0deabec 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,7 @@ Entra nella community DaProd su Discord

-# DaProd · Video 🎬 - -> **Update 1.5.8:** preparazioni manuali e nuova organizzazione di Finale, LIVE, Montage e Montaggio. Verifiche eseguite e limiti noti in [docs/flussi-ui.md](docs/flussi-ui.md): runtime Tauri, AI reale, LIVE con dispositivi e compatibilità completa con vecchi progetti non sono ancora certificati. Importare o riaprire non avvia nuove copie leggere o analisi; si scelgono in **Attività**. Le descrizioni delle release precedenti possono riferirsi al vecchio comportamento automatico. -> -> **Censura e compatibilità:** il mosaico non garantisce anonimizzazione irreversibile: controlla tutta la clip e il tracking. La **1.5.7 ignora gli effetti nuovi e NON applica la censura** dei progetti creati su questo ramo. Non usare il downgrade per consegnare immagini protette. +# DaProd · Editor Video 🎬 [![▶ PROVA ORA](https://img.shields.io/badge/%E2%96%B6_PROVA_ORA-DaProd_Video-ffd54a?style=for-the-badge&labelColor=1a1428)](https://cammo22.github.io/DaProdVideo/app/) @@ -26,7 +22,7 @@ montaggio**), la **pulsantiera** con i tasti grandi, i **livelli a barra**, gli scritti dall'AI** (Nemotron di NVIDIA o Whisper, sul tuo computer), **voce AI**, **velocità delle clip** (Alt+E) col movimento fluido e logo su tutto il montaggio, **più timeline** nello stesso progetto, la pagina **LIVE** per registrare lo schermo **con la webcam a bolla** (3-2-1, pausa, segni, telecomando), il **pacchetto .daprod** con dentro tutti i file e la **EDL**. Cursore sul punto, premi **1** e tagli, premi **2** -ed elimini. Gira su **Windows, Mac e Android** e, in versione prova, **nel browser**. +ed elimini. Arriva su **Windows, poi Linux e Mac** e, in versione prova, **nel browser**. ![Il banco di montaggio](risorse/schermata.png) @@ -112,35 +108,30 @@ finestra gialla per scorrere, tira i suoi bordi per lo zoom. Ogni bordo fra i pa (doppio clic lo chiude). **Doppio clic sull'immagine**: schermo intero con la timeline in piccolo e i VU. Sul telefono: tocco = cursore, **tieni premuto** e trascina per spostare, **due dita** per lo zoom. -## 📥 App per Windows, Mac e Android +## 📥 App: Windows, poi Linux e Mac -Ogni [release](https://github.com/cammo22/DaProdVideo/releases/latest) ha quattro file: +I file delle [release](https://github.com/cammo22/DaProdVideo/releases/latest): | | File | Come si usa | | --- | --- | --- | | 🪟 Windows | `DaProd-Video-X.Y.Z-portatile.exe` | niente installazione: doppio clic e parte. Se SmartScreen avvisa: *Ulteriori informazioni → Esegui comunque* | | 💿 Windows | `DaProd-Video-X.Y.Z-setup.exe` | installa con il collegamento nel menu Start (senza permessi di amministratore) | | 🍎 Mac | `DaProd-Video-X.Y.Z.dmg` | trascina in Applicazioni; la prima volta *tasto destro → Apri* (su Sequoia: *Impostazioni → Privacy e sicurezza → Apri comunque*) | -| 🤖 Android | `DaProd-Video-X.Y.Z.apk` | **in pausa dalla 1.0.7** (l'ultimo APK è nella release 1.0.6) | Le app sono fatte con **Tauri 2**: l'interfaccia gira nel motore web del sistema (WebView2 su Windows, WebKit -su Mac, Chromium su Android) e i file li legge e li scrive **Rust**. Pesano pochi MB, leggono ore di girato a +su Mac) e i file li legge e li scrive **Rust**. Pesano pochi MB, leggono ore di girato a pezzi senza caricarle in memoria, scrivono l'export mentre esce e **riprendono il montaggio da dove eri**. -Requisiti: Windows 10/11, macOS 14 o più nuovo con Safari aggiornato (per l'audio serve WebKit 26), Android 8+. +Requisiti: Windows 10/11, macOS 14 o più nuovo con Safari aggiornato (per l'audio serve WebKit 26). **È tutto automatico** (`.github/workflows/app.yml`): quando su `main` arriva una versione nuova (il campo -`version` di `package.json`), GitHub Actions fa le prove, compila EXE, DMG e APK e pubblica da sola la release +`version` di `package.json`), GitHub Actions fa le prove, compila le app desktop e pubblica da sola la release `vX.Y.Z` con le note prese dal CHANGELOG. Per una versione nuova basta alzare `version`, scrivere la voce nel CHANGELOG e unire. **Aggiornarsi è un clic**: nell'app c'è il tasto **Aggiornamenti** in alto (si accende da solo quando esce una -versione nuova). Fa vedere le novità, scarica il file giusto (setup, portatile, DMG o APK) e lo apre. Alla prima +versione nuova). Fa vedere le novità, scarica il file giusto (setup, portatile o DMG) e lo apre. Alla prima apertura dopo l'aggiornamento compaiono le **novità** della versione (sempre anche da *Aiuto → Novità*). -Per firmare l'APK con una chiave tua aggiungi ai segreti del repository `ANDROID_KEYSTORE_BASE64`, -`ANDROID_KEYSTORE_PASSWORD`, `ANDROID_KEY_ALIAS` e `ANDROID_KEY_PASSWORD`. Senza, la CI usa una chiave che tiene -nella sua cache (resta uguale fra le release, così gli aggiornamenti si installano sopra). - ## 🌐 La versione prova su GitHub Pages [`cammo22.github.io/DaProdVideo`](https://cammo22.github.io/DaProdVideo/) è la home; il banco è in @@ -212,3 +203,7 @@ node test/foto.mjs # foto del banco (computer, Finale, contenitore, timeline - Per ritrovare le cose: `src/ui/cerca.ts` (Ctrl+K) con quello che si trova in `fontiCerca.ts`, `src/ui/guida.ts` (F1, Come si fa), `src/ui/centroAI.ts` (Centro AI) e, sotto, `src/media/libreriaAI.ts` (la libreria AI dentro l'app e i ripieghi), `erroriAI.ts` (gli errori spiegati), `diagnosiAI.ts` (Controlla l'AI). - `src/azioni.ts` tutti i comandi con i loro tasti · `src/effetti.ts` gli effetti al volo · `src/export/` export ed EDL · `src/demo.ts` il montaggio dimostrativo. - `src-tauri/` l'app Rust, con `gen/android` per l'APK · `test/` le prove. + +## Limiti + +Il mosaico non garantisce anonimizzazione irreversibile: controlla tutta la clip e il tracking. La 1.5.7 non applica la censura dei progetti nuovi: non usare il downgrade per consegnare immagini protette. diff --git a/TERZE-PARTI.md b/TERZE-PARTI.md new file mode 100644 index 0000000..84426da --- /dev/null +++ b/TERZE-PARTI.md @@ -0,0 +1,85 @@ +# Componenti di terze parti + +## OpenReel Video · MIT + +Origine: https://github.com/Augani/openreel-video + +Commit studiato: `367d7e90b61b5181f9861b852bb8b9d7a7d2954a`. + +Adattamenti in DaProd Video: + +- `src/render/lut.ts`: parser `.cube` da `apps/web/src/components/editor/inspector/LUTLoader.tsx` (`parseCubeLUT`) e riferimento trilineare da `packages/core/src/video/color-grading-engine.ts` (`applyLutToData`). Aggiunti domini, limiti e validazione; upload 3D WebGL2 in `src/render/coloreGpu.ts` scritto per DaProd. +- `src/render/curve.ts`, `src/render/coloreGpu.ts`: generatore e applicazione curve da `color-grading-engine.ts` (`buildCurveLUT`, `applyCurvesToData`, `CURVES_SHADER`), riscritti in float con Hermite a pendenze limitate, texture GPU e vera curva luma Rec.709. +- `src/core/ducking.ts`: rilevamento RMS, unione intervalli e generazione inviluppo da `packages/core/src/audio/volume-automation.ts` (`AudioDucker.detectAudioPresence`, `generateDuckingKeyframes`, `mergePresenceRanges`). Estesi a tutti i canali, flusso a pezzi, isteresi, tempo timeline e attenuazione separata in dB. + +- `src/core/automazioni.ts`, `src/core/maschereForma.ts`: keyframe e maschere a forma. Dall'architettura di `packages/core/src/animation/evaluate-keyframes.ts`, `keyframe-properties.ts` e `video/keyframe-engine.ts` (linee di chiavi per proprietà, ricerca della coppia di chiavi, descrittori dei parametri per percorso) e da `packages/core/src/video/mask-engine.ts` (forme parametriche come tracciati di Bézier, l'ellisse con la costante 0,5522847498, sfumatura, inversione, maschere multiple). Il calcolo è riscritto da zero: interpolazione lineare / morbida / a gradino, copertura in distanza con segno su griglia a un canale, compositore WebGL2 e interfaccia sono propri di DaProd. + +Nessun asset LUT, font, framework React o dipendenza del donatore è stato importato. + +```text +MIT License + +Copyright (c) 2024-2026 Augustus Otu and Contributors + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +``` + +## OpenScreen · MIT + +La geometria del focus in `src/core/zoomCursore.ts` è adattata da +`src/components/video-editor/videoPlayback/zoomTransform.ts` di OpenScreen. +La raccolta Windows, il raccordo con le tappe DaProd e gli anelli dei clic sono implementazioni locali. +Non sono stati importati gli asset dei puntatori, Electron o Pixi. + +Sorgenti di riferimento: il clone locale OpenScreen fornito per l'integrazione. + +```text +MIT License + +Copyright (c) 2025 Siddharth Vaddem + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +``` + +## HyperFrames · Apache-2.0 + +Origine: https://github.com/heygen-com/hyperframes (HeyGen). Licenza controllata sul repository: Apache License 2.0, nessun file NOTICE. + +Cosa ne abbiamo preso: **l'idea**, non il codice. Titoli e grafiche scritti in HTML/CSS e guidati dal tempo fotogramma per fotogramma, così anteprima ed esportazione sono identiche; e le idee di movimento dei suoi blocchi (entrata, tenuta, uscita) per i sottopancia e i testi animati. + +- `src/core/titoliHtml.ts` e `src/render/titoliHtml.ts` (titoli animati HTML): motore, modelli e disegno **scritti per DaProd Video**. Niente codice, template, CSS o immagini di HyperFrames è stato copiato; non c'è nessuna sua dipendenza. Il disegno passa da un SVG con `foreignObject` e dalla tela del browser (nessun Node, Puppeteer o FFmpeg). +- `src/core/animazioni.ts` e `src/render/anim/*.ts` (animazioni su tela 2D, 1.1.4): stessa ispirazione, ridisegnate da zero. + +Caratteri dei titoli HTML: solo quelli già nel programma, tutti con licenza SIL OFL 1.1 (@fontsource: Orbitron, Rajdhani, Montserrat, Oswald, Bebas Neue, Archivo Black, Space Mono, Playfair Display; DSEG7 di Keshikan, `src/stile/font/DSEG-LICENSE.txt`). diff --git a/app/index.html b/app/index.html index e32d510..3ef7926 100644 --- a/app/index.html +++ b/app/index.html @@ -5,7 +5,7 @@ -DaProd Video · banco di montaggio +DaProd Editor Video · banco di montaggio diff --git a/docs/flussi-ui.md b/docs/flussi-ui.md index 8939748..865ec9e 100644 --- a/docs/flussi-ui.md +++ b/docs/flussi-ui.md @@ -1,5 +1,7 @@ # Flussi UI — update 1.5.8 +> Documento storico: descrive la versione 1.5.8, non i flussi attuali. + Base motore `faf6c9b4aec68c3e8620ecf201452c35414f363b`, consolidamento `feat/update-qa-consolidato`. Frontend e Rust del motore devono essere distribuiti insieme. ## Stato di consegna — 2026-10-24 diff --git a/index.html b/index.html index b741e07..ed872ea 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ -DaProd Video — il montaggio vecchio stile, moderno dentro +DaProd Editor Video — il montaggio vecchio stile, moderno dentro diff --git a/package-lock.json b/package-lock.json index 8c828d8..7ab9964 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "daprod-video", - "version": "1.6.6", + "version": "1.7.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "daprod-video", - "version": "1.6.6", + "version": "1.7.0", "license": "MIT", "dependencies": { "@desert-ant-labs/clear": "3.6.0", diff --git a/package.json b/package.json index cd3880a..7c8e0db 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "daprod-video", "productName": "DaProd Video", - "version": "1.6.6", + "version": "1.7.0", "description": "DaProd Video: il montaggio video vecchio stile, moderno dentro. Timeline, due monitor, pulsantiera e VU a lancetta.", "author": "DaProd", "license": "MIT", diff --git a/scripts/genera-lut.mjs b/scripts/genera-lut.mjs new file mode 100644 index 0000000..433ddae --- /dev/null +++ b/scripts/genera-lut.mjs @@ -0,0 +1,79 @@ +// Genera le LUT di partenza di DaProd Video (file .cube 3D, 17 punti per lato) in src/assets/lut/. +// Sono nostre: nate da formule semplici scritte qui sotto, senza copiare nessuna LUT di altri. Stessa licenza del progetto (MIT). +// node scripts/genera-lut.mjs +// Lavorano su immagini SDR (Rec.709, già con la gamma): nessuna conversione da log. +import { mkdirSync, writeFileSync } from 'node:fs'; +import path from 'node:path'; +import { fileURLToPath } from 'node:url'; + +const radice = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..'); +const uscita = path.join(radice, 'src/assets/lut'); +export const PUNTI = 17; + +const lim = (x, a = 0, b = 1) => Math.max(a, Math.min(b, x)); +const mix = (a, b, t) => a + (b - a) * t; +const luma = ([r, g, b]) => 0.2126 * r + 0.7152 * g + 0.0722 * b; +const passo = (x) => x * x * (3 - 2 * x); +/** curva a S morbida: k=0 non fa niente, k=1 è un contrasto deciso */ +const curvaS = (x, k) => mix(x, passo(lim(x)), k); +/** satura (k>1) o desatura (k<1) rispetto al grigio della luce */ +const satura = (c, k) => { const y = luma(c); return c.map((v) => y + (v - y) * k); }; +const colorato = (c, ombre, luci, forza = 1) => { + const y = luma(c), o = (1 - passo(lim(y * 1.4))) * forza, l = passo(lim((y - 0.35) / 0.65)) * forza; + return c.map((v, i) => v + ombre[i] * o + luci[i] * l); +}; + +export const LUT = [ + { + file: 'caldo', nome: 'Caldo', info: 'ambra morbida, pelle dorata', + f: (c) => satura(colorato(c.map((v) => curvaS(v, 0.25)), [0.012, 0.0, -0.02], [0.05, 0.02, -0.05]).map((v, i) => v * [1.03, 1.0, 0.94][i]), 1.06), + }, + { + file: 'freddo', nome: 'Freddo', info: 'azzurro pulito, aria d\'inverno', + f: (c) => satura(colorato(c.map((v) => curvaS(v, 0.2)), [-0.01, 0.0, 0.025], [-0.03, 0.0, 0.05]).map((v, i) => v * [0.95, 1.0, 1.04][i]), 0.96), + }, + { + file: 'pellicola-anni-70', nome: 'Pellicola anni 70', info: 'neri alzati, verde giallino, colori un po\' spenti', + f: (c) => { + let o = satura(c, 0.82).map((v) => curvaS(v, 0.3)); + o = colorato(o, [0.02, 0.035, -0.01], [0.045, 0.02, -0.03]); + return o.map((v, i) => mix(0.045 + [0.01, 0.02, 0.0][i], 0.965 - [0.0, 0.01, 0.03][i], lim(v))); + }, + }, + { + file: 'bianco-e-nero-ricco', nome: 'Bianco e nero ricco', info: 'contrasto pieno, rossi chiari e blu scuri', + f: (c) => { + const y = lim(0.34 * c[0] + 0.52 * c[1] + 0.14 * c[2]); + const v = curvaS(curvaS(y, 0.8), 0.35); + return [v, v, v]; + }, + }, + { + file: 'teal-e-orange', nome: 'Teal & orange', info: 'ombre verde-azzurro, pelle e luci arancio', + f: (c) => { + const y = luma(c), ombre = 1 - passo(lim(y * 1.6)), luci = passo(lim((y - 0.3) / 0.7)); + const teal = [0.0, 0.42, 0.5], arancio = [1.0, 0.58, 0.2]; + let o = c.map((v) => curvaS(v, 0.3)); + o = o.map((v, i) => mix(v, v * 0.7 + teal[i] * 0.3 * (0.4 + y), ombre * 0.55)); + o = o.map((v, i) => mix(v, v * 0.75 + arancio[i] * 0.25 * (0.5 + y), luci * 0.5)); + return satura(o, 1.12); + }, + }, +]; + +export function testoCube(l) { + const righe = ['# DaProd Video · LUT di partenza, create da noi (licenza MIT, come il progetto).', '# Generata da scripts/genera-lut.mjs: non si modifica a mano.', + `TITLE "${l.nome}"`, `LUT_3D_SIZE ${PUNTI}`, 'DOMAIN_MIN 0.0 0.0 0.0', 'DOMAIN_MAX 1.0 1.0 1.0']; + // il rosso corre più veloce, poi il verde, poi il blu (come vuole il formato .cube) + for (let b = 0; b < PUNTI; b++) for (let g = 0; g < PUNTI; g++) for (let r = 0; r < PUNTI; r++) { + const o = l.f([r / (PUNTI - 1), g / (PUNTI - 1), b / (PUNTI - 1)]).map((v) => lim(v).toFixed(5)); + righe.push(o.join(' ')); + } + return righe.join('\n') + '\n'; +} + +if (process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url)) { + mkdirSync(uscita, { recursive: true }); + for (const l of LUT) writeFileSync(path.join(uscita, l.file + '.cube'), testoCube(l)); + console.log(`Scritte ${LUT.length} LUT in ${uscita}`); +} diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index ff039fc..c6167e5 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -624,7 +624,7 @@ checksum = "52560adf09603e58c9a7ee1fe1dcb95a16927b17c127f0ac02d6e768a0e25bc1" [[package]] name = "daprod-video" -version = "1.6.6" +version = "1.7.0" dependencies = [ "serde", "serde_json", @@ -634,6 +634,9 @@ dependencies = [ "tauri-plugin-dialog", "tauri-plugin-fs", "tauri-plugin-opener", + "tauri-plugin-single-instance", + "windows-sys 0.61.2", + "winreg", ] [[package]] @@ -3726,6 +3729,22 @@ dependencies = [ "zbus", ] +[[package]] +name = "tauri-plugin-single-instance" +version = "2.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db817fe9295e19b7d8357e900af31edb93703dd9fb6de524b007b47b6afc63b0" +dependencies = [ + "serde", + "serde_json", + "tauri", + "thiserror 2.0.21", + "tokio", + "tracing", + "windows-sys 0.60.2", + "zbus", +] + [[package]] name = "tauri-runtime" version = "2.11.3" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 2fa3651..9ae3e23 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "daprod-video" -version = "1.6.6" +version = "1.7.0" description = "DaProd Video: il montaggio vecchio stile, moderno dentro" authors = ["DaProd"] license = "MIT" @@ -24,6 +24,15 @@ serde_json = "1" # decodifica audio di riserva per WebKit senza AudioDecoder (Mac con Safari vecchio) symphonia = { version = "0.6.1", default-features = false, features = ["aac", "mp3", "flac", "vorbis"] } +# una sola finestra aperta alla volta (solo sul computer): un secondo avvio passa il file a quella già aperta +[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies] +tauri-plugin-single-instance = "2" + +# solo Windows: l'apertura dei .dap/.daprod/.dpv col programma si scrive nel registro dell'utente (come un'installazione "per utente") +[target.'cfg(windows)'.dependencies] +winreg = "0.55" +windows-sys = { version = "0.61", features = ["Win32_UI_Shell"] } + [profile.release] codegen-units = 1 lto = true diff --git a/src-tauri/src/associazioni.rs b/src-tauri/src/associazioni.rs new file mode 100644 index 0000000..c6877dc --- /dev/null +++ b/src-tauri/src/associazioni.rs @@ -0,0 +1,111 @@ +//! L'apertura dei file del programma col doppio clic su Windows. +//! +//! L'installazione "per utente" (NSIS, `currentUser`) scrive le associazioni sotto `HKCU\Software\Classes`; il +//! portatile non scrive niente e un'installazione rovinata può averle perse. Qui si rifà lo stesso lavoro: per +//! `.dap`, `.daprod` e `.dpv` un tipo di file (ProgID) che apre l'exe in uso con il file come argomento (`lib.rs` +//! lo prende da `file_progetto`), e poi si avvisa la shell con `SHChangeNotify` così Esplora risorse aggiorna icone +//! e "Apri con" senza riavviare. Non si tocca mai `HKLM` (niente permessi da amministratore) e non si forza la scelta +//! che l'utente ha fatto a mano (`UserChoice`, protetta da Windows): se c'è, il passo lo dice. + +use serde::Serialize; + +#[derive(Serialize)] +pub struct Associazione { + /// su questo sistema c'è qualcosa da sistemare (solo Windows) + pub windows: bool, + /// tutte le estensioni sono già a posto + pub a_posto: bool, + /// le estensioni scritte adesso (vuoto se `applica` era falso o era già tutto a posto) + pub scritte: Vec, + /// le estensioni che Windows apre con un altro programma per scelta dell'utente + pub altro_programma: Vec, +} + +#[cfg(not(windows))] +#[tauri::command] +pub fn associa_file(_applica: bool) -> Associazione { + Associazione { windows: false, a_posto: true, scritte: vec![], altro_programma: vec![] } +} + +#[cfg(windows)] +mod win { + use super::Associazione; + use winreg::enums::{HKEY_CURRENT_USER, KEY_READ, KEY_WRITE}; + use winreg::RegKey; + + const ESTENSIONI: [&str; 3] = ["dap", "daprod", "dpv"]; + const PROG_ID: &str = "DaProdVideo.Progetto"; + + fn comando(exe: &str) -> String { + format!("\"{exe}\" \"%1\"") + } + + /// il tipo di file è già com'è giusto per questo exe? + fn tipo_a_posto(classi: &RegKey, exe: &str) -> bool { + classi + .open_subkey_with_flags(format!("{PROG_ID}\\shell\\open\\command"), KEY_READ) + .and_then(|k| k.get_value::("")) + .map(|v| v.eq_ignore_ascii_case(&comando(exe))) + .unwrap_or(false) + } + + fn estensione_a_posto(classi: &RegKey, ext: &str) -> bool { + classi + .open_subkey_with_flags(format!(".{ext}"), KEY_READ) + .and_then(|k| k.get_value::("")) + .map(|v| v == PROG_ID) + .unwrap_or(false) + } + + /// se l'utente ha scelto a mano un altro programma, Windows lo ricorda qui e comanda lui + fn scelta_altrui(ext: &str) -> bool { + let Ok(k) = RegKey::predef(HKEY_CURRENT_USER).open_subkey_with_flags( + format!("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\FileExts\\.{ext}\\UserChoice"), + KEY_READ, + ) else { + return false; + }; + k.get_value::("ProgId").map(|v| !v.is_empty() && v != PROG_ID).unwrap_or(false) + } + + pub fn associa(applica: bool) -> Result { + let e = |x: std::io::Error| x.to_string(); + let exe = std::env::current_exe().map_err(e)?.to_string_lossy().into_owned(); + let hkcu = RegKey::predef(HKEY_CURRENT_USER); + let (classi, _) = hkcu.create_subkey_with_flags("Software\\Classes", KEY_READ | KEY_WRITE).map_err(e)?; + let altro_programma: Vec = ESTENSIONI.iter().filter(|x| scelta_altrui(x)).map(|x| format!(".{x}")).collect(); + let tutto_giusto = tipo_a_posto(&classi, &exe) && ESTENSIONI.iter().all(|x| estensione_a_posto(&classi, x)); + if tutto_giusto || !applica { + return Ok(Associazione { windows: true, a_posto: tutto_giusto && altro_programma.is_empty(), scritte: vec![], altro_programma }); + } + // il tipo di file: nome, icona (la prima dell'exe) e il comando che apre il file + let (tipo, _) = classi.create_subkey(PROG_ID).map_err(e)?; + tipo.set_value("", &"Progetto DaProd Video").map_err(e)?; + let (icona, _) = tipo.create_subkey("DefaultIcon").map_err(e)?; + icona.set_value("", &format!("\"{exe}\",0")).map_err(e)?; + let (cmd, _) = tipo.create_subkey("shell\\open\\command").map_err(e)?; + cmd.set_value("", &comando(&exe)).map_err(e)?; + let mut scritte = Vec::new(); + for ext in ESTENSIONI { + let (k, _) = classi.create_subkey(format!(".{ext}")).map_err(e)?; + k.set_value("", &PROG_ID).map_err(e)?; + // anche fra i programmi proposti da "Apri con" + let (o, _) = k.create_subkey("OpenWithProgids").map_err(e)?; + o.set_value(PROG_ID, &"").map_err(e)?; + scritte.push(format!(".{ext}")); + } + // la shell aggiorna icone e "Apri con" da sola + unsafe { + use windows_sys::Win32::UI::Shell::{SHChangeNotify, SHCNE_ASSOCCHANGED, SHCNF_IDLIST}; + SHChangeNotify(SHCNE_ASSOCCHANGED as i32, SHCNF_IDLIST, std::ptr::null(), std::ptr::null()); + } + Ok(Associazione { windows: true, a_posto: altro_programma.is_empty(), scritte, altro_programma }) + } +} + +/// Controlla (`applica` falso) o sistema (`applica` vero) l'apertura dei .dap, .daprod e .dpv col programma. +#[cfg(windows)] +#[tauri::command] +pub fn associa_file(applica: bool) -> Result { + win::associa(applica) +} diff --git a/src-tauri/src/cursore.rs b/src-tauri/src/cursore.rs new file mode 100644 index 0000000..aae309f --- /dev/null +++ b/src-tauri/src/cursore.rs @@ -0,0 +1,298 @@ +//! Il cursore di LIVE: campiona anche con la WebView nascosta, senza ascoltare la tastiera. +//! Il file provvisorio cresce sul disco; le pause e i tagli si rimappano alla consegna del video. +use serde::Serialize; +use std::sync::{mpsc, Mutex}; +use std::thread::JoinHandle; +#[cfg(windows)] +use std::time::Instant; + +#[derive(Serialize)] +#[serde(rename_all = "camelCase")] +pub struct Avviato { + id: u64, + trascorsi_ms: f64, +} + +#[derive(Clone, Serialize)] +pub struct Schermo { + id: String, + left: i32, + top: i32, + width: i32, + height: i32, +} + +struct Sessione { + id: u64, + stop: mpsc::Sender<()>, + thread: JoinHandle>, +} + +#[derive(Default)] +pub struct Cursore(Mutex>); + +impl Cursore { + pub fn chiudi(&self) { + if let Ok(mut attiva) = self.0.lock() { + if let Some(s) = attiva.take() { + let _ = s.stop.send(()); + let _ = s.thread.join(); + } + } + } +} + +impl Drop for Cursore { + fn drop(&mut self) { + self.chiudi(); + } +} + +#[cfg(windows)] +mod win { + use super::*; + use std::ffi::c_void; + use std::io::{BufWriter, Write}; + use std::sync::atomic::{AtomicU64, Ordering}; + use std::time::Duration; + + #[repr(C)] + #[derive(Default)] + struct Punto { + x: i32, + y: i32, + } + #[repr(C)] + struct Rett { + left: i32, + top: i32, + right: i32, + bottom: i32, + } + #[repr(C)] + struct Info { + size: u32, + flags: u32, + cursor: *mut c_void, + pos: Punto, + } + + // ABI Win32, senza una dipendenza nuova solo per queste cinque funzioni. + #[link(name = "user32")] + extern "system" { + fn GetCursorPos(p: *mut Punto) -> i32; + fn GetCursorInfo(p: *mut Info) -> i32; + fn GetAsyncKeyState(key: i32) -> i16; + fn SetThreadDpiAwarenessContext(ctx: isize) -> isize; + fn EnumDisplayMonitors( + dc: *mut c_void, + clip: *const Rett, + callback: unsafe extern "system" fn(*mut c_void, *mut c_void, *mut Rett, isize) -> i32, + data: isize, + ) -> i32; + } + + unsafe extern "system" fn monitor( + _m: *mut c_void, + _dc: *mut c_void, + r: *mut Rett, + data: isize, + ) -> i32 { + let v = &mut *(data as *mut Vec); + let r = &*r; + // L'identità è il rettangolo fisico: se cambia la disposizione, va scelto di nuovo. + v.push(Schermo { + id: format!("{}:{}:{}:{}", r.left, r.top, r.right, r.bottom), + left: r.left, + top: r.top, + width: r.right - r.left, + height: r.bottom - r.top, + }); + 1 + } + + pub fn schermi() -> Result, String> { + let mut v = Vec::new(); + unsafe { + let prima = SetThreadDpiAwarenessContext(-4); // PER_MONITOR_AWARE_V2 + if prima == 0 { + return Err("Non riesco a leggere le coordinate fisiche dello schermo".into()); + } + let ok = EnumDisplayMonitors( + std::ptr::null_mut(), + std::ptr::null(), + monitor, + &mut v as *mut _ as isize, + ); + SetThreadDpiAwarenessContext(prima); + if ok == 0 { + return Err("Non riesco a leggere gli schermi".into()); + } + } + Ok(v) + } + + #[derive(Serialize)] + struct Campione { + #[serde(rename = "tMs")] + t_ms: f64, + cx: f64, + cy: f64, + visible: bool, + // Ogni bit in salita è un clic fisico: sinistro, destro, centrale. + clicks: u8, + } + + pub fn avvia(stato: &Cursore, schermo: String) -> Result { + let mut attiva = stato.0.lock().map_err(|e| e.to_string())?; + if attiva.is_some() { + return Err("Il cursore sta già registrando".into()); + } + let b = schermi()? + .into_iter() + .find(|s| s.id == schermo) + .ok_or("Scegli di nuovo lo schermo: la disposizione è cambiata")?; + static SEQ: AtomicU64 = AtomicU64::new(1); + let id = SEQ.fetch_add(1, Ordering::Relaxed); + let path = std::env::temp_dir().join(format!( + "daprod-cursore-{}-{}.jsonl", + std::process::id(), + id + )); + let file = std::fs::File::create(&path).map_err(|e| e.to_string())?; + let (stop, ricevi) = mpsc::channel(); + let (pronto, avvio) = mpsc::sync_channel(1); + let thread = std::thread::Builder::new() + .name("cursore-live".into()) + .spawn(move || { + let risultato = (|| -> Result { + unsafe { + if SetThreadDpiAwarenessContext(-4) == 0 { + return Err("Coordinate fisiche non disponibili".into()); + } + } + let mut out = BufWriter::new(file); + let t0 = Instant::now(); + pronto.send(t0).map_err(|e| e.to_string())?; + let tasti = || -> u8 { + unsafe { + u8::from(GetAsyncKeyState(1) < 0) + | (u8::from(GetAsyncKeyState(2) < 0) << 1) + | (u8::from(GetAsyncKeyState(4) < 0) << 2) + } + }; + let mut prima = tasti(); // un pulsante già premuto all'avvio non è un clic + let mut controllo = Instant::now(); + let mut geometria_valida = true; + loop { + if controllo.elapsed() >= Duration::from_secs(1) { + // Se il monitor cambia risoluzione o viene scollegato, non inventiamo coordinate. + geometria_valida = schermi() + .map(|v| v.iter().any(|s| s.id == b.id)) + .unwrap_or(false); + controllo = Instant::now(); + } + let mut p = Punto::default(); + let mut ci = Info { + size: std::mem::size_of::() as u32, + flags: 0, + cursor: std::ptr::null_mut(), + pos: Punto::default(), + }; + let ok = + unsafe { GetCursorPos(&mut p) != 0 && GetCursorInfo(&mut ci) != 0 }; + let ora = tasti(); + let x = (p.x - b.left) as f64 / b.width as f64; + let y = (p.y - b.top) as f64 / b.height as f64; + let visible = geometria_valida + && ok + && ci.flags & 1 != 0 + && (0.0..1.0).contains(&x) + && (0.0..1.0).contains(&y); + let s = Campione { + t_ms: t0.elapsed().as_secs_f64() * 1000.0, + cx: x, + cy: y, + visible, + clicks: if visible { ora & !prima } else { 0 }, + }; + prima = ora; + serde_json::to_writer(&mut out, &s).map_err(|e| e.to_string())?; + out.write_all(b"\n").map_err(|e| e.to_string())?; + // Flush periodico: niente ring buffer che perda l'inizio delle registrazioni lunghe. + if t0.elapsed().as_millis() % 1000 < 17 { + out.flush().map_err(|e| e.to_string())?; + } + match ricevi.recv_timeout(Duration::from_micros(16_667)) { + Err(mpsc::RecvTimeoutError::Timeout) => (), + _ => break, + } + } + out.flush().map_err(|e| e.to_string())?; + std::fs::read_to_string(&path).map_err(|e| e.to_string()) + })(); + let _ = std::fs::remove_file(path); + risultato + }) + .map_err(|e| e.to_string())?; + *attiva = Some(Sessione { id, stop, thread }); + let t0 = match avvio.recv() { + Ok(t) => t, + Err(e) => { + if let Some(s) = attiva.take() { + let _ = s.stop.send(()); + let _ = s.thread.join(); + } + return Err(e.to_string()); + } + }; + Ok(Avviato { + id, + trascorsi_ms: t0.elapsed().as_secs_f64() * 1000.0, + }) + } +} + +#[tauri::command] +pub fn cursore_schermi() -> Result, String> { + #[cfg(windows)] + { + win::schermi() + } + #[cfg(not(windows))] + { + Ok(Vec::new()) + } +} + +#[tauri::command] +pub fn cursore_avvia(stato: tauri::State<'_, Cursore>, schermo: String) -> Result { + #[cfg(windows)] + { + win::avvia(&stato, schermo) + } + #[cfg(not(windows))] + { + let _ = (stato, schermo); + Err("Il cursore LIVE è disponibile su Windows".into()) + } +} + +#[tauri::command] +pub async fn cursore_ferma(stato: tauri::State<'_, Cursore>, id: u64) -> Result { + let s = { + let mut attiva = stato.0.lock().map_err(|e| e.to_string())?; + if attiva.as_ref().map(|s| s.id) != Some(id) { + return Err("Registrazione del cursore già chiusa".into()); + } + attiva.take().unwrap() + }; + let _ = s.stop.send(()); + tauri::async_runtime::spawn_blocking(move || { + s.thread + .join() + .map_err(|_| "Il campionatore del cursore si è fermato".to_string())? + }) + .await + .map_err(|e| e.to_string())? +} diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index cc67c99..4d40f21 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -7,7 +7,9 @@ mod aggiorna; mod audio_riserva; +mod associazioni; mod conversioni; +mod cursore; mod motori; use std::collections::HashMap; @@ -207,6 +209,29 @@ async fn registrazione_percorso(app: AppHandle, name: String) -> Esito { Ok(p.to_string_lossy().into_owned()) } +/// Le cartelle di lavoro: Video/DaProd Video e, dentro, Registrazioni. Le crea se mancano ("Aggiusta tutto" della pagina +/// iniziale). Ritorna per ognuna il percorso e se l'ha dovuta creare adesso. +#[derive(serde::Serialize)] +struct CartellaLavoro { + nome: &'static str, + percorso: String, + creata: bool, +} + +#[tauri::command] +async fn cartelle_lavoro(app: AppHandle) -> Esito> { + let base = app.path().video_dir().or_else(|_| app.path().app_data_dir()).map_err(|e| e.to_string())?; + let principale = base.join("DaProd Video"); + let registrazioni = principale.join("Registrazioni"); + let mut fuori = Vec::new(); + for (nome, dir) in [("DaProd Video", principale), ("Registrazioni", registrazioni)] { + let creata = !dir.is_dir(); + std::fs::create_dir_all(&dir).map_err(|e| format!("{nome}: {e}"))?; + fuori.push(CartellaLavoro { nome, percorso: dir.to_string_lossy().into_owned(), creata }); + } + Ok(fuori) +} + /// Apre il file dell'export in scrittura; ritorna un numero da usare per scrivere e chiudere. #[tauri::command] async fn export_apri(app: AppHandle, stato: State<'_, Stato>, path: String) -> Esito { @@ -443,14 +468,63 @@ fn apri_link(app: AppHandle, url: String) -> Esito<()> { app.opener().open_url(url, None::<&str>).map_err(|e| e.to_string()) } +/// Porta la finestra davanti a tutto: la rimette se era ridotta a icona, la mostra, le dà il fuoco e la tiene +/// "sempre in primo piano" per un attimo (Windows altrimenti la lascia dietro le altre, lampeggiando sulla barra). +fn finestra_davanti(app: &AppHandle) { + if let Some(w) = app.get_webview_window("main") { + let _ = w.unminimize(); + let _ = w.show(); + let _ = w.set_always_on_top(true); + let _ = w.set_focus(); + let _ = w.set_always_on_top(false); + } +} + +/// Un progetto da aprire arrivato da fuori (doppio clic sul file con l'app già aperta, o secondo avvio): si ricorda +/// e si dice alla finestra, che lo apre (riusa l'evento `apri-file`). +fn passa_file(app: &AppHandle, s: String) { + use tauri::Emitter; + if let Some(a) = app.try_state::() { + if let Ok(mut x) = a.0.lock() { + *x = Some(s.clone()); + } + } + let _ = app.emit("apri-file", s); +} + +/// Apre la cartella del file e lo mette in evidenza (a fine esportazione: «Apri la cartella»). +#[tauri::command] +fn mostra_nella_cartella(app: AppHandle, path: String) -> Esito<()> { + use tauri_plugin_opener::OpenerExt; + app.opener().reveal_item_in_dir(path).map_err(|e| e.to_string()) +} + #[cfg_attr(mobile, tauri::mobile_entry_point)] pub fn run() { let dall_avvio = std::env::args().skip(1).find(|a| file_progetto(a)); - tauri::Builder::default() + let mut costruttore = tauri::Builder::default(); + // Una sola finestra alla volta (sul computer): un secondo avvio non apre un'altra copia, passa il file + // (se c'è) a quella già aperta e la porta davanti. Il plugin dev'essere il primo. + #[cfg(desktop)] + { + costruttore = costruttore.plugin(tauri_plugin_single_instance::init(|app, argomenti, _cartella| { + if let Some(f) = argomenti.iter().skip(1).find(|a| file_progetto(a)) { + passa_file(app, f.clone()); + } + finestra_davanti(app); + })); + } + costruttore + .setup(|app| { + // anche al primo avvio la finestra sta davanti + finestra_davanti(app.handle()); + Ok(()) + }) .plugin(tauri_plugin_dialog::init()) .plugin(tauri_plugin_fs::init()) .plugin(tauri_plugin_opener::init()) .manage(Stato::default()) + .manage(cursore::Cursore::default()) .manage(Avvio(Mutex::new(dall_avvio))) .manage(audio_riserva::Decoder::default()) .invoke_handler(tauri::generate_handler![ @@ -471,8 +545,14 @@ pub fn run() { pacchetto_lunghezza, file_di_avvio, apri_link, + mostra_nella_cartella, istantanea_percorso, registrazione_percorso, + cartelle_lavoro, + associazioni::associa_file, + cursore::cursore_schermi, + cursore::cursore_avvia, + cursore::cursore_ferma, audio_apri, audio_decodifica, audio_chiudi, @@ -497,22 +577,19 @@ pub fn run() { .build(tauri::generate_context!()) .expect("errore all'avvio di DaProd Video") .run(|_app, _ev| { + if matches!(_ev, tauri::RunEvent::Exit) { + _app.state::().chiudi(); + } // sul Mac il doppio clic su un progetto arriva come evento (anche ad app già aperta) #[cfg(any(target_os = "macos", target_os = "ios"))] if let tauri::RunEvent::Opened { urls } = _ev { - use tauri::Emitter; for u in urls { let Ok(p) = u.to_file_path() else { continue }; let s = p.to_string_lossy().into_owned(); if !file_progetto(&s) { continue; } - if let Some(a) = _app.try_state::() { - if let Ok(mut x) = a.0.lock() { - *x = Some(s.clone()); - } - } - let _ = _app.emit("apri-file", s); + passa_file(_app, s); } } }); diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 89ea982..e2aa365 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -14,7 +14,7 @@ "windows": [ { "label": "main", - "title": "DaProd Video", + "title": "DaProd Editor Video", "url": "app/index.html", "width": 1600, "height": 960, diff --git a/src-tauri/tauri.linux.conf.json b/src-tauri/tauri.linux.conf.json index a7ea36e..46da28a 100644 --- a/src-tauri/tauri.linux.conf.json +++ b/src-tauri/tauri.linux.conf.json @@ -4,7 +4,7 @@ "windows": [ { "label": "main", - "title": "DaProd Video", + "title": "DaProd Editor Video", "url": "app/index.html", "width": 1600, "height": 960, diff --git a/src-tauri/tauri.macos.conf.json b/src-tauri/tauri.macos.conf.json index b50dc82..378de4b 100644 --- a/src-tauri/tauri.macos.conf.json +++ b/src-tauri/tauri.macos.conf.json @@ -4,7 +4,7 @@ "windows": [ { "label": "main", - "title": "DaProd Video", + "title": "DaProd Editor Video", "url": "app/index.html", "width": 1600, "height": 960, diff --git a/src-tauri/tauri.windows.conf.json b/src-tauri/tauri.windows.conf.json index e8a8441..497fca5 100644 --- a/src-tauri/tauri.windows.conf.json +++ b/src-tauri/tauri.windows.conf.json @@ -4,7 +4,7 @@ "windows": [ { "label": "main", - "title": "DaProd Video", + "title": "DaProd Editor Video", "url": "app/index.html", "width": 1600, "height": 960, diff --git a/src/assets/lut/bianco-e-nero-ricco.cube b/src/assets/lut/bianco-e-nero-ricco.cube new file mode 100644 index 0000000..3ef03d8 --- /dev/null +++ b/src/assets/lut/bianco-e-nero-ricco.cube @@ -0,0 +1,4919 @@ +# DaProd Video · LUT di partenza, create da noi (licenza MIT, come il progetto). +# Generata da scripts/genera-lut.mjs: non si modifica a mano. +TITLE "Bianco e nero ricco" +LUT_3D_SIZE 17 +DOMAIN_MIN 0.0 0.0 0.0 +DOMAIN_MAX 1.0 1.0 1.0 +0.00000 0.00000 0.00000 +0.00349 0.00349 0.00349 +0.00843 0.00843 0.00843 +0.01486 0.01486 0.01486 +0.02282 0.02282 0.02282 +0.03237 0.03237 0.03237 +0.04355 0.04355 0.04355 +0.05643 0.05643 0.05643 +0.07104 0.07104 0.07104 +0.08743 0.08743 0.08743 +0.10563 0.10563 0.10563 +0.12564 0.12564 0.12564 +0.14745 0.14745 0.14745 +0.17102 0.17102 0.17102 +0.19631 0.19631 0.19631 +0.22323 0.22323 0.22323 +0.25170 0.25170 0.25170 +0.00592 0.00592 0.00592 +0.01165 0.01165 0.01165 +0.01888 0.01888 0.01888 +0.02768 0.02768 0.02768 +0.03808 0.03808 0.03808 +0.05015 0.05015 0.05015 +0.06394 0.06394 0.06394 +0.07950 0.07950 0.07950 +0.09684 0.09684 0.09684 +0.11600 0.11600 0.11600 +0.13696 0.13696 0.13696 +0.15971 0.15971 0.15971 +0.18420 0.18420 0.18420 +0.21037 0.21037 0.21037 +0.23812 0.23812 0.23812 +0.26735 0.26735 0.26735 +0.29792 0.29792 0.29792 +0.01529 0.01529 0.01529 +0.02334 0.02334 0.02334 +0.03298 0.03298 0.03298 +0.04426 0.04426 0.04426 +0.05724 0.05724 0.05724 +0.07196 0.07196 0.07196 +0.08845 0.08845 0.08845 +0.10676 0.10676 0.10676 +0.12687 0.12687 0.12687 +0.14878 0.14878 0.14878 +0.17246 0.17246 0.17246 +0.19785 0.19785 0.19785 +0.22487 0.22487 0.22487 +0.25342 0.25342 0.25342 +0.28338 0.28338 0.28338 +0.31460 0.31460 0.31460 +0.34693 0.34693 0.34693 +0.02824 0.02824 0.02824 +0.03874 0.03874 0.03874 +0.05092 0.05092 0.05092 +0.06481 0.06481 0.06481 +0.08047 0.08047 0.08047 +0.09792 0.09792 0.09792 +0.11718 0.11718 0.11718 +0.13825 0.13825 0.13825 +0.16110 0.16110 0.16110 +0.18569 0.18569 0.18569 +0.21196 0.21196 0.21196 +0.23980 0.23980 0.23980 +0.26911 0.26911 0.26911 +0.29976 0.29976 0.29976 +0.33159 0.33159 0.33159 +0.36444 0.36444 0.36444 +0.39811 0.39811 0.39811 +0.04498 0.04498 0.04498 +0.05805 0.05805 0.05805 +0.07288 0.07288 0.07288 +0.08948 0.08948 0.08948 +0.10789 0.10789 0.10789 +0.12811 0.12811 0.12811 +0.15013 0.15013 0.15013 +0.17391 0.17391 0.17391 +0.19939 0.19939 0.19939 +0.22651 0.22651 0.22651 +0.25514 0.25514 0.25514 +0.28518 0.28518 0.28518 +0.31648 0.31648 0.31648 +0.34887 0.34887 0.34887 +0.38217 0.38217 0.38217 +0.41620 0.41620 0.41620 +0.45075 0.45075 0.45075 +0.06568 0.06568 0.06568 +0.08144 0.08144 0.08144 +0.09900 0.09900 0.09900 +0.11837 0.11837 0.11837 +0.13955 0.13955 0.13955 +0.16250 0.16250 0.16250 +0.18719 0.18719 0.18719 +0.21355 0.21355 0.21355 +0.24148 0.24148 0.24148 +0.27088 0.27088 0.27088 +0.30160 0.30160 0.30160 +0.33350 0.33350 0.33350 +0.36640 0.36640 0.36640 +0.40011 0.40011 0.40011 +0.43444 0.43444 0.43444 +0.46918 0.46918 0.46918 +0.50411 0.50411 0.50411 +0.09051 0.09051 0.09051 +0.10903 0.10903 0.10903 +0.12936 0.12936 0.12936 +0.15148 0.15148 0.15148 +0.17536 0.17536 0.17536 +0.20094 0.20094 0.20094 +0.22815 0.22815 0.22815 +0.25687 0.25687 0.25687 +0.28699 0.28699 0.28699 +0.31835 0.31835 0.31835 +0.35080 0.35080 0.35080 +0.38416 0.38416 0.38416 +0.41822 0.41822 0.41822 +0.45280 0.45280 0.45280 +0.48766 0.48766 0.48766 +0.52261 0.52261 0.52261 +0.55741 0.55741 0.55741 +0.11957 0.11957 0.11957 +0.14085 0.14085 0.14085 +0.16391 0.16391 0.16391 +0.18870 0.18870 0.18870 +0.21515 0.21515 0.21515 +0.24317 0.24317 0.24317 +0.27265 0.27265 0.27265 +0.30345 0.30345 0.30345 +0.33541 0.33541 0.33541 +0.36836 0.36836 0.36836 +0.40212 0.40212 0.40212 +0.43648 0.43648 0.43648 +0.47123 0.47123 0.47123 +0.50617 0.50617 0.50617 +0.54107 0.54107 0.54107 +0.57571 0.57571 0.57571 +0.60988 0.60988 0.60988 +0.15284 0.15284 0.15284 +0.17682 0.17682 0.17682 +0.20250 0.20250 0.20250 +0.22980 0.22980 0.22980 +0.25861 0.25861 0.25861 +0.28880 0.28880 0.28880 +0.32023 0.32023 0.32023 +0.35274 0.35274 0.35274 +0.38614 0.38614 0.38614 +0.42024 0.42024 0.42024 +0.45484 0.45484 0.45484 +0.48972 0.48972 0.48972 +0.52466 0.52466 0.52466 +0.55945 0.55945 0.55945 +0.59387 0.59387 0.59387 +0.62771 0.62771 0.62771 +0.66076 0.66076 0.66076 +0.19021 0.19021 0.19021 +0.21676 0.21676 0.21676 +0.24487 0.24487 0.24487 +0.27443 0.27443 0.27443 +0.30530 0.30530 0.30530 +0.33732 0.33732 0.33732 +0.37032 0.37032 0.37032 +0.40412 0.40412 0.40412 +0.43851 0.43851 0.43851 +0.47329 0.47329 0.47329 +0.50822 0.50822 0.50822 +0.54311 0.54311 0.54311 +0.57773 0.57773 0.57773 +0.61187 0.61187 0.61187 +0.64532 0.64532 0.64532 +0.67788 0.67788 0.67788 +0.70938 0.70938 0.70938 +0.23145 0.23145 0.23145 +0.26034 0.26034 0.26034 +0.29062 0.29062 0.29062 +0.32212 0.32212 0.32212 +0.35468 0.35468 0.35468 +0.38813 0.38813 0.38813 +0.42227 0.42227 0.42227 +0.45689 0.45689 0.45689 +0.49178 0.49178 0.49178 +0.52671 0.52671 0.52671 +0.56149 0.56149 0.56149 +0.59588 0.59588 0.59588 +0.62968 0.62968 0.62968 +0.66268 0.66268 0.66268 +0.69470 0.69470 0.69470 +0.72557 0.72557 0.72557 +0.75513 0.75513 0.75513 +0.27621 0.27621 0.27621 +0.30715 0.30715 0.30715 +0.33924 0.33924 0.33924 +0.37229 0.37229 0.37229 +0.40613 0.40613 0.40613 +0.44055 0.44055 0.44055 +0.47534 0.47534 0.47534 +0.51028 0.51028 0.51028 +0.54516 0.54516 0.54516 +0.57976 0.57976 0.57976 +0.61386 0.61386 0.61386 +0.64726 0.64726 0.64726 +0.67977 0.67977 0.67977 +0.71120 0.71120 0.71120 +0.74139 0.74139 0.74139 +0.77020 0.77020 0.77020 +0.79750 0.79750 0.79750 +0.32400 0.32400 0.32400 +0.35663 0.35663 0.35663 +0.39012 0.39012 0.39012 +0.42429 0.42429 0.42429 +0.45893 0.45893 0.45893 +0.49383 0.49383 0.49383 +0.52877 0.52877 0.52877 +0.56352 0.56352 0.56352 +0.59788 0.59788 0.59788 +0.63164 0.63164 0.63164 +0.66459 0.66459 0.66459 +0.69655 0.69655 0.69655 +0.72735 0.72735 0.72735 +0.75683 0.75683 0.75683 +0.78485 0.78485 0.78485 +0.81130 0.81130 0.81130 +0.83609 0.83609 0.83609 +0.37426 0.37426 0.37426 +0.40814 0.40814 0.40814 +0.44259 0.44259 0.44259 +0.47739 0.47739 0.47739 +0.51234 0.51234 0.51234 +0.54720 0.54720 0.54720 +0.58178 0.58178 0.58178 +0.61584 0.61584 0.61584 +0.64920 0.64920 0.64920 +0.68165 0.68165 0.68165 +0.71301 0.71301 0.71301 +0.74313 0.74313 0.74313 +0.77185 0.77185 0.77185 +0.79906 0.79906 0.79906 +0.82464 0.82464 0.82464 +0.84852 0.84852 0.84852 +0.87064 0.87064 0.87064 +0.42632 0.42632 0.42632 +0.46098 0.46098 0.46098 +0.49589 0.49589 0.49589 +0.53082 0.53082 0.53082 +0.56556 0.56556 0.56556 +0.59989 0.59989 0.59989 +0.63360 0.63360 0.63360 +0.66650 0.66650 0.66650 +0.69840 0.69840 0.69840 +0.72912 0.72912 0.72912 +0.75852 0.75852 0.75852 +0.78645 0.78645 0.78645 +0.81281 0.81281 0.81281 +0.83750 0.83750 0.83750 +0.86045 0.86045 0.86045 +0.88163 0.88163 0.88163 +0.90100 0.90100 0.90100 +0.47944 0.47944 0.47944 +0.51439 0.51439 0.51439 +0.54925 0.54925 0.54925 +0.58380 0.58380 0.58380 +0.61783 0.61783 0.61783 +0.65113 0.65113 0.65113 +0.68352 0.68352 0.68352 +0.71482 0.71482 0.71482 +0.74486 0.74486 0.74486 +0.77349 0.77349 0.77349 +0.80061 0.80061 0.80061 +0.82609 0.82609 0.82609 +0.84987 0.84987 0.84987 +0.87189 0.87189 0.87189 +0.89211 0.89211 0.89211 +0.91052 0.91052 0.91052 +0.92712 0.92712 0.92712 +0.53287 0.53287 0.53287 +0.56759 0.56759 0.56759 +0.60189 0.60189 0.60189 +0.63556 0.63556 0.63556 +0.66841 0.66841 0.66841 +0.70024 0.70024 0.70024 +0.73089 0.73089 0.73089 +0.76020 0.76020 0.76020 +0.78804 0.78804 0.78804 +0.81431 0.81431 0.81431 +0.83890 0.83890 0.83890 +0.86175 0.86175 0.86175 +0.88282 0.88282 0.88282 +0.90208 0.90208 0.90208 +0.91953 0.91953 0.91953 +0.93519 0.93519 0.93519 +0.94908 0.94908 0.94908 +0.00126 0.00126 0.00126 +0.00534 0.00534 0.00534 +0.01090 0.01090 0.01090 +0.01795 0.01795 0.01795 +0.02656 0.02656 0.02656 +0.03677 0.03677 0.03677 +0.04864 0.04864 0.04864 +0.06223 0.06223 0.06223 +0.07757 0.07757 0.07757 +0.09471 0.09471 0.09471 +0.11365 0.11365 0.11365 +0.13440 0.13440 0.13440 +0.15694 0.15694 0.15694 +0.18123 0.18123 0.18123 +0.20720 0.20720 0.20720 +0.23477 0.23477 0.23477 +0.26384 0.26384 0.26384 +0.00810 0.00810 0.00810 +0.01444 0.01444 0.01444 +0.02231 0.02231 0.02231 +0.03176 0.03176 0.03176 +0.04285 0.04285 0.04285 +0.05562 0.05562 0.05562 +0.07013 0.07013 0.07013 +0.08642 0.08642 0.08642 +0.10451 0.10451 0.10451 +0.12441 0.12441 0.12441 +0.14611 0.14611 0.14611 +0.16959 0.16959 0.16959 +0.19478 0.19478 0.19478 +0.22161 0.22161 0.22161 +0.24998 0.24998 0.24998 +0.27978 0.27978 0.27978 +0.31087 0.31087 0.31087 +0.01842 0.01842 0.01842 +0.02712 0.02712 0.02712 +0.03742 0.03742 0.03742 +0.04940 0.04940 0.04940 +0.06308 0.06308 0.06308 +0.07853 0.07853 0.07853 +0.09577 0.09577 0.09577 +0.11482 0.11482 0.11482 +0.13568 0.13568 0.13568 +0.15832 0.15832 0.15832 +0.18271 0.18271 0.18271 +0.20878 0.20878 0.20878 +0.23644 0.23644 0.23644 +0.26559 0.26559 0.26559 +0.29609 0.29609 0.29609 +0.32779 0.32779 0.32779 +0.36053 0.36053 0.36053 +0.03237 0.03237 0.03237 +0.04355 0.04355 0.04355 +0.05643 0.05643 0.05643 +0.07104 0.07104 0.07104 +0.08743 0.08743 0.08743 +0.10563 0.10563 0.10563 +0.12564 0.12564 0.12564 +0.14745 0.14745 0.14745 +0.17102 0.17102 0.17102 +0.19631 0.19631 0.19631 +0.22323 0.22323 0.22323 +0.25170 0.25170 0.25170 +0.28158 0.28158 0.28158 +0.31273 0.31273 0.31273 +0.34500 0.34500 0.34500 +0.37821 0.37821 0.37821 +0.41217 0.41217 0.41217 +0.05015 0.05015 0.05015 +0.06394 0.06394 0.06394 +0.07950 0.07950 0.07950 +0.09684 0.09684 0.09684 +0.11600 0.11600 0.11600 +0.13696 0.13696 0.13696 +0.15971 0.15971 0.15971 +0.18420 0.18420 0.18420 +0.21037 0.21037 0.21037 +0.23812 0.23812 0.23812 +0.26735 0.26735 0.26735 +0.29792 0.29792 0.29792 +0.32969 0.32969 0.32969 +0.36248 0.36248 0.36248 +0.39611 0.39611 0.39611 +0.43038 0.43038 0.43038 +0.46508 0.46508 0.46508 +0.07196 0.07196 0.07196 +0.08845 0.08845 0.08845 +0.10676 0.10676 0.10676 +0.12687 0.12687 0.12687 +0.14878 0.14878 0.14878 +0.17246 0.17246 0.17246 +0.19785 0.19785 0.19785 +0.22487 0.22487 0.22487 +0.25342 0.25342 0.25342 +0.28338 0.28338 0.28338 +0.31460 0.31460 0.31460 +0.34693 0.34693 0.34693 +0.38019 0.38019 0.38019 +0.41418 0.41418 0.41418 +0.44871 0.44871 0.44871 +0.48355 0.48355 0.48355 +0.51850 0.51850 0.51850 +0.09792 0.09792 0.09792 +0.11718 0.11718 0.11718 +0.13825 0.13825 0.13825 +0.16110 0.16110 0.16110 +0.18569 0.18569 0.18569 +0.21196 0.21196 0.21196 +0.23980 0.23980 0.23980 +0.26911 0.26911 0.26911 +0.29976 0.29976 0.29976 +0.33159 0.33159 0.33159 +0.36444 0.36444 0.36444 +0.39811 0.39811 0.39811 +0.43241 0.43241 0.43241 +0.46713 0.46713 0.46713 +0.50206 0.50206 0.50206 +0.53697 0.53697 0.53697 +0.57165 0.57165 0.57165 +0.12811 0.12811 0.12811 +0.15013 0.15013 0.15013 +0.17391 0.17391 0.17391 +0.19939 0.19939 0.19939 +0.22651 0.22651 0.22651 +0.25514 0.25514 0.25514 +0.28518 0.28518 0.28518 +0.31648 0.31648 0.31648 +0.34887 0.34887 0.34887 +0.38217 0.38217 0.38217 +0.41620 0.41620 0.41620 +0.45075 0.45075 0.45075 +0.48561 0.48561 0.48561 +0.52056 0.52056 0.52056 +0.55537 0.55537 0.55537 +0.58985 0.58985 0.58985 +0.62376 0.62376 0.62376 +0.16250 0.16250 0.16250 +0.18719 0.18719 0.18719 +0.21355 0.21355 0.21355 +0.24148 0.24148 0.24148 +0.27088 0.27088 0.27088 +0.30160 0.30160 0.30160 +0.33350 0.33350 0.33350 +0.36640 0.36640 0.36640 +0.40011 0.40011 0.40011 +0.43444 0.43444 0.43444 +0.46918 0.46918 0.46918 +0.50411 0.50411 0.50411 +0.53902 0.53902 0.53902 +0.57368 0.57368 0.57368 +0.60788 0.60788 0.60788 +0.64142 0.64142 0.64142 +0.67410 0.67410 0.67410 +0.20094 0.20094 0.20094 +0.22815 0.22815 0.22815 +0.25687 0.25687 0.25687 +0.28699 0.28699 0.28699 +0.31835 0.31835 0.31835 +0.35080 0.35080 0.35080 +0.38416 0.38416 0.38416 +0.41822 0.41822 0.41822 +0.45280 0.45280 0.45280 +0.48766 0.48766 0.48766 +0.52261 0.52261 0.52261 +0.55741 0.55741 0.55741 +0.59186 0.59186 0.59186 +0.62574 0.62574 0.62574 +0.65884 0.65884 0.65884 +0.69099 0.69099 0.69099 +0.72201 0.72201 0.72201 +0.24317 0.24317 0.24317 +0.27265 0.27265 0.27265 +0.30345 0.30345 0.30345 +0.33541 0.33541 0.33541 +0.36836 0.36836 0.36836 +0.40212 0.40212 0.40212 +0.43648 0.43648 0.43648 +0.47123 0.47123 0.47123 +0.50617 0.50617 0.50617 +0.54107 0.54107 0.54107 +0.57571 0.57571 0.57571 +0.60988 0.60988 0.60988 +0.64337 0.64337 0.64337 +0.67600 0.67600 0.67600 +0.70756 0.70756 0.70756 +0.73791 0.73791 0.73791 +0.76689 0.76689 0.76689 +0.28880 0.28880 0.28880 +0.32023 0.32023 0.32023 +0.35274 0.35274 0.35274 +0.38614 0.38614 0.38614 +0.42024 0.42024 0.42024 +0.45484 0.45484 0.45484 +0.48972 0.48972 0.48972 +0.52466 0.52466 0.52466 +0.55945 0.55945 0.55945 +0.59387 0.59387 0.59387 +0.62771 0.62771 0.62771 +0.66076 0.66076 0.66076 +0.69285 0.69285 0.69285 +0.72379 0.72379 0.72379 +0.75343 0.75343 0.75343 +0.78163 0.78163 0.78163 +0.80827 0.80827 0.80827 +0.33732 0.33732 0.33732 +0.37032 0.37032 0.37032 +0.40412 0.40412 0.40412 +0.43851 0.43851 0.43851 +0.47329 0.47329 0.47329 +0.50822 0.50822 0.50822 +0.54311 0.54311 0.54311 +0.57773 0.57773 0.57773 +0.61187 0.61187 0.61187 +0.64532 0.64532 0.64532 +0.67788 0.67788 0.67788 +0.70938 0.70938 0.70938 +0.73966 0.73966 0.73966 +0.76855 0.76855 0.76855 +0.79594 0.79594 0.79594 +0.82172 0.82172 0.82172 +0.84580 0.84580 0.84580 +0.38813 0.38813 0.38813 +0.42227 0.42227 0.42227 +0.45689 0.45689 0.45689 +0.49178 0.49178 0.49178 +0.52671 0.52671 0.52671 +0.56149 0.56149 0.56149 +0.59588 0.59588 0.59588 +0.62968 0.62968 0.62968 +0.66268 0.66268 0.66268 +0.69470 0.69470 0.69470 +0.72557 0.72557 0.72557 +0.75513 0.75513 0.75513 +0.78324 0.78324 0.78324 +0.80979 0.80979 0.80979 +0.83468 0.83468 0.83468 +0.85785 0.85785 0.85785 +0.87923 0.87923 0.87923 +0.44055 0.44055 0.44055 +0.47534 0.47534 0.47534 +0.51028 0.51028 0.51028 +0.54516 0.54516 0.54516 +0.57976 0.57976 0.57976 +0.61386 0.61386 0.61386 +0.64726 0.64726 0.64726 +0.67977 0.67977 0.67977 +0.71120 0.71120 0.71120 +0.74139 0.74139 0.74139 +0.77020 0.77020 0.77020 +0.79750 0.79750 0.79750 +0.82318 0.82318 0.82318 +0.84716 0.84716 0.84716 +0.86939 0.86939 0.86939 +0.88982 0.88982 0.88982 +0.90845 0.90845 0.90845 +0.49383 0.49383 0.49383 +0.52877 0.52877 0.52877 +0.56352 0.56352 0.56352 +0.59788 0.59788 0.59788 +0.63164 0.63164 0.63164 +0.66459 0.66459 0.66459 +0.69655 0.69655 0.69655 +0.72735 0.72735 0.72735 +0.75683 0.75683 0.75683 +0.78485 0.78485 0.78485 +0.81130 0.81130 0.81130 +0.83609 0.83609 0.83609 +0.85915 0.85915 0.85915 +0.88043 0.88043 0.88043 +0.89991 0.89991 0.89991 +0.91757 0.91757 0.91757 +0.93344 0.93344 0.93344 +0.54720 0.54720 0.54720 +0.58178 0.58178 0.58178 +0.61584 0.61584 0.61584 +0.64920 0.64920 0.64920 +0.68165 0.68165 0.68165 +0.71301 0.71301 0.71301 +0.74313 0.74313 0.74313 +0.77185 0.77185 0.77185 +0.79906 0.79906 0.79906 +0.82464 0.82464 0.82464 +0.84852 0.84852 0.84852 +0.87064 0.87064 0.87064 +0.89097 0.89097 0.89097 +0.90949 0.90949 0.90949 +0.92620 0.92620 0.92620 +0.94112 0.94112 0.94112 +0.95430 0.95430 0.95430 +0.00277 0.00277 0.00277 +0.00745 0.00745 0.00745 +0.01362 0.01362 0.01362 +0.02131 0.02131 0.02131 +0.03057 0.03057 0.03057 +0.04146 0.04146 0.04146 +0.05403 0.05403 0.05403 +0.06833 0.06833 0.06833 +0.08441 0.08441 0.08441 +0.10229 0.10229 0.10229 +0.12198 0.12198 0.12198 +0.14347 0.14347 0.14347 +0.16673 0.16673 0.16673 +0.19173 0.19173 0.19173 +0.21837 0.21837 0.21837 +0.24657 0.24657 0.24657 +0.27621 0.27621 0.27621 +0.01053 0.01053 0.01053 +0.01750 0.01750 0.01750 +0.02601 0.02601 0.02601 +0.03613 0.03613 0.03613 +0.04790 0.04790 0.04790 +0.06138 0.06138 0.06138 +0.07662 0.07662 0.07662 +0.09365 0.09365 0.09365 +0.11249 0.11249 0.11249 +0.13313 0.13313 0.13313 +0.15557 0.15557 0.15557 +0.17975 0.17975 0.17975 +0.20563 0.20563 0.20563 +0.23311 0.23311 0.23311 +0.26209 0.26209 0.26209 +0.29244 0.29244 0.29244 +0.32400 0.32400 0.32400 +0.02181 0.02181 0.02181 +0.03116 0.03116 0.03116 +0.04215 0.04215 0.04215 +0.05482 0.05482 0.05482 +0.06923 0.06923 0.06923 +0.08541 0.08541 0.08541 +0.10340 0.10340 0.10340 +0.12319 0.12319 0.12319 +0.14479 0.14479 0.14479 +0.16816 0.16816 0.16816 +0.19325 0.19325 0.19325 +0.21998 0.21998 0.21998 +0.24827 0.24827 0.24827 +0.27799 0.27799 0.27799 +0.30901 0.30901 0.30901 +0.34116 0.34116 0.34116 +0.37426 0.37426 0.37426 +0.03677 0.03677 0.03677 +0.04864 0.04864 0.04864 +0.06223 0.06223 0.06223 +0.07757 0.07757 0.07757 +0.09471 0.09471 0.09471 +0.11365 0.11365 0.11365 +0.13440 0.13440 0.13440 +0.15694 0.15694 0.15694 +0.18123 0.18123 0.18123 +0.20720 0.20720 0.20720 +0.23477 0.23477 0.23477 +0.26384 0.26384 0.26384 +0.29426 0.29426 0.29426 +0.32590 0.32590 0.32590 +0.35858 0.35858 0.35858 +0.39212 0.39212 0.39212 +0.42632 0.42632 0.42632 +0.05562 0.05562 0.05562 +0.07013 0.07013 0.07013 +0.08642 0.08642 0.08642 +0.10451 0.10451 0.10451 +0.12441 0.12441 0.12441 +0.14611 0.14611 0.14611 +0.16959 0.16959 0.16959 +0.19478 0.19478 0.19478 +0.22161 0.22161 0.22161 +0.24998 0.24998 0.24998 +0.27978 0.27978 0.27978 +0.31087 0.31087 0.31087 +0.34308 0.34308 0.34308 +0.37624 0.37624 0.37624 +0.41015 0.41015 0.41015 +0.44463 0.44463 0.44463 +0.47944 0.47944 0.47944 +0.07853 0.07853 0.07853 +0.09577 0.09577 0.09577 +0.11482 0.11482 0.11482 +0.13568 0.13568 0.13568 +0.15832 0.15832 0.15832 +0.18271 0.18271 0.18271 +0.20878 0.20878 0.20878 +0.23644 0.23644 0.23644 +0.26559 0.26559 0.26559 +0.29609 0.29609 0.29609 +0.32779 0.32779 0.32779 +0.36053 0.36053 0.36053 +0.39411 0.39411 0.39411 +0.42835 0.42835 0.42835 +0.46303 0.46303 0.46303 +0.49794 0.49794 0.49794 +0.53287 0.53287 0.53287 +0.10563 0.10563 0.10563 +0.12564 0.12564 0.12564 +0.14745 0.14745 0.14745 +0.17102 0.17102 0.17102 +0.19631 0.19631 0.19631 +0.22323 0.22323 0.22323 +0.25170 0.25170 0.25170 +0.28158 0.28158 0.28158 +0.31273 0.31273 0.31273 +0.34500 0.34500 0.34500 +0.37821 0.37821 0.37821 +0.41217 0.41217 0.41217 +0.44667 0.44667 0.44667 +0.48150 0.48150 0.48150 +0.51645 0.51645 0.51645 +0.55129 0.55129 0.55129 +0.58582 0.58582 0.58582 +0.13696 0.13696 0.13696 +0.15971 0.15971 0.15971 +0.18420 0.18420 0.18420 +0.21037 0.21037 0.21037 +0.23812 0.23812 0.23812 +0.26735 0.26735 0.26735 +0.29792 0.29792 0.29792 +0.32969 0.32969 0.32969 +0.36248 0.36248 0.36248 +0.39611 0.39611 0.39611 +0.43038 0.43038 0.43038 +0.46508 0.46508 0.46508 +0.50000 0.50000 0.50000 +0.53492 0.53492 0.53492 +0.56962 0.56962 0.56962 +0.60389 0.60389 0.60389 +0.63752 0.63752 0.63752 +0.17246 0.17246 0.17246 +0.19785 0.19785 0.19785 +0.22487 0.22487 0.22487 +0.25342 0.25342 0.25342 +0.28338 0.28338 0.28338 +0.31460 0.31460 0.31460 +0.34693 0.34693 0.34693 +0.38019 0.38019 0.38019 +0.41418 0.41418 0.41418 +0.44871 0.44871 0.44871 +0.48355 0.48355 0.48355 +0.51850 0.51850 0.51850 +0.55333 0.55333 0.55333 +0.58783 0.58783 0.58783 +0.62179 0.62179 0.62179 +0.65500 0.65500 0.65500 +0.68727 0.68727 0.68727 +0.21196 0.21196 0.21196 +0.23980 0.23980 0.23980 +0.26911 0.26911 0.26911 +0.29976 0.29976 0.29976 +0.33159 0.33159 0.33159 +0.36444 0.36444 0.36444 +0.39811 0.39811 0.39811 +0.43241 0.43241 0.43241 +0.46713 0.46713 0.46713 +0.50206 0.50206 0.50206 +0.53697 0.53697 0.53697 +0.57165 0.57165 0.57165 +0.60589 0.60589 0.60589 +0.63947 0.63947 0.63947 +0.67221 0.67221 0.67221 +0.70391 0.70391 0.70391 +0.73441 0.73441 0.73441 +0.25514 0.25514 0.25514 +0.28518 0.28518 0.28518 +0.31648 0.31648 0.31648 +0.34887 0.34887 0.34887 +0.38217 0.38217 0.38217 +0.41620 0.41620 0.41620 +0.45075 0.45075 0.45075 +0.48561 0.48561 0.48561 +0.52056 0.52056 0.52056 +0.55537 0.55537 0.55537 +0.58985 0.58985 0.58985 +0.62376 0.62376 0.62376 +0.65692 0.65692 0.65692 +0.68913 0.68913 0.68913 +0.72022 0.72022 0.72022 +0.75002 0.75002 0.75002 +0.77839 0.77839 0.77839 +0.30160 0.30160 0.30160 +0.33350 0.33350 0.33350 +0.36640 0.36640 0.36640 +0.40011 0.40011 0.40011 +0.43444 0.43444 0.43444 +0.46918 0.46918 0.46918 +0.50411 0.50411 0.50411 +0.53902 0.53902 0.53902 +0.57368 0.57368 0.57368 +0.60788 0.60788 0.60788 +0.64142 0.64142 0.64142 +0.67410 0.67410 0.67410 +0.70574 0.70574 0.70574 +0.73616 0.73616 0.73616 +0.76523 0.76523 0.76523 +0.79280 0.79280 0.79280 +0.81877 0.81877 0.81877 +0.35080 0.35080 0.35080 +0.38416 0.38416 0.38416 +0.41822 0.41822 0.41822 +0.45280 0.45280 0.45280 +0.48766 0.48766 0.48766 +0.52261 0.52261 0.52261 +0.55741 0.55741 0.55741 +0.59186 0.59186 0.59186 +0.62574 0.62574 0.62574 +0.65884 0.65884 0.65884 +0.69099 0.69099 0.69099 +0.72201 0.72201 0.72201 +0.75173 0.75173 0.75173 +0.78002 0.78002 0.78002 +0.80675 0.80675 0.80675 +0.83184 0.83184 0.83184 +0.85521 0.85521 0.85521 +0.40212 0.40212 0.40212 +0.43648 0.43648 0.43648 +0.47123 0.47123 0.47123 +0.50617 0.50617 0.50617 +0.54107 0.54107 0.54107 +0.57571 0.57571 0.57571 +0.60988 0.60988 0.60988 +0.64337 0.64337 0.64337 +0.67600 0.67600 0.67600 +0.70756 0.70756 0.70756 +0.73791 0.73791 0.73791 +0.76689 0.76689 0.76689 +0.79437 0.79437 0.79437 +0.82025 0.82025 0.82025 +0.84443 0.84443 0.84443 +0.86687 0.86687 0.86687 +0.88751 0.88751 0.88751 +0.45484 0.45484 0.45484 +0.48972 0.48972 0.48972 +0.52466 0.52466 0.52466 +0.55945 0.55945 0.55945 +0.59387 0.59387 0.59387 +0.62771 0.62771 0.62771 +0.66076 0.66076 0.66076 +0.69285 0.69285 0.69285 +0.72379 0.72379 0.72379 +0.75343 0.75343 0.75343 +0.78163 0.78163 0.78163 +0.80827 0.80827 0.80827 +0.83327 0.83327 0.83327 +0.85653 0.85653 0.85653 +0.87802 0.87802 0.87802 +0.89771 0.89771 0.89771 +0.91559 0.91559 0.91559 +0.50822 0.50822 0.50822 +0.54311 0.54311 0.54311 +0.57773 0.57773 0.57773 +0.61187 0.61187 0.61187 +0.64532 0.64532 0.64532 +0.67788 0.67788 0.67788 +0.70938 0.70938 0.70938 +0.73966 0.73966 0.73966 +0.76855 0.76855 0.76855 +0.79594 0.79594 0.79594 +0.82172 0.82172 0.82172 +0.84580 0.84580 0.84580 +0.86813 0.86813 0.86813 +0.88867 0.88867 0.88867 +0.90740 0.90740 0.90740 +0.92432 0.92432 0.92432 +0.93946 0.93946 0.93946 +0.56149 0.56149 0.56149 +0.59588 0.59588 0.59588 +0.62968 0.62968 0.62968 +0.66268 0.66268 0.66268 +0.69470 0.69470 0.69470 +0.72557 0.72557 0.72557 +0.75513 0.75513 0.75513 +0.78324 0.78324 0.78324 +0.80979 0.80979 0.80979 +0.83468 0.83468 0.83468 +0.85785 0.85785 0.85785 +0.87923 0.87923 0.87923 +0.89881 0.89881 0.89881 +0.91658 0.91658 0.91658 +0.93256 0.93256 0.93256 +0.94676 0.94676 0.94676 +0.95923 0.95923 0.95923 +0.00452 0.00452 0.00452 +0.00981 0.00981 0.00981 +0.01660 0.01660 0.01660 +0.02493 0.02493 0.02493 +0.03485 0.03485 0.03485 +0.04643 0.04643 0.04643 +0.05971 0.05971 0.05971 +0.07474 0.07474 0.07474 +0.09155 0.09155 0.09155 +0.11018 0.11018 0.11018 +0.13061 0.13061 0.13061 +0.15284 0.15284 0.15284 +0.17682 0.17682 0.17682 +0.20250 0.20250 0.20250 +0.22980 0.22980 0.22980 +0.25861 0.25861 0.25861 +0.28880 0.28880 0.28880 +0.01321 0.01321 0.01321 +0.02081 0.02081 0.02081 +0.02998 0.02998 0.02998 +0.04077 0.04077 0.04077 +0.05324 0.05324 0.05324 +0.06744 0.06744 0.06744 +0.08342 0.08342 0.08342 +0.10119 0.10119 0.10119 +0.12077 0.12077 0.12077 +0.14215 0.14215 0.14215 +0.16532 0.16532 0.16532 +0.19021 0.19021 0.19021 +0.21676 0.21676 0.21676 +0.24487 0.24487 0.24487 +0.27443 0.27443 0.27443 +0.30530 0.30530 0.30530 +0.33732 0.33732 0.33732 +0.02547 0.02547 0.02547 +0.03549 0.03549 0.03549 +0.04716 0.04716 0.04716 +0.06054 0.06054 0.06054 +0.07568 0.07568 0.07568 +0.09260 0.09260 0.09260 +0.11133 0.11133 0.11133 +0.13187 0.13187 0.13187 +0.15420 0.15420 0.15420 +0.17828 0.17828 0.17828 +0.20406 0.20406 0.20406 +0.23145 0.23145 0.23145 +0.26034 0.26034 0.26034 +0.29062 0.29062 0.29062 +0.32212 0.32212 0.32212 +0.35468 0.35468 0.35468 +0.38813 0.38813 0.38813 +0.04146 0.04146 0.04146 +0.05403 0.05403 0.05403 +0.06833 0.06833 0.06833 +0.08441 0.08441 0.08441 +0.10229 0.10229 0.10229 +0.12198 0.12198 0.12198 +0.14347 0.14347 0.14347 +0.16673 0.16673 0.16673 +0.19173 0.19173 0.19173 +0.21837 0.21837 0.21837 +0.24657 0.24657 0.24657 +0.27621 0.27621 0.27621 +0.30715 0.30715 0.30715 +0.33924 0.33924 0.33924 +0.37229 0.37229 0.37229 +0.40613 0.40613 0.40613 +0.44055 0.44055 0.44055 +0.06138 0.06138 0.06138 +0.07662 0.07662 0.07662 +0.09365 0.09365 0.09365 +0.11249 0.11249 0.11249 +0.13313 0.13313 0.13313 +0.15557 0.15557 0.15557 +0.17975 0.17975 0.17975 +0.20563 0.20563 0.20563 +0.23311 0.23311 0.23311 +0.26209 0.26209 0.26209 +0.29244 0.29244 0.29244 +0.32400 0.32400 0.32400 +0.35663 0.35663 0.35663 +0.39012 0.39012 0.39012 +0.42429 0.42429 0.42429 +0.45893 0.45893 0.45893 +0.49383 0.49383 0.49383 +0.08541 0.08541 0.08541 +0.10340 0.10340 0.10340 +0.12319 0.12319 0.12319 +0.14479 0.14479 0.14479 +0.16816 0.16816 0.16816 +0.19325 0.19325 0.19325 +0.21998 0.21998 0.21998 +0.24827 0.24827 0.24827 +0.27799 0.27799 0.27799 +0.30901 0.30901 0.30901 +0.34116 0.34116 0.34116 +0.37426 0.37426 0.37426 +0.40814 0.40814 0.40814 +0.44259 0.44259 0.44259 +0.47739 0.47739 0.47739 +0.51234 0.51234 0.51234 +0.54720 0.54720 0.54720 +0.11365 0.11365 0.11365 +0.13440 0.13440 0.13440 +0.15694 0.15694 0.15694 +0.18123 0.18123 0.18123 +0.20720 0.20720 0.20720 +0.23477 0.23477 0.23477 +0.26384 0.26384 0.26384 +0.29426 0.29426 0.29426 +0.32590 0.32590 0.32590 +0.35858 0.35858 0.35858 +0.39212 0.39212 0.39212 +0.42632 0.42632 0.42632 +0.46098 0.46098 0.46098 +0.49589 0.49589 0.49589 +0.53082 0.53082 0.53082 +0.56556 0.56556 0.56556 +0.59989 0.59989 0.59989 +0.14611 0.14611 0.14611 +0.16959 0.16959 0.16959 +0.19478 0.19478 0.19478 +0.22161 0.22161 0.22161 +0.24998 0.24998 0.24998 +0.27978 0.27978 0.27978 +0.31087 0.31087 0.31087 +0.34308 0.34308 0.34308 +0.37624 0.37624 0.37624 +0.41015 0.41015 0.41015 +0.44463 0.44463 0.44463 +0.47944 0.47944 0.47944 +0.51439 0.51439 0.51439 +0.54925 0.54925 0.54925 +0.58380 0.58380 0.58380 +0.61783 0.61783 0.61783 +0.65113 0.65113 0.65113 +0.18271 0.18271 0.18271 +0.20878 0.20878 0.20878 +0.23644 0.23644 0.23644 +0.26559 0.26559 0.26559 +0.29609 0.29609 0.29609 +0.32779 0.32779 0.32779 +0.36053 0.36053 0.36053 +0.39411 0.39411 0.39411 +0.42835 0.42835 0.42835 +0.46303 0.46303 0.46303 +0.49794 0.49794 0.49794 +0.53287 0.53287 0.53287 +0.56759 0.56759 0.56759 +0.60189 0.60189 0.60189 +0.63556 0.63556 0.63556 +0.66841 0.66841 0.66841 +0.70024 0.70024 0.70024 +0.22323 0.22323 0.22323 +0.25170 0.25170 0.25170 +0.28158 0.28158 0.28158 +0.31273 0.31273 0.31273 +0.34500 0.34500 0.34500 +0.37821 0.37821 0.37821 +0.41217 0.41217 0.41217 +0.44667 0.44667 0.44667 +0.48150 0.48150 0.48150 +0.51645 0.51645 0.51645 +0.55129 0.55129 0.55129 +0.58582 0.58582 0.58582 +0.61981 0.61981 0.61981 +0.65307 0.65307 0.65307 +0.68540 0.68540 0.68540 +0.71662 0.71662 0.71662 +0.74658 0.74658 0.74658 +0.26735 0.26735 0.26735 +0.29792 0.29792 0.29792 +0.32969 0.32969 0.32969 +0.36248 0.36248 0.36248 +0.39611 0.39611 0.39611 +0.43038 0.43038 0.43038 +0.46508 0.46508 0.46508 +0.50000 0.50000 0.50000 +0.53492 0.53492 0.53492 +0.56962 0.56962 0.56962 +0.60389 0.60389 0.60389 +0.63752 0.63752 0.63752 +0.67031 0.67031 0.67031 +0.70208 0.70208 0.70208 +0.73265 0.73265 0.73265 +0.76188 0.76188 0.76188 +0.78963 0.78963 0.78963 +0.31460 0.31460 0.31460 +0.34693 0.34693 0.34693 +0.38019 0.38019 0.38019 +0.41418 0.41418 0.41418 +0.44871 0.44871 0.44871 +0.48355 0.48355 0.48355 +0.51850 0.51850 0.51850 +0.55333 0.55333 0.55333 +0.58783 0.58783 0.58783 +0.62179 0.62179 0.62179 +0.65500 0.65500 0.65500 +0.68727 0.68727 0.68727 +0.71842 0.71842 0.71842 +0.74830 0.74830 0.74830 +0.77677 0.77677 0.77677 +0.80369 0.80369 0.80369 +0.82898 0.82898 0.82898 +0.36444 0.36444 0.36444 +0.39811 0.39811 0.39811 +0.43241 0.43241 0.43241 +0.46713 0.46713 0.46713 +0.50206 0.50206 0.50206 +0.53697 0.53697 0.53697 +0.57165 0.57165 0.57165 +0.60589 0.60589 0.60589 +0.63947 0.63947 0.63947 +0.67221 0.67221 0.67221 +0.70391 0.70391 0.70391 +0.73441 0.73441 0.73441 +0.76356 0.76356 0.76356 +0.79122 0.79122 0.79122 +0.81729 0.81729 0.81729 +0.84168 0.84168 0.84168 +0.86432 0.86432 0.86432 +0.41620 0.41620 0.41620 +0.45075 0.45075 0.45075 +0.48561 0.48561 0.48561 +0.52056 0.52056 0.52056 +0.55537 0.55537 0.55537 +0.58985 0.58985 0.58985 +0.62376 0.62376 0.62376 +0.65692 0.65692 0.65692 +0.68913 0.68913 0.68913 +0.72022 0.72022 0.72022 +0.75002 0.75002 0.75002 +0.77839 0.77839 0.77839 +0.80522 0.80522 0.80522 +0.83041 0.83041 0.83041 +0.85389 0.85389 0.85389 +0.87559 0.87559 0.87559 +0.89549 0.89549 0.89549 +0.46918 0.46918 0.46918 +0.50411 0.50411 0.50411 +0.53902 0.53902 0.53902 +0.57368 0.57368 0.57368 +0.60788 0.60788 0.60788 +0.64142 0.64142 0.64142 +0.67410 0.67410 0.67410 +0.70574 0.70574 0.70574 +0.73616 0.73616 0.73616 +0.76523 0.76523 0.76523 +0.79280 0.79280 0.79280 +0.81877 0.81877 0.81877 +0.84306 0.84306 0.84306 +0.86560 0.86560 0.86560 +0.88635 0.88635 0.88635 +0.90529 0.90529 0.90529 +0.92243 0.92243 0.92243 +0.52261 0.52261 0.52261 +0.55741 0.55741 0.55741 +0.59186 0.59186 0.59186 +0.62574 0.62574 0.62574 +0.65884 0.65884 0.65884 +0.69099 0.69099 0.69099 +0.72201 0.72201 0.72201 +0.75173 0.75173 0.75173 +0.78002 0.78002 0.78002 +0.80675 0.80675 0.80675 +0.83184 0.83184 0.83184 +0.85521 0.85521 0.85521 +0.87681 0.87681 0.87681 +0.89660 0.89660 0.89660 +0.91459 0.91459 0.91459 +0.93077 0.93077 0.93077 +0.94518 0.94518 0.94518 +0.57571 0.57571 0.57571 +0.60988 0.60988 0.60988 +0.64337 0.64337 0.64337 +0.67600 0.67600 0.67600 +0.70756 0.70756 0.70756 +0.73791 0.73791 0.73791 +0.76689 0.76689 0.76689 +0.79437 0.79437 0.79437 +0.82025 0.82025 0.82025 +0.84443 0.84443 0.84443 +0.86687 0.86687 0.86687 +0.88751 0.88751 0.88751 +0.90635 0.90635 0.90635 +0.92338 0.92338 0.92338 +0.93862 0.93862 0.93862 +0.95210 0.95210 0.95210 +0.96387 0.96387 0.96387 +0.00652 0.00652 0.00652 +0.01242 0.01242 0.01242 +0.01984 0.01984 0.01984 +0.02882 0.02882 0.02882 +0.03941 0.03941 0.03941 +0.05169 0.05169 0.05169 +0.06568 0.06568 0.06568 +0.08144 0.08144 0.08144 +0.09900 0.09900 0.09900 +0.11837 0.11837 0.11837 +0.13955 0.13955 0.13955 +0.16250 0.16250 0.16250 +0.18719 0.18719 0.18719 +0.21355 0.21355 0.21355 +0.24148 0.24148 0.24148 +0.27088 0.27088 0.27088 +0.30160 0.30160 0.30160 +0.01616 0.01616 0.01616 +0.02439 0.02439 0.02439 +0.03422 0.03422 0.03422 +0.04570 0.04570 0.04570 +0.05888 0.05888 0.05888 +0.07380 0.07380 0.07380 +0.09051 0.09051 0.09051 +0.10903 0.10903 0.10903 +0.12936 0.12936 0.12936 +0.15148 0.15148 0.15148 +0.17536 0.17536 0.17536 +0.20094 0.20094 0.20094 +0.22815 0.22815 0.22815 +0.25687 0.25687 0.25687 +0.28699 0.28699 0.28699 +0.31835 0.31835 0.31835 +0.35080 0.35080 0.35080 +0.02939 0.02939 0.02939 +0.04009 0.04009 0.04009 +0.05246 0.05246 0.05246 +0.06656 0.06656 0.06656 +0.08243 0.08243 0.08243 +0.10009 0.10009 0.10009 +0.11957 0.11957 0.11957 +0.14085 0.14085 0.14085 +0.16391 0.16391 0.16391 +0.18870 0.18870 0.18870 +0.21515 0.21515 0.21515 +0.24317 0.24317 0.24317 +0.27265 0.27265 0.27265 +0.30345 0.30345 0.30345 +0.33541 0.33541 0.33541 +0.36836 0.36836 0.36836 +0.40212 0.40212 0.40212 +0.04643 0.04643 0.04643 +0.05971 0.05971 0.05971 +0.07474 0.07474 0.07474 +0.09155 0.09155 0.09155 +0.11018 0.11018 0.11018 +0.13061 0.13061 0.13061 +0.15284 0.15284 0.15284 +0.17682 0.17682 0.17682 +0.20250 0.20250 0.20250 +0.22980 0.22980 0.22980 +0.25861 0.25861 0.25861 +0.28880 0.28880 0.28880 +0.32023 0.32023 0.32023 +0.35274 0.35274 0.35274 +0.38614 0.38614 0.38614 +0.42024 0.42024 0.42024 +0.45484 0.45484 0.45484 +0.06744 0.06744 0.06744 +0.08342 0.08342 0.08342 +0.10119 0.10119 0.10119 +0.12077 0.12077 0.12077 +0.14215 0.14215 0.14215 +0.16532 0.16532 0.16532 +0.19021 0.19021 0.19021 +0.21676 0.21676 0.21676 +0.24487 0.24487 0.24487 +0.27443 0.27443 0.27443 +0.30530 0.30530 0.30530 +0.33732 0.33732 0.33732 +0.37032 0.37032 0.37032 +0.40412 0.40412 0.40412 +0.43851 0.43851 0.43851 +0.47329 0.47329 0.47329 +0.50822 0.50822 0.50822 +0.09260 0.09260 0.09260 +0.11133 0.11133 0.11133 +0.13187 0.13187 0.13187 +0.15420 0.15420 0.15420 +0.17828 0.17828 0.17828 +0.20406 0.20406 0.20406 +0.23145 0.23145 0.23145 +0.26034 0.26034 0.26034 +0.29062 0.29062 0.29062 +0.32212 0.32212 0.32212 +0.35468 0.35468 0.35468 +0.38813 0.38813 0.38813 +0.42227 0.42227 0.42227 +0.45689 0.45689 0.45689 +0.49178 0.49178 0.49178 +0.52671 0.52671 0.52671 +0.56149 0.56149 0.56149 +0.12198 0.12198 0.12198 +0.14347 0.14347 0.14347 +0.16673 0.16673 0.16673 +0.19173 0.19173 0.19173 +0.21837 0.21837 0.21837 +0.24657 0.24657 0.24657 +0.27621 0.27621 0.27621 +0.30715 0.30715 0.30715 +0.33924 0.33924 0.33924 +0.37229 0.37229 0.37229 +0.40613 0.40613 0.40613 +0.44055 0.44055 0.44055 +0.47534 0.47534 0.47534 +0.51028 0.51028 0.51028 +0.54516 0.54516 0.54516 +0.57976 0.57976 0.57976 +0.61386 0.61386 0.61386 +0.15557 0.15557 0.15557 +0.17975 0.17975 0.17975 +0.20563 0.20563 0.20563 +0.23311 0.23311 0.23311 +0.26209 0.26209 0.26209 +0.29244 0.29244 0.29244 +0.32400 0.32400 0.32400 +0.35663 0.35663 0.35663 +0.39012 0.39012 0.39012 +0.42429 0.42429 0.42429 +0.45893 0.45893 0.45893 +0.49383 0.49383 0.49383 +0.52877 0.52877 0.52877 +0.56352 0.56352 0.56352 +0.59788 0.59788 0.59788 +0.63164 0.63164 0.63164 +0.66459 0.66459 0.66459 +0.19325 0.19325 0.19325 +0.21998 0.21998 0.21998 +0.24827 0.24827 0.24827 +0.27799 0.27799 0.27799 +0.30901 0.30901 0.30901 +0.34116 0.34116 0.34116 +0.37426 0.37426 0.37426 +0.40814 0.40814 0.40814 +0.44259 0.44259 0.44259 +0.47739 0.47739 0.47739 +0.51234 0.51234 0.51234 +0.54720 0.54720 0.54720 +0.58178 0.58178 0.58178 +0.61584 0.61584 0.61584 +0.64920 0.64920 0.64920 +0.68165 0.68165 0.68165 +0.71301 0.71301 0.71301 +0.23477 0.23477 0.23477 +0.26384 0.26384 0.26384 +0.29426 0.29426 0.29426 +0.32590 0.32590 0.32590 +0.35858 0.35858 0.35858 +0.39212 0.39212 0.39212 +0.42632 0.42632 0.42632 +0.46098 0.46098 0.46098 +0.49589 0.49589 0.49589 +0.53082 0.53082 0.53082 +0.56556 0.56556 0.56556 +0.59989 0.59989 0.59989 +0.63360 0.63360 0.63360 +0.66650 0.66650 0.66650 +0.69840 0.69840 0.69840 +0.72912 0.72912 0.72912 +0.75852 0.75852 0.75852 +0.27978 0.27978 0.27978 +0.31087 0.31087 0.31087 +0.34308 0.34308 0.34308 +0.37624 0.37624 0.37624 +0.41015 0.41015 0.41015 +0.44463 0.44463 0.44463 +0.47944 0.47944 0.47944 +0.51439 0.51439 0.51439 +0.54925 0.54925 0.54925 +0.58380 0.58380 0.58380 +0.61783 0.61783 0.61783 +0.65113 0.65113 0.65113 +0.68352 0.68352 0.68352 +0.71482 0.71482 0.71482 +0.74486 0.74486 0.74486 +0.77349 0.77349 0.77349 +0.80061 0.80061 0.80061 +0.32779 0.32779 0.32779 +0.36053 0.36053 0.36053 +0.39411 0.39411 0.39411 +0.42835 0.42835 0.42835 +0.46303 0.46303 0.46303 +0.49794 0.49794 0.49794 +0.53287 0.53287 0.53287 +0.56759 0.56759 0.56759 +0.60189 0.60189 0.60189 +0.63556 0.63556 0.63556 +0.66841 0.66841 0.66841 +0.70024 0.70024 0.70024 +0.73089 0.73089 0.73089 +0.76020 0.76020 0.76020 +0.78804 0.78804 0.78804 +0.81431 0.81431 0.81431 +0.83890 0.83890 0.83890 +0.37821 0.37821 0.37821 +0.41217 0.41217 0.41217 +0.44667 0.44667 0.44667 +0.48150 0.48150 0.48150 +0.51645 0.51645 0.51645 +0.55129 0.55129 0.55129 +0.58582 0.58582 0.58582 +0.61981 0.61981 0.61981 +0.65307 0.65307 0.65307 +0.68540 0.68540 0.68540 +0.71662 0.71662 0.71662 +0.74658 0.74658 0.74658 +0.77513 0.77513 0.77513 +0.80215 0.80215 0.80215 +0.82754 0.82754 0.82754 +0.85122 0.85122 0.85122 +0.87313 0.87313 0.87313 +0.43038 0.43038 0.43038 +0.46508 0.46508 0.46508 +0.50000 0.50000 0.50000 +0.53492 0.53492 0.53492 +0.56962 0.56962 0.56962 +0.60389 0.60389 0.60389 +0.63752 0.63752 0.63752 +0.67031 0.67031 0.67031 +0.70208 0.70208 0.70208 +0.73265 0.73265 0.73265 +0.76188 0.76188 0.76188 +0.78963 0.78963 0.78963 +0.81580 0.81580 0.81580 +0.84029 0.84029 0.84029 +0.86304 0.86304 0.86304 +0.88400 0.88400 0.88400 +0.90316 0.90316 0.90316 +0.48355 0.48355 0.48355 +0.51850 0.51850 0.51850 +0.55333 0.55333 0.55333 +0.58783 0.58783 0.58783 +0.62179 0.62179 0.62179 +0.65500 0.65500 0.65500 +0.68727 0.68727 0.68727 +0.71842 0.71842 0.71842 +0.74830 0.74830 0.74830 +0.77677 0.77677 0.77677 +0.80369 0.80369 0.80369 +0.82898 0.82898 0.82898 +0.85255 0.85255 0.85255 +0.87436 0.87436 0.87436 +0.89437 0.89437 0.89437 +0.91257 0.91257 0.91257 +0.92896 0.92896 0.92896 +0.53697 0.53697 0.53697 +0.57165 0.57165 0.57165 +0.60589 0.60589 0.60589 +0.63947 0.63947 0.63947 +0.67221 0.67221 0.67221 +0.70391 0.70391 0.70391 +0.73441 0.73441 0.73441 +0.76356 0.76356 0.76356 +0.79122 0.79122 0.79122 +0.81729 0.81729 0.81729 +0.84168 0.84168 0.84168 +0.86432 0.86432 0.86432 +0.88518 0.88518 0.88518 +0.90423 0.90423 0.90423 +0.92147 0.92147 0.92147 +0.93692 0.93692 0.93692 +0.95060 0.95060 0.95060 +0.58985 0.58985 0.58985 +0.62376 0.62376 0.62376 +0.65692 0.65692 0.65692 +0.68913 0.68913 0.68913 +0.72022 0.72022 0.72022 +0.75002 0.75002 0.75002 +0.77839 0.77839 0.77839 +0.80522 0.80522 0.80522 +0.83041 0.83041 0.83041 +0.85389 0.85389 0.85389 +0.87559 0.87559 0.87559 +0.89549 0.89549 0.89549 +0.91358 0.91358 0.91358 +0.92987 0.92987 0.92987 +0.94438 0.94438 0.94438 +0.95715 0.95715 0.95715 +0.96824 0.96824 0.96824 +0.00877 0.00877 0.00877 +0.01529 0.01529 0.01529 +0.02334 0.02334 0.02334 +0.03298 0.03298 0.03298 +0.04426 0.04426 0.04426 +0.05724 0.05724 0.05724 +0.07196 0.07196 0.07196 +0.08845 0.08845 0.08845 +0.10676 0.10676 0.10676 +0.12687 0.12687 0.12687 +0.14878 0.14878 0.14878 +0.17246 0.17246 0.17246 +0.19785 0.19785 0.19785 +0.22487 0.22487 0.22487 +0.25342 0.25342 0.25342 +0.28338 0.28338 0.28338 +0.31460 0.31460 0.31460 +0.01936 0.01936 0.01936 +0.02824 0.02824 0.02824 +0.03874 0.03874 0.03874 +0.05092 0.05092 0.05092 +0.06481 0.06481 0.06481 +0.08047 0.08047 0.08047 +0.09792 0.09792 0.09792 +0.11718 0.11718 0.11718 +0.13825 0.13825 0.13825 +0.16110 0.16110 0.16110 +0.18569 0.18569 0.18569 +0.21196 0.21196 0.21196 +0.23980 0.23980 0.23980 +0.26911 0.26911 0.26911 +0.29976 0.29976 0.29976 +0.33159 0.33159 0.33159 +0.36444 0.36444 0.36444 +0.03360 0.03360 0.03360 +0.04498 0.04498 0.04498 +0.05805 0.05805 0.05805 +0.07288 0.07288 0.07288 +0.08948 0.08948 0.08948 +0.10789 0.10789 0.10789 +0.12811 0.12811 0.12811 +0.15013 0.15013 0.15013 +0.17391 0.17391 0.17391 +0.19939 0.19939 0.19939 +0.22651 0.22651 0.22651 +0.25514 0.25514 0.25514 +0.28518 0.28518 0.28518 +0.31648 0.31648 0.31648 +0.34887 0.34887 0.34887 +0.38217 0.38217 0.38217 +0.41620 0.41620 0.41620 +0.05169 0.05169 0.05169 +0.06568 0.06568 0.06568 +0.08144 0.08144 0.08144 +0.09900 0.09900 0.09900 +0.11837 0.11837 0.11837 +0.13955 0.13955 0.13955 +0.16250 0.16250 0.16250 +0.18719 0.18719 0.18719 +0.21355 0.21355 0.21355 +0.24148 0.24148 0.24148 +0.27088 0.27088 0.27088 +0.30160 0.30160 0.30160 +0.33350 0.33350 0.33350 +0.36640 0.36640 0.36640 +0.40011 0.40011 0.40011 +0.43444 0.43444 0.43444 +0.46918 0.46918 0.46918 +0.07380 0.07380 0.07380 +0.09051 0.09051 0.09051 +0.10903 0.10903 0.10903 +0.12936 0.12936 0.12936 +0.15148 0.15148 0.15148 +0.17536 0.17536 0.17536 +0.20094 0.20094 0.20094 +0.22815 0.22815 0.22815 +0.25687 0.25687 0.25687 +0.28699 0.28699 0.28699 +0.31835 0.31835 0.31835 +0.35080 0.35080 0.35080 +0.38416 0.38416 0.38416 +0.41822 0.41822 0.41822 +0.45280 0.45280 0.45280 +0.48766 0.48766 0.48766 +0.52261 0.52261 0.52261 +0.10009 0.10009 0.10009 +0.11957 0.11957 0.11957 +0.14085 0.14085 0.14085 +0.16391 0.16391 0.16391 +0.18870 0.18870 0.18870 +0.21515 0.21515 0.21515 +0.24317 0.24317 0.24317 +0.27265 0.27265 0.27265 +0.30345 0.30345 0.30345 +0.33541 0.33541 0.33541 +0.36836 0.36836 0.36836 +0.40212 0.40212 0.40212 +0.43648 0.43648 0.43648 +0.47123 0.47123 0.47123 +0.50617 0.50617 0.50617 +0.54107 0.54107 0.54107 +0.57571 0.57571 0.57571 +0.13061 0.13061 0.13061 +0.15284 0.15284 0.15284 +0.17682 0.17682 0.17682 +0.20250 0.20250 0.20250 +0.22980 0.22980 0.22980 +0.25861 0.25861 0.25861 +0.28880 0.28880 0.28880 +0.32023 0.32023 0.32023 +0.35274 0.35274 0.35274 +0.38614 0.38614 0.38614 +0.42024 0.42024 0.42024 +0.45484 0.45484 0.45484 +0.48972 0.48972 0.48972 +0.52466 0.52466 0.52466 +0.55945 0.55945 0.55945 +0.59387 0.59387 0.59387 +0.62771 0.62771 0.62771 +0.16532 0.16532 0.16532 +0.19021 0.19021 0.19021 +0.21676 0.21676 0.21676 +0.24487 0.24487 0.24487 +0.27443 0.27443 0.27443 +0.30530 0.30530 0.30530 +0.33732 0.33732 0.33732 +0.37032 0.37032 0.37032 +0.40412 0.40412 0.40412 +0.43851 0.43851 0.43851 +0.47329 0.47329 0.47329 +0.50822 0.50822 0.50822 +0.54311 0.54311 0.54311 +0.57773 0.57773 0.57773 +0.61187 0.61187 0.61187 +0.64532 0.64532 0.64532 +0.67788 0.67788 0.67788 +0.20406 0.20406 0.20406 +0.23145 0.23145 0.23145 +0.26034 0.26034 0.26034 +0.29062 0.29062 0.29062 +0.32212 0.32212 0.32212 +0.35468 0.35468 0.35468 +0.38813 0.38813 0.38813 +0.42227 0.42227 0.42227 +0.45689 0.45689 0.45689 +0.49178 0.49178 0.49178 +0.52671 0.52671 0.52671 +0.56149 0.56149 0.56149 +0.59588 0.59588 0.59588 +0.62968 0.62968 0.62968 +0.66268 0.66268 0.66268 +0.69470 0.69470 0.69470 +0.72557 0.72557 0.72557 +0.24657 0.24657 0.24657 +0.27621 0.27621 0.27621 +0.30715 0.30715 0.30715 +0.33924 0.33924 0.33924 +0.37229 0.37229 0.37229 +0.40613 0.40613 0.40613 +0.44055 0.44055 0.44055 +0.47534 0.47534 0.47534 +0.51028 0.51028 0.51028 +0.54516 0.54516 0.54516 +0.57976 0.57976 0.57976 +0.61386 0.61386 0.61386 +0.64726 0.64726 0.64726 +0.67977 0.67977 0.67977 +0.71120 0.71120 0.71120 +0.74139 0.74139 0.74139 +0.77020 0.77020 0.77020 +0.29244 0.29244 0.29244 +0.32400 0.32400 0.32400 +0.35663 0.35663 0.35663 +0.39012 0.39012 0.39012 +0.42429 0.42429 0.42429 +0.45893 0.45893 0.45893 +0.49383 0.49383 0.49383 +0.52877 0.52877 0.52877 +0.56352 0.56352 0.56352 +0.59788 0.59788 0.59788 +0.63164 0.63164 0.63164 +0.66459 0.66459 0.66459 +0.69655 0.69655 0.69655 +0.72735 0.72735 0.72735 +0.75683 0.75683 0.75683 +0.78485 0.78485 0.78485 +0.81130 0.81130 0.81130 +0.34116 0.34116 0.34116 +0.37426 0.37426 0.37426 +0.40814 0.40814 0.40814 +0.44259 0.44259 0.44259 +0.47739 0.47739 0.47739 +0.51234 0.51234 0.51234 +0.54720 0.54720 0.54720 +0.58178 0.58178 0.58178 +0.61584 0.61584 0.61584 +0.64920 0.64920 0.64920 +0.68165 0.68165 0.68165 +0.71301 0.71301 0.71301 +0.74313 0.74313 0.74313 +0.77185 0.77185 0.77185 +0.79906 0.79906 0.79906 +0.82464 0.82464 0.82464 +0.84852 0.84852 0.84852 +0.39212 0.39212 0.39212 +0.42632 0.42632 0.42632 +0.46098 0.46098 0.46098 +0.49589 0.49589 0.49589 +0.53082 0.53082 0.53082 +0.56556 0.56556 0.56556 +0.59989 0.59989 0.59989 +0.63360 0.63360 0.63360 +0.66650 0.66650 0.66650 +0.69840 0.69840 0.69840 +0.72912 0.72912 0.72912 +0.75852 0.75852 0.75852 +0.78645 0.78645 0.78645 +0.81281 0.81281 0.81281 +0.83750 0.83750 0.83750 +0.86045 0.86045 0.86045 +0.88163 0.88163 0.88163 +0.44463 0.44463 0.44463 +0.47944 0.47944 0.47944 +0.51439 0.51439 0.51439 +0.54925 0.54925 0.54925 +0.58380 0.58380 0.58380 +0.61783 0.61783 0.61783 +0.65113 0.65113 0.65113 +0.68352 0.68352 0.68352 +0.71482 0.71482 0.71482 +0.74486 0.74486 0.74486 +0.77349 0.77349 0.77349 +0.80061 0.80061 0.80061 +0.82609 0.82609 0.82609 +0.84987 0.84987 0.84987 +0.87189 0.87189 0.87189 +0.89211 0.89211 0.89211 +0.91052 0.91052 0.91052 +0.49794 0.49794 0.49794 +0.53287 0.53287 0.53287 +0.56759 0.56759 0.56759 +0.60189 0.60189 0.60189 +0.63556 0.63556 0.63556 +0.66841 0.66841 0.66841 +0.70024 0.70024 0.70024 +0.73089 0.73089 0.73089 +0.76020 0.76020 0.76020 +0.78804 0.78804 0.78804 +0.81431 0.81431 0.81431 +0.83890 0.83890 0.83890 +0.86175 0.86175 0.86175 +0.88282 0.88282 0.88282 +0.90208 0.90208 0.90208 +0.91953 0.91953 0.91953 +0.93519 0.93519 0.93519 +0.55129 0.55129 0.55129 +0.58582 0.58582 0.58582 +0.61981 0.61981 0.61981 +0.65307 0.65307 0.65307 +0.68540 0.68540 0.68540 +0.71662 0.71662 0.71662 +0.74658 0.74658 0.74658 +0.77513 0.77513 0.77513 +0.80215 0.80215 0.80215 +0.82754 0.82754 0.82754 +0.85122 0.85122 0.85122 +0.87313 0.87313 0.87313 +0.89324 0.89324 0.89324 +0.91155 0.91155 0.91155 +0.92804 0.92804 0.92804 +0.94276 0.94276 0.94276 +0.95574 0.95574 0.95574 +0.60389 0.60389 0.60389 +0.63752 0.63752 0.63752 +0.67031 0.67031 0.67031 +0.70208 0.70208 0.70208 +0.73265 0.73265 0.73265 +0.76188 0.76188 0.76188 +0.78963 0.78963 0.78963 +0.81580 0.81580 0.81580 +0.84029 0.84029 0.84029 +0.86304 0.86304 0.86304 +0.88400 0.88400 0.88400 +0.90316 0.90316 0.90316 +0.92050 0.92050 0.92050 +0.93606 0.93606 0.93606 +0.94985 0.94985 0.94985 +0.96192 0.96192 0.96192 +0.97232 0.97232 0.97232 +0.01127 0.01127 0.01127 +0.01842 0.01842 0.01842 +0.02712 0.02712 0.02712 +0.03742 0.03742 0.03742 +0.04940 0.04940 0.04940 +0.06308 0.06308 0.06308 +0.07853 0.07853 0.07853 +0.09577 0.09577 0.09577 +0.11482 0.11482 0.11482 +0.13568 0.13568 0.13568 +0.15832 0.15832 0.15832 +0.18271 0.18271 0.18271 +0.20878 0.20878 0.20878 +0.23644 0.23644 0.23644 +0.26559 0.26559 0.26559 +0.29609 0.29609 0.29609 +0.32779 0.32779 0.32779 +0.02282 0.02282 0.02282 +0.03237 0.03237 0.03237 +0.04355 0.04355 0.04355 +0.05643 0.05643 0.05643 +0.07104 0.07104 0.07104 +0.08743 0.08743 0.08743 +0.10563 0.10563 0.10563 +0.12564 0.12564 0.12564 +0.14745 0.14745 0.14745 +0.17102 0.17102 0.17102 +0.19631 0.19631 0.19631 +0.22323 0.22323 0.22323 +0.25170 0.25170 0.25170 +0.28158 0.28158 0.28158 +0.31273 0.31273 0.31273 +0.34500 0.34500 0.34500 +0.37821 0.37821 0.37821 +0.03808 0.03808 0.03808 +0.05015 0.05015 0.05015 +0.06394 0.06394 0.06394 +0.07950 0.07950 0.07950 +0.09684 0.09684 0.09684 +0.11600 0.11600 0.11600 +0.13696 0.13696 0.13696 +0.15971 0.15971 0.15971 +0.18420 0.18420 0.18420 +0.21037 0.21037 0.21037 +0.23812 0.23812 0.23812 +0.26735 0.26735 0.26735 +0.29792 0.29792 0.29792 +0.32969 0.32969 0.32969 +0.36248 0.36248 0.36248 +0.39611 0.39611 0.39611 +0.43038 0.43038 0.43038 +0.05724 0.05724 0.05724 +0.07196 0.07196 0.07196 +0.08845 0.08845 0.08845 +0.10676 0.10676 0.10676 +0.12687 0.12687 0.12687 +0.14878 0.14878 0.14878 +0.17246 0.17246 0.17246 +0.19785 0.19785 0.19785 +0.22487 0.22487 0.22487 +0.25342 0.25342 0.25342 +0.28338 0.28338 0.28338 +0.31460 0.31460 0.31460 +0.34693 0.34693 0.34693 +0.38019 0.38019 0.38019 +0.41418 0.41418 0.41418 +0.44871 0.44871 0.44871 +0.48355 0.48355 0.48355 +0.08047 0.08047 0.08047 +0.09792 0.09792 0.09792 +0.11718 0.11718 0.11718 +0.13825 0.13825 0.13825 +0.16110 0.16110 0.16110 +0.18569 0.18569 0.18569 +0.21196 0.21196 0.21196 +0.23980 0.23980 0.23980 +0.26911 0.26911 0.26911 +0.29976 0.29976 0.29976 +0.33159 0.33159 0.33159 +0.36444 0.36444 0.36444 +0.39811 0.39811 0.39811 +0.43241 0.43241 0.43241 +0.46713 0.46713 0.46713 +0.50206 0.50206 0.50206 +0.53697 0.53697 0.53697 +0.10789 0.10789 0.10789 +0.12811 0.12811 0.12811 +0.15013 0.15013 0.15013 +0.17391 0.17391 0.17391 +0.19939 0.19939 0.19939 +0.22651 0.22651 0.22651 +0.25514 0.25514 0.25514 +0.28518 0.28518 0.28518 +0.31648 0.31648 0.31648 +0.34887 0.34887 0.34887 +0.38217 0.38217 0.38217 +0.41620 0.41620 0.41620 +0.45075 0.45075 0.45075 +0.48561 0.48561 0.48561 +0.52056 0.52056 0.52056 +0.55537 0.55537 0.55537 +0.58985 0.58985 0.58985 +0.13955 0.13955 0.13955 +0.16250 0.16250 0.16250 +0.18719 0.18719 0.18719 +0.21355 0.21355 0.21355 +0.24148 0.24148 0.24148 +0.27088 0.27088 0.27088 +0.30160 0.30160 0.30160 +0.33350 0.33350 0.33350 +0.36640 0.36640 0.36640 +0.40011 0.40011 0.40011 +0.43444 0.43444 0.43444 +0.46918 0.46918 0.46918 +0.50411 0.50411 0.50411 +0.53902 0.53902 0.53902 +0.57368 0.57368 0.57368 +0.60788 0.60788 0.60788 +0.64142 0.64142 0.64142 +0.17536 0.17536 0.17536 +0.20094 0.20094 0.20094 +0.22815 0.22815 0.22815 +0.25687 0.25687 0.25687 +0.28699 0.28699 0.28699 +0.31835 0.31835 0.31835 +0.35080 0.35080 0.35080 +0.38416 0.38416 0.38416 +0.41822 0.41822 0.41822 +0.45280 0.45280 0.45280 +0.48766 0.48766 0.48766 +0.52261 0.52261 0.52261 +0.55741 0.55741 0.55741 +0.59186 0.59186 0.59186 +0.62574 0.62574 0.62574 +0.65884 0.65884 0.65884 +0.69099 0.69099 0.69099 +0.21515 0.21515 0.21515 +0.24317 0.24317 0.24317 +0.27265 0.27265 0.27265 +0.30345 0.30345 0.30345 +0.33541 0.33541 0.33541 +0.36836 0.36836 0.36836 +0.40212 0.40212 0.40212 +0.43648 0.43648 0.43648 +0.47123 0.47123 0.47123 +0.50617 0.50617 0.50617 +0.54107 0.54107 0.54107 +0.57571 0.57571 0.57571 +0.60988 0.60988 0.60988 +0.64337 0.64337 0.64337 +0.67600 0.67600 0.67600 +0.70756 0.70756 0.70756 +0.73791 0.73791 0.73791 +0.25861 0.25861 0.25861 +0.28880 0.28880 0.28880 +0.32023 0.32023 0.32023 +0.35274 0.35274 0.35274 +0.38614 0.38614 0.38614 +0.42024 0.42024 0.42024 +0.45484 0.45484 0.45484 +0.48972 0.48972 0.48972 +0.52466 0.52466 0.52466 +0.55945 0.55945 0.55945 +0.59387 0.59387 0.59387 +0.62771 0.62771 0.62771 +0.66076 0.66076 0.66076 +0.69285 0.69285 0.69285 +0.72379 0.72379 0.72379 +0.75343 0.75343 0.75343 +0.78163 0.78163 0.78163 +0.30530 0.30530 0.30530 +0.33732 0.33732 0.33732 +0.37032 0.37032 0.37032 +0.40412 0.40412 0.40412 +0.43851 0.43851 0.43851 +0.47329 0.47329 0.47329 +0.50822 0.50822 0.50822 +0.54311 0.54311 0.54311 +0.57773 0.57773 0.57773 +0.61187 0.61187 0.61187 +0.64532 0.64532 0.64532 +0.67788 0.67788 0.67788 +0.70938 0.70938 0.70938 +0.73966 0.73966 0.73966 +0.76855 0.76855 0.76855 +0.79594 0.79594 0.79594 +0.82172 0.82172 0.82172 +0.35468 0.35468 0.35468 +0.38813 0.38813 0.38813 +0.42227 0.42227 0.42227 +0.45689 0.45689 0.45689 +0.49178 0.49178 0.49178 +0.52671 0.52671 0.52671 +0.56149 0.56149 0.56149 +0.59588 0.59588 0.59588 +0.62968 0.62968 0.62968 +0.66268 0.66268 0.66268 +0.69470 0.69470 0.69470 +0.72557 0.72557 0.72557 +0.75513 0.75513 0.75513 +0.78324 0.78324 0.78324 +0.80979 0.80979 0.80979 +0.83468 0.83468 0.83468 +0.85785 0.85785 0.85785 +0.40613 0.40613 0.40613 +0.44055 0.44055 0.44055 +0.47534 0.47534 0.47534 +0.51028 0.51028 0.51028 +0.54516 0.54516 0.54516 +0.57976 0.57976 0.57976 +0.61386 0.61386 0.61386 +0.64726 0.64726 0.64726 +0.67977 0.67977 0.67977 +0.71120 0.71120 0.71120 +0.74139 0.74139 0.74139 +0.77020 0.77020 0.77020 +0.79750 0.79750 0.79750 +0.82318 0.82318 0.82318 +0.84716 0.84716 0.84716 +0.86939 0.86939 0.86939 +0.88982 0.88982 0.88982 +0.45893 0.45893 0.45893 +0.49383 0.49383 0.49383 +0.52877 0.52877 0.52877 +0.56352 0.56352 0.56352 +0.59788 0.59788 0.59788 +0.63164 0.63164 0.63164 +0.66459 0.66459 0.66459 +0.69655 0.69655 0.69655 +0.72735 0.72735 0.72735 +0.75683 0.75683 0.75683 +0.78485 0.78485 0.78485 +0.81130 0.81130 0.81130 +0.83609 0.83609 0.83609 +0.85915 0.85915 0.85915 +0.88043 0.88043 0.88043 +0.89991 0.89991 0.89991 +0.91757 0.91757 0.91757 +0.51234 0.51234 0.51234 +0.54720 0.54720 0.54720 +0.58178 0.58178 0.58178 +0.61584 0.61584 0.61584 +0.64920 0.64920 0.64920 +0.68165 0.68165 0.68165 +0.71301 0.71301 0.71301 +0.74313 0.74313 0.74313 +0.77185 0.77185 0.77185 +0.79906 0.79906 0.79906 +0.82464 0.82464 0.82464 +0.84852 0.84852 0.84852 +0.87064 0.87064 0.87064 +0.89097 0.89097 0.89097 +0.90949 0.90949 0.90949 +0.92620 0.92620 0.92620 +0.94112 0.94112 0.94112 +0.56556 0.56556 0.56556 +0.59989 0.59989 0.59989 +0.63360 0.63360 0.63360 +0.66650 0.66650 0.66650 +0.69840 0.69840 0.69840 +0.72912 0.72912 0.72912 +0.75852 0.75852 0.75852 +0.78645 0.78645 0.78645 +0.81281 0.81281 0.81281 +0.83750 0.83750 0.83750 +0.86045 0.86045 0.86045 +0.88163 0.88163 0.88163 +0.90100 0.90100 0.90100 +0.91856 0.91856 0.91856 +0.93432 0.93432 0.93432 +0.94831 0.94831 0.94831 +0.96059 0.96059 0.96059 +0.61783 0.61783 0.61783 +0.65113 0.65113 0.65113 +0.68352 0.68352 0.68352 +0.71482 0.71482 0.71482 +0.74486 0.74486 0.74486 +0.77349 0.77349 0.77349 +0.80061 0.80061 0.80061 +0.82609 0.82609 0.82609 +0.84987 0.84987 0.84987 +0.87189 0.87189 0.87189 +0.89211 0.89211 0.89211 +0.91052 0.91052 0.91052 +0.92712 0.92712 0.92712 +0.94195 0.94195 0.94195 +0.95502 0.95502 0.95502 +0.96640 0.96640 0.96640 +0.97614 0.97614 0.97614 +0.01403 0.01403 0.01403 +0.02181 0.02181 0.02181 +0.03116 0.03116 0.03116 +0.04215 0.04215 0.04215 +0.05482 0.05482 0.05482 +0.06923 0.06923 0.06923 +0.08541 0.08541 0.08541 +0.10340 0.10340 0.10340 +0.12319 0.12319 0.12319 +0.14479 0.14479 0.14479 +0.16816 0.16816 0.16816 +0.19325 0.19325 0.19325 +0.21998 0.21998 0.21998 +0.24827 0.24827 0.24827 +0.27799 0.27799 0.27799 +0.30901 0.30901 0.30901 +0.34116 0.34116 0.34116 +0.02656 0.02656 0.02656 +0.03677 0.03677 0.03677 +0.04864 0.04864 0.04864 +0.06223 0.06223 0.06223 +0.07757 0.07757 0.07757 +0.09471 0.09471 0.09471 +0.11365 0.11365 0.11365 +0.13440 0.13440 0.13440 +0.15694 0.15694 0.15694 +0.18123 0.18123 0.18123 +0.20720 0.20720 0.20720 +0.23477 0.23477 0.23477 +0.26384 0.26384 0.26384 +0.29426 0.29426 0.29426 +0.32590 0.32590 0.32590 +0.35858 0.35858 0.35858 +0.39212 0.39212 0.39212 +0.04285 0.04285 0.04285 +0.05562 0.05562 0.05562 +0.07013 0.07013 0.07013 +0.08642 0.08642 0.08642 +0.10451 0.10451 0.10451 +0.12441 0.12441 0.12441 +0.14611 0.14611 0.14611 +0.16959 0.16959 0.16959 +0.19478 0.19478 0.19478 +0.22161 0.22161 0.22161 +0.24998 0.24998 0.24998 +0.27978 0.27978 0.27978 +0.31087 0.31087 0.31087 +0.34308 0.34308 0.34308 +0.37624 0.37624 0.37624 +0.41015 0.41015 0.41015 +0.44463 0.44463 0.44463 +0.06308 0.06308 0.06308 +0.07853 0.07853 0.07853 +0.09577 0.09577 0.09577 +0.11482 0.11482 0.11482 +0.13568 0.13568 0.13568 +0.15832 0.15832 0.15832 +0.18271 0.18271 0.18271 +0.20878 0.20878 0.20878 +0.23644 0.23644 0.23644 +0.26559 0.26559 0.26559 +0.29609 0.29609 0.29609 +0.32779 0.32779 0.32779 +0.36053 0.36053 0.36053 +0.39411 0.39411 0.39411 +0.42835 0.42835 0.42835 +0.46303 0.46303 0.46303 +0.49794 0.49794 0.49794 +0.08743 0.08743 0.08743 +0.10563 0.10563 0.10563 +0.12564 0.12564 0.12564 +0.14745 0.14745 0.14745 +0.17102 0.17102 0.17102 +0.19631 0.19631 0.19631 +0.22323 0.22323 0.22323 +0.25170 0.25170 0.25170 +0.28158 0.28158 0.28158 +0.31273 0.31273 0.31273 +0.34500 0.34500 0.34500 +0.37821 0.37821 0.37821 +0.41217 0.41217 0.41217 +0.44667 0.44667 0.44667 +0.48150 0.48150 0.48150 +0.51645 0.51645 0.51645 +0.55129 0.55129 0.55129 +0.11600 0.11600 0.11600 +0.13696 0.13696 0.13696 +0.15971 0.15971 0.15971 +0.18420 0.18420 0.18420 +0.21037 0.21037 0.21037 +0.23812 0.23812 0.23812 +0.26735 0.26735 0.26735 +0.29792 0.29792 0.29792 +0.32969 0.32969 0.32969 +0.36248 0.36248 0.36248 +0.39611 0.39611 0.39611 +0.43038 0.43038 0.43038 +0.46508 0.46508 0.46508 +0.50000 0.50000 0.50000 +0.53492 0.53492 0.53492 +0.56962 0.56962 0.56962 +0.60389 0.60389 0.60389 +0.14878 0.14878 0.14878 +0.17246 0.17246 0.17246 +0.19785 0.19785 0.19785 +0.22487 0.22487 0.22487 +0.25342 0.25342 0.25342 +0.28338 0.28338 0.28338 +0.31460 0.31460 0.31460 +0.34693 0.34693 0.34693 +0.38019 0.38019 0.38019 +0.41418 0.41418 0.41418 +0.44871 0.44871 0.44871 +0.48355 0.48355 0.48355 +0.51850 0.51850 0.51850 +0.55333 0.55333 0.55333 +0.58783 0.58783 0.58783 +0.62179 0.62179 0.62179 +0.65500 0.65500 0.65500 +0.18569 0.18569 0.18569 +0.21196 0.21196 0.21196 +0.23980 0.23980 0.23980 +0.26911 0.26911 0.26911 +0.29976 0.29976 0.29976 +0.33159 0.33159 0.33159 +0.36444 0.36444 0.36444 +0.39811 0.39811 0.39811 +0.43241 0.43241 0.43241 +0.46713 0.46713 0.46713 +0.50206 0.50206 0.50206 +0.53697 0.53697 0.53697 +0.57165 0.57165 0.57165 +0.60589 0.60589 0.60589 +0.63947 0.63947 0.63947 +0.67221 0.67221 0.67221 +0.70391 0.70391 0.70391 +0.22651 0.22651 0.22651 +0.25514 0.25514 0.25514 +0.28518 0.28518 0.28518 +0.31648 0.31648 0.31648 +0.34887 0.34887 0.34887 +0.38217 0.38217 0.38217 +0.41620 0.41620 0.41620 +0.45075 0.45075 0.45075 +0.48561 0.48561 0.48561 +0.52056 0.52056 0.52056 +0.55537 0.55537 0.55537 +0.58985 0.58985 0.58985 +0.62376 0.62376 0.62376 +0.65692 0.65692 0.65692 +0.68913 0.68913 0.68913 +0.72022 0.72022 0.72022 +0.75002 0.75002 0.75002 +0.27088 0.27088 0.27088 +0.30160 0.30160 0.30160 +0.33350 0.33350 0.33350 +0.36640 0.36640 0.36640 +0.40011 0.40011 0.40011 +0.43444 0.43444 0.43444 +0.46918 0.46918 0.46918 +0.50411 0.50411 0.50411 +0.53902 0.53902 0.53902 +0.57368 0.57368 0.57368 +0.60788 0.60788 0.60788 +0.64142 0.64142 0.64142 +0.67410 0.67410 0.67410 +0.70574 0.70574 0.70574 +0.73616 0.73616 0.73616 +0.76523 0.76523 0.76523 +0.79280 0.79280 0.79280 +0.31835 0.31835 0.31835 +0.35080 0.35080 0.35080 +0.38416 0.38416 0.38416 +0.41822 0.41822 0.41822 +0.45280 0.45280 0.45280 +0.48766 0.48766 0.48766 +0.52261 0.52261 0.52261 +0.55741 0.55741 0.55741 +0.59186 0.59186 0.59186 +0.62574 0.62574 0.62574 +0.65884 0.65884 0.65884 +0.69099 0.69099 0.69099 +0.72201 0.72201 0.72201 +0.75173 0.75173 0.75173 +0.78002 0.78002 0.78002 +0.80675 0.80675 0.80675 +0.83184 0.83184 0.83184 +0.36836 0.36836 0.36836 +0.40212 0.40212 0.40212 +0.43648 0.43648 0.43648 +0.47123 0.47123 0.47123 +0.50617 0.50617 0.50617 +0.54107 0.54107 0.54107 +0.57571 0.57571 0.57571 +0.60988 0.60988 0.60988 +0.64337 0.64337 0.64337 +0.67600 0.67600 0.67600 +0.70756 0.70756 0.70756 +0.73791 0.73791 0.73791 +0.76689 0.76689 0.76689 +0.79437 0.79437 0.79437 +0.82025 0.82025 0.82025 +0.84443 0.84443 0.84443 +0.86687 0.86687 0.86687 +0.42024 0.42024 0.42024 +0.45484 0.45484 0.45484 +0.48972 0.48972 0.48972 +0.52466 0.52466 0.52466 +0.55945 0.55945 0.55945 +0.59387 0.59387 0.59387 +0.62771 0.62771 0.62771 +0.66076 0.66076 0.66076 +0.69285 0.69285 0.69285 +0.72379 0.72379 0.72379 +0.75343 0.75343 0.75343 +0.78163 0.78163 0.78163 +0.80827 0.80827 0.80827 +0.83327 0.83327 0.83327 +0.85653 0.85653 0.85653 +0.87802 0.87802 0.87802 +0.89771 0.89771 0.89771 +0.47329 0.47329 0.47329 +0.50822 0.50822 0.50822 +0.54311 0.54311 0.54311 +0.57773 0.57773 0.57773 +0.61187 0.61187 0.61187 +0.64532 0.64532 0.64532 +0.67788 0.67788 0.67788 +0.70938 0.70938 0.70938 +0.73966 0.73966 0.73966 +0.76855 0.76855 0.76855 +0.79594 0.79594 0.79594 +0.82172 0.82172 0.82172 +0.84580 0.84580 0.84580 +0.86813 0.86813 0.86813 +0.88867 0.88867 0.88867 +0.90740 0.90740 0.90740 +0.92432 0.92432 0.92432 +0.52671 0.52671 0.52671 +0.56149 0.56149 0.56149 +0.59588 0.59588 0.59588 +0.62968 0.62968 0.62968 +0.66268 0.66268 0.66268 +0.69470 0.69470 0.69470 +0.72557 0.72557 0.72557 +0.75513 0.75513 0.75513 +0.78324 0.78324 0.78324 +0.80979 0.80979 0.80979 +0.83468 0.83468 0.83468 +0.85785 0.85785 0.85785 +0.87923 0.87923 0.87923 +0.89881 0.89881 0.89881 +0.91658 0.91658 0.91658 +0.93256 0.93256 0.93256 +0.94676 0.94676 0.94676 +0.57976 0.57976 0.57976 +0.61386 0.61386 0.61386 +0.64726 0.64726 0.64726 +0.67977 0.67977 0.67977 +0.71120 0.71120 0.71120 +0.74139 0.74139 0.74139 +0.77020 0.77020 0.77020 +0.79750 0.79750 0.79750 +0.82318 0.82318 0.82318 +0.84716 0.84716 0.84716 +0.86939 0.86939 0.86939 +0.88982 0.88982 0.88982 +0.90845 0.90845 0.90845 +0.92526 0.92526 0.92526 +0.94029 0.94029 0.94029 +0.95357 0.95357 0.95357 +0.96515 0.96515 0.96515 +0.63164 0.63164 0.63164 +0.66459 0.66459 0.66459 +0.69655 0.69655 0.69655 +0.72735 0.72735 0.72735 +0.75683 0.75683 0.75683 +0.78485 0.78485 0.78485 +0.81130 0.81130 0.81130 +0.83609 0.83609 0.83609 +0.85915 0.85915 0.85915 +0.88043 0.88043 0.88043 +0.89991 0.89991 0.89991 +0.91757 0.91757 0.91757 +0.93344 0.93344 0.93344 +0.94754 0.94754 0.94754 +0.95991 0.95991 0.95991 +0.97061 0.97061 0.97061 +0.97968 0.97968 0.97968 +0.01704 0.01704 0.01704 +0.02547 0.02547 0.02547 +0.03549 0.03549 0.03549 +0.04716 0.04716 0.04716 +0.06054 0.06054 0.06054 +0.07568 0.07568 0.07568 +0.09260 0.09260 0.09260 +0.11133 0.11133 0.11133 +0.13187 0.13187 0.13187 +0.15420 0.15420 0.15420 +0.17828 0.17828 0.17828 +0.20406 0.20406 0.20406 +0.23145 0.23145 0.23145 +0.26034 0.26034 0.26034 +0.29062 0.29062 0.29062 +0.32212 0.32212 0.32212 +0.35468 0.35468 0.35468 +0.03057 0.03057 0.03057 +0.04146 0.04146 0.04146 +0.05403 0.05403 0.05403 +0.06833 0.06833 0.06833 +0.08441 0.08441 0.08441 +0.10229 0.10229 0.10229 +0.12198 0.12198 0.12198 +0.14347 0.14347 0.14347 +0.16673 0.16673 0.16673 +0.19173 0.19173 0.19173 +0.21837 0.21837 0.21837 +0.24657 0.24657 0.24657 +0.27621 0.27621 0.27621 +0.30715 0.30715 0.30715 +0.33924 0.33924 0.33924 +0.37229 0.37229 0.37229 +0.40613 0.40613 0.40613 +0.04790 0.04790 0.04790 +0.06138 0.06138 0.06138 +0.07662 0.07662 0.07662 +0.09365 0.09365 0.09365 +0.11249 0.11249 0.11249 +0.13313 0.13313 0.13313 +0.15557 0.15557 0.15557 +0.17975 0.17975 0.17975 +0.20563 0.20563 0.20563 +0.23311 0.23311 0.23311 +0.26209 0.26209 0.26209 +0.29244 0.29244 0.29244 +0.32400 0.32400 0.32400 +0.35663 0.35663 0.35663 +0.39012 0.39012 0.39012 +0.42429 0.42429 0.42429 +0.45893 0.45893 0.45893 +0.06923 0.06923 0.06923 +0.08541 0.08541 0.08541 +0.10340 0.10340 0.10340 +0.12319 0.12319 0.12319 +0.14479 0.14479 0.14479 +0.16816 0.16816 0.16816 +0.19325 0.19325 0.19325 +0.21998 0.21998 0.21998 +0.24827 0.24827 0.24827 +0.27799 0.27799 0.27799 +0.30901 0.30901 0.30901 +0.34116 0.34116 0.34116 +0.37426 0.37426 0.37426 +0.40814 0.40814 0.40814 +0.44259 0.44259 0.44259 +0.47739 0.47739 0.47739 +0.51234 0.51234 0.51234 +0.09471 0.09471 0.09471 +0.11365 0.11365 0.11365 +0.13440 0.13440 0.13440 +0.15694 0.15694 0.15694 +0.18123 0.18123 0.18123 +0.20720 0.20720 0.20720 +0.23477 0.23477 0.23477 +0.26384 0.26384 0.26384 +0.29426 0.29426 0.29426 +0.32590 0.32590 0.32590 +0.35858 0.35858 0.35858 +0.39212 0.39212 0.39212 +0.42632 0.42632 0.42632 +0.46098 0.46098 0.46098 +0.49589 0.49589 0.49589 +0.53082 0.53082 0.53082 +0.56556 0.56556 0.56556 +0.12441 0.12441 0.12441 +0.14611 0.14611 0.14611 +0.16959 0.16959 0.16959 +0.19478 0.19478 0.19478 +0.22161 0.22161 0.22161 +0.24998 0.24998 0.24998 +0.27978 0.27978 0.27978 +0.31087 0.31087 0.31087 +0.34308 0.34308 0.34308 +0.37624 0.37624 0.37624 +0.41015 0.41015 0.41015 +0.44463 0.44463 0.44463 +0.47944 0.47944 0.47944 +0.51439 0.51439 0.51439 +0.54925 0.54925 0.54925 +0.58380 0.58380 0.58380 +0.61783 0.61783 0.61783 +0.15832 0.15832 0.15832 +0.18271 0.18271 0.18271 +0.20878 0.20878 0.20878 +0.23644 0.23644 0.23644 +0.26559 0.26559 0.26559 +0.29609 0.29609 0.29609 +0.32779 0.32779 0.32779 +0.36053 0.36053 0.36053 +0.39411 0.39411 0.39411 +0.42835 0.42835 0.42835 +0.46303 0.46303 0.46303 +0.49794 0.49794 0.49794 +0.53287 0.53287 0.53287 +0.56759 0.56759 0.56759 +0.60189 0.60189 0.60189 +0.63556 0.63556 0.63556 +0.66841 0.66841 0.66841 +0.19631 0.19631 0.19631 +0.22323 0.22323 0.22323 +0.25170 0.25170 0.25170 +0.28158 0.28158 0.28158 +0.31273 0.31273 0.31273 +0.34500 0.34500 0.34500 +0.37821 0.37821 0.37821 +0.41217 0.41217 0.41217 +0.44667 0.44667 0.44667 +0.48150 0.48150 0.48150 +0.51645 0.51645 0.51645 +0.55129 0.55129 0.55129 +0.58582 0.58582 0.58582 +0.61981 0.61981 0.61981 +0.65307 0.65307 0.65307 +0.68540 0.68540 0.68540 +0.71662 0.71662 0.71662 +0.23812 0.23812 0.23812 +0.26735 0.26735 0.26735 +0.29792 0.29792 0.29792 +0.32969 0.32969 0.32969 +0.36248 0.36248 0.36248 +0.39611 0.39611 0.39611 +0.43038 0.43038 0.43038 +0.46508 0.46508 0.46508 +0.50000 0.50000 0.50000 +0.53492 0.53492 0.53492 +0.56962 0.56962 0.56962 +0.60389 0.60389 0.60389 +0.63752 0.63752 0.63752 +0.67031 0.67031 0.67031 +0.70208 0.70208 0.70208 +0.73265 0.73265 0.73265 +0.76188 0.76188 0.76188 +0.28338 0.28338 0.28338 +0.31460 0.31460 0.31460 +0.34693 0.34693 0.34693 +0.38019 0.38019 0.38019 +0.41418 0.41418 0.41418 +0.44871 0.44871 0.44871 +0.48355 0.48355 0.48355 +0.51850 0.51850 0.51850 +0.55333 0.55333 0.55333 +0.58783 0.58783 0.58783 +0.62179 0.62179 0.62179 +0.65500 0.65500 0.65500 +0.68727 0.68727 0.68727 +0.71842 0.71842 0.71842 +0.74830 0.74830 0.74830 +0.77677 0.77677 0.77677 +0.80369 0.80369 0.80369 +0.33159 0.33159 0.33159 +0.36444 0.36444 0.36444 +0.39811 0.39811 0.39811 +0.43241 0.43241 0.43241 +0.46713 0.46713 0.46713 +0.50206 0.50206 0.50206 +0.53697 0.53697 0.53697 +0.57165 0.57165 0.57165 +0.60589 0.60589 0.60589 +0.63947 0.63947 0.63947 +0.67221 0.67221 0.67221 +0.70391 0.70391 0.70391 +0.73441 0.73441 0.73441 +0.76356 0.76356 0.76356 +0.79122 0.79122 0.79122 +0.81729 0.81729 0.81729 +0.84168 0.84168 0.84168 +0.38217 0.38217 0.38217 +0.41620 0.41620 0.41620 +0.45075 0.45075 0.45075 +0.48561 0.48561 0.48561 +0.52056 0.52056 0.52056 +0.55537 0.55537 0.55537 +0.58985 0.58985 0.58985 +0.62376 0.62376 0.62376 +0.65692 0.65692 0.65692 +0.68913 0.68913 0.68913 +0.72022 0.72022 0.72022 +0.75002 0.75002 0.75002 +0.77839 0.77839 0.77839 +0.80522 0.80522 0.80522 +0.83041 0.83041 0.83041 +0.85389 0.85389 0.85389 +0.87559 0.87559 0.87559 +0.43444 0.43444 0.43444 +0.46918 0.46918 0.46918 +0.50411 0.50411 0.50411 +0.53902 0.53902 0.53902 +0.57368 0.57368 0.57368 +0.60788 0.60788 0.60788 +0.64142 0.64142 0.64142 +0.67410 0.67410 0.67410 +0.70574 0.70574 0.70574 +0.73616 0.73616 0.73616 +0.76523 0.76523 0.76523 +0.79280 0.79280 0.79280 +0.81877 0.81877 0.81877 +0.84306 0.84306 0.84306 +0.86560 0.86560 0.86560 +0.88635 0.88635 0.88635 +0.90529 0.90529 0.90529 +0.48766 0.48766 0.48766 +0.52261 0.52261 0.52261 +0.55741 0.55741 0.55741 +0.59186 0.59186 0.59186 +0.62574 0.62574 0.62574 +0.65884 0.65884 0.65884 +0.69099 0.69099 0.69099 +0.72201 0.72201 0.72201 +0.75173 0.75173 0.75173 +0.78002 0.78002 0.78002 +0.80675 0.80675 0.80675 +0.83184 0.83184 0.83184 +0.85521 0.85521 0.85521 +0.87681 0.87681 0.87681 +0.89660 0.89660 0.89660 +0.91459 0.91459 0.91459 +0.93077 0.93077 0.93077 +0.54107 0.54107 0.54107 +0.57571 0.57571 0.57571 +0.60988 0.60988 0.60988 +0.64337 0.64337 0.64337 +0.67600 0.67600 0.67600 +0.70756 0.70756 0.70756 +0.73791 0.73791 0.73791 +0.76689 0.76689 0.76689 +0.79437 0.79437 0.79437 +0.82025 0.82025 0.82025 +0.84443 0.84443 0.84443 +0.86687 0.86687 0.86687 +0.88751 0.88751 0.88751 +0.90635 0.90635 0.90635 +0.92338 0.92338 0.92338 +0.93862 0.93862 0.93862 +0.95210 0.95210 0.95210 +0.59387 0.59387 0.59387 +0.62771 0.62771 0.62771 +0.66076 0.66076 0.66076 +0.69285 0.69285 0.69285 +0.72379 0.72379 0.72379 +0.75343 0.75343 0.75343 +0.78163 0.78163 0.78163 +0.80827 0.80827 0.80827 +0.83327 0.83327 0.83327 +0.85653 0.85653 0.85653 +0.87802 0.87802 0.87802 +0.89771 0.89771 0.89771 +0.91559 0.91559 0.91559 +0.93167 0.93167 0.93167 +0.94597 0.94597 0.94597 +0.95854 0.95854 0.95854 +0.96943 0.96943 0.96943 +0.64532 0.64532 0.64532 +0.67788 0.67788 0.67788 +0.70938 0.70938 0.70938 +0.73966 0.73966 0.73966 +0.76855 0.76855 0.76855 +0.79594 0.79594 0.79594 +0.82172 0.82172 0.82172 +0.84580 0.84580 0.84580 +0.86813 0.86813 0.86813 +0.88867 0.88867 0.88867 +0.90740 0.90740 0.90740 +0.92432 0.92432 0.92432 +0.93946 0.93946 0.93946 +0.95284 0.95284 0.95284 +0.96451 0.96451 0.96451 +0.97453 0.97453 0.97453 +0.98296 0.98296 0.98296 +0.02032 0.02032 0.02032 +0.02939 0.02939 0.02939 +0.04009 0.04009 0.04009 +0.05246 0.05246 0.05246 +0.06656 0.06656 0.06656 +0.08243 0.08243 0.08243 +0.10009 0.10009 0.10009 +0.11957 0.11957 0.11957 +0.14085 0.14085 0.14085 +0.16391 0.16391 0.16391 +0.18870 0.18870 0.18870 +0.21515 0.21515 0.21515 +0.24317 0.24317 0.24317 +0.27265 0.27265 0.27265 +0.30345 0.30345 0.30345 +0.33541 0.33541 0.33541 +0.36836 0.36836 0.36836 +0.03485 0.03485 0.03485 +0.04643 0.04643 0.04643 +0.05971 0.05971 0.05971 +0.07474 0.07474 0.07474 +0.09155 0.09155 0.09155 +0.11018 0.11018 0.11018 +0.13061 0.13061 0.13061 +0.15284 0.15284 0.15284 +0.17682 0.17682 0.17682 +0.20250 0.20250 0.20250 +0.22980 0.22980 0.22980 +0.25861 0.25861 0.25861 +0.28880 0.28880 0.28880 +0.32023 0.32023 0.32023 +0.35274 0.35274 0.35274 +0.38614 0.38614 0.38614 +0.42024 0.42024 0.42024 +0.05324 0.05324 0.05324 +0.06744 0.06744 0.06744 +0.08342 0.08342 0.08342 +0.10119 0.10119 0.10119 +0.12077 0.12077 0.12077 +0.14215 0.14215 0.14215 +0.16532 0.16532 0.16532 +0.19021 0.19021 0.19021 +0.21676 0.21676 0.21676 +0.24487 0.24487 0.24487 +0.27443 0.27443 0.27443 +0.30530 0.30530 0.30530 +0.33732 0.33732 0.33732 +0.37032 0.37032 0.37032 +0.40412 0.40412 0.40412 +0.43851 0.43851 0.43851 +0.47329 0.47329 0.47329 +0.07568 0.07568 0.07568 +0.09260 0.09260 0.09260 +0.11133 0.11133 0.11133 +0.13187 0.13187 0.13187 +0.15420 0.15420 0.15420 +0.17828 0.17828 0.17828 +0.20406 0.20406 0.20406 +0.23145 0.23145 0.23145 +0.26034 0.26034 0.26034 +0.29062 0.29062 0.29062 +0.32212 0.32212 0.32212 +0.35468 0.35468 0.35468 +0.38813 0.38813 0.38813 +0.42227 0.42227 0.42227 +0.45689 0.45689 0.45689 +0.49178 0.49178 0.49178 +0.52671 0.52671 0.52671 +0.10229 0.10229 0.10229 +0.12198 0.12198 0.12198 +0.14347 0.14347 0.14347 +0.16673 0.16673 0.16673 +0.19173 0.19173 0.19173 +0.21837 0.21837 0.21837 +0.24657 0.24657 0.24657 +0.27621 0.27621 0.27621 +0.30715 0.30715 0.30715 +0.33924 0.33924 0.33924 +0.37229 0.37229 0.37229 +0.40613 0.40613 0.40613 +0.44055 0.44055 0.44055 +0.47534 0.47534 0.47534 +0.51028 0.51028 0.51028 +0.54516 0.54516 0.54516 +0.57976 0.57976 0.57976 +0.13313 0.13313 0.13313 +0.15557 0.15557 0.15557 +0.17975 0.17975 0.17975 +0.20563 0.20563 0.20563 +0.23311 0.23311 0.23311 +0.26209 0.26209 0.26209 +0.29244 0.29244 0.29244 +0.32400 0.32400 0.32400 +0.35663 0.35663 0.35663 +0.39012 0.39012 0.39012 +0.42429 0.42429 0.42429 +0.45893 0.45893 0.45893 +0.49383 0.49383 0.49383 +0.52877 0.52877 0.52877 +0.56352 0.56352 0.56352 +0.59788 0.59788 0.59788 +0.63164 0.63164 0.63164 +0.16816 0.16816 0.16816 +0.19325 0.19325 0.19325 +0.21998 0.21998 0.21998 +0.24827 0.24827 0.24827 +0.27799 0.27799 0.27799 +0.30901 0.30901 0.30901 +0.34116 0.34116 0.34116 +0.37426 0.37426 0.37426 +0.40814 0.40814 0.40814 +0.44259 0.44259 0.44259 +0.47739 0.47739 0.47739 +0.51234 0.51234 0.51234 +0.54720 0.54720 0.54720 +0.58178 0.58178 0.58178 +0.61584 0.61584 0.61584 +0.64920 0.64920 0.64920 +0.68165 0.68165 0.68165 +0.20720 0.20720 0.20720 +0.23477 0.23477 0.23477 +0.26384 0.26384 0.26384 +0.29426 0.29426 0.29426 +0.32590 0.32590 0.32590 +0.35858 0.35858 0.35858 +0.39212 0.39212 0.39212 +0.42632 0.42632 0.42632 +0.46098 0.46098 0.46098 +0.49589 0.49589 0.49589 +0.53082 0.53082 0.53082 +0.56556 0.56556 0.56556 +0.59989 0.59989 0.59989 +0.63360 0.63360 0.63360 +0.66650 0.66650 0.66650 +0.69840 0.69840 0.69840 +0.72912 0.72912 0.72912 +0.24998 0.24998 0.24998 +0.27978 0.27978 0.27978 +0.31087 0.31087 0.31087 +0.34308 0.34308 0.34308 +0.37624 0.37624 0.37624 +0.41015 0.41015 0.41015 +0.44463 0.44463 0.44463 +0.47944 0.47944 0.47944 +0.51439 0.51439 0.51439 +0.54925 0.54925 0.54925 +0.58380 0.58380 0.58380 +0.61783 0.61783 0.61783 +0.65113 0.65113 0.65113 +0.68352 0.68352 0.68352 +0.71482 0.71482 0.71482 +0.74486 0.74486 0.74486 +0.77349 0.77349 0.77349 +0.29609 0.29609 0.29609 +0.32779 0.32779 0.32779 +0.36053 0.36053 0.36053 +0.39411 0.39411 0.39411 +0.42835 0.42835 0.42835 +0.46303 0.46303 0.46303 +0.49794 0.49794 0.49794 +0.53287 0.53287 0.53287 +0.56759 0.56759 0.56759 +0.60189 0.60189 0.60189 +0.63556 0.63556 0.63556 +0.66841 0.66841 0.66841 +0.70024 0.70024 0.70024 +0.73089 0.73089 0.73089 +0.76020 0.76020 0.76020 +0.78804 0.78804 0.78804 +0.81431 0.81431 0.81431 +0.34500 0.34500 0.34500 +0.37821 0.37821 0.37821 +0.41217 0.41217 0.41217 +0.44667 0.44667 0.44667 +0.48150 0.48150 0.48150 +0.51645 0.51645 0.51645 +0.55129 0.55129 0.55129 +0.58582 0.58582 0.58582 +0.61981 0.61981 0.61981 +0.65307 0.65307 0.65307 +0.68540 0.68540 0.68540 +0.71662 0.71662 0.71662 +0.74658 0.74658 0.74658 +0.77513 0.77513 0.77513 +0.80215 0.80215 0.80215 +0.82754 0.82754 0.82754 +0.85122 0.85122 0.85122 +0.39611 0.39611 0.39611 +0.43038 0.43038 0.43038 +0.46508 0.46508 0.46508 +0.50000 0.50000 0.50000 +0.53492 0.53492 0.53492 +0.56962 0.56962 0.56962 +0.60389 0.60389 0.60389 +0.63752 0.63752 0.63752 +0.67031 0.67031 0.67031 +0.70208 0.70208 0.70208 +0.73265 0.73265 0.73265 +0.76188 0.76188 0.76188 +0.78963 0.78963 0.78963 +0.81580 0.81580 0.81580 +0.84029 0.84029 0.84029 +0.86304 0.86304 0.86304 +0.88400 0.88400 0.88400 +0.44871 0.44871 0.44871 +0.48355 0.48355 0.48355 +0.51850 0.51850 0.51850 +0.55333 0.55333 0.55333 +0.58783 0.58783 0.58783 +0.62179 0.62179 0.62179 +0.65500 0.65500 0.65500 +0.68727 0.68727 0.68727 +0.71842 0.71842 0.71842 +0.74830 0.74830 0.74830 +0.77677 0.77677 0.77677 +0.80369 0.80369 0.80369 +0.82898 0.82898 0.82898 +0.85255 0.85255 0.85255 +0.87436 0.87436 0.87436 +0.89437 0.89437 0.89437 +0.91257 0.91257 0.91257 +0.50206 0.50206 0.50206 +0.53697 0.53697 0.53697 +0.57165 0.57165 0.57165 +0.60589 0.60589 0.60589 +0.63947 0.63947 0.63947 +0.67221 0.67221 0.67221 +0.70391 0.70391 0.70391 +0.73441 0.73441 0.73441 +0.76356 0.76356 0.76356 +0.79122 0.79122 0.79122 +0.81729 0.81729 0.81729 +0.84168 0.84168 0.84168 +0.86432 0.86432 0.86432 +0.88518 0.88518 0.88518 +0.90423 0.90423 0.90423 +0.92147 0.92147 0.92147 +0.93692 0.93692 0.93692 +0.55537 0.55537 0.55537 +0.58985 0.58985 0.58985 +0.62376 0.62376 0.62376 +0.65692 0.65692 0.65692 +0.68913 0.68913 0.68913 +0.72022 0.72022 0.72022 +0.75002 0.75002 0.75002 +0.77839 0.77839 0.77839 +0.80522 0.80522 0.80522 +0.83041 0.83041 0.83041 +0.85389 0.85389 0.85389 +0.87559 0.87559 0.87559 +0.89549 0.89549 0.89549 +0.91358 0.91358 0.91358 +0.92987 0.92987 0.92987 +0.94438 0.94438 0.94438 +0.95715 0.95715 0.95715 +0.60788 0.60788 0.60788 +0.64142 0.64142 0.64142 +0.67410 0.67410 0.67410 +0.70574 0.70574 0.70574 +0.73616 0.73616 0.73616 +0.76523 0.76523 0.76523 +0.79280 0.79280 0.79280 +0.81877 0.81877 0.81877 +0.84306 0.84306 0.84306 +0.86560 0.86560 0.86560 +0.88635 0.88635 0.88635 +0.90529 0.90529 0.90529 +0.92243 0.92243 0.92243 +0.93777 0.93777 0.93777 +0.95136 0.95136 0.95136 +0.96323 0.96323 0.96323 +0.97344 0.97344 0.97344 +0.65884 0.65884 0.65884 +0.69099 0.69099 0.69099 +0.72201 0.72201 0.72201 +0.75173 0.75173 0.75173 +0.78002 0.78002 0.78002 +0.80675 0.80675 0.80675 +0.83184 0.83184 0.83184 +0.85521 0.85521 0.85521 +0.87681 0.87681 0.87681 +0.89660 0.89660 0.89660 +0.91459 0.91459 0.91459 +0.93077 0.93077 0.93077 +0.94518 0.94518 0.94518 +0.95785 0.95785 0.95785 +0.96884 0.96884 0.96884 +0.97819 0.97819 0.97819 +0.98597 0.98597 0.98597 +0.02386 0.02386 0.02386 +0.03360 0.03360 0.03360 +0.04498 0.04498 0.04498 +0.05805 0.05805 0.05805 +0.07288 0.07288 0.07288 +0.08948 0.08948 0.08948 +0.10789 0.10789 0.10789 +0.12811 0.12811 0.12811 +0.15013 0.15013 0.15013 +0.17391 0.17391 0.17391 +0.19939 0.19939 0.19939 +0.22651 0.22651 0.22651 +0.25514 0.25514 0.25514 +0.28518 0.28518 0.28518 +0.31648 0.31648 0.31648 +0.34887 0.34887 0.34887 +0.38217 0.38217 0.38217 +0.03941 0.03941 0.03941 +0.05169 0.05169 0.05169 +0.06568 0.06568 0.06568 +0.08144 0.08144 0.08144 +0.09900 0.09900 0.09900 +0.11837 0.11837 0.11837 +0.13955 0.13955 0.13955 +0.16250 0.16250 0.16250 +0.18719 0.18719 0.18719 +0.21355 0.21355 0.21355 +0.24148 0.24148 0.24148 +0.27088 0.27088 0.27088 +0.30160 0.30160 0.30160 +0.33350 0.33350 0.33350 +0.36640 0.36640 0.36640 +0.40011 0.40011 0.40011 +0.43444 0.43444 0.43444 +0.05888 0.05888 0.05888 +0.07380 0.07380 0.07380 +0.09051 0.09051 0.09051 +0.10903 0.10903 0.10903 +0.12936 0.12936 0.12936 +0.15148 0.15148 0.15148 +0.17536 0.17536 0.17536 +0.20094 0.20094 0.20094 +0.22815 0.22815 0.22815 +0.25687 0.25687 0.25687 +0.28699 0.28699 0.28699 +0.31835 0.31835 0.31835 +0.35080 0.35080 0.35080 +0.38416 0.38416 0.38416 +0.41822 0.41822 0.41822 +0.45280 0.45280 0.45280 +0.48766 0.48766 0.48766 +0.08243 0.08243 0.08243 +0.10009 0.10009 0.10009 +0.11957 0.11957 0.11957 +0.14085 0.14085 0.14085 +0.16391 0.16391 0.16391 +0.18870 0.18870 0.18870 +0.21515 0.21515 0.21515 +0.24317 0.24317 0.24317 +0.27265 0.27265 0.27265 +0.30345 0.30345 0.30345 +0.33541 0.33541 0.33541 +0.36836 0.36836 0.36836 +0.40212 0.40212 0.40212 +0.43648 0.43648 0.43648 +0.47123 0.47123 0.47123 +0.50617 0.50617 0.50617 +0.54107 0.54107 0.54107 +0.11018 0.11018 0.11018 +0.13061 0.13061 0.13061 +0.15284 0.15284 0.15284 +0.17682 0.17682 0.17682 +0.20250 0.20250 0.20250 +0.22980 0.22980 0.22980 +0.25861 0.25861 0.25861 +0.28880 0.28880 0.28880 +0.32023 0.32023 0.32023 +0.35274 0.35274 0.35274 +0.38614 0.38614 0.38614 +0.42024 0.42024 0.42024 +0.45484 0.45484 0.45484 +0.48972 0.48972 0.48972 +0.52466 0.52466 0.52466 +0.55945 0.55945 0.55945 +0.59387 0.59387 0.59387 +0.14215 0.14215 0.14215 +0.16532 0.16532 0.16532 +0.19021 0.19021 0.19021 +0.21676 0.21676 0.21676 +0.24487 0.24487 0.24487 +0.27443 0.27443 0.27443 +0.30530 0.30530 0.30530 +0.33732 0.33732 0.33732 +0.37032 0.37032 0.37032 +0.40412 0.40412 0.40412 +0.43851 0.43851 0.43851 +0.47329 0.47329 0.47329 +0.50822 0.50822 0.50822 +0.54311 0.54311 0.54311 +0.57773 0.57773 0.57773 +0.61187 0.61187 0.61187 +0.64532 0.64532 0.64532 +0.17828 0.17828 0.17828 +0.20406 0.20406 0.20406 +0.23145 0.23145 0.23145 +0.26034 0.26034 0.26034 +0.29062 0.29062 0.29062 +0.32212 0.32212 0.32212 +0.35468 0.35468 0.35468 +0.38813 0.38813 0.38813 +0.42227 0.42227 0.42227 +0.45689 0.45689 0.45689 +0.49178 0.49178 0.49178 +0.52671 0.52671 0.52671 +0.56149 0.56149 0.56149 +0.59588 0.59588 0.59588 +0.62968 0.62968 0.62968 +0.66268 0.66268 0.66268 +0.69470 0.69470 0.69470 +0.21837 0.21837 0.21837 +0.24657 0.24657 0.24657 +0.27621 0.27621 0.27621 +0.30715 0.30715 0.30715 +0.33924 0.33924 0.33924 +0.37229 0.37229 0.37229 +0.40613 0.40613 0.40613 +0.44055 0.44055 0.44055 +0.47534 0.47534 0.47534 +0.51028 0.51028 0.51028 +0.54516 0.54516 0.54516 +0.57976 0.57976 0.57976 +0.61386 0.61386 0.61386 +0.64726 0.64726 0.64726 +0.67977 0.67977 0.67977 +0.71120 0.71120 0.71120 +0.74139 0.74139 0.74139 +0.26209 0.26209 0.26209 +0.29244 0.29244 0.29244 +0.32400 0.32400 0.32400 +0.35663 0.35663 0.35663 +0.39012 0.39012 0.39012 +0.42429 0.42429 0.42429 +0.45893 0.45893 0.45893 +0.49383 0.49383 0.49383 +0.52877 0.52877 0.52877 +0.56352 0.56352 0.56352 +0.59788 0.59788 0.59788 +0.63164 0.63164 0.63164 +0.66459 0.66459 0.66459 +0.69655 0.69655 0.69655 +0.72735 0.72735 0.72735 +0.75683 0.75683 0.75683 +0.78485 0.78485 0.78485 +0.30901 0.30901 0.30901 +0.34116 0.34116 0.34116 +0.37426 0.37426 0.37426 +0.40814 0.40814 0.40814 +0.44259 0.44259 0.44259 +0.47739 0.47739 0.47739 +0.51234 0.51234 0.51234 +0.54720 0.54720 0.54720 +0.58178 0.58178 0.58178 +0.61584 0.61584 0.61584 +0.64920 0.64920 0.64920 +0.68165 0.68165 0.68165 +0.71301 0.71301 0.71301 +0.74313 0.74313 0.74313 +0.77185 0.77185 0.77185 +0.79906 0.79906 0.79906 +0.82464 0.82464 0.82464 +0.35858 0.35858 0.35858 +0.39212 0.39212 0.39212 +0.42632 0.42632 0.42632 +0.46098 0.46098 0.46098 +0.49589 0.49589 0.49589 +0.53082 0.53082 0.53082 +0.56556 0.56556 0.56556 +0.59989 0.59989 0.59989 +0.63360 0.63360 0.63360 +0.66650 0.66650 0.66650 +0.69840 0.69840 0.69840 +0.72912 0.72912 0.72912 +0.75852 0.75852 0.75852 +0.78645 0.78645 0.78645 +0.81281 0.81281 0.81281 +0.83750 0.83750 0.83750 +0.86045 0.86045 0.86045 +0.41015 0.41015 0.41015 +0.44463 0.44463 0.44463 +0.47944 0.47944 0.47944 +0.51439 0.51439 0.51439 +0.54925 0.54925 0.54925 +0.58380 0.58380 0.58380 +0.61783 0.61783 0.61783 +0.65113 0.65113 0.65113 +0.68352 0.68352 0.68352 +0.71482 0.71482 0.71482 +0.74486 0.74486 0.74486 +0.77349 0.77349 0.77349 +0.80061 0.80061 0.80061 +0.82609 0.82609 0.82609 +0.84987 0.84987 0.84987 +0.87189 0.87189 0.87189 +0.89211 0.89211 0.89211 +0.46303 0.46303 0.46303 +0.49794 0.49794 0.49794 +0.53287 0.53287 0.53287 +0.56759 0.56759 0.56759 +0.60189 0.60189 0.60189 +0.63556 0.63556 0.63556 +0.66841 0.66841 0.66841 +0.70024 0.70024 0.70024 +0.73089 0.73089 0.73089 +0.76020 0.76020 0.76020 +0.78804 0.78804 0.78804 +0.81431 0.81431 0.81431 +0.83890 0.83890 0.83890 +0.86175 0.86175 0.86175 +0.88282 0.88282 0.88282 +0.90208 0.90208 0.90208 +0.91953 0.91953 0.91953 +0.51645 0.51645 0.51645 +0.55129 0.55129 0.55129 +0.58582 0.58582 0.58582 +0.61981 0.61981 0.61981 +0.65307 0.65307 0.65307 +0.68540 0.68540 0.68540 +0.71662 0.71662 0.71662 +0.74658 0.74658 0.74658 +0.77513 0.77513 0.77513 +0.80215 0.80215 0.80215 +0.82754 0.82754 0.82754 +0.85122 0.85122 0.85122 +0.87313 0.87313 0.87313 +0.89324 0.89324 0.89324 +0.91155 0.91155 0.91155 +0.92804 0.92804 0.92804 +0.94276 0.94276 0.94276 +0.56962 0.56962 0.56962 +0.60389 0.60389 0.60389 +0.63752 0.63752 0.63752 +0.67031 0.67031 0.67031 +0.70208 0.70208 0.70208 +0.73265 0.73265 0.73265 +0.76188 0.76188 0.76188 +0.78963 0.78963 0.78963 +0.81580 0.81580 0.81580 +0.84029 0.84029 0.84029 +0.86304 0.86304 0.86304 +0.88400 0.88400 0.88400 +0.90316 0.90316 0.90316 +0.92050 0.92050 0.92050 +0.93606 0.93606 0.93606 +0.94985 0.94985 0.94985 +0.96192 0.96192 0.96192 +0.62179 0.62179 0.62179 +0.65500 0.65500 0.65500 +0.68727 0.68727 0.68727 +0.71842 0.71842 0.71842 +0.74830 0.74830 0.74830 +0.77677 0.77677 0.77677 +0.80369 0.80369 0.80369 +0.82898 0.82898 0.82898 +0.85255 0.85255 0.85255 +0.87436 0.87436 0.87436 +0.89437 0.89437 0.89437 +0.91257 0.91257 0.91257 +0.92896 0.92896 0.92896 +0.94357 0.94357 0.94357 +0.95645 0.95645 0.95645 +0.96763 0.96763 0.96763 +0.97718 0.97718 0.97718 +0.67221 0.67221 0.67221 +0.70391 0.70391 0.70391 +0.73441 0.73441 0.73441 +0.76356 0.76356 0.76356 +0.79122 0.79122 0.79122 +0.81729 0.81729 0.81729 +0.84168 0.84168 0.84168 +0.86432 0.86432 0.86432 +0.88518 0.88518 0.88518 +0.90423 0.90423 0.90423 +0.92147 0.92147 0.92147 +0.93692 0.93692 0.93692 +0.95060 0.95060 0.95060 +0.96258 0.96258 0.96258 +0.97288 0.97288 0.97288 +0.98158 0.98158 0.98158 +0.98873 0.98873 0.98873 +0.02768 0.02768 0.02768 +0.03808 0.03808 0.03808 +0.05015 0.05015 0.05015 +0.06394 0.06394 0.06394 +0.07950 0.07950 0.07950 +0.09684 0.09684 0.09684 +0.11600 0.11600 0.11600 +0.13696 0.13696 0.13696 +0.15971 0.15971 0.15971 +0.18420 0.18420 0.18420 +0.21037 0.21037 0.21037 +0.23812 0.23812 0.23812 +0.26735 0.26735 0.26735 +0.29792 0.29792 0.29792 +0.32969 0.32969 0.32969 +0.36248 0.36248 0.36248 +0.39611 0.39611 0.39611 +0.04426 0.04426 0.04426 +0.05724 0.05724 0.05724 +0.07196 0.07196 0.07196 +0.08845 0.08845 0.08845 +0.10676 0.10676 0.10676 +0.12687 0.12687 0.12687 +0.14878 0.14878 0.14878 +0.17246 0.17246 0.17246 +0.19785 0.19785 0.19785 +0.22487 0.22487 0.22487 +0.25342 0.25342 0.25342 +0.28338 0.28338 0.28338 +0.31460 0.31460 0.31460 +0.34693 0.34693 0.34693 +0.38019 0.38019 0.38019 +0.41418 0.41418 0.41418 +0.44871 0.44871 0.44871 +0.06481 0.06481 0.06481 +0.08047 0.08047 0.08047 +0.09792 0.09792 0.09792 +0.11718 0.11718 0.11718 +0.13825 0.13825 0.13825 +0.16110 0.16110 0.16110 +0.18569 0.18569 0.18569 +0.21196 0.21196 0.21196 +0.23980 0.23980 0.23980 +0.26911 0.26911 0.26911 +0.29976 0.29976 0.29976 +0.33159 0.33159 0.33159 +0.36444 0.36444 0.36444 +0.39811 0.39811 0.39811 +0.43241 0.43241 0.43241 +0.46713 0.46713 0.46713 +0.50206 0.50206 0.50206 +0.08948 0.08948 0.08948 +0.10789 0.10789 0.10789 +0.12811 0.12811 0.12811 +0.15013 0.15013 0.15013 +0.17391 0.17391 0.17391 +0.19939 0.19939 0.19939 +0.22651 0.22651 0.22651 +0.25514 0.25514 0.25514 +0.28518 0.28518 0.28518 +0.31648 0.31648 0.31648 +0.34887 0.34887 0.34887 +0.38217 0.38217 0.38217 +0.41620 0.41620 0.41620 +0.45075 0.45075 0.45075 +0.48561 0.48561 0.48561 +0.52056 0.52056 0.52056 +0.55537 0.55537 0.55537 +0.11837 0.11837 0.11837 +0.13955 0.13955 0.13955 +0.16250 0.16250 0.16250 +0.18719 0.18719 0.18719 +0.21355 0.21355 0.21355 +0.24148 0.24148 0.24148 +0.27088 0.27088 0.27088 +0.30160 0.30160 0.30160 +0.33350 0.33350 0.33350 +0.36640 0.36640 0.36640 +0.40011 0.40011 0.40011 +0.43444 0.43444 0.43444 +0.46918 0.46918 0.46918 +0.50411 0.50411 0.50411 +0.53902 0.53902 0.53902 +0.57368 0.57368 0.57368 +0.60788 0.60788 0.60788 +0.15148 0.15148 0.15148 +0.17536 0.17536 0.17536 +0.20094 0.20094 0.20094 +0.22815 0.22815 0.22815 +0.25687 0.25687 0.25687 +0.28699 0.28699 0.28699 +0.31835 0.31835 0.31835 +0.35080 0.35080 0.35080 +0.38416 0.38416 0.38416 +0.41822 0.41822 0.41822 +0.45280 0.45280 0.45280 +0.48766 0.48766 0.48766 +0.52261 0.52261 0.52261 +0.55741 0.55741 0.55741 +0.59186 0.59186 0.59186 +0.62574 0.62574 0.62574 +0.65884 0.65884 0.65884 +0.18870 0.18870 0.18870 +0.21515 0.21515 0.21515 +0.24317 0.24317 0.24317 +0.27265 0.27265 0.27265 +0.30345 0.30345 0.30345 +0.33541 0.33541 0.33541 +0.36836 0.36836 0.36836 +0.40212 0.40212 0.40212 +0.43648 0.43648 0.43648 +0.47123 0.47123 0.47123 +0.50617 0.50617 0.50617 +0.54107 0.54107 0.54107 +0.57571 0.57571 0.57571 +0.60988 0.60988 0.60988 +0.64337 0.64337 0.64337 +0.67600 0.67600 0.67600 +0.70756 0.70756 0.70756 +0.22980 0.22980 0.22980 +0.25861 0.25861 0.25861 +0.28880 0.28880 0.28880 +0.32023 0.32023 0.32023 +0.35274 0.35274 0.35274 +0.38614 0.38614 0.38614 +0.42024 0.42024 0.42024 +0.45484 0.45484 0.45484 +0.48972 0.48972 0.48972 +0.52466 0.52466 0.52466 +0.55945 0.55945 0.55945 +0.59387 0.59387 0.59387 +0.62771 0.62771 0.62771 +0.66076 0.66076 0.66076 +0.69285 0.69285 0.69285 +0.72379 0.72379 0.72379 +0.75343 0.75343 0.75343 +0.27443 0.27443 0.27443 +0.30530 0.30530 0.30530 +0.33732 0.33732 0.33732 +0.37032 0.37032 0.37032 +0.40412 0.40412 0.40412 +0.43851 0.43851 0.43851 +0.47329 0.47329 0.47329 +0.50822 0.50822 0.50822 +0.54311 0.54311 0.54311 +0.57773 0.57773 0.57773 +0.61187 0.61187 0.61187 +0.64532 0.64532 0.64532 +0.67788 0.67788 0.67788 +0.70938 0.70938 0.70938 +0.73966 0.73966 0.73966 +0.76855 0.76855 0.76855 +0.79594 0.79594 0.79594 +0.32212 0.32212 0.32212 +0.35468 0.35468 0.35468 +0.38813 0.38813 0.38813 +0.42227 0.42227 0.42227 +0.45689 0.45689 0.45689 +0.49178 0.49178 0.49178 +0.52671 0.52671 0.52671 +0.56149 0.56149 0.56149 +0.59588 0.59588 0.59588 +0.62968 0.62968 0.62968 +0.66268 0.66268 0.66268 +0.69470 0.69470 0.69470 +0.72557 0.72557 0.72557 +0.75513 0.75513 0.75513 +0.78324 0.78324 0.78324 +0.80979 0.80979 0.80979 +0.83468 0.83468 0.83468 +0.37229 0.37229 0.37229 +0.40613 0.40613 0.40613 +0.44055 0.44055 0.44055 +0.47534 0.47534 0.47534 +0.51028 0.51028 0.51028 +0.54516 0.54516 0.54516 +0.57976 0.57976 0.57976 +0.61386 0.61386 0.61386 +0.64726 0.64726 0.64726 +0.67977 0.67977 0.67977 +0.71120 0.71120 0.71120 +0.74139 0.74139 0.74139 +0.77020 0.77020 0.77020 +0.79750 0.79750 0.79750 +0.82318 0.82318 0.82318 +0.84716 0.84716 0.84716 +0.86939 0.86939 0.86939 +0.42429 0.42429 0.42429 +0.45893 0.45893 0.45893 +0.49383 0.49383 0.49383 +0.52877 0.52877 0.52877 +0.56352 0.56352 0.56352 +0.59788 0.59788 0.59788 +0.63164 0.63164 0.63164 +0.66459 0.66459 0.66459 +0.69655 0.69655 0.69655 +0.72735 0.72735 0.72735 +0.75683 0.75683 0.75683 +0.78485 0.78485 0.78485 +0.81130 0.81130 0.81130 +0.83609 0.83609 0.83609 +0.85915 0.85915 0.85915 +0.88043 0.88043 0.88043 +0.89991 0.89991 0.89991 +0.47739 0.47739 0.47739 +0.51234 0.51234 0.51234 +0.54720 0.54720 0.54720 +0.58178 0.58178 0.58178 +0.61584 0.61584 0.61584 +0.64920 0.64920 0.64920 +0.68165 0.68165 0.68165 +0.71301 0.71301 0.71301 +0.74313 0.74313 0.74313 +0.77185 0.77185 0.77185 +0.79906 0.79906 0.79906 +0.82464 0.82464 0.82464 +0.84852 0.84852 0.84852 +0.87064 0.87064 0.87064 +0.89097 0.89097 0.89097 +0.90949 0.90949 0.90949 +0.92620 0.92620 0.92620 +0.53082 0.53082 0.53082 +0.56556 0.56556 0.56556 +0.59989 0.59989 0.59989 +0.63360 0.63360 0.63360 +0.66650 0.66650 0.66650 +0.69840 0.69840 0.69840 +0.72912 0.72912 0.72912 +0.75852 0.75852 0.75852 +0.78645 0.78645 0.78645 +0.81281 0.81281 0.81281 +0.83750 0.83750 0.83750 +0.86045 0.86045 0.86045 +0.88163 0.88163 0.88163 +0.90100 0.90100 0.90100 +0.91856 0.91856 0.91856 +0.93432 0.93432 0.93432 +0.94831 0.94831 0.94831 +0.58380 0.58380 0.58380 +0.61783 0.61783 0.61783 +0.65113 0.65113 0.65113 +0.68352 0.68352 0.68352 +0.71482 0.71482 0.71482 +0.74486 0.74486 0.74486 +0.77349 0.77349 0.77349 +0.80061 0.80061 0.80061 +0.82609 0.82609 0.82609 +0.84987 0.84987 0.84987 +0.87189 0.87189 0.87189 +0.89211 0.89211 0.89211 +0.91052 0.91052 0.91052 +0.92712 0.92712 0.92712 +0.94195 0.94195 0.94195 +0.95502 0.95502 0.95502 +0.96640 0.96640 0.96640 +0.63556 0.63556 0.63556 +0.66841 0.66841 0.66841 +0.70024 0.70024 0.70024 +0.73089 0.73089 0.73089 +0.76020 0.76020 0.76020 +0.78804 0.78804 0.78804 +0.81431 0.81431 0.81431 +0.83890 0.83890 0.83890 +0.86175 0.86175 0.86175 +0.88282 0.88282 0.88282 +0.90208 0.90208 0.90208 +0.91953 0.91953 0.91953 +0.93519 0.93519 0.93519 +0.94908 0.94908 0.94908 +0.96126 0.96126 0.96126 +0.97176 0.97176 0.97176 +0.98064 0.98064 0.98064 +0.68540 0.68540 0.68540 +0.71662 0.71662 0.71662 +0.74658 0.74658 0.74658 +0.77513 0.77513 0.77513 +0.80215 0.80215 0.80215 +0.82754 0.82754 0.82754 +0.85122 0.85122 0.85122 +0.87313 0.87313 0.87313 +0.89324 0.89324 0.89324 +0.91155 0.91155 0.91155 +0.92804 0.92804 0.92804 +0.94276 0.94276 0.94276 +0.95574 0.95574 0.95574 +0.96702 0.96702 0.96702 +0.97666 0.97666 0.97666 +0.98471 0.98471 0.98471 +0.99123 0.99123 0.99123 +0.03176 0.03176 0.03176 +0.04285 0.04285 0.04285 +0.05562 0.05562 0.05562 +0.07013 0.07013 0.07013 +0.08642 0.08642 0.08642 +0.10451 0.10451 0.10451 +0.12441 0.12441 0.12441 +0.14611 0.14611 0.14611 +0.16959 0.16959 0.16959 +0.19478 0.19478 0.19478 +0.22161 0.22161 0.22161 +0.24998 0.24998 0.24998 +0.27978 0.27978 0.27978 +0.31087 0.31087 0.31087 +0.34308 0.34308 0.34308 +0.37624 0.37624 0.37624 +0.41015 0.41015 0.41015 +0.04940 0.04940 0.04940 +0.06308 0.06308 0.06308 +0.07853 0.07853 0.07853 +0.09577 0.09577 0.09577 +0.11482 0.11482 0.11482 +0.13568 0.13568 0.13568 +0.15832 0.15832 0.15832 +0.18271 0.18271 0.18271 +0.20878 0.20878 0.20878 +0.23644 0.23644 0.23644 +0.26559 0.26559 0.26559 +0.29609 0.29609 0.29609 +0.32779 0.32779 0.32779 +0.36053 0.36053 0.36053 +0.39411 0.39411 0.39411 +0.42835 0.42835 0.42835 +0.46303 0.46303 0.46303 +0.07104 0.07104 0.07104 +0.08743 0.08743 0.08743 +0.10563 0.10563 0.10563 +0.12564 0.12564 0.12564 +0.14745 0.14745 0.14745 +0.17102 0.17102 0.17102 +0.19631 0.19631 0.19631 +0.22323 0.22323 0.22323 +0.25170 0.25170 0.25170 +0.28158 0.28158 0.28158 +0.31273 0.31273 0.31273 +0.34500 0.34500 0.34500 +0.37821 0.37821 0.37821 +0.41217 0.41217 0.41217 +0.44667 0.44667 0.44667 +0.48150 0.48150 0.48150 +0.51645 0.51645 0.51645 +0.09684 0.09684 0.09684 +0.11600 0.11600 0.11600 +0.13696 0.13696 0.13696 +0.15971 0.15971 0.15971 +0.18420 0.18420 0.18420 +0.21037 0.21037 0.21037 +0.23812 0.23812 0.23812 +0.26735 0.26735 0.26735 +0.29792 0.29792 0.29792 +0.32969 0.32969 0.32969 +0.36248 0.36248 0.36248 +0.39611 0.39611 0.39611 +0.43038 0.43038 0.43038 +0.46508 0.46508 0.46508 +0.50000 0.50000 0.50000 +0.53492 0.53492 0.53492 +0.56962 0.56962 0.56962 +0.12687 0.12687 0.12687 +0.14878 0.14878 0.14878 +0.17246 0.17246 0.17246 +0.19785 0.19785 0.19785 +0.22487 0.22487 0.22487 +0.25342 0.25342 0.25342 +0.28338 0.28338 0.28338 +0.31460 0.31460 0.31460 +0.34693 0.34693 0.34693 +0.38019 0.38019 0.38019 +0.41418 0.41418 0.41418 +0.44871 0.44871 0.44871 +0.48355 0.48355 0.48355 +0.51850 0.51850 0.51850 +0.55333 0.55333 0.55333 +0.58783 0.58783 0.58783 +0.62179 0.62179 0.62179 +0.16110 0.16110 0.16110 +0.18569 0.18569 0.18569 +0.21196 0.21196 0.21196 +0.23980 0.23980 0.23980 +0.26911 0.26911 0.26911 +0.29976 0.29976 0.29976 +0.33159 0.33159 0.33159 +0.36444 0.36444 0.36444 +0.39811 0.39811 0.39811 +0.43241 0.43241 0.43241 +0.46713 0.46713 0.46713 +0.50206 0.50206 0.50206 +0.53697 0.53697 0.53697 +0.57165 0.57165 0.57165 +0.60589 0.60589 0.60589 +0.63947 0.63947 0.63947 +0.67221 0.67221 0.67221 +0.19939 0.19939 0.19939 +0.22651 0.22651 0.22651 +0.25514 0.25514 0.25514 +0.28518 0.28518 0.28518 +0.31648 0.31648 0.31648 +0.34887 0.34887 0.34887 +0.38217 0.38217 0.38217 +0.41620 0.41620 0.41620 +0.45075 0.45075 0.45075 +0.48561 0.48561 0.48561 +0.52056 0.52056 0.52056 +0.55537 0.55537 0.55537 +0.58985 0.58985 0.58985 +0.62376 0.62376 0.62376 +0.65692 0.65692 0.65692 +0.68913 0.68913 0.68913 +0.72022 0.72022 0.72022 +0.24148 0.24148 0.24148 +0.27088 0.27088 0.27088 +0.30160 0.30160 0.30160 +0.33350 0.33350 0.33350 +0.36640 0.36640 0.36640 +0.40011 0.40011 0.40011 +0.43444 0.43444 0.43444 +0.46918 0.46918 0.46918 +0.50411 0.50411 0.50411 +0.53902 0.53902 0.53902 +0.57368 0.57368 0.57368 +0.60788 0.60788 0.60788 +0.64142 0.64142 0.64142 +0.67410 0.67410 0.67410 +0.70574 0.70574 0.70574 +0.73616 0.73616 0.73616 +0.76523 0.76523 0.76523 +0.28699 0.28699 0.28699 +0.31835 0.31835 0.31835 +0.35080 0.35080 0.35080 +0.38416 0.38416 0.38416 +0.41822 0.41822 0.41822 +0.45280 0.45280 0.45280 +0.48766 0.48766 0.48766 +0.52261 0.52261 0.52261 +0.55741 0.55741 0.55741 +0.59186 0.59186 0.59186 +0.62574 0.62574 0.62574 +0.65884 0.65884 0.65884 +0.69099 0.69099 0.69099 +0.72201 0.72201 0.72201 +0.75173 0.75173 0.75173 +0.78002 0.78002 0.78002 +0.80675 0.80675 0.80675 +0.33541 0.33541 0.33541 +0.36836 0.36836 0.36836 +0.40212 0.40212 0.40212 +0.43648 0.43648 0.43648 +0.47123 0.47123 0.47123 +0.50617 0.50617 0.50617 +0.54107 0.54107 0.54107 +0.57571 0.57571 0.57571 +0.60988 0.60988 0.60988 +0.64337 0.64337 0.64337 +0.67600 0.67600 0.67600 +0.70756 0.70756 0.70756 +0.73791 0.73791 0.73791 +0.76689 0.76689 0.76689 +0.79437 0.79437 0.79437 +0.82025 0.82025 0.82025 +0.84443 0.84443 0.84443 +0.38614 0.38614 0.38614 +0.42024 0.42024 0.42024 +0.45484 0.45484 0.45484 +0.48972 0.48972 0.48972 +0.52466 0.52466 0.52466 +0.55945 0.55945 0.55945 +0.59387 0.59387 0.59387 +0.62771 0.62771 0.62771 +0.66076 0.66076 0.66076 +0.69285 0.69285 0.69285 +0.72379 0.72379 0.72379 +0.75343 0.75343 0.75343 +0.78163 0.78163 0.78163 +0.80827 0.80827 0.80827 +0.83327 0.83327 0.83327 +0.85653 0.85653 0.85653 +0.87802 0.87802 0.87802 +0.43851 0.43851 0.43851 +0.47329 0.47329 0.47329 +0.50822 0.50822 0.50822 +0.54311 0.54311 0.54311 +0.57773 0.57773 0.57773 +0.61187 0.61187 0.61187 +0.64532 0.64532 0.64532 +0.67788 0.67788 0.67788 +0.70938 0.70938 0.70938 +0.73966 0.73966 0.73966 +0.76855 0.76855 0.76855 +0.79594 0.79594 0.79594 +0.82172 0.82172 0.82172 +0.84580 0.84580 0.84580 +0.86813 0.86813 0.86813 +0.88867 0.88867 0.88867 +0.90740 0.90740 0.90740 +0.49178 0.49178 0.49178 +0.52671 0.52671 0.52671 +0.56149 0.56149 0.56149 +0.59588 0.59588 0.59588 +0.62968 0.62968 0.62968 +0.66268 0.66268 0.66268 +0.69470 0.69470 0.69470 +0.72557 0.72557 0.72557 +0.75513 0.75513 0.75513 +0.78324 0.78324 0.78324 +0.80979 0.80979 0.80979 +0.83468 0.83468 0.83468 +0.85785 0.85785 0.85785 +0.87923 0.87923 0.87923 +0.89881 0.89881 0.89881 +0.91658 0.91658 0.91658 +0.93256 0.93256 0.93256 +0.54516 0.54516 0.54516 +0.57976 0.57976 0.57976 +0.61386 0.61386 0.61386 +0.64726 0.64726 0.64726 +0.67977 0.67977 0.67977 +0.71120 0.71120 0.71120 +0.74139 0.74139 0.74139 +0.77020 0.77020 0.77020 +0.79750 0.79750 0.79750 +0.82318 0.82318 0.82318 +0.84716 0.84716 0.84716 +0.86939 0.86939 0.86939 +0.88982 0.88982 0.88982 +0.90845 0.90845 0.90845 +0.92526 0.92526 0.92526 +0.94029 0.94029 0.94029 +0.95357 0.95357 0.95357 +0.59788 0.59788 0.59788 +0.63164 0.63164 0.63164 +0.66459 0.66459 0.66459 +0.69655 0.69655 0.69655 +0.72735 0.72735 0.72735 +0.75683 0.75683 0.75683 +0.78485 0.78485 0.78485 +0.81130 0.81130 0.81130 +0.83609 0.83609 0.83609 +0.85915 0.85915 0.85915 +0.88043 0.88043 0.88043 +0.89991 0.89991 0.89991 +0.91757 0.91757 0.91757 +0.93344 0.93344 0.93344 +0.94754 0.94754 0.94754 +0.95991 0.95991 0.95991 +0.97061 0.97061 0.97061 +0.64920 0.64920 0.64920 +0.68165 0.68165 0.68165 +0.71301 0.71301 0.71301 +0.74313 0.74313 0.74313 +0.77185 0.77185 0.77185 +0.79906 0.79906 0.79906 +0.82464 0.82464 0.82464 +0.84852 0.84852 0.84852 +0.87064 0.87064 0.87064 +0.89097 0.89097 0.89097 +0.90949 0.90949 0.90949 +0.92620 0.92620 0.92620 +0.94112 0.94112 0.94112 +0.95430 0.95430 0.95430 +0.96578 0.96578 0.96578 +0.97561 0.97561 0.97561 +0.98384 0.98384 0.98384 +0.69840 0.69840 0.69840 +0.72912 0.72912 0.72912 +0.75852 0.75852 0.75852 +0.78645 0.78645 0.78645 +0.81281 0.81281 0.81281 +0.83750 0.83750 0.83750 +0.86045 0.86045 0.86045 +0.88163 0.88163 0.88163 +0.90100 0.90100 0.90100 +0.91856 0.91856 0.91856 +0.93432 0.93432 0.93432 +0.94831 0.94831 0.94831 +0.96059 0.96059 0.96059 +0.97118 0.97118 0.97118 +0.98016 0.98016 0.98016 +0.98758 0.98758 0.98758 +0.99348 0.99348 0.99348 +0.03613 0.03613 0.03613 +0.04790 0.04790 0.04790 +0.06138 0.06138 0.06138 +0.07662 0.07662 0.07662 +0.09365 0.09365 0.09365 +0.11249 0.11249 0.11249 +0.13313 0.13313 0.13313 +0.15557 0.15557 0.15557 +0.17975 0.17975 0.17975 +0.20563 0.20563 0.20563 +0.23311 0.23311 0.23311 +0.26209 0.26209 0.26209 +0.29244 0.29244 0.29244 +0.32400 0.32400 0.32400 +0.35663 0.35663 0.35663 +0.39012 0.39012 0.39012 +0.42429 0.42429 0.42429 +0.05482 0.05482 0.05482 +0.06923 0.06923 0.06923 +0.08541 0.08541 0.08541 +0.10340 0.10340 0.10340 +0.12319 0.12319 0.12319 +0.14479 0.14479 0.14479 +0.16816 0.16816 0.16816 +0.19325 0.19325 0.19325 +0.21998 0.21998 0.21998 +0.24827 0.24827 0.24827 +0.27799 0.27799 0.27799 +0.30901 0.30901 0.30901 +0.34116 0.34116 0.34116 +0.37426 0.37426 0.37426 +0.40814 0.40814 0.40814 +0.44259 0.44259 0.44259 +0.47739 0.47739 0.47739 +0.07757 0.07757 0.07757 +0.09471 0.09471 0.09471 +0.11365 0.11365 0.11365 +0.13440 0.13440 0.13440 +0.15694 0.15694 0.15694 +0.18123 0.18123 0.18123 +0.20720 0.20720 0.20720 +0.23477 0.23477 0.23477 +0.26384 0.26384 0.26384 +0.29426 0.29426 0.29426 +0.32590 0.32590 0.32590 +0.35858 0.35858 0.35858 +0.39212 0.39212 0.39212 +0.42632 0.42632 0.42632 +0.46098 0.46098 0.46098 +0.49589 0.49589 0.49589 +0.53082 0.53082 0.53082 +0.10451 0.10451 0.10451 +0.12441 0.12441 0.12441 +0.14611 0.14611 0.14611 +0.16959 0.16959 0.16959 +0.19478 0.19478 0.19478 +0.22161 0.22161 0.22161 +0.24998 0.24998 0.24998 +0.27978 0.27978 0.27978 +0.31087 0.31087 0.31087 +0.34308 0.34308 0.34308 +0.37624 0.37624 0.37624 +0.41015 0.41015 0.41015 +0.44463 0.44463 0.44463 +0.47944 0.47944 0.47944 +0.51439 0.51439 0.51439 +0.54925 0.54925 0.54925 +0.58380 0.58380 0.58380 +0.13568 0.13568 0.13568 +0.15832 0.15832 0.15832 +0.18271 0.18271 0.18271 +0.20878 0.20878 0.20878 +0.23644 0.23644 0.23644 +0.26559 0.26559 0.26559 +0.29609 0.29609 0.29609 +0.32779 0.32779 0.32779 +0.36053 0.36053 0.36053 +0.39411 0.39411 0.39411 +0.42835 0.42835 0.42835 +0.46303 0.46303 0.46303 +0.49794 0.49794 0.49794 +0.53287 0.53287 0.53287 +0.56759 0.56759 0.56759 +0.60189 0.60189 0.60189 +0.63556 0.63556 0.63556 +0.17102 0.17102 0.17102 +0.19631 0.19631 0.19631 +0.22323 0.22323 0.22323 +0.25170 0.25170 0.25170 +0.28158 0.28158 0.28158 +0.31273 0.31273 0.31273 +0.34500 0.34500 0.34500 +0.37821 0.37821 0.37821 +0.41217 0.41217 0.41217 +0.44667 0.44667 0.44667 +0.48150 0.48150 0.48150 +0.51645 0.51645 0.51645 +0.55129 0.55129 0.55129 +0.58582 0.58582 0.58582 +0.61981 0.61981 0.61981 +0.65307 0.65307 0.65307 +0.68540 0.68540 0.68540 +0.21037 0.21037 0.21037 +0.23812 0.23812 0.23812 +0.26735 0.26735 0.26735 +0.29792 0.29792 0.29792 +0.32969 0.32969 0.32969 +0.36248 0.36248 0.36248 +0.39611 0.39611 0.39611 +0.43038 0.43038 0.43038 +0.46508 0.46508 0.46508 +0.50000 0.50000 0.50000 +0.53492 0.53492 0.53492 +0.56962 0.56962 0.56962 +0.60389 0.60389 0.60389 +0.63752 0.63752 0.63752 +0.67031 0.67031 0.67031 +0.70208 0.70208 0.70208 +0.73265 0.73265 0.73265 +0.25342 0.25342 0.25342 +0.28338 0.28338 0.28338 +0.31460 0.31460 0.31460 +0.34693 0.34693 0.34693 +0.38019 0.38019 0.38019 +0.41418 0.41418 0.41418 +0.44871 0.44871 0.44871 +0.48355 0.48355 0.48355 +0.51850 0.51850 0.51850 +0.55333 0.55333 0.55333 +0.58783 0.58783 0.58783 +0.62179 0.62179 0.62179 +0.65500 0.65500 0.65500 +0.68727 0.68727 0.68727 +0.71842 0.71842 0.71842 +0.74830 0.74830 0.74830 +0.77677 0.77677 0.77677 +0.29976 0.29976 0.29976 +0.33159 0.33159 0.33159 +0.36444 0.36444 0.36444 +0.39811 0.39811 0.39811 +0.43241 0.43241 0.43241 +0.46713 0.46713 0.46713 +0.50206 0.50206 0.50206 +0.53697 0.53697 0.53697 +0.57165 0.57165 0.57165 +0.60589 0.60589 0.60589 +0.63947 0.63947 0.63947 +0.67221 0.67221 0.67221 +0.70391 0.70391 0.70391 +0.73441 0.73441 0.73441 +0.76356 0.76356 0.76356 +0.79122 0.79122 0.79122 +0.81729 0.81729 0.81729 +0.34887 0.34887 0.34887 +0.38217 0.38217 0.38217 +0.41620 0.41620 0.41620 +0.45075 0.45075 0.45075 +0.48561 0.48561 0.48561 +0.52056 0.52056 0.52056 +0.55537 0.55537 0.55537 +0.58985 0.58985 0.58985 +0.62376 0.62376 0.62376 +0.65692 0.65692 0.65692 +0.68913 0.68913 0.68913 +0.72022 0.72022 0.72022 +0.75002 0.75002 0.75002 +0.77839 0.77839 0.77839 +0.80522 0.80522 0.80522 +0.83041 0.83041 0.83041 +0.85389 0.85389 0.85389 +0.40011 0.40011 0.40011 +0.43444 0.43444 0.43444 +0.46918 0.46918 0.46918 +0.50411 0.50411 0.50411 +0.53902 0.53902 0.53902 +0.57368 0.57368 0.57368 +0.60788 0.60788 0.60788 +0.64142 0.64142 0.64142 +0.67410 0.67410 0.67410 +0.70574 0.70574 0.70574 +0.73616 0.73616 0.73616 +0.76523 0.76523 0.76523 +0.79280 0.79280 0.79280 +0.81877 0.81877 0.81877 +0.84306 0.84306 0.84306 +0.86560 0.86560 0.86560 +0.88635 0.88635 0.88635 +0.45280 0.45280 0.45280 +0.48766 0.48766 0.48766 +0.52261 0.52261 0.52261 +0.55741 0.55741 0.55741 +0.59186 0.59186 0.59186 +0.62574 0.62574 0.62574 +0.65884 0.65884 0.65884 +0.69099 0.69099 0.69099 +0.72201 0.72201 0.72201 +0.75173 0.75173 0.75173 +0.78002 0.78002 0.78002 +0.80675 0.80675 0.80675 +0.83184 0.83184 0.83184 +0.85521 0.85521 0.85521 +0.87681 0.87681 0.87681 +0.89660 0.89660 0.89660 +0.91459 0.91459 0.91459 +0.50617 0.50617 0.50617 +0.54107 0.54107 0.54107 +0.57571 0.57571 0.57571 +0.60988 0.60988 0.60988 +0.64337 0.64337 0.64337 +0.67600 0.67600 0.67600 +0.70756 0.70756 0.70756 +0.73791 0.73791 0.73791 +0.76689 0.76689 0.76689 +0.79437 0.79437 0.79437 +0.82025 0.82025 0.82025 +0.84443 0.84443 0.84443 +0.86687 0.86687 0.86687 +0.88751 0.88751 0.88751 +0.90635 0.90635 0.90635 +0.92338 0.92338 0.92338 +0.93862 0.93862 0.93862 +0.55945 0.55945 0.55945 +0.59387 0.59387 0.59387 +0.62771 0.62771 0.62771 +0.66076 0.66076 0.66076 +0.69285 0.69285 0.69285 +0.72379 0.72379 0.72379 +0.75343 0.75343 0.75343 +0.78163 0.78163 0.78163 +0.80827 0.80827 0.80827 +0.83327 0.83327 0.83327 +0.85653 0.85653 0.85653 +0.87802 0.87802 0.87802 +0.89771 0.89771 0.89771 +0.91559 0.91559 0.91559 +0.93167 0.93167 0.93167 +0.94597 0.94597 0.94597 +0.95854 0.95854 0.95854 +0.61187 0.61187 0.61187 +0.64532 0.64532 0.64532 +0.67788 0.67788 0.67788 +0.70938 0.70938 0.70938 +0.73966 0.73966 0.73966 +0.76855 0.76855 0.76855 +0.79594 0.79594 0.79594 +0.82172 0.82172 0.82172 +0.84580 0.84580 0.84580 +0.86813 0.86813 0.86813 +0.88867 0.88867 0.88867 +0.90740 0.90740 0.90740 +0.92432 0.92432 0.92432 +0.93946 0.93946 0.93946 +0.95284 0.95284 0.95284 +0.96451 0.96451 0.96451 +0.97453 0.97453 0.97453 +0.66268 0.66268 0.66268 +0.69470 0.69470 0.69470 +0.72557 0.72557 0.72557 +0.75513 0.75513 0.75513 +0.78324 0.78324 0.78324 +0.80979 0.80979 0.80979 +0.83468 0.83468 0.83468 +0.85785 0.85785 0.85785 +0.87923 0.87923 0.87923 +0.89881 0.89881 0.89881 +0.91658 0.91658 0.91658 +0.93256 0.93256 0.93256 +0.94676 0.94676 0.94676 +0.95923 0.95923 0.95923 +0.97002 0.97002 0.97002 +0.97919 0.97919 0.97919 +0.98679 0.98679 0.98679 +0.71120 0.71120 0.71120 +0.74139 0.74139 0.74139 +0.77020 0.77020 0.77020 +0.79750 0.79750 0.79750 +0.82318 0.82318 0.82318 +0.84716 0.84716 0.84716 +0.86939 0.86939 0.86939 +0.88982 0.88982 0.88982 +0.90845 0.90845 0.90845 +0.92526 0.92526 0.92526 +0.94029 0.94029 0.94029 +0.95357 0.95357 0.95357 +0.96515 0.96515 0.96515 +0.97507 0.97507 0.97507 +0.98340 0.98340 0.98340 +0.99019 0.99019 0.99019 +0.99548 0.99548 0.99548 +0.04077 0.04077 0.04077 +0.05324 0.05324 0.05324 +0.06744 0.06744 0.06744 +0.08342 0.08342 0.08342 +0.10119 0.10119 0.10119 +0.12077 0.12077 0.12077 +0.14215 0.14215 0.14215 +0.16532 0.16532 0.16532 +0.19021 0.19021 0.19021 +0.21676 0.21676 0.21676 +0.24487 0.24487 0.24487 +0.27443 0.27443 0.27443 +0.30530 0.30530 0.30530 +0.33732 0.33732 0.33732 +0.37032 0.37032 0.37032 +0.40412 0.40412 0.40412 +0.43851 0.43851 0.43851 +0.06054 0.06054 0.06054 +0.07568 0.07568 0.07568 +0.09260 0.09260 0.09260 +0.11133 0.11133 0.11133 +0.13187 0.13187 0.13187 +0.15420 0.15420 0.15420 +0.17828 0.17828 0.17828 +0.20406 0.20406 0.20406 +0.23145 0.23145 0.23145 +0.26034 0.26034 0.26034 +0.29062 0.29062 0.29062 +0.32212 0.32212 0.32212 +0.35468 0.35468 0.35468 +0.38813 0.38813 0.38813 +0.42227 0.42227 0.42227 +0.45689 0.45689 0.45689 +0.49178 0.49178 0.49178 +0.08441 0.08441 0.08441 +0.10229 0.10229 0.10229 +0.12198 0.12198 0.12198 +0.14347 0.14347 0.14347 +0.16673 0.16673 0.16673 +0.19173 0.19173 0.19173 +0.21837 0.21837 0.21837 +0.24657 0.24657 0.24657 +0.27621 0.27621 0.27621 +0.30715 0.30715 0.30715 +0.33924 0.33924 0.33924 +0.37229 0.37229 0.37229 +0.40613 0.40613 0.40613 +0.44055 0.44055 0.44055 +0.47534 0.47534 0.47534 +0.51028 0.51028 0.51028 +0.54516 0.54516 0.54516 +0.11249 0.11249 0.11249 +0.13313 0.13313 0.13313 +0.15557 0.15557 0.15557 +0.17975 0.17975 0.17975 +0.20563 0.20563 0.20563 +0.23311 0.23311 0.23311 +0.26209 0.26209 0.26209 +0.29244 0.29244 0.29244 +0.32400 0.32400 0.32400 +0.35663 0.35663 0.35663 +0.39012 0.39012 0.39012 +0.42429 0.42429 0.42429 +0.45893 0.45893 0.45893 +0.49383 0.49383 0.49383 +0.52877 0.52877 0.52877 +0.56352 0.56352 0.56352 +0.59788 0.59788 0.59788 +0.14479 0.14479 0.14479 +0.16816 0.16816 0.16816 +0.19325 0.19325 0.19325 +0.21998 0.21998 0.21998 +0.24827 0.24827 0.24827 +0.27799 0.27799 0.27799 +0.30901 0.30901 0.30901 +0.34116 0.34116 0.34116 +0.37426 0.37426 0.37426 +0.40814 0.40814 0.40814 +0.44259 0.44259 0.44259 +0.47739 0.47739 0.47739 +0.51234 0.51234 0.51234 +0.54720 0.54720 0.54720 +0.58178 0.58178 0.58178 +0.61584 0.61584 0.61584 +0.64920 0.64920 0.64920 +0.18123 0.18123 0.18123 +0.20720 0.20720 0.20720 +0.23477 0.23477 0.23477 +0.26384 0.26384 0.26384 +0.29426 0.29426 0.29426 +0.32590 0.32590 0.32590 +0.35858 0.35858 0.35858 +0.39212 0.39212 0.39212 +0.42632 0.42632 0.42632 +0.46098 0.46098 0.46098 +0.49589 0.49589 0.49589 +0.53082 0.53082 0.53082 +0.56556 0.56556 0.56556 +0.59989 0.59989 0.59989 +0.63360 0.63360 0.63360 +0.66650 0.66650 0.66650 +0.69840 0.69840 0.69840 +0.22161 0.22161 0.22161 +0.24998 0.24998 0.24998 +0.27978 0.27978 0.27978 +0.31087 0.31087 0.31087 +0.34308 0.34308 0.34308 +0.37624 0.37624 0.37624 +0.41015 0.41015 0.41015 +0.44463 0.44463 0.44463 +0.47944 0.47944 0.47944 +0.51439 0.51439 0.51439 +0.54925 0.54925 0.54925 +0.58380 0.58380 0.58380 +0.61783 0.61783 0.61783 +0.65113 0.65113 0.65113 +0.68352 0.68352 0.68352 +0.71482 0.71482 0.71482 +0.74486 0.74486 0.74486 +0.26559 0.26559 0.26559 +0.29609 0.29609 0.29609 +0.32779 0.32779 0.32779 +0.36053 0.36053 0.36053 +0.39411 0.39411 0.39411 +0.42835 0.42835 0.42835 +0.46303 0.46303 0.46303 +0.49794 0.49794 0.49794 +0.53287 0.53287 0.53287 +0.56759 0.56759 0.56759 +0.60189 0.60189 0.60189 +0.63556 0.63556 0.63556 +0.66841 0.66841 0.66841 +0.70024 0.70024 0.70024 +0.73089 0.73089 0.73089 +0.76020 0.76020 0.76020 +0.78804 0.78804 0.78804 +0.31273 0.31273 0.31273 +0.34500 0.34500 0.34500 +0.37821 0.37821 0.37821 +0.41217 0.41217 0.41217 +0.44667 0.44667 0.44667 +0.48150 0.48150 0.48150 +0.51645 0.51645 0.51645 +0.55129 0.55129 0.55129 +0.58582 0.58582 0.58582 +0.61981 0.61981 0.61981 +0.65307 0.65307 0.65307 +0.68540 0.68540 0.68540 +0.71662 0.71662 0.71662 +0.74658 0.74658 0.74658 +0.77513 0.77513 0.77513 +0.80215 0.80215 0.80215 +0.82754 0.82754 0.82754 +0.36248 0.36248 0.36248 +0.39611 0.39611 0.39611 +0.43038 0.43038 0.43038 +0.46508 0.46508 0.46508 +0.50000 0.50000 0.50000 +0.53492 0.53492 0.53492 +0.56962 0.56962 0.56962 +0.60389 0.60389 0.60389 +0.63752 0.63752 0.63752 +0.67031 0.67031 0.67031 +0.70208 0.70208 0.70208 +0.73265 0.73265 0.73265 +0.76188 0.76188 0.76188 +0.78963 0.78963 0.78963 +0.81580 0.81580 0.81580 +0.84029 0.84029 0.84029 +0.86304 0.86304 0.86304 +0.41418 0.41418 0.41418 +0.44871 0.44871 0.44871 +0.48355 0.48355 0.48355 +0.51850 0.51850 0.51850 +0.55333 0.55333 0.55333 +0.58783 0.58783 0.58783 +0.62179 0.62179 0.62179 +0.65500 0.65500 0.65500 +0.68727 0.68727 0.68727 +0.71842 0.71842 0.71842 +0.74830 0.74830 0.74830 +0.77677 0.77677 0.77677 +0.80369 0.80369 0.80369 +0.82898 0.82898 0.82898 +0.85255 0.85255 0.85255 +0.87436 0.87436 0.87436 +0.89437 0.89437 0.89437 +0.46713 0.46713 0.46713 +0.50206 0.50206 0.50206 +0.53697 0.53697 0.53697 +0.57165 0.57165 0.57165 +0.60589 0.60589 0.60589 +0.63947 0.63947 0.63947 +0.67221 0.67221 0.67221 +0.70391 0.70391 0.70391 +0.73441 0.73441 0.73441 +0.76356 0.76356 0.76356 +0.79122 0.79122 0.79122 +0.81729 0.81729 0.81729 +0.84168 0.84168 0.84168 +0.86432 0.86432 0.86432 +0.88518 0.88518 0.88518 +0.90423 0.90423 0.90423 +0.92147 0.92147 0.92147 +0.52056 0.52056 0.52056 +0.55537 0.55537 0.55537 +0.58985 0.58985 0.58985 +0.62376 0.62376 0.62376 +0.65692 0.65692 0.65692 +0.68913 0.68913 0.68913 +0.72022 0.72022 0.72022 +0.75002 0.75002 0.75002 +0.77839 0.77839 0.77839 +0.80522 0.80522 0.80522 +0.83041 0.83041 0.83041 +0.85389 0.85389 0.85389 +0.87559 0.87559 0.87559 +0.89549 0.89549 0.89549 +0.91358 0.91358 0.91358 +0.92987 0.92987 0.92987 +0.94438 0.94438 0.94438 +0.57368 0.57368 0.57368 +0.60788 0.60788 0.60788 +0.64142 0.64142 0.64142 +0.67410 0.67410 0.67410 +0.70574 0.70574 0.70574 +0.73616 0.73616 0.73616 +0.76523 0.76523 0.76523 +0.79280 0.79280 0.79280 +0.81877 0.81877 0.81877 +0.84306 0.84306 0.84306 +0.86560 0.86560 0.86560 +0.88635 0.88635 0.88635 +0.90529 0.90529 0.90529 +0.92243 0.92243 0.92243 +0.93777 0.93777 0.93777 +0.95136 0.95136 0.95136 +0.96323 0.96323 0.96323 +0.62574 0.62574 0.62574 +0.65884 0.65884 0.65884 +0.69099 0.69099 0.69099 +0.72201 0.72201 0.72201 +0.75173 0.75173 0.75173 +0.78002 0.78002 0.78002 +0.80675 0.80675 0.80675 +0.83184 0.83184 0.83184 +0.85521 0.85521 0.85521 +0.87681 0.87681 0.87681 +0.89660 0.89660 0.89660 +0.91459 0.91459 0.91459 +0.93077 0.93077 0.93077 +0.94518 0.94518 0.94518 +0.95785 0.95785 0.95785 +0.96884 0.96884 0.96884 +0.97819 0.97819 0.97819 +0.67600 0.67600 0.67600 +0.70756 0.70756 0.70756 +0.73791 0.73791 0.73791 +0.76689 0.76689 0.76689 +0.79437 0.79437 0.79437 +0.82025 0.82025 0.82025 +0.84443 0.84443 0.84443 +0.86687 0.86687 0.86687 +0.88751 0.88751 0.88751 +0.90635 0.90635 0.90635 +0.92338 0.92338 0.92338 +0.93862 0.93862 0.93862 +0.95210 0.95210 0.95210 +0.96387 0.96387 0.96387 +0.97399 0.97399 0.97399 +0.98250 0.98250 0.98250 +0.98947 0.98947 0.98947 +0.72379 0.72379 0.72379 +0.75343 0.75343 0.75343 +0.78163 0.78163 0.78163 +0.80827 0.80827 0.80827 +0.83327 0.83327 0.83327 +0.85653 0.85653 0.85653 +0.87802 0.87802 0.87802 +0.89771 0.89771 0.89771 +0.91559 0.91559 0.91559 +0.93167 0.93167 0.93167 +0.94597 0.94597 0.94597 +0.95854 0.95854 0.95854 +0.96943 0.96943 0.96943 +0.97869 0.97869 0.97869 +0.98638 0.98638 0.98638 +0.99255 0.99255 0.99255 +0.99723 0.99723 0.99723 +0.04570 0.04570 0.04570 +0.05888 0.05888 0.05888 +0.07380 0.07380 0.07380 +0.09051 0.09051 0.09051 +0.10903 0.10903 0.10903 +0.12936 0.12936 0.12936 +0.15148 0.15148 0.15148 +0.17536 0.17536 0.17536 +0.20094 0.20094 0.20094 +0.22815 0.22815 0.22815 +0.25687 0.25687 0.25687 +0.28699 0.28699 0.28699 +0.31835 0.31835 0.31835 +0.35080 0.35080 0.35080 +0.38416 0.38416 0.38416 +0.41822 0.41822 0.41822 +0.45280 0.45280 0.45280 +0.06656 0.06656 0.06656 +0.08243 0.08243 0.08243 +0.10009 0.10009 0.10009 +0.11957 0.11957 0.11957 +0.14085 0.14085 0.14085 +0.16391 0.16391 0.16391 +0.18870 0.18870 0.18870 +0.21515 0.21515 0.21515 +0.24317 0.24317 0.24317 +0.27265 0.27265 0.27265 +0.30345 0.30345 0.30345 +0.33541 0.33541 0.33541 +0.36836 0.36836 0.36836 +0.40212 0.40212 0.40212 +0.43648 0.43648 0.43648 +0.47123 0.47123 0.47123 +0.50617 0.50617 0.50617 +0.09155 0.09155 0.09155 +0.11018 0.11018 0.11018 +0.13061 0.13061 0.13061 +0.15284 0.15284 0.15284 +0.17682 0.17682 0.17682 +0.20250 0.20250 0.20250 +0.22980 0.22980 0.22980 +0.25861 0.25861 0.25861 +0.28880 0.28880 0.28880 +0.32023 0.32023 0.32023 +0.35274 0.35274 0.35274 +0.38614 0.38614 0.38614 +0.42024 0.42024 0.42024 +0.45484 0.45484 0.45484 +0.48972 0.48972 0.48972 +0.52466 0.52466 0.52466 +0.55945 0.55945 0.55945 +0.12077 0.12077 0.12077 +0.14215 0.14215 0.14215 +0.16532 0.16532 0.16532 +0.19021 0.19021 0.19021 +0.21676 0.21676 0.21676 +0.24487 0.24487 0.24487 +0.27443 0.27443 0.27443 +0.30530 0.30530 0.30530 +0.33732 0.33732 0.33732 +0.37032 0.37032 0.37032 +0.40412 0.40412 0.40412 +0.43851 0.43851 0.43851 +0.47329 0.47329 0.47329 +0.50822 0.50822 0.50822 +0.54311 0.54311 0.54311 +0.57773 0.57773 0.57773 +0.61187 0.61187 0.61187 +0.15420 0.15420 0.15420 +0.17828 0.17828 0.17828 +0.20406 0.20406 0.20406 +0.23145 0.23145 0.23145 +0.26034 0.26034 0.26034 +0.29062 0.29062 0.29062 +0.32212 0.32212 0.32212 +0.35468 0.35468 0.35468 +0.38813 0.38813 0.38813 +0.42227 0.42227 0.42227 +0.45689 0.45689 0.45689 +0.49178 0.49178 0.49178 +0.52671 0.52671 0.52671 +0.56149 0.56149 0.56149 +0.59588 0.59588 0.59588 +0.62968 0.62968 0.62968 +0.66268 0.66268 0.66268 +0.19173 0.19173 0.19173 +0.21837 0.21837 0.21837 +0.24657 0.24657 0.24657 +0.27621 0.27621 0.27621 +0.30715 0.30715 0.30715 +0.33924 0.33924 0.33924 +0.37229 0.37229 0.37229 +0.40613 0.40613 0.40613 +0.44055 0.44055 0.44055 +0.47534 0.47534 0.47534 +0.51028 0.51028 0.51028 +0.54516 0.54516 0.54516 +0.57976 0.57976 0.57976 +0.61386 0.61386 0.61386 +0.64726 0.64726 0.64726 +0.67977 0.67977 0.67977 +0.71120 0.71120 0.71120 +0.23311 0.23311 0.23311 +0.26209 0.26209 0.26209 +0.29244 0.29244 0.29244 +0.32400 0.32400 0.32400 +0.35663 0.35663 0.35663 +0.39012 0.39012 0.39012 +0.42429 0.42429 0.42429 +0.45893 0.45893 0.45893 +0.49383 0.49383 0.49383 +0.52877 0.52877 0.52877 +0.56352 0.56352 0.56352 +0.59788 0.59788 0.59788 +0.63164 0.63164 0.63164 +0.66459 0.66459 0.66459 +0.69655 0.69655 0.69655 +0.72735 0.72735 0.72735 +0.75683 0.75683 0.75683 +0.27799 0.27799 0.27799 +0.30901 0.30901 0.30901 +0.34116 0.34116 0.34116 +0.37426 0.37426 0.37426 +0.40814 0.40814 0.40814 +0.44259 0.44259 0.44259 +0.47739 0.47739 0.47739 +0.51234 0.51234 0.51234 +0.54720 0.54720 0.54720 +0.58178 0.58178 0.58178 +0.61584 0.61584 0.61584 +0.64920 0.64920 0.64920 +0.68165 0.68165 0.68165 +0.71301 0.71301 0.71301 +0.74313 0.74313 0.74313 +0.77185 0.77185 0.77185 +0.79906 0.79906 0.79906 +0.32590 0.32590 0.32590 +0.35858 0.35858 0.35858 +0.39212 0.39212 0.39212 +0.42632 0.42632 0.42632 +0.46098 0.46098 0.46098 +0.49589 0.49589 0.49589 +0.53082 0.53082 0.53082 +0.56556 0.56556 0.56556 +0.59989 0.59989 0.59989 +0.63360 0.63360 0.63360 +0.66650 0.66650 0.66650 +0.69840 0.69840 0.69840 +0.72912 0.72912 0.72912 +0.75852 0.75852 0.75852 +0.78645 0.78645 0.78645 +0.81281 0.81281 0.81281 +0.83750 0.83750 0.83750 +0.37624 0.37624 0.37624 +0.41015 0.41015 0.41015 +0.44463 0.44463 0.44463 +0.47944 0.47944 0.47944 +0.51439 0.51439 0.51439 +0.54925 0.54925 0.54925 +0.58380 0.58380 0.58380 +0.61783 0.61783 0.61783 +0.65113 0.65113 0.65113 +0.68352 0.68352 0.68352 +0.71482 0.71482 0.71482 +0.74486 0.74486 0.74486 +0.77349 0.77349 0.77349 +0.80061 0.80061 0.80061 +0.82609 0.82609 0.82609 +0.84987 0.84987 0.84987 +0.87189 0.87189 0.87189 +0.42835 0.42835 0.42835 +0.46303 0.46303 0.46303 +0.49794 0.49794 0.49794 +0.53287 0.53287 0.53287 +0.56759 0.56759 0.56759 +0.60189 0.60189 0.60189 +0.63556 0.63556 0.63556 +0.66841 0.66841 0.66841 +0.70024 0.70024 0.70024 +0.73089 0.73089 0.73089 +0.76020 0.76020 0.76020 +0.78804 0.78804 0.78804 +0.81431 0.81431 0.81431 +0.83890 0.83890 0.83890 +0.86175 0.86175 0.86175 +0.88282 0.88282 0.88282 +0.90208 0.90208 0.90208 +0.48150 0.48150 0.48150 +0.51645 0.51645 0.51645 +0.55129 0.55129 0.55129 +0.58582 0.58582 0.58582 +0.61981 0.61981 0.61981 +0.65307 0.65307 0.65307 +0.68540 0.68540 0.68540 +0.71662 0.71662 0.71662 +0.74658 0.74658 0.74658 +0.77513 0.77513 0.77513 +0.80215 0.80215 0.80215 +0.82754 0.82754 0.82754 +0.85122 0.85122 0.85122 +0.87313 0.87313 0.87313 +0.89324 0.89324 0.89324 +0.91155 0.91155 0.91155 +0.92804 0.92804 0.92804 +0.53492 0.53492 0.53492 +0.56962 0.56962 0.56962 +0.60389 0.60389 0.60389 +0.63752 0.63752 0.63752 +0.67031 0.67031 0.67031 +0.70208 0.70208 0.70208 +0.73265 0.73265 0.73265 +0.76188 0.76188 0.76188 +0.78963 0.78963 0.78963 +0.81580 0.81580 0.81580 +0.84029 0.84029 0.84029 +0.86304 0.86304 0.86304 +0.88400 0.88400 0.88400 +0.90316 0.90316 0.90316 +0.92050 0.92050 0.92050 +0.93606 0.93606 0.93606 +0.94985 0.94985 0.94985 +0.58783 0.58783 0.58783 +0.62179 0.62179 0.62179 +0.65500 0.65500 0.65500 +0.68727 0.68727 0.68727 +0.71842 0.71842 0.71842 +0.74830 0.74830 0.74830 +0.77677 0.77677 0.77677 +0.80369 0.80369 0.80369 +0.82898 0.82898 0.82898 +0.85255 0.85255 0.85255 +0.87436 0.87436 0.87436 +0.89437 0.89437 0.89437 +0.91257 0.91257 0.91257 +0.92896 0.92896 0.92896 +0.94357 0.94357 0.94357 +0.95645 0.95645 0.95645 +0.96763 0.96763 0.96763 +0.63947 0.63947 0.63947 +0.67221 0.67221 0.67221 +0.70391 0.70391 0.70391 +0.73441 0.73441 0.73441 +0.76356 0.76356 0.76356 +0.79122 0.79122 0.79122 +0.81729 0.81729 0.81729 +0.84168 0.84168 0.84168 +0.86432 0.86432 0.86432 +0.88518 0.88518 0.88518 +0.90423 0.90423 0.90423 +0.92147 0.92147 0.92147 +0.93692 0.93692 0.93692 +0.95060 0.95060 0.95060 +0.96258 0.96258 0.96258 +0.97288 0.97288 0.97288 +0.98158 0.98158 0.98158 +0.68913 0.68913 0.68913 +0.72022 0.72022 0.72022 +0.75002 0.75002 0.75002 +0.77839 0.77839 0.77839 +0.80522 0.80522 0.80522 +0.83041 0.83041 0.83041 +0.85389 0.85389 0.85389 +0.87559 0.87559 0.87559 +0.89549 0.89549 0.89549 +0.91358 0.91358 0.91358 +0.92987 0.92987 0.92987 +0.94438 0.94438 0.94438 +0.95715 0.95715 0.95715 +0.96824 0.96824 0.96824 +0.97769 0.97769 0.97769 +0.98556 0.98556 0.98556 +0.99190 0.99190 0.99190 +0.73616 0.73616 0.73616 +0.76523 0.76523 0.76523 +0.79280 0.79280 0.79280 +0.81877 0.81877 0.81877 +0.84306 0.84306 0.84306 +0.86560 0.86560 0.86560 +0.88635 0.88635 0.88635 +0.90529 0.90529 0.90529 +0.92243 0.92243 0.92243 +0.93777 0.93777 0.93777 +0.95136 0.95136 0.95136 +0.96323 0.96323 0.96323 +0.97344 0.97344 0.97344 +0.98205 0.98205 0.98205 +0.98910 0.98910 0.98910 +0.99466 0.99466 0.99466 +0.99874 0.99874 0.99874 +0.05092 0.05092 0.05092 +0.06481 0.06481 0.06481 +0.08047 0.08047 0.08047 +0.09792 0.09792 0.09792 +0.11718 0.11718 0.11718 +0.13825 0.13825 0.13825 +0.16110 0.16110 0.16110 +0.18569 0.18569 0.18569 +0.21196 0.21196 0.21196 +0.23980 0.23980 0.23980 +0.26911 0.26911 0.26911 +0.29976 0.29976 0.29976 +0.33159 0.33159 0.33159 +0.36444 0.36444 0.36444 +0.39811 0.39811 0.39811 +0.43241 0.43241 0.43241 +0.46713 0.46713 0.46713 +0.07288 0.07288 0.07288 +0.08948 0.08948 0.08948 +0.10789 0.10789 0.10789 +0.12811 0.12811 0.12811 +0.15013 0.15013 0.15013 +0.17391 0.17391 0.17391 +0.19939 0.19939 0.19939 +0.22651 0.22651 0.22651 +0.25514 0.25514 0.25514 +0.28518 0.28518 0.28518 +0.31648 0.31648 0.31648 +0.34887 0.34887 0.34887 +0.38217 0.38217 0.38217 +0.41620 0.41620 0.41620 +0.45075 0.45075 0.45075 +0.48561 0.48561 0.48561 +0.52056 0.52056 0.52056 +0.09900 0.09900 0.09900 +0.11837 0.11837 0.11837 +0.13955 0.13955 0.13955 +0.16250 0.16250 0.16250 +0.18719 0.18719 0.18719 +0.21355 0.21355 0.21355 +0.24148 0.24148 0.24148 +0.27088 0.27088 0.27088 +0.30160 0.30160 0.30160 +0.33350 0.33350 0.33350 +0.36640 0.36640 0.36640 +0.40011 0.40011 0.40011 +0.43444 0.43444 0.43444 +0.46918 0.46918 0.46918 +0.50411 0.50411 0.50411 +0.53902 0.53902 0.53902 +0.57368 0.57368 0.57368 +0.12936 0.12936 0.12936 +0.15148 0.15148 0.15148 +0.17536 0.17536 0.17536 +0.20094 0.20094 0.20094 +0.22815 0.22815 0.22815 +0.25687 0.25687 0.25687 +0.28699 0.28699 0.28699 +0.31835 0.31835 0.31835 +0.35080 0.35080 0.35080 +0.38416 0.38416 0.38416 +0.41822 0.41822 0.41822 +0.45280 0.45280 0.45280 +0.48766 0.48766 0.48766 +0.52261 0.52261 0.52261 +0.55741 0.55741 0.55741 +0.59186 0.59186 0.59186 +0.62574 0.62574 0.62574 +0.16391 0.16391 0.16391 +0.18870 0.18870 0.18870 +0.21515 0.21515 0.21515 +0.24317 0.24317 0.24317 +0.27265 0.27265 0.27265 +0.30345 0.30345 0.30345 +0.33541 0.33541 0.33541 +0.36836 0.36836 0.36836 +0.40212 0.40212 0.40212 +0.43648 0.43648 0.43648 +0.47123 0.47123 0.47123 +0.50617 0.50617 0.50617 +0.54107 0.54107 0.54107 +0.57571 0.57571 0.57571 +0.60988 0.60988 0.60988 +0.64337 0.64337 0.64337 +0.67600 0.67600 0.67600 +0.20250 0.20250 0.20250 +0.22980 0.22980 0.22980 +0.25861 0.25861 0.25861 +0.28880 0.28880 0.28880 +0.32023 0.32023 0.32023 +0.35274 0.35274 0.35274 +0.38614 0.38614 0.38614 +0.42024 0.42024 0.42024 +0.45484 0.45484 0.45484 +0.48972 0.48972 0.48972 +0.52466 0.52466 0.52466 +0.55945 0.55945 0.55945 +0.59387 0.59387 0.59387 +0.62771 0.62771 0.62771 +0.66076 0.66076 0.66076 +0.69285 0.69285 0.69285 +0.72379 0.72379 0.72379 +0.24487 0.24487 0.24487 +0.27443 0.27443 0.27443 +0.30530 0.30530 0.30530 +0.33732 0.33732 0.33732 +0.37032 0.37032 0.37032 +0.40412 0.40412 0.40412 +0.43851 0.43851 0.43851 +0.47329 0.47329 0.47329 +0.50822 0.50822 0.50822 +0.54311 0.54311 0.54311 +0.57773 0.57773 0.57773 +0.61187 0.61187 0.61187 +0.64532 0.64532 0.64532 +0.67788 0.67788 0.67788 +0.70938 0.70938 0.70938 +0.73966 0.73966 0.73966 +0.76855 0.76855 0.76855 +0.29062 0.29062 0.29062 +0.32212 0.32212 0.32212 +0.35468 0.35468 0.35468 +0.38813 0.38813 0.38813 +0.42227 0.42227 0.42227 +0.45689 0.45689 0.45689 +0.49178 0.49178 0.49178 +0.52671 0.52671 0.52671 +0.56149 0.56149 0.56149 +0.59588 0.59588 0.59588 +0.62968 0.62968 0.62968 +0.66268 0.66268 0.66268 +0.69470 0.69470 0.69470 +0.72557 0.72557 0.72557 +0.75513 0.75513 0.75513 +0.78324 0.78324 0.78324 +0.80979 0.80979 0.80979 +0.33924 0.33924 0.33924 +0.37229 0.37229 0.37229 +0.40613 0.40613 0.40613 +0.44055 0.44055 0.44055 +0.47534 0.47534 0.47534 +0.51028 0.51028 0.51028 +0.54516 0.54516 0.54516 +0.57976 0.57976 0.57976 +0.61386 0.61386 0.61386 +0.64726 0.64726 0.64726 +0.67977 0.67977 0.67977 +0.71120 0.71120 0.71120 +0.74139 0.74139 0.74139 +0.77020 0.77020 0.77020 +0.79750 0.79750 0.79750 +0.82318 0.82318 0.82318 +0.84716 0.84716 0.84716 +0.39012 0.39012 0.39012 +0.42429 0.42429 0.42429 +0.45893 0.45893 0.45893 +0.49383 0.49383 0.49383 +0.52877 0.52877 0.52877 +0.56352 0.56352 0.56352 +0.59788 0.59788 0.59788 +0.63164 0.63164 0.63164 +0.66459 0.66459 0.66459 +0.69655 0.69655 0.69655 +0.72735 0.72735 0.72735 +0.75683 0.75683 0.75683 +0.78485 0.78485 0.78485 +0.81130 0.81130 0.81130 +0.83609 0.83609 0.83609 +0.85915 0.85915 0.85915 +0.88043 0.88043 0.88043 +0.44259 0.44259 0.44259 +0.47739 0.47739 0.47739 +0.51234 0.51234 0.51234 +0.54720 0.54720 0.54720 +0.58178 0.58178 0.58178 +0.61584 0.61584 0.61584 +0.64920 0.64920 0.64920 +0.68165 0.68165 0.68165 +0.71301 0.71301 0.71301 +0.74313 0.74313 0.74313 +0.77185 0.77185 0.77185 +0.79906 0.79906 0.79906 +0.82464 0.82464 0.82464 +0.84852 0.84852 0.84852 +0.87064 0.87064 0.87064 +0.89097 0.89097 0.89097 +0.90949 0.90949 0.90949 +0.49589 0.49589 0.49589 +0.53082 0.53082 0.53082 +0.56556 0.56556 0.56556 +0.59989 0.59989 0.59989 +0.63360 0.63360 0.63360 +0.66650 0.66650 0.66650 +0.69840 0.69840 0.69840 +0.72912 0.72912 0.72912 +0.75852 0.75852 0.75852 +0.78645 0.78645 0.78645 +0.81281 0.81281 0.81281 +0.83750 0.83750 0.83750 +0.86045 0.86045 0.86045 +0.88163 0.88163 0.88163 +0.90100 0.90100 0.90100 +0.91856 0.91856 0.91856 +0.93432 0.93432 0.93432 +0.54925 0.54925 0.54925 +0.58380 0.58380 0.58380 +0.61783 0.61783 0.61783 +0.65113 0.65113 0.65113 +0.68352 0.68352 0.68352 +0.71482 0.71482 0.71482 +0.74486 0.74486 0.74486 +0.77349 0.77349 0.77349 +0.80061 0.80061 0.80061 +0.82609 0.82609 0.82609 +0.84987 0.84987 0.84987 +0.87189 0.87189 0.87189 +0.89211 0.89211 0.89211 +0.91052 0.91052 0.91052 +0.92712 0.92712 0.92712 +0.94195 0.94195 0.94195 +0.95502 0.95502 0.95502 +0.60189 0.60189 0.60189 +0.63556 0.63556 0.63556 +0.66841 0.66841 0.66841 +0.70024 0.70024 0.70024 +0.73089 0.73089 0.73089 +0.76020 0.76020 0.76020 +0.78804 0.78804 0.78804 +0.81431 0.81431 0.81431 +0.83890 0.83890 0.83890 +0.86175 0.86175 0.86175 +0.88282 0.88282 0.88282 +0.90208 0.90208 0.90208 +0.91953 0.91953 0.91953 +0.93519 0.93519 0.93519 +0.94908 0.94908 0.94908 +0.96126 0.96126 0.96126 +0.97176 0.97176 0.97176 +0.65307 0.65307 0.65307 +0.68540 0.68540 0.68540 +0.71662 0.71662 0.71662 +0.74658 0.74658 0.74658 +0.77513 0.77513 0.77513 +0.80215 0.80215 0.80215 +0.82754 0.82754 0.82754 +0.85122 0.85122 0.85122 +0.87313 0.87313 0.87313 +0.89324 0.89324 0.89324 +0.91155 0.91155 0.91155 +0.92804 0.92804 0.92804 +0.94276 0.94276 0.94276 +0.95574 0.95574 0.95574 +0.96702 0.96702 0.96702 +0.97666 0.97666 0.97666 +0.98471 0.98471 0.98471 +0.70208 0.70208 0.70208 +0.73265 0.73265 0.73265 +0.76188 0.76188 0.76188 +0.78963 0.78963 0.78963 +0.81580 0.81580 0.81580 +0.84029 0.84029 0.84029 +0.86304 0.86304 0.86304 +0.88400 0.88400 0.88400 +0.90316 0.90316 0.90316 +0.92050 0.92050 0.92050 +0.93606 0.93606 0.93606 +0.94985 0.94985 0.94985 +0.96192 0.96192 0.96192 +0.97232 0.97232 0.97232 +0.98112 0.98112 0.98112 +0.98835 0.98835 0.98835 +0.99408 0.99408 0.99408 +0.74830 0.74830 0.74830 +0.77677 0.77677 0.77677 +0.80369 0.80369 0.80369 +0.82898 0.82898 0.82898 +0.85255 0.85255 0.85255 +0.87436 0.87436 0.87436 +0.89437 0.89437 0.89437 +0.91257 0.91257 0.91257 +0.92896 0.92896 0.92896 +0.94357 0.94357 0.94357 +0.95645 0.95645 0.95645 +0.96763 0.96763 0.96763 +0.97718 0.97718 0.97718 +0.98514 0.98514 0.98514 +0.99157 0.99157 0.99157 +0.99651 0.99651 0.99651 +1.00000 1.00000 1.00000 diff --git a/src/assets/lut/caldo.cube b/src/assets/lut/caldo.cube new file mode 100644 index 0000000..58ee35b --- /dev/null +++ b/src/assets/lut/caldo.cube @@ -0,0 +1,4919 @@ +# DaProd Video · LUT di partenza, create da noi (licenza MIT, come il progetto). +# Generata da scripts/genera-lut.mjs: non si modifica a mano. +TITLE "Caldo" +LUT_3D_SIZE 17 +DOMAIN_MIN 0.0 0.0 0.0 +DOMAIN_MAX 1.0 1.0 1.0 +0.01303 0.00000 0.00000 +0.06661 0.00000 0.00000 +0.12570 0.00000 0.00000 +0.18951 0.00000 0.00000 +0.25724 0.00000 0.00000 +0.32810 0.00000 0.00000 +0.40131 0.00000 0.00000 +0.47606 0.00000 0.00000 +0.55158 0.00000 0.00000 +0.62707 0.00000 0.00000 +0.70175 0.00000 0.00000 +0.77484 0.00000 0.00000 +0.84555 0.00000 0.00000 +0.91309 0.00000 0.00000 +0.97669 0.00000 0.00000 +1.00000 0.00000 0.00000 +1.00000 0.00000 0.00000 +0.01080 0.05046 0.00000 +0.06433 0.04980 0.00000 +0.12336 0.04908 0.00000 +0.18711 0.04831 0.00000 +0.25478 0.04748 0.00000 +0.32558 0.04662 0.00000 +0.39873 0.04573 0.00000 +0.47342 0.04481 0.00000 +0.54889 0.04389 0.00000 +0.62433 0.04297 0.00000 +0.69896 0.04206 0.00000 +0.77201 0.04117 0.00000 +0.84268 0.04031 0.00000 +0.91019 0.03948 0.00000 +0.97376 0.03871 0.00000 +1.00000 0.03799 0.00000 +1.00000 0.03734 0.00000 +0.00814 0.10620 0.00000 +0.06162 0.10555 0.00000 +0.12060 0.10483 0.00000 +0.18429 0.10406 0.00000 +0.25190 0.10323 0.00000 +0.32265 0.10237 0.00000 +0.39573 0.10148 0.00000 +0.47037 0.10056 0.00000 +0.54579 0.09964 0.00000 +0.62118 0.09872 0.00000 +0.69577 0.09781 0.00000 +0.76878 0.09692 0.00000 +0.83942 0.09606 0.00000 +0.90690 0.09524 0.00000 +0.97044 0.09446 0.00000 +1.00000 0.09374 0.00000 +1.00000 0.09309 0.00000 +0.00507 0.16642 0.00000 +0.05849 0.16577 0.00000 +0.11742 0.16505 0.00000 +0.18106 0.16428 0.00000 +0.24862 0.16345 0.00000 +0.31931 0.16259 0.00000 +0.39234 0.16170 0.00000 +0.46694 0.16079 0.00000 +0.54231 0.15987 0.00000 +0.61766 0.15895 0.00000 +0.69222 0.15804 0.00000 +0.76519 0.15714 0.00000 +0.83580 0.15628 0.00000 +0.90326 0.15546 0.00000 +0.96679 0.15468 0.00000 +1.00000 0.15396 0.00000 +1.00000 0.15331 0.00000 +0.00160 0.23037 0.00000 +0.05498 0.22972 0.00000 +0.11386 0.22900 0.00000 +0.17745 0.22822 0.00000 +0.24497 0.22740 0.00000 +0.31561 0.22653 0.00000 +0.38861 0.22564 0.00000 +0.46317 0.22473 0.00000 +0.53850 0.22381 0.00000 +0.61382 0.22289 0.00000 +0.68836 0.22198 0.00000 +0.76131 0.22109 0.00000 +0.83190 0.22023 0.00000 +0.89935 0.21941 0.00000 +0.96287 0.21863 0.00000 +1.00000 0.21794 0.00000 +1.00000 0.21734 0.00000 +0.00000 0.29729 0.00000 +0.05113 0.29664 0.00000 +0.10998 0.29592 0.00000 +0.17353 0.29515 0.00000 +0.24101 0.29432 0.00000 +0.31163 0.29346 0.00000 +0.38459 0.29257 0.00000 +0.45912 0.29166 0.00000 +0.53443 0.29074 0.00000 +0.60974 0.28982 0.00000 +0.68426 0.28891 0.00000 +0.75724 0.28803 0.00000 +0.82800 0.28723 0.00000 +0.89574 0.28652 0.00000 +0.95964 0.28589 0.00000 +1.00000 0.28533 0.00000 +1.00000 0.28486 0.00000 +0.00000 0.36646 0.00000 +0.04702 0.36580 0.00000 +0.10584 0.36509 0.00000 +0.16937 0.36431 0.00000 +0.23683 0.36349 0.00000 +0.30742 0.36262 0.00000 +0.38037 0.36173 0.00000 +0.45489 0.36082 0.00000 +0.53027 0.35993 0.00000 +0.60580 0.35910 0.00000 +0.68071 0.35833 0.00000 +0.75417 0.35763 0.00000 +0.82539 0.35700 0.00000 +0.89355 0.35644 0.00000 +0.95784 0.35594 0.00000 +1.00000 0.35551 0.00000 +1.00000 0.35514 0.00000 +0.00000 0.43711 0.00000 +0.04273 0.43646 0.00000 +0.10153 0.43574 0.00000 +0.16505 0.43496 0.00000 +0.23251 0.43414 0.00000 +0.30323 0.43333 0.00000 +0.37645 0.43254 0.00000 +0.45141 0.43179 0.00000 +0.52730 0.43109 0.00000 +0.60333 0.43044 0.00000 +0.67870 0.42984 0.00000 +0.75261 0.42930 0.00000 +0.82423 0.42881 0.00000 +0.89276 0.42837 0.00000 +0.95738 0.42799 0.00000 +1.00000 0.42766 0.00000 +1.00000 0.42737 0.00000 +0.00000 0.50851 0.00000 +0.03847 0.50790 0.00000 +0.09748 0.50726 0.00000 +0.16132 0.50660 0.00000 +0.22923 0.50595 0.00000 +0.30043 0.50531 0.00000 +0.37413 0.50470 0.00000 +0.44955 0.50412 0.00000 +0.52589 0.50357 0.00000 +0.60235 0.50307 0.00000 +0.67812 0.50261 0.00000 +0.75240 0.50219 0.00000 +0.82436 0.50181 0.00000 +0.89320 0.50148 0.00000 +0.95810 0.50118 0.00000 +1.00000 0.50092 0.00000 +1.00000 0.50070 0.00000 +0.00000 0.58035 0.00000 +0.03562 0.57987 0.00000 +0.09501 0.57936 0.00000 +0.15926 0.57885 0.00000 +0.22758 0.57835 0.00000 +0.29919 0.57785 0.00000 +0.37330 0.57738 0.00000 +0.44911 0.57693 0.00000 +0.52583 0.57651 0.00000 +0.60265 0.57612 0.00000 +0.67875 0.57577 0.00000 +0.75333 0.57544 0.00000 +0.82557 0.57515 0.00000 +0.89466 0.57488 0.00000 +0.95977 0.57465 0.00000 +1.00000 0.57444 0.00000 +1.00000 0.57425 0.00000 +0.00000 0.65201 0.00000 +0.03435 0.65163 0.00000 +0.09407 0.65125 0.00000 +0.15866 0.65085 0.00000 +0.22732 0.65046 0.00000 +0.29927 0.65008 0.00000 +0.37372 0.64971 0.00000 +0.44985 0.64937 0.00000 +0.52687 0.64904 0.00000 +0.60397 0.64873 0.00000 +0.68033 0.64845 0.00000 +0.75515 0.64819 0.00000 +0.82760 0.64794 0.00000 +0.89686 0.64772 0.00000 +0.96213 0.64751 0.00000 +1.00000 0.64733 0.00000 +1.00000 0.64716 0.00000 +0.00000 0.72261 0.00000 +0.03438 0.72232 0.00000 +0.09436 0.72202 0.00000 +0.15922 0.72171 0.00000 +0.22816 0.72141 0.00000 +0.30039 0.72111 0.00000 +0.37509 0.72081 0.00000 +0.45147 0.72054 0.00000 +0.52872 0.72027 0.00000 +0.60603 0.72001 0.00000 +0.68258 0.71977 0.00000 +0.75755 0.71953 0.00000 +0.83014 0.71931 0.00000 +0.89952 0.71910 0.00000 +0.96488 0.71890 0.00000 +1.00000 0.71871 0.00000 +1.00000 0.71853 0.00000 +0.00000 0.79126 0.00000 +0.03539 0.79103 0.00000 +0.09558 0.79079 0.00000 +0.16066 0.79054 0.00000 +0.22981 0.79029 0.00000 +0.30223 0.79004 0.00000 +0.37713 0.78980 0.00000 +0.45368 0.78956 0.00000 +0.53109 0.78932 0.00000 +0.60853 0.78908 0.00000 +0.68520 0.78884 0.00000 +0.76027 0.78861 0.00000 +0.83293 0.78838 0.00000 +0.90235 0.78815 0.00000 +0.96770 0.78793 0.00000 +1.00000 0.78772 0.00000 +1.00000 0.78752 0.00000 +0.00000 0.85707 0.00000 +0.03707 0.85688 0.00000 +0.09742 0.85668 0.00000 +0.16265 0.85646 0.00000 +0.23195 0.85625 0.00000 +0.30451 0.85602 0.00000 +0.37953 0.85579 0.00000 +0.45620 0.85556 0.00000 +0.53370 0.85532 0.00000 +0.61121 0.85507 0.00000 +0.68790 0.85482 0.00000 +0.76295 0.85456 0.00000 +0.83553 0.85430 0.00000 +0.90485 0.85403 0.00000 +0.97009 0.85377 0.00000 +1.00000 0.85351 0.00000 +1.00000 0.85327 0.00000 +0.00000 0.91917 0.00000 +0.03915 0.91900 0.00000 +0.09960 0.91882 0.00000 +0.16493 0.91862 0.00000 +0.23432 0.91840 0.00000 +0.30697 0.91818 0.00000 +0.38205 0.91794 0.00000 +0.45875 0.91769 0.00000 +0.53622 0.91743 0.00000 +0.61366 0.91715 0.00000 +0.69024 0.91686 0.00000 +0.76516 0.91655 0.00000 +0.83761 0.91624 0.00000 +0.90677 0.91592 0.00000 +0.97185 0.91559 0.00000 +1.00000 0.91528 0.00000 +1.00000 0.91497 0.00000 +0.00000 0.97671 0.00000 +0.04136 0.97655 0.00000 +0.10188 0.97636 0.00000 +0.16726 0.97615 0.00000 +0.23668 0.97593 0.00000 +0.30931 0.97568 0.00000 +0.38434 0.97542 0.00000 +0.46094 0.97513 0.00000 +0.53830 0.97483 0.00000 +0.61561 0.97450 0.00000 +0.69204 0.97415 0.00000 +0.76679 0.97378 0.00000 +0.83905 0.97340 0.00000 +0.90802 0.97301 0.00000 +0.97291 0.97261 0.00000 +1.00000 0.97222 0.00000 +1.00000 0.97185 0.00000 +0.00000 1.00000 0.00000 +0.04351 1.00000 0.00000 +0.10402 1.00000 0.00000 +0.16936 1.00000 0.00000 +0.23871 1.00000 0.00000 +0.31125 1.00000 0.00000 +0.38617 1.00000 0.00000 +0.46264 1.00000 0.00000 +0.53985 1.00000 0.00000 +0.61698 1.00000 0.00000 +0.69323 1.00000 0.00000 +0.76778 1.00000 0.00000 +0.83984 1.00000 0.00000 +0.90860 1.00000 0.00000 +0.97327 1.00000 0.00000 +1.00000 1.00000 0.00000 +1.00000 1.00000 0.00000 +0.01282 0.00000 0.02930 +0.06640 0.00000 0.02867 +0.12548 0.00000 0.02800 +0.18929 0.00000 0.02731 +0.25701 0.00000 0.02662 +0.32787 0.00000 0.02593 +0.40106 0.00000 0.02526 +0.47581 0.00000 0.02462 +0.55132 0.00000 0.02400 +0.62681 0.00000 0.02342 +0.70149 0.00000 0.02289 +0.77457 0.00000 0.02239 +0.84528 0.00000 0.02194 +0.91282 0.00000 0.02152 +0.97641 0.00000 0.02116 +1.00000 0.00000 0.02083 +1.00000 0.00000 0.02055 +0.01058 0.05025 0.02734 +0.06410 0.04960 0.02679 +0.12313 0.04888 0.02621 +0.18687 0.04810 0.02561 +0.25454 0.04728 0.02501 +0.32534 0.04642 0.02442 +0.39847 0.04552 0.02384 +0.47316 0.04461 0.02328 +0.54862 0.04369 0.02275 +0.62406 0.04277 0.02225 +0.69869 0.04186 0.02178 +0.77173 0.04097 0.02135 +0.84240 0.04011 0.02095 +0.90991 0.03928 0.02059 +0.97347 0.03851 0.02027 +1.00000 0.03779 0.01998 +1.00000 0.03714 0.01973 +0.00790 0.10600 0.02548 +0.06137 0.10535 0.02501 +0.12035 0.10463 0.02452 +0.18404 0.10385 0.02401 +0.25164 0.10303 0.02350 +0.32238 0.10217 0.02299 +0.39546 0.10127 0.02249 +0.47010 0.10036 0.02202 +0.54551 0.09944 0.02156 +0.62090 0.09852 0.02113 +0.69549 0.09761 0.02073 +0.76849 0.09672 0.02036 +0.83913 0.09586 0.02001 +0.90660 0.09503 0.01970 +0.97015 0.09426 0.01941 +1.00000 0.09354 0.01915 +1.00000 0.09289 0.01893 +0.00481 0.16622 0.02379 +0.05823 0.16557 0.02340 +0.11716 0.16485 0.02298 +0.18079 0.16407 0.02255 +0.24834 0.16325 0.02212 +0.31903 0.16239 0.02169 +0.39206 0.16149 0.02127 +0.46666 0.16058 0.02087 +0.54202 0.15966 0.02048 +0.61737 0.15874 0.02011 +0.69193 0.15783 0.01976 +0.76490 0.15694 0.01943 +0.83551 0.15608 0.01913 +0.90297 0.15526 0.01884 +0.96649 0.15448 0.01858 +1.00000 0.15376 0.01835 +1.00000 0.15311 0.01813 +0.00132 0.23017 0.02230 +0.05471 0.22951 0.02197 +0.11358 0.22880 0.02162 +0.17717 0.22802 0.02127 +0.24468 0.22720 0.02090 +0.31533 0.22633 0.02054 +0.38832 0.22544 0.02018 +0.46287 0.22453 0.01983 +0.53821 0.22361 0.01950 +0.61353 0.22269 0.01917 +0.68806 0.22178 0.01886 +0.76101 0.22089 0.01856 +0.83160 0.22003 0.01828 +0.89905 0.21920 0.01801 +0.96258 0.21843 0.01775 +1.00000 0.21775 0.01742 +1.00000 0.21717 0.01704 +0.00000 0.29709 0.02102 +0.05085 0.29644 0.02074 +0.10969 0.29572 0.02045 +0.17324 0.29495 0.02014 +0.24072 0.29412 0.01983 +0.31133 0.29326 0.01952 +0.38430 0.29237 0.01920 +0.45882 0.29146 0.01889 +0.53414 0.29054 0.01859 +0.60944 0.28962 0.01829 +0.68396 0.28871 0.01799 +0.75697 0.28784 0.01765 +0.82777 0.28706 0.01717 +0.89554 0.28635 0.01659 +0.95947 0.28573 0.01594 +1.00000 0.28519 0.01525 +1.00000 0.28472 0.01454 +0.00000 0.36625 0.01991 +0.04673 0.36560 0.01967 +0.10554 0.36488 0.01941 +0.16907 0.36411 0.01915 +0.23653 0.36328 0.01887 +0.30712 0.36242 0.01858 +0.38007 0.36153 0.01829 +0.45459 0.36062 0.01800 +0.53001 0.35974 0.01760 +0.60558 0.35893 0.01704 +0.68052 0.35817 0.01634 +0.75402 0.35748 0.01552 +0.82527 0.35686 0.01460 +0.89346 0.35631 0.01361 +0.95778 0.35583 0.01259 +1.00000 0.35540 0.01156 +1.00000 0.35504 0.01056 +0.00000 0.43691 0.01893 +0.04243 0.43626 0.01871 +0.10123 0.43554 0.01848 +0.16475 0.43476 0.01823 +0.23223 0.43395 0.01793 +0.30298 0.43315 0.01750 +0.37625 0.43238 0.01690 +0.45124 0.43164 0.01616 +0.52716 0.43095 0.01526 +0.60323 0.43031 0.01422 +0.67863 0.42972 0.01307 +0.75256 0.42919 0.01182 +0.82421 0.42871 0.01050 +0.89277 0.42828 0.00915 +0.95741 0.42790 0.00779 +1.00000 0.42758 0.00647 +1.00000 0.42730 0.00521 +0.00000 0.50832 0.01797 +0.03822 0.50772 0.01764 +0.09726 0.50709 0.01718 +0.16113 0.50644 0.01659 +0.22907 0.50580 0.01584 +0.30030 0.50518 0.01495 +0.37404 0.50457 0.01389 +0.44949 0.50400 0.01269 +0.52586 0.50347 0.01135 +0.60234 0.50297 0.00990 +0.67814 0.50252 0.00834 +0.75244 0.50211 0.00672 +0.82443 0.50174 0.00505 +0.89329 0.50141 0.00338 +0.95820 0.50112 0.00174 +1.00000 0.50086 0.00016 +1.00000 0.50064 0.00000 +0.00000 0.58020 0.01581 +0.03549 0.57973 0.01513 +0.09491 0.57923 0.01430 +0.15918 0.57873 0.01332 +0.22753 0.57824 0.01217 +0.29917 0.57775 0.01087 +0.37331 0.57729 0.00941 +0.44914 0.57685 0.00782 +0.52589 0.57644 0.00610 +0.60272 0.57605 0.00428 +0.67885 0.57570 0.00238 +0.75345 0.57539 0.00044 +0.82571 0.57510 0.00000 +0.89481 0.57483 0.00000 +0.95994 0.57460 0.00000 +1.00000 0.57439 0.00000 +1.00000 0.57421 0.00000 +0.00000 0.65190 0.01212 +0.03433 0.65153 0.01114 +0.09407 0.65115 0.00999 +0.15868 0.65076 0.00867 +0.22736 0.65038 0.00717 +0.29934 0.65001 0.00553 +0.37380 0.64965 0.00373 +0.44996 0.64931 0.00180 +0.52700 0.64898 0.00000 +0.60411 0.64868 0.00000 +0.68049 0.64840 0.00000 +0.75532 0.64814 0.00000 +0.82778 0.64790 0.00000 +0.89706 0.64768 0.00000 +0.96233 0.64747 0.00000 +1.00000 0.64729 0.00000 +1.00000 0.64712 0.00000 +0.00000 0.72253 0.00721 +0.03443 0.72224 0.00597 +0.09444 0.72195 0.00454 +0.15932 0.72165 0.00294 +0.22828 0.72135 0.00116 +0.30052 0.72105 0.00000 +0.37524 0.72076 0.00000 +0.45163 0.72049 0.00000 +0.52890 0.72022 0.00000 +0.60622 0.71997 0.00000 +0.68278 0.71973 0.00000 +0.75776 0.71950 0.00000 +0.83036 0.71927 0.00000 +0.89975 0.71906 0.00000 +0.96511 0.71886 0.00000 +1.00000 0.71867 0.00000 +1.00000 0.71849 0.00000 +0.00000 0.79120 0.00139 +0.03551 0.79097 0.00000 +0.09572 0.79074 0.00000 +0.16081 0.79049 0.00000 +0.22997 0.79025 0.00000 +0.30241 0.79000 0.00000 +0.37732 0.78976 0.00000 +0.45388 0.78952 0.00000 +0.53130 0.78928 0.00000 +0.60875 0.78904 0.00000 +0.68542 0.78880 0.00000 +0.76050 0.78857 0.00000 +0.83316 0.78834 0.00000 +0.90258 0.78811 0.00000 +0.96792 0.78789 0.00000 +1.00000 0.78767 0.00000 +1.00000 0.78747 0.00000 +0.00000 0.85702 0.00000 +0.03724 0.85684 0.00000 +0.09761 0.85664 0.00000 +0.16284 0.85642 0.00000 +0.23215 0.85621 0.00000 +0.30472 0.85598 0.00000 +0.37975 0.85575 0.00000 +0.45642 0.85552 0.00000 +0.53393 0.85528 0.00000 +0.61144 0.85503 0.00000 +0.68813 0.85477 0.00000 +0.76316 0.85451 0.00000 +0.83574 0.85425 0.00000 +0.90504 0.85398 0.00000 +0.97027 0.85371 0.00000 +1.00000 0.85345 0.00000 +1.00000 0.85320 0.00000 +0.00000 0.91913 0.00000 +0.03935 0.91896 0.00000 +0.09982 0.91878 0.00000 +0.16515 0.91858 0.00000 +0.23454 0.91836 0.00000 +0.30719 0.91814 0.00000 +0.38228 0.91790 0.00000 +0.45897 0.91765 0.00000 +0.53644 0.91738 0.00000 +0.61387 0.91710 0.00000 +0.69044 0.91680 0.00000 +0.76534 0.91649 0.00000 +0.83778 0.91617 0.00000 +0.90692 0.91585 0.00000 +0.97199 0.91552 0.00000 +1.00000 0.91519 0.00000 +1.00000 0.91488 0.00000 +0.00000 0.97668 0.00000 +0.04159 0.97651 0.00000 +0.10211 0.97632 0.00000 +0.16749 0.97611 0.00000 +0.23691 0.97589 0.00000 +0.30953 0.97564 0.00000 +0.38455 0.97537 0.00000 +0.46114 0.97508 0.00000 +0.53849 0.97477 0.00000 +0.61578 0.97443 0.00000 +0.69219 0.97408 0.00000 +0.76692 0.97371 0.00000 +0.83917 0.97332 0.00000 +0.90812 0.97292 0.00000 +0.97299 0.97251 0.00000 +1.00000 0.97212 0.00000 +1.00000 0.97174 0.00000 +0.00000 1.00000 0.00000 +0.04374 1.00000 0.00000 +0.10424 1.00000 0.00000 +0.16957 1.00000 0.00000 +0.23891 1.00000 0.00000 +0.31144 1.00000 0.00000 +0.38635 1.00000 0.00000 +0.46280 1.00000 0.00000 +0.54000 1.00000 0.00000 +0.61711 1.00000 0.00000 +0.69334 1.00000 0.00000 +0.76787 1.00000 0.00000 +0.83990 1.00000 0.00000 +0.90864 1.00000 0.00000 +0.97328 1.00000 0.00000 +1.00000 1.00000 0.00000 +1.00000 1.00000 0.00000 +0.01260 0.00000 0.08369 +0.06617 0.00000 0.08307 +0.12525 0.00000 0.08241 +0.18904 0.00000 0.08174 +0.25676 0.00000 0.08106 +0.32761 0.00000 0.08038 +0.40080 0.00000 0.07972 +0.47554 0.00000 0.07908 +0.55104 0.00000 0.07848 +0.62652 0.00000 0.07791 +0.70120 0.00000 0.07738 +0.77428 0.00000 0.07689 +0.84498 0.00000 0.07644 +0.91251 0.00000 0.07604 +0.97610 0.00000 0.07568 +1.00000 0.00000 0.07536 +1.00000 0.00000 0.07508 +0.01033 0.05003 0.08176 +0.06385 0.04938 0.08122 +0.12287 0.04866 0.08065 +0.18661 0.04788 0.08007 +0.25427 0.04706 0.07947 +0.32506 0.04619 0.07889 +0.39819 0.04530 0.07832 +0.47288 0.04439 0.07777 +0.54833 0.04347 0.07724 +0.62376 0.04255 0.07675 +0.69839 0.04164 0.07629 +0.77142 0.04075 0.07587 +0.84209 0.03988 0.07548 +0.90959 0.03906 0.07512 +0.97315 0.03828 0.07480 +1.00000 0.03756 0.07452 +1.00000 0.03691 0.07427 +0.00764 0.10578 0.07994 +0.06110 0.10513 0.07948 +0.12007 0.10441 0.07899 +0.18375 0.10363 0.07849 +0.25136 0.10281 0.07798 +0.32209 0.10194 0.07748 +0.39517 0.10105 0.07700 +0.46980 0.10014 0.07653 +0.54520 0.09922 0.07608 +0.62059 0.09830 0.07566 +0.69517 0.09739 0.07526 +0.76817 0.09650 0.07489 +0.83880 0.09564 0.07455 +0.90628 0.09481 0.07424 +0.96982 0.09404 0.07396 +1.00000 0.09332 0.07370 +1.00000 0.09267 0.07348 +0.00452 0.16600 0.07828 +0.05794 0.16535 0.07789 +0.11686 0.16463 0.07748 +0.18049 0.16385 0.07706 +0.24804 0.16303 0.07663 +0.31872 0.16216 0.07621 +0.39175 0.16127 0.07580 +0.46634 0.16036 0.07540 +0.54170 0.15944 0.07501 +0.61705 0.15852 0.07465 +0.69160 0.15761 0.07430 +0.76457 0.15672 0.07398 +0.83518 0.15586 0.07368 +0.90264 0.15503 0.07340 +0.96616 0.15426 0.07314 +1.00000 0.15354 0.07290 +1.00000 0.15289 0.07269 +0.00102 0.22994 0.07681 +0.05440 0.22929 0.07649 +0.11328 0.22857 0.07614 +0.17686 0.22780 0.07579 +0.24437 0.22697 0.07543 +0.31501 0.22611 0.07507 +0.38800 0.22522 0.07472 +0.46255 0.22431 0.07438 +0.53788 0.22339 0.07404 +0.61320 0.22247 0.07372 +0.68773 0.22156 0.07341 +0.76068 0.22067 0.07312 +0.83127 0.21980 0.07283 +0.89872 0.21898 0.07257 +0.96227 0.21822 0.07228 +1.00000 0.21755 0.07192 +1.00000 0.21698 0.07151 +0.00000 0.29687 0.07554 +0.05053 0.29622 0.07527 +0.10937 0.29550 0.07498 +0.17292 0.29472 0.07468 +0.24040 0.29390 0.07437 +0.31101 0.29304 0.07406 +0.38397 0.29215 0.07375 +0.45850 0.29124 0.07344 +0.53380 0.29032 0.07314 +0.60911 0.28940 0.07284 +0.68363 0.28849 0.07255 +0.75668 0.28764 0.07216 +0.82752 0.28686 0.07165 +0.89533 0.28617 0.07103 +0.95929 0.28557 0.07035 +1.00000 0.28503 0.06962 +1.00000 0.28458 0.06890 +0.00000 0.36603 0.07445 +0.04640 0.36538 0.07422 +0.10522 0.36466 0.07396 +0.16874 0.36389 0.07370 +0.23620 0.36306 0.07342 +0.30679 0.36220 0.07314 +0.37974 0.36131 0.07285 +0.45427 0.36040 0.07254 +0.52973 0.35954 0.07210 +0.60535 0.35874 0.07150 +0.68033 0.35800 0.07076 +0.75387 0.35733 0.06990 +0.82515 0.35672 0.06895 +0.89337 0.35618 0.06793 +0.95771 0.35570 0.06688 +1.00000 0.35529 0.06583 +1.00000 0.35493 0.06481 +0.00000 0.43668 0.07348 +0.04210 0.43603 0.07327 +0.10090 0.43531 0.07303 +0.16442 0.43454 0.07278 +0.23193 0.43374 0.07246 +0.30272 0.43295 0.07198 +0.37603 0.43219 0.07135 +0.45106 0.43147 0.07057 +0.52702 0.43080 0.06963 +0.60312 0.43017 0.06856 +0.67856 0.42959 0.06737 +0.75252 0.42907 0.06609 +0.82420 0.42860 0.06475 +0.89278 0.42818 0.06336 +0.95745 0.42781 0.06198 +1.00000 0.42749 0.06064 +1.00000 0.42722 0.05936 +0.00000 0.50811 0.07249 +0.03796 0.50752 0.07213 +0.09703 0.50690 0.07164 +0.16093 0.50627 0.07101 +0.22891 0.50564 0.07024 +0.30017 0.50503 0.06930 +0.37394 0.50444 0.06822 +0.44943 0.50388 0.06698 +0.52583 0.50335 0.06561 +0.60234 0.50287 0.06413 +0.67817 0.50242 0.06254 +0.75250 0.50202 0.06089 +0.82451 0.50166 0.05920 +0.89339 0.50134 0.05750 +0.95832 0.50105 0.05584 +1.00000 0.50080 0.05424 +1.00000 0.50059 0.05275 +0.00000 0.58004 0.07020 +0.03536 0.57958 0.06949 +0.09481 0.57910 0.06864 +0.15911 0.57860 0.06762 +0.22749 0.57812 0.06645 +0.29915 0.57764 0.06511 +0.37332 0.57719 0.06363 +0.44918 0.57676 0.06201 +0.52595 0.57635 0.06026 +0.60281 0.57598 0.05841 +0.67896 0.57564 0.05649 +0.75358 0.57532 0.05453 +0.82586 0.57504 0.05255 +0.89498 0.57478 0.05059 +0.96012 0.57455 0.04870 +1.00000 0.57435 0.04689 +1.00000 0.57417 0.04523 +0.00000 0.65178 0.06640 +0.03431 0.65142 0.06539 +0.09407 0.65105 0.06421 +0.15870 0.65067 0.06287 +0.22741 0.65029 0.06135 +0.29941 0.64993 0.05968 +0.37390 0.64957 0.05785 +0.45008 0.64924 0.05590 +0.52714 0.64892 0.05384 +0.60427 0.64863 0.05170 +0.68067 0.64835 0.04950 +0.75551 0.64809 0.04728 +0.82799 0.64786 0.04507 +0.89727 0.64764 0.04291 +0.96256 0.64743 0.04083 +1.00000 0.64725 0.03888 +1.00000 0.64708 0.03708 +0.00000 0.72244 0.06138 +0.03451 0.72216 0.06013 +0.09453 0.72187 0.05868 +0.15943 0.72158 0.05705 +0.22841 0.72128 0.05525 +0.30066 0.72099 0.05329 +0.37540 0.72071 0.05120 +0.45182 0.72044 0.04898 +0.52910 0.72018 0.04667 +0.60643 0.71993 0.04429 +0.68300 0.71968 0.04188 +0.75800 0.71945 0.03946 +0.83060 0.71923 0.03708 +0.90000 0.71902 0.03477 +0.96537 0.71882 0.03256 +1.00000 0.71862 0.03050 +1.00000 0.71845 0.02862 +0.00000 0.79113 0.05549 +0.03565 0.79091 0.05402 +0.09588 0.79068 0.05236 +0.16098 0.79044 0.05050 +0.23016 0.79020 0.04847 +0.30261 0.78996 0.04629 +0.37753 0.78971 0.04398 +0.45411 0.78947 0.04156 +0.53154 0.78924 0.03906 +0.60900 0.78900 0.03651 +0.68567 0.78876 0.03394 +0.76076 0.78853 0.03139 +0.83342 0.78829 0.02890 +0.90282 0.78806 0.02655 +0.96816 0.78784 0.02435 +1.00000 0.78762 0.02235 +1.00000 0.78741 0.02055 +0.00000 0.85697 0.04905 +0.03744 0.85679 0.04742 +0.09781 0.85659 0.04558 +0.16306 0.85638 0.04355 +0.23238 0.85616 0.04135 +0.30496 0.85594 0.03900 +0.37999 0.85571 0.03653 +0.45667 0.85548 0.03396 +0.53418 0.85523 0.03132 +0.61169 0.85498 0.02867 +0.68837 0.85473 0.02608 +0.76340 0.85446 0.02357 +0.83596 0.85419 0.02117 +0.90526 0.85392 0.01893 +0.97047 0.85365 0.01685 +1.00000 0.85338 0.01496 +1.00000 0.85312 0.01329 +0.00000 0.91909 0.04239 +0.03958 0.91892 0.04063 +0.10005 0.91874 0.03867 +0.16539 0.91854 0.03651 +0.23479 0.91832 0.03419 +0.30745 0.91810 0.03172 +0.38254 0.91785 0.02915 +0.45922 0.91760 0.02655 +0.53667 0.91733 0.02395 +0.61409 0.91704 0.02140 +0.69065 0.91674 0.01891 +0.76554 0.91643 0.01653 +0.83795 0.91610 0.01428 +0.90709 0.91577 0.01219 +0.97213 0.91543 0.01028 +1.00000 0.91510 0.00855 +1.00000 0.91478 0.00704 +0.00000 0.97663 0.03582 +0.04184 0.97647 0.03398 +0.10236 0.97628 0.03192 +0.16775 0.97607 0.02969 +0.23716 0.97584 0.02733 +0.30977 0.97559 0.02488 +0.38478 0.97532 0.02239 +0.46136 0.97502 0.01989 +0.53869 0.97470 0.01741 +0.61596 0.97436 0.01499 +0.69236 0.97400 0.01267 +0.76707 0.97362 0.01046 +0.83929 0.97322 0.00839 +0.90822 0.97281 0.00649 +0.97307 0.97240 0.00477 +1.00000 0.97200 0.00324 +1.00000 0.97161 0.00191 +0.00000 1.00000 0.02962 +0.04398 1.00000 0.02775 +0.10448 1.00000 0.02571 +0.16981 1.00000 0.02353 +0.23914 1.00000 0.02125 +0.31165 1.00000 0.01890 +0.38654 1.00000 0.01652 +0.46298 1.00000 0.01415 +0.54015 1.00000 0.01183 +0.61725 1.00000 0.00958 +0.69345 1.00000 0.00744 +0.76795 1.00000 0.00543 +0.83996 1.00000 0.00357 +0.90867 1.00000 0.00188 +0.97329 1.00000 0.00038 +1.00000 1.00000 0.00000 +1.00000 1.00000 0.00000 +0.01235 0.00000 0.14245 +0.06591 0.00000 0.14184 +0.12498 0.00000 0.14120 +0.18877 0.00000 0.14053 +0.25648 0.00000 0.13986 +0.32732 0.00000 0.13919 +0.40051 0.00000 0.13855 +0.47524 0.00000 0.13792 +0.55074 0.00000 0.13733 +0.62621 0.00000 0.13677 +0.70088 0.00000 0.13625 +0.77395 0.00000 0.13577 +0.84465 0.00000 0.13533 +0.91218 0.00000 0.13493 +0.97577 0.00000 0.13457 +1.00000 0.00000 0.13426 +1.00000 0.00000 0.13398 +0.01006 0.04979 0.14056 +0.06357 0.04914 0.14002 +0.12259 0.04842 0.13946 +0.18632 0.04764 0.13889 +0.25397 0.04682 0.13830 +0.32476 0.04595 0.13773 +0.39788 0.04506 0.13717 +0.47256 0.04415 0.13663 +0.54801 0.04323 0.13611 +0.62344 0.04231 0.13563 +0.69806 0.04140 0.13518 +0.77109 0.04051 0.13476 +0.84175 0.03964 0.13438 +0.90925 0.03882 0.13403 +0.97281 0.03804 0.13371 +1.00000 0.03732 0.13343 +1.00000 0.03667 0.13319 +0.00735 0.10554 0.13876 +0.06081 0.10489 0.13831 +0.11977 0.10417 0.13783 +0.18345 0.10339 0.13734 +0.25104 0.10257 0.13684 +0.32177 0.10170 0.13635 +0.39484 0.10081 0.13587 +0.46947 0.09990 0.13541 +0.54487 0.09898 0.13497 +0.62025 0.09806 0.13455 +0.69483 0.09715 0.13416 +0.76783 0.09626 0.13380 +0.83846 0.09539 0.13346 +0.90593 0.09457 0.13316 +0.96947 0.09379 0.13288 +1.00000 0.09308 0.13262 +1.00000 0.09243 0.13240 +0.00421 0.16576 0.13713 +0.05763 0.16511 0.13675 +0.11654 0.16439 0.13635 +0.18017 0.16361 0.13593 +0.24771 0.16279 0.13551 +0.31839 0.16192 0.13510 +0.39142 0.16103 0.13469 +0.46600 0.16012 0.13430 +0.54136 0.15920 0.13392 +0.61670 0.15828 0.13356 +0.69125 0.15737 0.13322 +0.76422 0.15648 0.13290 +0.83483 0.15562 0.13260 +0.90228 0.15479 0.13232 +0.96580 0.15402 0.13206 +1.00000 0.15330 0.13183 +1.00000 0.15265 0.13162 +0.00070 0.22970 0.13569 +0.05407 0.22905 0.13537 +0.11294 0.22833 0.13504 +0.17652 0.22756 0.13469 +0.24403 0.22673 0.13433 +0.31467 0.22587 0.13398 +0.38765 0.22498 0.13363 +0.46220 0.22407 0.13329 +0.53753 0.22315 0.13296 +0.61285 0.22223 0.13264 +0.68737 0.22132 0.13234 +0.76033 0.22043 0.13204 +0.83092 0.21956 0.13176 +0.89836 0.21874 0.13150 +0.96195 0.21799 0.13118 +1.00000 0.21734 0.13078 +1.00000 0.21678 0.13034 +0.00000 0.29663 0.13445 +0.05019 0.29598 0.13418 +0.10902 0.29526 0.13389 +0.17257 0.29448 0.13360 +0.24004 0.29366 0.13329 +0.31065 0.29280 0.13298 +0.38361 0.29191 0.13268 +0.45814 0.29100 0.13237 +0.53345 0.29008 0.13207 +0.60875 0.28916 0.13177 +0.68329 0.28825 0.13146 +0.75639 0.28742 0.13103 +0.82726 0.28666 0.13048 +0.89511 0.28599 0.12982 +0.95911 0.28539 0.12911 +1.00000 0.28487 0.12835 +1.00000 0.28442 0.12760 +0.00000 0.36579 0.13337 +0.04605 0.36514 0.13314 +0.10486 0.36442 0.13289 +0.16839 0.36365 0.13262 +0.23584 0.36282 0.13235 +0.30643 0.36196 0.13207 +0.37938 0.36107 0.13178 +0.45394 0.36017 0.13144 +0.52945 0.35933 0.13095 +0.60511 0.35854 0.13031 +0.68013 0.35782 0.12954 +0.75371 0.35716 0.12864 +0.82503 0.35656 0.12765 +0.89328 0.35604 0.12660 +0.95765 0.35557 0.12552 +1.00000 0.35516 0.12443 +1.00000 0.35482 0.12339 +0.00000 0.43644 0.13241 +0.04174 0.43579 0.13219 +0.10054 0.43507 0.13196 +0.16407 0.43430 0.13171 +0.23162 0.43352 0.13134 +0.30246 0.43275 0.13082 +0.37580 0.43200 0.13015 +0.45087 0.43130 0.12933 +0.52688 0.43063 0.12835 +0.60301 0.43002 0.12724 +0.67849 0.42946 0.12602 +0.75248 0.42894 0.12471 +0.82419 0.42848 0.12333 +0.89280 0.42807 0.12192 +0.95749 0.42772 0.12051 +1.00000 0.42740 0.11914 +1.00000 0.42713 0.11784 +0.00000 0.50789 0.13136 +0.03769 0.50731 0.13097 +0.09679 0.50671 0.13045 +0.16073 0.50609 0.12979 +0.22875 0.50547 0.12898 +0.30005 0.50487 0.12801 +0.37385 0.50429 0.12689 +0.44937 0.50374 0.12562 +0.52580 0.50323 0.12421 +0.60235 0.50276 0.12269 +0.67821 0.50232 0.12108 +0.75257 0.50193 0.11940 +0.82460 0.50158 0.11768 +0.89351 0.50126 0.11596 +0.95846 0.50098 0.11427 +1.00000 0.50074 0.11266 +1.00000 0.50053 0.11115 +0.00000 0.57987 0.12893 +0.03523 0.57942 0.12820 +0.09471 0.57895 0.12731 +0.15904 0.57847 0.12627 +0.22745 0.57799 0.12506 +0.29914 0.57753 0.12370 +0.37334 0.57708 0.12218 +0.44924 0.57666 0.12053 +0.52603 0.57627 0.11875 +0.60292 0.57590 0.11688 +0.67909 0.57556 0.11493 +0.75374 0.57526 0.11294 +0.82603 0.57498 0.11094 +0.89517 0.57472 0.10897 +0.96032 0.57450 0.10705 +1.00000 0.57430 0.10524 +1.00000 0.57412 0.10356 +0.00000 0.65166 0.12501 +0.03429 0.65130 0.12398 +0.09408 0.65094 0.12278 +0.15874 0.65057 0.12141 +0.22748 0.65020 0.11986 +0.29950 0.64984 0.11816 +0.37401 0.64950 0.11631 +0.45021 0.64917 0.11433 +0.52730 0.64886 0.11225 +0.60445 0.64857 0.11008 +0.68087 0.64830 0.10787 +0.75573 0.64804 0.10563 +0.82821 0.64781 0.10340 +0.89751 0.64759 0.10123 +0.96281 0.64739 0.09913 +1.00000 0.64720 0.09716 +1.00000 0.64703 0.09535 +0.00000 0.72235 0.11990 +0.03459 0.72208 0.11862 +0.09463 0.72179 0.11715 +0.15955 0.72150 0.11550 +0.22855 0.72121 0.11368 +0.30083 0.72093 0.11170 +0.37559 0.72065 0.10958 +0.45202 0.72039 0.10734 +0.52931 0.72013 0.10501 +0.60666 0.71988 0.10261 +0.68324 0.71964 0.10018 +0.75825 0.71941 0.09776 +0.83086 0.71919 0.09536 +0.90027 0.71897 0.09304 +0.96564 0.71877 0.09082 +1.00000 0.71858 0.08875 +1.00000 0.71840 0.08688 +0.00000 0.79107 0.11391 +0.03581 0.79085 0.11243 +0.09605 0.79062 0.11075 +0.16117 0.79039 0.10887 +0.23036 0.79015 0.10683 +0.30283 0.78991 0.10463 +0.37776 0.78967 0.10230 +0.45436 0.78943 0.09986 +0.53179 0.78919 0.09735 +0.60926 0.78895 0.09478 +0.68595 0.78872 0.09220 +0.76103 0.78848 0.08964 +0.83369 0.78824 0.08716 +0.90308 0.78801 0.08482 +0.96841 0.78778 0.08263 +1.00000 0.78756 0.08063 +1.00000 0.78734 0.07884 +0.00000 0.85692 0.10741 +0.03765 0.85674 0.10576 +0.09804 0.85654 0.10391 +0.16330 0.85633 0.10186 +0.23262 0.85612 0.09965 +0.30522 0.85590 0.09729 +0.38026 0.85567 0.09480 +0.45695 0.85543 0.09222 +0.53446 0.85519 0.08958 +0.61196 0.85493 0.08693 +0.68863 0.85467 0.08435 +0.76365 0.85440 0.08185 +0.83620 0.85413 0.07946 +0.90548 0.85385 0.07723 +0.97068 0.85357 0.07517 +1.00000 0.85330 0.07330 +1.00000 0.85304 0.07163 +0.00000 0.91905 0.10070 +0.03983 0.91888 0.09893 +0.10031 0.91869 0.09695 +0.16566 0.91849 0.09479 +0.23507 0.91828 0.09245 +0.30773 0.91805 0.08997 +0.38281 0.91780 0.08741 +0.45948 0.91755 0.08482 +0.53693 0.91727 0.08223 +0.61433 0.91698 0.07969 +0.69087 0.91667 0.07722 +0.76575 0.91635 0.07485 +0.83814 0.91602 0.07262 +0.90725 0.91568 0.07055 +0.97228 0.91533 0.06865 +1.00000 0.91500 0.06695 +1.00000 0.91467 0.06545 +0.00000 0.97659 0.09409 +0.04211 0.97642 0.09224 +0.10264 0.97623 0.09018 +0.16802 0.97602 0.08794 +0.23742 0.97579 0.08559 +0.31003 0.97553 0.08316 +0.38502 0.97526 0.08068 +0.46159 0.97496 0.07819 +0.53890 0.97463 0.07573 +0.61615 0.97428 0.07333 +0.69253 0.97391 0.07102 +0.76722 0.97352 0.06883 +0.83942 0.97312 0.06679 +0.90832 0.97270 0.06491 +0.97314 0.97228 0.06322 +1.00000 0.97187 0.06171 +1.00000 0.97147 0.06040 +0.00000 1.00000 0.08788 +0.04425 1.00000 0.08602 +0.10474 1.00000 0.08398 +0.17005 1.00000 0.08181 +0.23937 1.00000 0.07954 +0.31188 1.00000 0.07720 +0.38675 1.00000 0.07484 +0.46317 1.00000 0.07249 +0.54032 1.00000 0.07019 +0.61739 1.00000 0.06797 +0.69356 1.00000 0.06585 +0.76804 1.00000 0.06387 +0.84002 1.00000 0.06204 +0.90870 1.00000 0.06038 +0.97329 1.00000 0.05890 +1.00000 1.00000 0.05761 +1.00000 1.00000 0.05650 +0.01208 0.00000 0.20485 +0.06564 0.00000 0.20425 +0.12470 0.00000 0.20362 +0.18848 0.00000 0.20296 +0.25619 0.00000 0.20230 +0.32702 0.00000 0.20165 +0.40020 0.00000 0.20101 +0.47492 0.00000 0.20040 +0.55041 0.00000 0.19982 +0.62588 0.00000 0.19927 +0.70054 0.00000 0.19876 +0.77361 0.00000 0.19829 +0.84430 0.00000 0.19785 +0.91183 0.00000 0.19746 +0.97541 0.00000 0.19711 +1.00000 0.00000 0.19680 +1.00000 0.00000 0.19653 +0.00977 0.04953 0.20299 +0.06328 0.04888 0.20247 +0.12229 0.04816 0.20192 +0.18601 0.04739 0.20135 +0.25366 0.04656 0.20078 +0.32444 0.04570 0.20021 +0.39756 0.04480 0.19966 +0.47223 0.04389 0.19913 +0.54767 0.04297 0.19863 +0.62309 0.04205 0.19815 +0.69771 0.04114 0.19771 +0.77073 0.04025 0.19730 +0.84139 0.03939 0.19692 +0.90888 0.03856 0.19658 +0.97244 0.03779 0.19627 +1.00000 0.03707 0.19599 +1.00000 0.03642 0.19575 +0.00704 0.10528 0.20123 +0.06049 0.10463 0.20078 +0.11945 0.10391 0.20031 +0.18312 0.10313 0.19983 +0.25071 0.10231 0.19934 +0.32143 0.10145 0.19886 +0.39450 0.10056 0.19839 +0.46912 0.09964 0.19794 +0.54452 0.09872 0.19751 +0.61989 0.09780 0.19710 +0.69447 0.09689 0.19671 +0.76746 0.09600 0.19635 +0.83809 0.09514 0.19602 +0.90556 0.09432 0.19572 +0.96909 0.09354 0.19544 +1.00000 0.09282 0.19519 +1.00000 0.09217 0.19497 +0.00388 0.16550 0.19963 +0.05729 0.16485 0.19925 +0.11620 0.16413 0.19886 +0.17982 0.16335 0.19845 +0.24736 0.16253 0.19804 +0.31804 0.16167 0.19763 +0.39106 0.16078 0.19723 +0.46564 0.15987 0.19685 +0.54099 0.15895 0.19647 +0.61633 0.15803 0.19612 +0.69088 0.15711 0.19578 +0.76385 0.15622 0.19547 +0.83445 0.15536 0.19517 +0.90190 0.15454 0.19489 +0.96542 0.15376 0.19464 +1.00000 0.15304 0.19440 +1.00000 0.15239 0.19419 +0.00035 0.22945 0.19822 +0.05372 0.22880 0.19790 +0.11259 0.22808 0.19757 +0.17616 0.22730 0.19723 +0.24366 0.22648 0.19688 +0.31430 0.22561 0.19653 +0.38728 0.22472 0.19619 +0.46183 0.22381 0.19586 +0.53715 0.22289 0.19553 +0.61247 0.22197 0.19521 +0.68700 0.22106 0.19491 +0.75995 0.22017 0.19462 +0.83054 0.21931 0.19434 +0.89800 0.21849 0.19406 +0.96163 0.21776 0.19370 +1.00000 0.21712 0.19327 +1.00000 0.21657 0.19279 +0.00000 0.29637 0.19700 +0.04982 0.29572 0.19673 +0.10866 0.29500 0.19645 +0.17220 0.29423 0.19616 +0.23967 0.29340 0.19586 +0.31028 0.29254 0.19555 +0.38324 0.29165 0.19525 +0.45776 0.29074 0.19494 +0.53307 0.28982 0.19464 +0.60837 0.28890 0.19435 +0.68294 0.28801 0.19401 +0.75608 0.28719 0.19353 +0.82701 0.28645 0.19293 +0.89489 0.28579 0.19224 +0.95893 0.28521 0.19149 +1.00000 0.28470 0.19070 +1.00000 0.28426 0.18992 +0.00000 0.36554 0.19593 +0.04567 0.36488 0.19570 +0.10449 0.36417 0.19545 +0.16801 0.36339 0.19519 +0.23546 0.36257 0.19492 +0.30605 0.36170 0.19464 +0.37900 0.36081 0.19435 +0.45361 0.35994 0.19398 +0.52916 0.35911 0.19344 +0.60487 0.35834 0.19275 +0.67993 0.35763 0.19193 +0.75355 0.35699 0.19100 +0.82491 0.35641 0.18997 +0.89320 0.35589 0.18888 +0.95760 0.35543 0.18777 +1.00000 0.35504 0.18666 +1.00000 0.35470 0.18559 +0.00000 0.43619 0.19498 +0.04136 0.43554 0.19477 +0.10016 0.43482 0.19454 +0.16371 0.43405 0.19426 +0.23130 0.43329 0.19385 +0.30219 0.43253 0.19329 +0.37558 0.43181 0.19258 +0.45069 0.43111 0.19171 +0.52674 0.43047 0.19069 +0.60291 0.42987 0.18955 +0.67842 0.42931 0.18829 +0.75246 0.42882 0.18693 +0.82420 0.42837 0.18552 +0.89284 0.42797 0.18408 +0.95755 0.42762 0.18265 +1.00000 0.42731 0.18125 +1.00000 0.42705 0.17994 +0.00000 0.50767 0.19387 +0.03741 0.50710 0.19344 +0.09655 0.50650 0.19289 +0.16053 0.50590 0.19219 +0.22858 0.50530 0.19134 +0.29992 0.50471 0.19033 +0.37377 0.50414 0.18917 +0.44932 0.50361 0.18787 +0.52579 0.50311 0.18643 +0.60238 0.50265 0.18487 +0.67826 0.50222 0.18322 +0.75265 0.50184 0.18151 +0.82471 0.50149 0.17977 +0.89364 0.50118 0.17802 +0.95861 0.50091 0.17631 +1.00000 0.50067 0.17468 +1.00000 0.50046 0.17315 +0.00000 0.57970 0.19129 +0.03510 0.57926 0.19053 +0.09461 0.57880 0.18961 +0.15897 0.57833 0.18854 +0.22742 0.57786 0.18730 +0.29915 0.57741 0.18590 +0.37337 0.57697 0.18435 +0.44930 0.57656 0.18267 +0.52612 0.57618 0.18086 +0.60304 0.57582 0.17896 +0.67924 0.57549 0.17698 +0.75390 0.57519 0.17497 +0.82622 0.57491 0.17294 +0.89537 0.57467 0.17095 +0.96054 0.57444 0.16901 +1.00000 0.57424 0.16718 +1.00000 0.57407 0.16549 +0.00000 0.65153 0.18724 +0.03429 0.65118 0.18619 +0.09411 0.65083 0.18496 +0.15879 0.65047 0.18356 +0.22755 0.65011 0.18198 +0.29960 0.64976 0.18025 +0.37414 0.64942 0.17838 +0.45037 0.64910 0.17637 +0.52747 0.64879 0.17426 +0.60465 0.64851 0.17208 +0.68108 0.64824 0.16983 +0.75596 0.64799 0.16758 +0.82846 0.64776 0.16533 +0.89777 0.64754 0.16314 +0.96308 0.64734 0.16103 +1.00000 0.64715 0.15905 +1.00000 0.64699 0.15723 +0.00000 0.72226 0.18202 +0.03469 0.72199 0.18072 +0.09475 0.72171 0.17922 +0.15969 0.72143 0.17755 +0.22871 0.72115 0.17571 +0.30101 0.72087 0.17370 +0.37579 0.72059 0.17156 +0.45224 0.72033 0.16930 +0.52955 0.72008 0.16695 +0.60691 0.71983 0.16454 +0.68351 0.71959 0.16209 +0.75852 0.71936 0.15965 +0.83115 0.71914 0.15724 +0.90055 0.71892 0.15491 +0.96593 0.71872 0.15268 +1.00000 0.71852 0.15061 +1.00000 0.71834 0.14875 +0.00000 0.79100 0.17595 +0.03599 0.79078 0.17444 +0.09624 0.79056 0.17274 +0.16138 0.79033 0.17085 +0.23059 0.79009 0.16879 +0.30307 0.78985 0.16657 +0.37802 0.78962 0.16422 +0.45462 0.78938 0.16177 +0.53207 0.78914 0.15923 +0.60954 0.78891 0.15666 +0.68624 0.78867 0.15407 +0.76133 0.78843 0.15150 +0.83397 0.78819 0.14903 +0.90336 0.78795 0.14669 +0.96868 0.78772 0.14451 +1.00000 0.78749 0.14252 +1.00000 0.78728 0.14075 +0.00000 0.85687 0.16937 +0.03789 0.85669 0.16771 +0.09828 0.85649 0.16584 +0.16355 0.85629 0.16378 +0.23289 0.85607 0.16155 +0.30549 0.85585 0.15918 +0.38054 0.85562 0.15668 +0.45724 0.85538 0.15409 +0.53475 0.85513 0.15144 +0.61225 0.85488 0.14880 +0.68891 0.85461 0.14622 +0.76391 0.85434 0.14373 +0.83645 0.85406 0.14137 +0.90571 0.85378 0.13915 +0.97090 0.85349 0.13710 +1.00000 0.85321 0.13524 +1.00000 0.85295 0.13360 +0.00000 0.91900 0.16261 +0.04010 0.91883 0.16083 +0.10059 0.91864 0.15884 +0.16594 0.91844 0.15666 +0.23536 0.91823 0.15431 +0.30802 0.91800 0.15183 +0.38309 0.91775 0.14928 +0.45976 0.91749 0.14669 +0.53719 0.91721 0.14412 +0.61458 0.91691 0.14159 +0.69110 0.91660 0.13913 +0.76596 0.91627 0.13679 +0.83833 0.91593 0.13458 +0.90742 0.91558 0.13252 +0.97243 0.91523 0.13065 +1.00000 0.91488 0.12896 +1.00000 0.91455 0.12749 +0.00000 0.97654 0.15596 +0.04240 0.97637 0.15410 +0.10293 0.97618 0.15203 +0.16831 0.97596 0.14981 +0.23770 0.97573 0.14746 +0.31030 0.97547 0.14504 +0.38528 0.97519 0.14257 +0.46182 0.97488 0.14010 +0.53912 0.97455 0.13765 +0.61635 0.97420 0.13527 +0.69270 0.97382 0.13299 +0.76737 0.97342 0.13083 +0.83954 0.97300 0.12881 +0.90842 0.97258 0.12696 +0.97321 0.97215 0.12529 +1.00000 0.97172 0.12381 +1.00000 0.97131 0.12252 +0.00000 1.00000 0.14974 +0.04453 1.00000 0.14789 +0.10501 1.00000 0.14586 +0.17031 1.00000 0.14370 +0.23962 1.00000 0.14144 +0.31211 1.00000 0.13912 +0.38696 1.00000 0.13678 +0.46336 1.00000 0.13445 +0.54048 1.00000 0.13217 +0.61752 1.00000 0.12997 +0.69367 1.00000 0.12788 +0.76812 1.00000 0.12593 +0.84007 1.00000 0.12413 +0.90871 1.00000 0.12250 +0.97327 1.00000 0.12105 +1.00000 1.00000 0.11979 +1.00000 1.00000 0.11871 +0.01180 0.00000 0.27016 +0.06535 0.00000 0.26957 +0.12441 0.00000 0.26895 +0.18818 0.00000 0.26831 +0.25588 0.00000 0.26766 +0.32670 0.00000 0.26702 +0.39987 0.00000 0.26640 +0.47459 0.00000 0.26580 +0.55007 0.00000 0.26522 +0.62553 0.00000 0.26469 +0.70019 0.00000 0.26418 +0.77325 0.00000 0.26372 +0.84393 0.00000 0.26330 +0.91146 0.00000 0.26291 +0.97503 0.00000 0.26257 +1.00000 0.00000 0.26226 +1.00000 0.00000 0.26200 +0.00947 0.04927 0.26834 +0.06297 0.04861 0.26782 +0.12197 0.04789 0.26728 +0.18569 0.04712 0.26673 +0.25333 0.04629 0.26617 +0.32410 0.04543 0.26561 +0.39721 0.04454 0.26507 +0.47188 0.04363 0.26455 +0.54731 0.04271 0.26406 +0.62272 0.04179 0.26359 +0.69734 0.04087 0.26315 +0.77036 0.03998 0.26275 +0.84101 0.03912 0.26238 +0.90850 0.03830 0.26204 +0.97206 0.03752 0.26174 +1.00000 0.03680 0.26146 +1.00000 0.03615 0.26122 +0.00671 0.10501 0.26661 +0.06016 0.10436 0.26617 +0.11911 0.10364 0.26571 +0.18278 0.10287 0.26524 +0.25036 0.10204 0.26476 +0.32108 0.10118 0.26429 +0.39414 0.10029 0.26383 +0.46875 0.09938 0.26338 +0.54414 0.09846 0.26296 +0.61952 0.09754 0.26255 +0.69409 0.09663 0.26218 +0.76708 0.09573 0.26182 +0.83770 0.09487 0.26150 +0.90517 0.09405 0.26120 +0.96870 0.09327 0.26092 +1.00000 0.09255 0.26068 +1.00000 0.09190 0.26046 +0.00354 0.16523 0.26504 +0.05694 0.16458 0.26468 +0.11585 0.16386 0.26429 +0.17946 0.16309 0.26389 +0.24700 0.16226 0.26348 +0.31767 0.16140 0.26308 +0.39068 0.16051 0.26269 +0.46526 0.15960 0.26231 +0.54061 0.15868 0.26194 +0.61595 0.15776 0.26159 +0.69049 0.15685 0.26126 +0.76345 0.15596 0.26095 +0.83405 0.15509 0.26065 +0.90151 0.15427 0.26038 +0.96503 0.15349 0.26013 +1.00000 0.15278 0.25989 +1.00000 0.15213 0.25968 +0.00000 0.22918 0.26366 +0.05335 0.22853 0.26335 +0.11221 0.22781 0.26303 +0.17579 0.22703 0.26269 +0.24328 0.22621 0.26235 +0.31391 0.22535 0.26201 +0.38690 0.22446 0.26167 +0.46144 0.22355 0.26134 +0.53676 0.22263 0.26101 +0.61208 0.22171 0.26070 +0.68660 0.22080 0.26040 +0.75955 0.21990 0.26011 +0.83014 0.21904 0.25983 +0.89763 0.21823 0.25952 +0.96131 0.21752 0.25912 +1.00000 0.21689 0.25865 +1.00000 0.21635 0.25814 +0.00000 0.29611 0.26246 +0.04944 0.29545 0.26220 +0.10827 0.29474 0.26192 +0.17181 0.29396 0.26163 +0.23928 0.29314 0.26134 +0.30988 0.29227 0.26103 +0.38284 0.29138 0.26073 +0.45736 0.29047 0.26043 +0.53267 0.28955 0.26013 +0.60798 0.28863 0.25984 +0.68259 0.28776 0.25945 +0.75578 0.28696 0.25893 +0.82675 0.28624 0.25828 +0.89468 0.28559 0.25755 +0.95876 0.28502 0.25676 +1.00000 0.28453 0.25594 +1.00000 0.28410 0.25513 +0.00000 0.36527 0.26141 +0.04528 0.36462 0.26119 +0.10409 0.36390 0.26094 +0.16762 0.36312 0.26068 +0.23507 0.36230 0.26041 +0.30566 0.36144 0.26013 +0.37861 0.36055 0.25983 +0.45327 0.35969 0.25941 +0.52888 0.35888 0.25882 +0.60463 0.35813 0.25809 +0.67974 0.35744 0.25722 +0.75340 0.35681 0.25625 +0.82480 0.35624 0.25518 +0.89313 0.35574 0.25406 +0.95756 0.35529 0.25291 +1.00000 0.35491 0.25177 +1.00000 0.35458 0.25068 +0.00000 0.43592 0.26047 +0.04096 0.43527 0.26026 +0.09977 0.43455 0.26003 +0.16335 0.43380 0.25971 +0.23099 0.43305 0.25926 +0.30192 0.43231 0.25866 +0.37536 0.43160 0.25790 +0.45051 0.43093 0.25698 +0.52660 0.43030 0.25593 +0.60282 0.42971 0.25474 +0.67837 0.42917 0.25344 +0.75244 0.42868 0.25205 +0.82422 0.42825 0.25061 +0.89288 0.42786 0.24913 +0.95763 0.42751 0.24767 +1.00000 0.42722 0.24625 +1.00000 0.42696 0.24491 +0.00000 0.50743 0.25927 +0.03714 0.50688 0.25881 +0.09632 0.50630 0.25822 +0.16034 0.50571 0.25749 +0.22843 0.50512 0.25660 +0.29981 0.50454 0.25555 +0.37369 0.50399 0.25435 +0.44928 0.50347 0.25301 +0.52579 0.50298 0.25153 +0.60241 0.50253 0.24994 +0.67833 0.50212 0.24826 +0.75274 0.50174 0.24652 +0.82483 0.50140 0.24474 +0.89378 0.50110 0.24297 +0.95878 0.50084 0.24124 +1.00000 0.50060 0.23958 +1.00000 0.50040 0.23804 +0.00000 0.57952 0.25654 +0.03498 0.57909 0.25575 +0.09452 0.57864 0.25480 +0.15892 0.57818 0.25369 +0.22739 0.57773 0.25242 +0.29916 0.57729 0.25099 +0.37342 0.57686 0.24940 +0.44938 0.57646 0.24769 +0.52623 0.57609 0.24585 +0.60317 0.57574 0.24392 +0.67940 0.57541 0.24191 +0.75408 0.57512 0.23987 +0.82642 0.57485 0.23783 +0.89559 0.57461 0.23581 +0.96078 0.57439 0.23386 +1.00000 0.57419 0.23201 +1.00000 0.57401 0.23030 +0.00000 0.65140 0.25236 +0.03430 0.65106 0.25128 +0.09414 0.65071 0.25002 +0.15885 0.65036 0.24859 +0.22764 0.65001 0.24699 +0.29972 0.64967 0.24523 +0.37429 0.64934 0.24333 +0.45053 0.64902 0.24130 +0.52766 0.64873 0.23916 +0.60486 0.64845 0.23695 +0.68131 0.64818 0.23468 +0.75620 0.64794 0.23240 +0.82872 0.64771 0.23014 +0.89805 0.64749 0.22793 +0.96336 0.64729 0.22582 +1.00000 0.64710 0.22382 +1.00000 0.64694 0.22199 +0.00000 0.72216 0.24702 +0.03480 0.72190 0.24570 +0.09488 0.72163 0.24419 +0.15985 0.72135 0.24249 +0.22889 0.72107 0.24062 +0.30121 0.72080 0.23859 +0.37601 0.72053 0.23643 +0.45247 0.72027 0.23414 +0.52980 0.72002 0.23177 +0.60718 0.71978 0.22934 +0.68379 0.71954 0.22688 +0.75881 0.71931 0.22442 +0.83144 0.71909 0.22200 +0.90086 0.71887 0.21965 +0.96624 0.71867 0.21742 +1.00000 0.71847 0.21536 +1.00000 0.71828 0.21350 +0.00000 0.79092 0.24086 +0.03618 0.79072 0.23934 +0.09645 0.79050 0.23762 +0.16160 0.79027 0.23571 +0.23083 0.79004 0.23362 +0.30332 0.78980 0.23139 +0.37829 0.78957 0.22902 +0.45490 0.78933 0.22655 +0.53236 0.78909 0.22400 +0.60984 0.78886 0.22141 +0.68654 0.78862 0.21881 +0.76163 0.78837 0.21624 +0.83427 0.78813 0.21378 +0.90365 0.78789 0.21145 +0.96895 0.78765 0.20928 +1.00000 0.78742 0.20731 +1.00000 0.78720 0.20554 +0.00000 0.85681 0.23421 +0.03813 0.85663 0.23254 +0.09854 0.85644 0.23065 +0.16382 0.85623 0.22858 +0.23317 0.85602 0.22633 +0.30578 0.85580 0.22394 +0.38084 0.85557 0.22143 +0.45754 0.85533 0.21883 +0.53505 0.85508 0.21618 +0.61254 0.85482 0.21355 +0.68919 0.85455 0.21098 +0.76418 0.85427 0.20851 +0.83670 0.85399 0.20616 +0.90595 0.85370 0.20395 +0.97112 0.85341 0.20192 +1.00000 0.85312 0.20008 +1.00000 0.85285 0.19845 +0.00000 0.91895 0.22739 +0.04039 0.91878 0.22561 +0.10088 0.91859 0.22361 +0.16624 0.91839 0.22141 +0.23566 0.91818 0.21906 +0.30832 0.91794 0.21657 +0.38339 0.91769 0.21403 +0.46004 0.91743 0.21145 +0.53746 0.91714 0.20889 +0.61483 0.91684 0.20638 +0.69134 0.91652 0.20394 +0.76617 0.91618 0.20161 +0.83853 0.91583 0.19942 +0.90760 0.91548 0.19739 +0.97258 0.91512 0.19554 +1.00000 0.91476 0.19388 +1.00000 0.91442 0.19242 +0.00000 0.97649 0.22071 +0.04271 0.97632 0.21885 +0.10324 0.97612 0.21678 +0.16860 0.97591 0.21455 +0.23799 0.97567 0.21222 +0.31057 0.97541 0.20981 +0.38554 0.97512 0.20735 +0.46207 0.97481 0.20490 +0.53934 0.97447 0.20247 +0.61655 0.97411 0.20012 +0.69288 0.97372 0.19785 +0.76752 0.97331 0.19572 +0.83966 0.97288 0.19373 +0.90851 0.97244 0.19190 +0.97328 0.97200 0.19026 +1.00000 0.97157 0.18881 +1.00000 0.97115 0.18755 +0.00000 1.00000 0.21449 +0.04482 1.00000 0.21264 +0.10529 1.00000 0.21063 +0.17058 1.00000 0.20848 +0.23987 1.00000 0.20623 +0.31234 1.00000 0.20393 +0.38717 1.00000 0.20161 +0.46355 1.00000 0.19930 +0.54065 1.00000 0.19704 +0.61766 1.00000 0.19487 +0.69378 1.00000 0.19281 +0.76819 1.00000 0.19089 +0.84011 1.00000 0.18912 +0.90872 1.00000 0.18753 +0.97325 1.00000 0.18611 +1.00000 1.00000 0.18488 +1.00000 1.00000 0.18383 +0.01151 0.00000 0.33766 +0.06505 0.00000 0.33708 +0.12410 0.00000 0.33647 +0.18786 0.00000 0.33584 +0.25555 0.00000 0.33521 +0.32637 0.00000 0.33458 +0.39953 0.00000 0.33397 +0.47424 0.00000 0.33338 +0.54971 0.00000 0.33282 +0.62517 0.00000 0.33229 +0.69982 0.00000 0.33180 +0.77287 0.00000 0.33134 +0.84355 0.00000 0.33093 +0.91107 0.00000 0.33055 +0.97465 0.00000 0.33021 +1.00000 0.00000 0.32991 +1.00000 0.00000 0.32965 +0.00915 0.04899 0.33587 +0.06265 0.04834 0.33537 +0.12164 0.04762 0.33484 +0.18535 0.04684 0.33429 +0.25298 0.04602 0.33374 +0.32374 0.04515 0.33320 +0.39685 0.04426 0.33267 +0.47151 0.04335 0.33216 +0.54694 0.04243 0.33168 +0.62235 0.04151 0.33122 +0.69695 0.04060 0.33079 +0.76997 0.03971 0.33039 +0.84062 0.03884 0.33003 +0.90811 0.03802 0.32970 +0.97166 0.03724 0.32940 +1.00000 0.03653 0.32913 +1.00000 0.03587 0.32889 +0.00637 0.10474 0.33418 +0.05981 0.10409 0.33375 +0.11876 0.10337 0.33330 +0.18242 0.10259 0.33284 +0.25000 0.10177 0.33237 +0.32071 0.10090 0.33190 +0.39376 0.10001 0.33145 +0.46837 0.09910 0.33101 +0.54376 0.09818 0.33060 +0.61912 0.09726 0.33020 +0.69369 0.09635 0.32983 +0.76668 0.09546 0.32948 +0.83730 0.09460 0.32916 +0.90476 0.09377 0.32886 +0.96830 0.09300 0.32859 +1.00000 0.09228 0.32835 +1.00000 0.09163 0.32813 +0.00317 0.16496 0.33264 +0.05658 0.16431 0.33228 +0.11548 0.16359 0.33190 +0.17908 0.16281 0.33151 +0.24662 0.16199 0.33112 +0.31728 0.16112 0.33072 +0.39029 0.16023 0.33034 +0.46486 0.15932 0.32996 +0.54021 0.15840 0.32960 +0.61555 0.15748 0.32926 +0.69009 0.15657 0.32893 +0.76305 0.15568 0.32862 +0.83365 0.15482 0.32833 +0.90110 0.15399 0.32805 +0.96462 0.15322 0.32780 +1.00000 0.15250 0.32757 +1.00000 0.15185 0.32735 +0.00000 0.22890 0.33129 +0.05297 0.22825 0.33099 +0.11183 0.22753 0.33067 +0.17540 0.22676 0.33034 +0.24289 0.22593 0.33000 +0.31352 0.22507 0.32966 +0.38649 0.22418 0.32933 +0.46103 0.22327 0.32900 +0.53635 0.22235 0.32868 +0.61167 0.22143 0.32837 +0.68619 0.22052 0.32807 +0.75914 0.21963 0.32778 +0.82973 0.21877 0.32750 +0.89727 0.21798 0.32715 +0.96099 0.21728 0.32671 +1.00000 0.21667 0.32620 +1.00000 0.21614 0.32566 +0.00000 0.29583 0.33011 +0.04904 0.29518 0.32986 +0.10787 0.29446 0.32958 +0.17141 0.29368 0.32930 +0.23888 0.29286 0.32900 +0.30948 0.29200 0.32871 +0.38243 0.29111 0.32841 +0.45695 0.29020 0.32811 +0.53226 0.28928 0.32781 +0.60758 0.28836 0.32750 +0.68225 0.28751 0.32706 +0.75549 0.28673 0.32649 +0.82650 0.28602 0.32580 +0.89448 0.28539 0.32503 +0.95859 0.28484 0.32420 +1.00000 0.28435 0.32335 +1.00000 0.28394 0.32250 +0.00000 0.36499 0.32908 +0.04487 0.36434 0.32886 +0.10368 0.36362 0.32861 +0.16721 0.36285 0.32836 +0.23466 0.36202 0.32809 +0.30525 0.36116 0.32781 +0.37823 0.36028 0.32748 +0.45294 0.35945 0.32701 +0.52860 0.35866 0.32637 +0.60440 0.35792 0.32559 +0.67956 0.35725 0.32468 +0.75326 0.35663 0.32366 +0.82470 0.35608 0.32255 +0.89306 0.35559 0.32139 +0.95753 0.35515 0.32021 +1.00000 0.35478 0.31904 +1.00000 0.35446 0.31793 +0.00000 0.43564 0.32815 +0.04055 0.43499 0.32794 +0.09937 0.43428 0.32769 +0.16299 0.43355 0.32734 +0.23068 0.43281 0.32684 +0.30166 0.43209 0.32619 +0.37514 0.43140 0.32538 +0.45035 0.43074 0.32443 +0.52648 0.43012 0.32333 +0.60274 0.42955 0.32209 +0.67833 0.42903 0.32075 +0.75243 0.42855 0.31933 +0.82424 0.42813 0.31785 +0.89294 0.42775 0.31635 +0.95771 0.42741 0.31486 +1.00000 0.42712 0.31341 +1.00000 0.42687 0.31205 +0.00000 0.50720 0.32684 +0.03688 0.50665 0.32635 +0.09609 0.50609 0.32572 +0.16015 0.50551 0.32495 +0.22828 0.50494 0.32402 +0.29970 0.50438 0.32293 +0.37362 0.50384 0.32169 +0.44925 0.50333 0.32031 +0.52580 0.50286 0.31879 +0.60245 0.50242 0.31717 +0.67841 0.50201 0.31545 +0.75285 0.50165 0.31368 +0.82497 0.50132 0.31187 +0.89394 0.50102 0.31008 +0.95896 0.50076 0.30832 +1.00000 0.50053 0.30664 +1.00000 0.50033 0.30508 +0.00000 0.57935 0.32396 +0.03487 0.57893 0.32313 +0.09444 0.57849 0.32215 +0.15888 0.57804 0.32101 +0.22738 0.57760 0.31970 +0.29918 0.57717 0.31824 +0.37347 0.57675 0.31662 +0.44946 0.57636 0.31487 +0.52635 0.57599 0.31300 +0.60332 0.57565 0.31103 +0.67957 0.57534 0.30900 +0.75428 0.57505 0.30694 +0.82664 0.57479 0.30487 +0.89583 0.57455 0.30283 +0.96103 0.57433 0.30086 +1.00000 0.57413 0.29899 +1.00000 0.57396 0.29727 +0.00000 0.65126 0.31964 +0.03432 0.65094 0.31853 +0.09419 0.65060 0.31725 +0.15893 0.65026 0.31579 +0.22775 0.64991 0.31416 +0.29985 0.64958 0.31237 +0.37444 0.64926 0.31044 +0.45072 0.64895 0.30838 +0.52787 0.64866 0.30622 +0.60508 0.64838 0.30398 +0.68156 0.64812 0.30169 +0.75646 0.64788 0.29939 +0.82900 0.64765 0.29711 +0.89833 0.64744 0.29489 +0.96366 0.64724 0.29275 +1.00000 0.64705 0.29075 +1.00000 0.64688 0.28891 +0.00000 0.72206 0.31419 +0.03492 0.72181 0.31284 +0.09503 0.72154 0.31131 +0.16001 0.72127 0.30958 +0.22908 0.72100 0.30769 +0.30142 0.72074 0.30564 +0.37624 0.72047 0.30345 +0.45272 0.72022 0.30115 +0.53007 0.71997 0.29875 +0.60746 0.71973 0.29630 +0.68408 0.71949 0.29382 +0.75912 0.71926 0.29135 +0.83175 0.71904 0.28892 +0.90117 0.71882 0.28656 +0.96655 0.71861 0.28432 +1.00000 0.71841 0.28227 +1.00000 0.71822 0.28042 +0.00000 0.79085 0.30793 +0.03638 0.79065 0.30640 +0.09667 0.79043 0.30465 +0.16184 0.79021 0.30272 +0.23108 0.78998 0.30062 +0.30359 0.78975 0.29836 +0.37857 0.78951 0.29598 +0.45520 0.78928 0.29349 +0.53266 0.78904 0.29093 +0.61016 0.78880 0.28833 +0.68686 0.78856 0.28571 +0.76194 0.78832 0.28315 +0.83457 0.78807 0.28069 +0.90394 0.78783 0.27838 +0.96923 0.78758 0.27622 +1.00000 0.78735 0.27426 +1.00000 0.78712 0.27251 +0.00000 0.85675 0.30121 +0.03840 0.85658 0.29952 +0.09881 0.85639 0.29762 +0.16411 0.85618 0.29553 +0.23347 0.85597 0.29328 +0.30609 0.85575 0.29087 +0.38116 0.85552 0.28835 +0.45786 0.85527 0.28573 +0.53537 0.85502 0.28309 +0.61284 0.85476 0.28047 +0.68948 0.85449 0.27791 +0.76445 0.85420 0.27545 +0.83696 0.85391 0.27312 +0.90619 0.85361 0.27093 +0.97133 0.85332 0.26892 +1.00000 0.85302 0.26710 +1.00000 0.85274 0.26549 +0.00000 0.91890 0.29434 +0.04069 0.91873 0.29254 +0.10119 0.91854 0.29053 +0.16655 0.91834 0.28833 +0.23598 0.91812 0.28596 +0.30863 0.91789 0.28348 +0.38369 0.91763 0.28094 +0.46033 0.91736 0.27838 +0.53773 0.91707 0.27583 +0.61509 0.91676 0.27334 +0.69158 0.91643 0.27092 +0.76639 0.91609 0.26861 +0.83872 0.91573 0.26644 +0.90776 0.91537 0.26444 +0.97272 0.91500 0.26261 +1.00000 0.91463 0.26097 +1.00000 0.91428 0.25954 +0.00000 0.97644 0.28762 +0.04303 0.97626 0.28575 +0.10355 0.97607 0.28368 +0.16891 0.97585 0.28147 +0.23828 0.97560 0.27914 +0.31085 0.97534 0.27674 +0.38580 0.97504 0.27431 +0.46231 0.97472 0.27187 +0.53957 0.97438 0.26947 +0.61675 0.97401 0.26713 +0.69305 0.97361 0.26489 +0.76766 0.97319 0.26278 +0.83978 0.97275 0.26082 +0.90860 0.97230 0.25903 +0.97333 0.97185 0.25741 +1.00000 0.97140 0.25599 +1.00000 0.97097 0.25476 +0.00000 1.00000 0.28140 +0.04512 1.00000 0.27957 +0.10558 1.00000 0.27756 +0.17085 1.00000 0.27542 +0.24013 1.00000 0.27319 +0.31258 1.00000 0.27091 +0.38739 1.00000 0.26861 +0.46374 1.00000 0.26632 +0.54081 1.00000 0.26410 +0.61779 1.00000 0.26195 +0.69388 1.00000 0.25992 +0.76826 1.00000 0.25803 +0.84013 1.00000 0.25630 +0.90871 1.00000 0.25474 +0.97320 1.00000 0.25336 +1.00000 1.00000 0.25216 +1.00000 1.00000 0.25114 +0.01120 0.00000 0.40662 +0.06474 0.00000 0.40605 +0.12378 0.00000 0.40545 +0.18754 0.00000 0.40484 +0.25521 0.00000 0.40421 +0.32602 0.00000 0.40360 +0.39917 0.00000 0.40300 +0.47388 0.00000 0.40242 +0.54935 0.00000 0.40187 +0.62479 0.00000 0.40136 +0.69944 0.00000 0.40087 +0.77249 0.00000 0.40043 +0.84316 0.00000 0.40002 +0.91067 0.00000 0.39965 +0.97425 0.00000 0.39932 +1.00000 0.00000 0.39902 +1.00000 0.00000 0.39876 +0.00882 0.04871 0.40486 +0.06231 0.04805 0.40437 +0.12130 0.04734 0.40385 +0.18500 0.04656 0.40332 +0.25263 0.04573 0.40278 +0.32338 0.04487 0.40225 +0.39648 0.04398 0.40173 +0.47113 0.04307 0.40123 +0.54655 0.04215 0.40075 +0.62196 0.04123 0.40031 +0.69656 0.04032 0.39989 +0.76957 0.03942 0.39950 +0.84021 0.03856 0.39914 +0.90770 0.03774 0.39881 +0.97125 0.03696 0.39851 +1.00000 0.03624 0.39825 +1.00000 0.03559 0.39802 +0.00602 0.10446 0.40321 +0.05946 0.10380 0.40279 +0.11840 0.10308 0.40235 +0.18205 0.10231 0.40189 +0.24962 0.10148 0.40143 +0.32033 0.10062 0.40098 +0.39337 0.09973 0.40054 +0.46798 0.09882 0.40011 +0.54336 0.09790 0.39970 +0.61872 0.09698 0.39931 +0.69329 0.09607 0.39894 +0.76627 0.09518 0.39860 +0.83689 0.09431 0.39828 +0.90435 0.09349 0.39799 +0.96788 0.09271 0.39772 +1.00000 0.09200 0.39748 +1.00000 0.09134 0.39726 +0.00280 0.16468 0.40171 +0.05620 0.16402 0.40135 +0.11509 0.16331 0.40098 +0.17870 0.16253 0.40060 +0.24622 0.16170 0.40021 +0.31688 0.16084 0.39982 +0.38989 0.15995 0.39944 +0.46446 0.15904 0.39907 +0.53980 0.15812 0.39872 +0.61513 0.15720 0.39838 +0.68967 0.15629 0.39806 +0.76263 0.15540 0.39775 +0.83323 0.15454 0.39746 +0.90068 0.15371 0.39719 +0.96420 0.15294 0.39694 +1.00000 0.15222 0.39671 +1.00000 0.15158 0.39646 +0.00000 0.22862 0.40038 +0.05257 0.22797 0.40008 +0.11143 0.22725 0.39977 +0.17499 0.22648 0.39944 +0.24248 0.22565 0.39911 +0.31311 0.22479 0.39878 +0.38608 0.22390 0.39845 +0.46062 0.22299 0.39813 +0.53594 0.22207 0.39781 +0.61125 0.22115 0.39750 +0.68577 0.22024 0.39721 +0.75872 0.21935 0.39692 +0.82933 0.21849 0.39662 +0.89691 0.21772 0.39622 +0.96068 0.21704 0.39573 +1.00000 0.21644 0.39519 +1.00000 0.21593 0.39461 +0.00000 0.29555 0.39922 +0.04863 0.29490 0.39897 +0.10746 0.29418 0.39870 +0.17100 0.29340 0.39842 +0.23846 0.29258 0.39813 +0.30906 0.29172 0.39784 +0.38201 0.29082 0.39754 +0.45654 0.28991 0.39724 +0.53184 0.28899 0.39694 +0.60719 0.28809 0.39660 +0.68191 0.28726 0.39612 +0.75521 0.28650 0.39549 +0.82627 0.28581 0.39476 +0.89428 0.28519 0.39395 +0.95844 0.28465 0.39308 +1.00000 0.28418 0.39219 +1.00000 0.28378 0.39132 +0.00000 0.36471 0.39821 +0.04446 0.36406 0.39799 +0.10327 0.36334 0.39774 +0.16679 0.36256 0.39749 +0.23424 0.36174 0.39722 +0.30483 0.36088 0.39694 +0.37786 0.36002 0.39657 +0.45262 0.35920 0.39604 +0.52833 0.35843 0.39536 +0.60418 0.35771 0.39453 +0.67939 0.35706 0.39358 +0.75313 0.35646 0.39251 +0.82461 0.35592 0.39137 +0.89301 0.35544 0.39017 +0.95751 0.35502 0.38895 +1.00000 0.35465 0.38776 +1.00000 0.35434 0.38661 +0.00000 0.43536 0.39728 +0.04013 0.43471 0.39707 +0.09898 0.43401 0.39680 +0.16265 0.43329 0.39640 +0.23039 0.43258 0.39586 +0.30141 0.43187 0.39516 +0.37494 0.43120 0.39431 +0.45019 0.43056 0.39331 +0.52637 0.42995 0.39216 +0.60267 0.42940 0.39089 +0.67830 0.42889 0.38951 +0.75244 0.42842 0.38805 +0.82428 0.42801 0.38653 +0.89301 0.42764 0.38500 +0.95781 0.42731 0.38348 +1.00000 0.42703 0.38201 +1.00000 0.42679 0.38062 +0.00000 0.50696 0.39585 +0.03662 0.50643 0.39533 +0.09587 0.50588 0.39466 +0.15997 0.50532 0.39385 +0.22814 0.50476 0.39288 +0.29961 0.50422 0.39175 +0.37357 0.50369 0.39047 +0.44924 0.50320 0.38905 +0.52582 0.50273 0.38749 +0.60251 0.50230 0.38583 +0.67849 0.50191 0.38408 +0.75297 0.50155 0.38228 +0.82511 0.50123 0.38044 +0.89411 0.50094 0.37862 +0.95915 0.50069 0.37684 +1.00000 0.50046 0.37514 +1.00000 0.50027 0.37356 +0.00000 0.57917 0.39281 +0.03477 0.57876 0.39196 +0.09438 0.57833 0.39094 +0.15884 0.57790 0.38977 +0.22739 0.57747 0.38842 +0.29922 0.57705 0.38692 +0.37354 0.57664 0.38527 +0.44957 0.57626 0.38348 +0.52648 0.57590 0.38158 +0.60348 0.57557 0.37959 +0.67975 0.57526 0.37753 +0.75449 0.57498 0.37544 +0.82687 0.57472 0.37334 +0.89607 0.57449 0.37128 +0.96129 0.57427 0.36930 +1.00000 0.57408 0.36741 +1.00000 0.57391 0.36568 +0.00000 0.65113 0.38836 +0.03435 0.65082 0.38722 +0.09425 0.65049 0.38591 +0.15901 0.65015 0.38442 +0.22786 0.64982 0.38276 +0.29999 0.64949 0.38094 +0.37461 0.64918 0.37898 +0.45091 0.64888 0.37689 +0.52808 0.64859 0.37471 +0.60532 0.64832 0.37244 +0.68181 0.64807 0.37014 +0.75674 0.64783 0.36782 +0.82928 0.64760 0.36552 +0.89863 0.64738 0.36328 +0.96396 0.64719 0.36113 +1.00000 0.64700 0.35911 +1.00000 0.64683 0.35726 +0.00000 0.72197 0.38279 +0.03506 0.72172 0.38142 +0.09519 0.72146 0.37986 +0.16019 0.72120 0.37812 +0.22928 0.72093 0.37620 +0.30164 0.72067 0.37412 +0.37648 0.72041 0.37191 +0.45298 0.72016 0.36958 +0.53034 0.71991 0.36717 +0.60775 0.71967 0.36470 +0.68438 0.71944 0.36221 +0.75943 0.71921 0.35972 +0.83207 0.71898 0.35727 +0.90150 0.71876 0.35490 +0.96687 0.71855 0.35267 +1.00000 0.71835 0.35062 +1.00000 0.71816 0.34878 +0.00000 0.79078 0.37644 +0.03660 0.79058 0.37489 +0.09690 0.79037 0.37313 +0.16209 0.79015 0.37118 +0.23135 0.78992 0.36905 +0.30387 0.78969 0.36678 +0.37886 0.78946 0.36438 +0.45550 0.78923 0.36187 +0.53298 0.78899 0.35930 +0.61048 0.78875 0.35668 +0.68718 0.78850 0.35406 +0.76226 0.78826 0.35150 +0.83487 0.78801 0.34906 +0.90423 0.78776 0.34675 +0.96951 0.78751 0.34461 +1.00000 0.78727 0.34266 +1.00000 0.78704 0.34092 +0.00000 0.85670 0.36965 +0.03867 0.85652 0.36794 +0.09910 0.85633 0.36603 +0.16440 0.85613 0.36393 +0.23377 0.85592 0.36165 +0.30640 0.85570 0.35923 +0.38148 0.85546 0.35670 +0.45818 0.85522 0.35407 +0.53568 0.85496 0.35144 +0.61315 0.85469 0.34883 +0.68976 0.85442 0.34629 +0.76472 0.85413 0.34384 +0.83721 0.85383 0.34152 +0.90642 0.85352 0.33936 +0.97155 0.85322 0.33736 +1.00000 0.85292 0.33556 +1.00000 0.85263 0.33397 +0.00000 0.91884 0.36272 +0.04100 0.91868 0.36091 +0.10150 0.91849 0.35889 +0.16688 0.91829 0.35668 +0.23630 0.91806 0.35430 +0.30895 0.91783 0.35183 +0.38400 0.91757 0.34930 +0.46062 0.91729 0.34675 +0.53801 0.91700 0.34422 +0.61534 0.91668 0.34174 +0.69181 0.91634 0.33935 +0.76660 0.91599 0.33706 +0.83891 0.91562 0.33492 +0.90792 0.91525 0.33294 +0.97286 0.91487 0.33113 +1.00000 0.91450 0.32952 +1.00000 0.91414 0.32811 +0.00000 0.97638 0.35597 +0.04335 0.97621 0.35409 +0.10387 0.97601 0.35203 +0.16921 0.97578 0.34983 +0.23858 0.97554 0.34751 +0.31113 0.97526 0.34513 +0.38607 0.97497 0.34271 +0.46256 0.97464 0.34029 +0.53979 0.97428 0.33791 +0.61695 0.97390 0.33560 +0.69322 0.97349 0.33339 +0.76780 0.97306 0.33131 +0.83988 0.97261 0.32937 +0.90867 0.97215 0.32761 +0.97337 0.97169 0.32603 +1.00000 0.97123 0.32463 +1.00000 0.97079 0.32343 +0.00000 1.00000 0.34976 +0.04541 1.00000 0.34793 +0.10586 1.00000 0.34594 +0.17112 1.00000 0.34382 +0.24038 1.00000 0.34160 +0.31281 1.00000 0.33934 +0.38760 1.00000 0.33706 +0.46392 1.00000 0.33480 +0.54096 1.00000 0.33260 +0.61792 1.00000 0.33049 +0.69397 1.00000 0.32849 +0.76831 1.00000 0.32664 +0.84015 1.00000 0.32494 +0.90869 1.00000 0.32341 +0.97314 1.00000 0.32207 +1.00000 1.00000 0.32090 +1.00000 1.00000 0.31992 +0.01089 0.00000 0.47631 +0.06442 0.00000 0.47575 +0.12345 0.00000 0.47517 +0.18720 0.00000 0.47456 +0.25487 0.00000 0.47395 +0.32567 0.00000 0.47335 +0.39882 0.00000 0.47276 +0.47351 0.00000 0.47220 +0.54897 0.00000 0.47166 +0.62441 0.00000 0.47115 +0.69905 0.00000 0.47068 +0.77209 0.00000 0.47024 +0.84276 0.00000 0.46984 +0.91027 0.00000 0.46948 +0.97384 0.00000 0.46915 +1.00000 0.00000 0.46886 +1.00000 0.00000 0.46861 +0.00849 0.04842 0.47459 +0.06197 0.04777 0.47411 +0.12095 0.04705 0.47360 +0.18465 0.04627 0.47308 +0.25227 0.04545 0.47255 +0.32301 0.04459 0.47203 +0.39610 0.04369 0.47152 +0.47075 0.04278 0.47103 +0.54617 0.04186 0.47056 +0.62156 0.04094 0.47012 +0.69616 0.04003 0.46971 +0.76917 0.03914 0.46933 +0.83981 0.03828 0.46898 +0.90729 0.03745 0.46865 +0.97083 0.03668 0.46836 +1.00000 0.03596 0.46810 +1.00000 0.03531 0.46787 +0.00566 0.10417 0.47297 +0.05910 0.10352 0.47256 +0.11803 0.10280 0.47213 +0.18167 0.10202 0.47168 +0.24924 0.10120 0.47123 +0.31994 0.10034 0.47079 +0.39298 0.09944 0.47035 +0.46758 0.09853 0.46993 +0.54296 0.09761 0.46953 +0.61832 0.09669 0.46915 +0.69288 0.09578 0.46879 +0.76586 0.09489 0.46845 +0.83647 0.09403 0.46814 +0.90393 0.09320 0.46785 +0.96746 0.09243 0.46758 +1.00000 0.09171 0.46734 +1.00000 0.09106 0.46713 +0.00242 0.16439 0.47150 +0.05582 0.16374 0.47115 +0.11471 0.16302 0.47079 +0.17831 0.16224 0.47041 +0.24583 0.16142 0.47003 +0.31648 0.16056 0.46965 +0.38949 0.15967 0.46928 +0.46405 0.15875 0.46892 +0.53939 0.15783 0.46857 +0.61472 0.15691 0.46823 +0.68925 0.15600 0.46791 +0.76221 0.15511 0.46761 +0.83281 0.15425 0.46732 +0.90026 0.15343 0.46705 +0.96377 0.15265 0.46680 +1.00000 0.15194 0.46656 +1.00000 0.15132 0.46627 +0.00000 0.22834 0.47020 +0.05217 0.22768 0.46991 +0.11102 0.22697 0.46960 +0.17459 0.22619 0.46928 +0.24207 0.22537 0.46896 +0.31269 0.22450 0.46863 +0.38567 0.22361 0.46831 +0.46020 0.22270 0.46799 +0.53552 0.22178 0.46767 +0.61083 0.22086 0.46737 +0.68535 0.21995 0.46707 +0.75829 0.21906 0.46678 +0.82894 0.21822 0.46645 +0.89658 0.21747 0.46600 +0.96039 0.21680 0.46547 +1.00000 0.21622 0.46489 +1.00000 0.21572 0.46428 +0.00000 0.29526 0.46907 +0.04822 0.29461 0.46882 +0.10705 0.29389 0.46855 +0.17058 0.29312 0.46827 +0.23804 0.29229 0.46799 +0.30864 0.29143 0.46770 +0.38159 0.29054 0.46740 +0.45611 0.28963 0.46711 +0.53142 0.28871 0.46681 +0.60682 0.28783 0.46642 +0.68159 0.28701 0.46588 +0.75494 0.28627 0.46521 +0.82605 0.28560 0.46443 +0.89410 0.28500 0.46357 +0.95830 0.28447 0.46267 +1.00000 0.28401 0.46174 +1.00000 0.28362 0.46084 +0.00000 0.36443 0.46807 +0.04404 0.36377 0.46785 +0.10284 0.36306 0.46761 +0.16636 0.36228 0.46735 +0.23381 0.36146 0.46709 +0.30441 0.36060 0.46680 +0.37750 0.35976 0.46637 +0.45232 0.35896 0.46579 +0.52808 0.35821 0.46506 +0.60398 0.35751 0.46418 +0.67923 0.35687 0.46318 +0.75302 0.35628 0.46207 +0.82454 0.35576 0.46089 +0.89298 0.35529 0.45965 +0.95751 0.35488 0.45841 +1.00000 0.35453 0.45718 +1.00000 0.35422 0.45601 +0.00000 0.43508 0.46715 +0.03971 0.43443 0.46693 +0.09860 0.43374 0.46662 +0.16232 0.43304 0.46617 +0.23010 0.43234 0.46558 +0.30117 0.43166 0.46484 +0.37475 0.43100 0.46394 +0.45005 0.43037 0.46290 +0.52627 0.42979 0.46171 +0.60261 0.42925 0.46039 +0.67828 0.42875 0.45897 +0.75246 0.42830 0.45747 +0.82434 0.42789 0.45593 +0.89310 0.42753 0.45436 +0.95792 0.42721 0.45281 +1.00000 0.42694 0.45131 +1.00000 0.42670 0.44991 +0.00000 0.50673 0.46557 +0.03638 0.50622 0.46501 +0.09567 0.50568 0.46431 +0.15981 0.50513 0.46346 +0.22802 0.50459 0.46245 +0.29952 0.50405 0.46128 +0.37353 0.50354 0.45996 +0.44924 0.50306 0.45850 +0.52585 0.50261 0.45691 +0.60258 0.50219 0.45521 +0.67860 0.50181 0.45342 +0.75310 0.50146 0.45159 +0.82527 0.50115 0.44973 +0.89429 0.50087 0.44788 +0.95935 0.50062 0.44607 +1.00000 0.50039 0.44435 +1.00000 0.50020 0.44276 +0.00000 0.57900 0.46237 +0.03469 0.57860 0.46149 +0.09433 0.57818 0.46044 +0.15882 0.57776 0.45923 +0.22740 0.57734 0.45786 +0.29927 0.57693 0.45632 +0.37362 0.57654 0.45463 +0.44968 0.57617 0.45281 +0.52662 0.57582 0.45088 +0.60365 0.57549 0.44886 +0.67995 0.57519 0.44677 +0.75471 0.57491 0.44465 +0.82711 0.57466 0.44253 +0.89633 0.57443 0.44045 +0.96156 0.57421 0.43845 +1.00000 0.57402 0.43655 +1.00000 0.57385 0.43480 +0.00000 0.65101 0.45778 +0.03439 0.65070 0.45662 +0.09432 0.65038 0.45528 +0.15911 0.65005 0.45377 +0.22799 0.64973 0.45208 +0.30015 0.64941 0.45023 +0.37479 0.64910 0.44824 +0.45111 0.64881 0.44613 +0.52831 0.64853 0.44391 +0.60557 0.64826 0.44162 +0.68208 0.64801 0.43929 +0.75702 0.64777 0.43695 +0.82957 0.64754 0.43464 +0.89893 0.64733 0.43238 +0.96427 0.64713 0.43022 +1.00000 0.64695 0.42819 +1.00000 0.64677 0.42634 +0.00000 0.72188 0.45211 +0.03520 0.72163 0.45072 +0.09536 0.72138 0.44913 +0.16038 0.72112 0.44736 +0.22949 0.72086 0.44542 +0.30187 0.72060 0.44332 +0.37673 0.72035 0.44108 +0.45325 0.72010 0.43874 +0.53063 0.71986 0.43630 +0.60805 0.71962 0.43382 +0.68469 0.71938 0.43130 +0.75975 0.71915 0.42880 +0.83240 0.71893 0.42634 +0.90182 0.71871 0.42397 +0.96719 0.71849 0.42174 +1.00000 0.71829 0.41970 +1.00000 0.71809 0.41787 +0.00000 0.79071 0.44567 +0.03682 0.79052 0.44409 +0.09715 0.79031 0.44231 +0.16235 0.79009 0.44034 +0.23162 0.78987 0.43820 +0.30416 0.78964 0.43591 +0.37916 0.78941 0.43349 +0.45581 0.78917 0.43097 +0.53330 0.78894 0.42838 +0.61080 0.78869 0.42574 +0.68751 0.78845 0.42312 +0.76257 0.78820 0.42058 +0.83518 0.78794 0.41814 +0.90452 0.78769 0.41585 +0.96978 0.78743 0.41372 +1.00000 0.78719 0.41179 +1.00000 0.78695 0.41006 +0.00000 0.85664 0.43880 +0.03895 0.85647 0.43708 +0.09939 0.85628 0.43515 +0.16470 0.85608 0.43303 +0.23408 0.85586 0.43075 +0.30672 0.85564 0.42831 +0.38180 0.85541 0.42576 +0.45851 0.85516 0.42314 +0.53599 0.85490 0.42051 +0.61345 0.85463 0.41792 +0.69005 0.85434 0.41539 +0.76499 0.85405 0.41296 +0.83746 0.85374 0.41066 +0.90665 0.85343 0.40851 +0.97176 0.85312 0.40654 +1.00000 0.85281 0.40476 +1.00000 0.85252 0.40319 +0.00000 0.91879 0.43182 +0.04131 0.91862 0.43000 +0.10182 0.91843 0.42797 +0.16720 0.91823 0.42574 +0.23663 0.91801 0.42337 +0.30927 0.91776 0.42091 +0.38430 0.91750 0.41839 +0.46091 0.91722 0.41585 +0.53828 0.91692 0.41334 +0.61560 0.91659 0.41088 +0.69204 0.91625 0.40850 +0.76681 0.91589 0.40624 +0.83909 0.91551 0.40412 +0.90808 0.91513 0.40217 +0.97298 0.91474 0.40039 +1.00000 0.91435 0.39880 +1.00000 0.91399 0.39742 +0.00000 0.97633 0.42503 +0.04367 0.97615 0.42316 +0.10418 0.97595 0.42111 +0.16952 0.97572 0.41891 +0.23887 0.97547 0.41661 +0.31141 0.97519 0.41424 +0.38632 0.97488 0.41184 +0.46279 0.97455 0.40944 +0.54000 0.97418 0.40708 +0.61713 0.97379 0.40480 +0.69338 0.97337 0.40261 +0.76793 0.97293 0.40056 +0.83998 0.97247 0.39866 +0.90873 0.97200 0.39693 +0.97340 0.97152 0.39538 +1.00000 0.97105 0.39401 +1.00000 0.97060 0.39284 +0.00000 1.00000 0.41885 +0.04571 1.00000 0.41703 +0.10614 1.00000 0.41504 +0.17139 1.00000 0.41294 +0.24063 1.00000 0.41074 +0.31304 1.00000 0.40850 +0.38780 1.00000 0.40624 +0.46410 1.00000 0.40401 +0.54111 1.00000 0.40184 +0.61803 1.00000 0.39976 +0.69404 1.00000 0.39780 +0.76835 1.00000 0.39597 +0.84015 1.00000 0.39431 +0.90866 1.00000 0.39282 +0.97307 1.00000 0.39152 +1.00000 1.00000 0.39039 +1.00000 1.00000 0.38944 +0.01058 0.00000 0.54600 +0.06410 0.00000 0.54546 +0.12313 0.00000 0.54488 +0.18687 0.00000 0.54429 +0.25453 0.00000 0.54370 +0.32532 0.00000 0.54311 +0.39846 0.00000 0.54253 +0.47314 0.00000 0.54198 +0.54860 0.00000 0.54145 +0.62403 0.00000 0.54095 +0.69866 0.00000 0.54049 +0.77170 0.00000 0.54006 +0.84236 0.00000 0.53967 +0.90987 0.00000 0.53931 +0.97343 0.00000 0.53899 +1.00000 0.00000 0.53870 +1.00000 0.00000 0.53845 +0.00815 0.04814 0.54432 +0.06163 0.04748 0.54385 +0.12060 0.04676 0.54335 +0.18429 0.04599 0.54284 +0.25190 0.04516 0.54232 +0.32264 0.04430 0.54181 +0.39573 0.04341 0.54131 +0.47037 0.04250 0.54083 +0.54578 0.04158 0.54038 +0.62117 0.04066 0.53994 +0.69576 0.03975 0.53954 +0.76876 0.03885 0.53916 +0.83940 0.03799 0.53882 +0.90688 0.03717 0.53850 +0.97042 0.03639 0.53821 +1.00000 0.03567 0.53796 +1.00000 0.03502 0.53773 +0.00530 0.10389 0.54274 +0.05873 0.10323 0.54233 +0.11766 0.10251 0.54191 +0.18130 0.10174 0.54147 +0.24886 0.10091 0.54103 +0.31955 0.10005 0.54060 +0.39259 0.09916 0.54017 +0.46718 0.09825 0.53976 +0.54255 0.09733 0.53936 +0.61791 0.09641 0.53899 +0.69247 0.09550 0.53863 +0.76544 0.09461 0.53830 +0.83605 0.09374 0.53799 +0.90351 0.09292 0.53770 +0.96704 0.09214 0.53744 +1.00000 0.09143 0.53720 +1.00000 0.09077 0.53699 +0.00204 0.16411 0.54130 +0.05543 0.16345 0.54096 +0.11432 0.16273 0.54060 +0.17791 0.16196 0.54023 +0.24543 0.16113 0.53986 +0.31608 0.16027 0.53948 +0.38908 0.15938 0.53912 +0.46364 0.15847 0.53876 +0.53897 0.15755 0.53842 +0.61430 0.15663 0.53809 +0.68883 0.15572 0.53777 +0.76179 0.15483 0.53747 +0.83238 0.15397 0.53718 +0.89983 0.15314 0.53692 +0.96335 0.15237 0.53667 +1.00000 0.15166 0.53640 +1.00000 0.15106 0.53607 +0.00000 0.22805 0.54003 +0.05177 0.22740 0.53974 +0.11062 0.22668 0.53944 +0.17418 0.22590 0.53912 +0.24166 0.22508 0.53880 +0.31228 0.22422 0.53848 +0.38525 0.22333 0.53816 +0.45978 0.22242 0.53784 +0.53509 0.22150 0.53753 +0.61040 0.22058 0.53723 +0.68492 0.21967 0.53693 +0.75787 0.21878 0.53664 +0.82857 0.21796 0.53626 +0.89626 0.21722 0.53577 +0.96011 0.21657 0.53519 +1.00000 0.21600 0.53457 +1.00000 0.21551 0.53393 +0.00000 0.29498 0.53891 +0.04781 0.29433 0.53867 +0.10663 0.29361 0.53841 +0.17016 0.29283 0.53813 +0.23762 0.29201 0.53785 +0.30822 0.29115 0.53756 +0.38117 0.29025 0.53726 +0.45569 0.28934 0.53697 +0.53101 0.28843 0.53666 +0.60647 0.28757 0.53621 +0.68129 0.28677 0.53562 +0.75469 0.28605 0.53491 +0.82584 0.28539 0.53408 +0.89394 0.28481 0.53318 +0.95817 0.28429 0.53224 +1.00000 0.28385 0.53128 +1.00000 0.28346 0.53035 +0.00000 0.36414 0.53792 +0.04361 0.36349 0.53771 +0.10242 0.36277 0.53747 +0.16594 0.36199 0.53722 +0.23339 0.36117 0.53695 +0.30402 0.36033 0.53663 +0.37716 0.35951 0.53616 +0.45203 0.35873 0.53553 +0.52784 0.35799 0.53474 +0.60379 0.35731 0.53382 +0.67909 0.35669 0.53277 +0.75292 0.35612 0.53162 +0.82448 0.35561 0.53040 +0.89295 0.35515 0.52913 +0.95752 0.35475 0.52785 +1.00000 0.35440 0.52659 +1.00000 0.35411 0.52539 +0.00000 0.43479 0.53701 +0.03931 0.43415 0.53677 +0.09825 0.43348 0.53642 +0.16201 0.43280 0.53593 +0.22984 0.43212 0.53529 +0.30096 0.43145 0.53451 +0.37458 0.43081 0.53357 +0.44992 0.43020 0.53247 +0.52618 0.42963 0.53124 +0.60257 0.42910 0.52988 +0.67828 0.42861 0.52842 +0.75249 0.42817 0.52689 +0.82440 0.42778 0.52531 +0.89319 0.42743 0.52371 +0.95804 0.42712 0.52213 +1.00000 0.42685 0.52061 +1.00000 0.42662 0.51919 +0.00000 0.50651 0.53528 +0.03616 0.50601 0.53468 +0.09549 0.50548 0.53394 +0.15966 0.50495 0.53305 +0.22792 0.50442 0.53200 +0.29946 0.50390 0.53079 +0.37350 0.50340 0.52944 +0.44925 0.50293 0.52793 +0.52590 0.50249 0.52631 +0.60266 0.50209 0.52457 +0.67871 0.50171 0.52276 +0.75324 0.50137 0.52089 +0.82544 0.50107 0.51900 +0.89448 0.50079 0.51712 +0.95956 0.50055 0.51530 +1.00000 0.50033 0.51356 +1.00000 0.50014 0.51194 +0.00000 0.57883 0.53192 +0.03462 0.57844 0.53101 +0.09429 0.57803 0.52993 +0.15882 0.57762 0.52869 +0.22743 0.57721 0.52727 +0.29933 0.57682 0.52570 +0.37372 0.57643 0.52399 +0.44980 0.57607 0.52213 +0.52677 0.57573 0.52017 +0.60383 0.57541 0.51812 +0.68015 0.57512 0.51600 +0.75493 0.57485 0.51386 +0.82735 0.57460 0.51172 +0.89659 0.57437 0.50962 +0.96183 0.57416 0.50759 +1.00000 0.57397 0.50568 +1.00000 0.57380 0.50392 +0.00000 0.65088 0.52720 +0.03445 0.65058 0.52601 +0.09440 0.65027 0.52465 +0.15922 0.64995 0.52310 +0.22812 0.64964 0.52138 +0.30031 0.64933 0.51951 +0.37498 0.64902 0.51749 +0.45132 0.64874 0.51535 +0.52854 0.64846 0.51311 +0.60582 0.64820 0.51080 +0.68235 0.64795 0.50845 +0.75730 0.64772 0.50609 +0.82987 0.64749 0.50375 +0.89924 0.64728 0.50148 +0.96459 0.64708 0.49931 +1.00000 0.64689 0.49727 +1.00000 0.64672 0.49540 +0.00000 0.72179 0.52141 +0.03536 0.72155 0.52000 +0.09553 0.72130 0.51839 +0.16058 0.72105 0.51660 +0.22971 0.72080 0.51463 +0.30211 0.72054 0.51251 +0.37699 0.72029 0.51025 +0.45353 0.72005 0.50788 +0.53092 0.71980 0.50543 +0.60835 0.71957 0.50292 +0.68500 0.71933 0.50040 +0.76007 0.71910 0.49788 +0.83272 0.71887 0.49541 +0.90215 0.71865 0.49303 +0.96751 0.71843 0.49082 +1.00000 0.71822 0.48878 +1.00000 0.71802 0.48696 +0.00000 0.79064 0.51488 +0.03706 0.79045 0.51329 +0.09739 0.79025 0.51149 +0.16261 0.79003 0.50950 +0.23190 0.78981 0.50734 +0.30445 0.78958 0.50503 +0.37946 0.78935 0.50259 +0.45612 0.78912 0.50006 +0.53362 0.78888 0.49745 +0.61113 0.78864 0.49481 +0.68783 0.78839 0.49219 +0.76288 0.78813 0.48966 +0.83548 0.78787 0.48723 +0.90480 0.78761 0.48495 +0.97005 0.78735 0.48284 +1.00000 0.78710 0.48092 +1.00000 0.78686 0.47921 +0.00000 0.85658 0.50794 +0.03923 0.85641 0.50621 +0.09969 0.85622 0.50427 +0.16501 0.85602 0.50214 +0.23440 0.85581 0.49983 +0.30704 0.85559 0.49739 +0.38213 0.85535 0.49483 +0.45883 0.85510 0.49221 +0.53630 0.85484 0.48959 +0.61374 0.85456 0.48701 +0.69033 0.85427 0.48450 +0.76526 0.85397 0.48209 +0.83771 0.85365 0.47981 +0.90688 0.85333 0.47768 +0.97196 0.85301 0.47572 +1.00000 0.85270 0.47396 +1.00000 0.85240 0.47241 +0.00000 0.91874 0.50092 +0.04163 0.91857 0.49909 +0.10215 0.91838 0.49704 +0.16753 0.91817 0.49481 +0.23695 0.91795 0.49244 +0.30958 0.91770 0.48999 +0.38460 0.91744 0.48748 +0.46119 0.91715 0.48496 +0.53855 0.91684 0.48246 +0.61584 0.91651 0.48002 +0.69226 0.91615 0.47767 +0.76700 0.91578 0.47543 +0.83926 0.91540 0.47334 +0.90822 0.91500 0.47141 +0.97310 0.91460 0.46966 +1.00000 0.91421 0.46810 +1.00000 0.91383 0.46674 +0.00000 0.97627 0.49410 +0.04399 0.97609 0.49223 +0.10449 0.97588 0.49018 +0.16982 0.97565 0.48800 +0.23916 0.97540 0.48571 +0.31168 0.97511 0.48336 +0.38658 0.97480 0.48097 +0.46302 0.97446 0.47859 +0.54021 0.97408 0.47626 +0.61731 0.97368 0.47400 +0.69352 0.97325 0.47185 +0.76804 0.97279 0.46983 +0.84006 0.97232 0.46796 +0.90878 0.97183 0.46626 +0.97342 0.97135 0.46474 +1.00000 0.97086 0.46341 +1.00000 0.97040 0.46226 +0.00000 1.00000 0.48794 +0.04600 1.00000 0.48613 +0.10642 1.00000 0.48416 +0.17165 1.00000 0.48206 +0.24087 1.00000 0.47989 +0.31326 1.00000 0.47766 +0.38800 1.00000 0.47543 +0.46426 1.00000 0.47323 +0.54125 1.00000 0.47109 +0.61813 1.00000 0.46904 +0.69411 1.00000 0.46711 +0.76838 1.00000 0.46533 +0.84014 1.00000 0.46370 +0.90860 1.00000 0.46225 +0.97298 1.00000 0.46098 +1.00000 1.00000 0.45989 +1.00000 1.00000 0.45897 +0.01026 0.00000 0.61498 +0.06378 0.00000 0.61444 +0.12280 0.00000 0.61388 +0.18653 0.00000 0.61330 +0.25418 0.00000 0.61271 +0.32497 0.00000 0.61214 +0.39810 0.00000 0.61157 +0.47278 0.00000 0.61103 +0.54822 0.00000 0.61051 +0.62365 0.00000 0.61003 +0.69828 0.00000 0.60957 +0.77131 0.00000 0.60915 +0.84197 0.00000 0.60877 +0.90947 0.00000 0.60842 +0.97303 0.00000 0.60810 +1.00000 0.00000 0.60782 +1.00000 0.00000 0.60757 +0.00782 0.04785 0.61333 +0.06128 0.04720 0.61287 +0.12025 0.04648 0.61238 +0.18393 0.04571 0.61188 +0.25154 0.04488 0.61137 +0.32227 0.04402 0.61087 +0.39535 0.04313 0.61038 +0.46998 0.04221 0.60991 +0.54539 0.04129 0.60946 +0.62077 0.04037 0.60904 +0.69536 0.03946 0.60864 +0.76836 0.03857 0.60827 +0.83899 0.03771 0.60793 +0.90647 0.03689 0.60762 +0.97001 0.03611 0.60734 +1.00000 0.03539 0.60708 +1.00000 0.03474 0.60686 +0.00494 0.10360 0.61178 +0.05837 0.10295 0.61138 +0.11729 0.10223 0.61097 +0.18092 0.10146 0.61054 +0.24848 0.10063 0.61011 +0.31916 0.09977 0.60968 +0.39220 0.09888 0.60926 +0.46679 0.09797 0.60886 +0.54215 0.09705 0.60847 +0.61750 0.09613 0.60810 +0.69206 0.09522 0.60775 +0.76503 0.09432 0.60742 +0.83564 0.09346 0.60712 +0.90310 0.09264 0.60683 +0.96662 0.09186 0.60657 +1.00000 0.09114 0.60634 +1.00000 0.09049 0.60613 +0.00167 0.16382 0.61037 +0.05505 0.16317 0.61004 +0.11393 0.16245 0.60969 +0.17752 0.16168 0.60932 +0.24503 0.16085 0.60896 +0.31568 0.15999 0.60859 +0.38867 0.15910 0.60823 +0.46323 0.15819 0.60788 +0.53856 0.15727 0.60754 +0.61389 0.15635 0.60721 +0.68842 0.15544 0.60690 +0.76137 0.15455 0.60660 +0.83196 0.15368 0.60632 +0.89941 0.15286 0.60605 +0.96293 0.15209 0.60580 +1.00000 0.15140 0.60549 +1.00000 0.15081 0.60512 +0.00000 0.22777 0.60912 +0.05137 0.22712 0.60884 +0.11022 0.22640 0.60854 +0.17377 0.22562 0.60823 +0.24125 0.22480 0.60792 +0.31187 0.22394 0.60760 +0.38483 0.22305 0.60729 +0.45937 0.22213 0.60697 +0.53468 0.22122 0.60667 +0.60998 0.22030 0.60636 +0.68450 0.21938 0.60607 +0.75748 0.21850 0.60576 +0.82823 0.21770 0.60532 +0.89596 0.21698 0.60479 +0.95986 0.21635 0.60417 +1.00000 0.21579 0.60351 +1.00000 0.21532 0.60284 +0.00000 0.29470 0.60803 +0.04740 0.29404 0.60779 +0.10622 0.29333 0.60753 +0.16975 0.29255 0.60726 +0.23720 0.29173 0.60698 +0.30780 0.29086 0.60669 +0.38075 0.28997 0.60640 +0.45527 0.28906 0.60611 +0.53062 0.28816 0.60576 +0.60613 0.28732 0.60527 +0.68101 0.28654 0.60463 +0.75445 0.28584 0.60386 +0.82565 0.28520 0.60299 +0.89379 0.28463 0.60205 +0.95806 0.28413 0.60107 +1.00000 0.28369 0.60008 +1.00000 0.28331 0.59912 +0.00000 0.36386 0.60706 +0.04320 0.36321 0.60684 +0.10200 0.36249 0.60660 +0.16552 0.36171 0.60635 +0.23297 0.36089 0.60608 +0.30365 0.36006 0.60572 +0.37684 0.35926 0.60519 +0.45176 0.35850 0.60451 +0.52762 0.35779 0.60368 +0.60362 0.35712 0.60271 +0.67896 0.35651 0.60162 +0.75284 0.35596 0.60043 +0.82443 0.35546 0.59917 +0.89294 0.35502 0.59786 +0.95754 0.35463 0.59655 +1.00000 0.35429 0.59526 +1.00000 0.35400 0.59404 +0.00000 0.43451 0.60614 +0.03894 0.43389 0.60586 +0.09791 0.43323 0.60547 +0.16172 0.43257 0.60494 +0.22959 0.43190 0.60426 +0.30076 0.43125 0.60343 +0.37442 0.43062 0.60244 +0.44981 0.43003 0.60131 +0.52611 0.42947 0.60003 +0.60254 0.42896 0.59864 +0.67829 0.42848 0.59714 +0.75254 0.42806 0.59557 +0.82448 0.42767 0.59395 +0.89330 0.42733 0.59232 +0.95817 0.42703 0.59072 +1.00000 0.42677 0.58918 +1.00000 0.42654 0.58773 +0.00000 0.50629 0.60424 +0.03595 0.50580 0.60361 +0.09532 0.50529 0.60283 +0.15953 0.50477 0.60190 +0.22782 0.50425 0.60082 +0.29940 0.50375 0.59957 +0.37348 0.50327 0.59817 +0.44927 0.50281 0.59663 +0.52596 0.50238 0.59497 +0.60275 0.50198 0.59320 +0.67883 0.50162 0.59135 +0.75339 0.50129 0.58945 +0.82561 0.50099 0.58754 +0.89468 0.50072 0.58564 +0.95978 0.50048 0.58379 +1.00000 0.50027 0.58203 +1.00000 0.50008 0.58040 +0.00000 0.57867 0.60073 +0.03456 0.57829 0.59979 +0.09426 0.57789 0.59868 +0.15882 0.57749 0.59740 +0.22747 0.57710 0.59596 +0.29940 0.57671 0.59435 +0.37382 0.57633 0.59260 +0.44993 0.57598 0.59072 +0.52693 0.57565 0.58872 +0.60401 0.57534 0.58664 +0.68036 0.57505 0.58450 +0.75516 0.57478 0.58233 +0.82760 0.57454 0.58017 +0.89685 0.57431 0.57805 +0.96211 0.57410 0.57601 +1.00000 0.57392 0.57408 +1.00000 0.57375 0.57231 +0.00000 0.65077 0.59588 +0.03451 0.65047 0.59467 +0.09449 0.65017 0.59327 +0.15934 0.64986 0.59170 +0.22827 0.64955 0.58995 +0.30048 0.64925 0.58805 +0.37517 0.64895 0.58600 +0.45154 0.64867 0.58384 +0.52878 0.64840 0.58157 +0.60608 0.64814 0.57924 +0.68262 0.64790 0.57687 +0.75759 0.64766 0.57449 +0.83017 0.64744 0.57214 +0.89955 0.64723 0.56985 +0.96491 0.64703 0.56767 +1.00000 0.64684 0.56562 +1.00000 0.64666 0.56375 +0.00000 0.72170 0.58998 +0.03553 0.72147 0.58855 +0.09572 0.72123 0.58692 +0.16079 0.72098 0.58510 +0.22993 0.72073 0.58311 +0.30236 0.72048 0.58097 +0.37725 0.72023 0.57869 +0.45380 0.71999 0.57630 +0.53121 0.71975 0.57383 +0.60865 0.71951 0.57130 +0.68531 0.71928 0.56876 +0.76039 0.71905 0.56623 +0.83305 0.71882 0.56375 +0.90246 0.71859 0.56138 +0.96782 0.71837 0.55917 +1.00000 0.71816 0.55715 +1.00000 0.71795 0.55533 +0.00000 0.79058 0.58336 +0.03729 0.79039 0.58175 +0.09765 0.79019 0.57994 +0.16288 0.78997 0.57793 +0.23218 0.78976 0.57575 +0.30474 0.78953 0.57342 +0.37977 0.78930 0.57097 +0.45644 0.78907 0.56842 +0.53394 0.78883 0.56580 +0.61145 0.78858 0.56315 +0.68814 0.78833 0.56054 +0.76318 0.78807 0.55802 +0.83577 0.78780 0.55561 +0.90508 0.78754 0.55334 +0.97031 0.78727 0.55124 +1.00000 0.78702 0.54934 +1.00000 0.78677 0.54764 +0.00000 0.85653 0.57636 +0.03952 0.85636 0.57462 +0.09998 0.85617 0.57266 +0.16532 0.85597 0.57051 +0.23471 0.85576 0.56820 +0.30736 0.85553 0.56574 +0.38245 0.85529 0.56317 +0.45914 0.85504 0.56056 +0.53661 0.85477 0.55796 +0.61403 0.85449 0.55539 +0.69060 0.85419 0.55289 +0.76551 0.85388 0.55050 +0.83794 0.85356 0.54824 +0.90709 0.85324 0.54613 +0.97215 0.85291 0.54420 +1.00000 0.85258 0.54246 +1.00000 0.85227 0.54093 +0.00000 0.91868 0.56929 +0.04195 0.91851 0.56744 +0.10247 0.91833 0.56539 +0.16785 0.91812 0.56315 +0.23726 0.91789 0.56079 +0.30988 0.91764 0.55835 +0.38489 0.91737 0.55585 +0.46147 0.91707 0.55335 +0.53880 0.91676 0.55087 +0.61608 0.91642 0.54845 +0.69247 0.91606 0.54612 +0.76719 0.91567 0.54391 +0.83941 0.91528 0.54184 +0.90835 0.91487 0.53994 +0.97320 0.91446 0.53821 +1.00000 0.91406 0.53668 +1.00000 0.91367 0.53535 +0.00000 0.97621 0.56244 +0.04431 0.97603 0.56058 +0.10480 0.97582 0.55855 +0.17011 0.97559 0.55637 +0.23944 0.97532 0.55410 +0.31194 0.97503 0.55176 +0.38682 0.97471 0.54939 +0.46324 0.97436 0.54704 +0.54040 0.97398 0.54473 +0.61748 0.97356 0.54250 +0.69366 0.97312 0.54037 +0.76814 0.97266 0.53838 +0.84013 0.97217 0.53655 +0.90882 0.97167 0.53488 +0.97342 0.97117 0.53339 +1.00000 0.97067 0.53209 +1.00000 0.97020 0.53098 +0.00000 1.00000 0.55631 +0.04628 1.00000 0.55451 +0.10669 1.00000 0.55255 +0.17190 1.00000 0.55048 +0.24110 1.00000 0.54832 +0.31347 1.00000 0.54612 +0.38818 1.00000 0.54391 +0.46442 1.00000 0.54173 +0.54137 1.00000 0.53962 +0.61822 1.00000 0.53761 +0.69416 1.00000 0.53571 +0.76839 1.00000 0.53397 +0.84012 1.00000 0.53238 +0.90854 1.00000 0.53097 +0.97287 1.00000 0.52973 +1.00000 1.00000 0.52868 +1.00000 1.00000 0.52780 +0.00995 0.00000 0.68250 +0.06346 0.00000 0.68198 +0.12247 0.00000 0.68142 +0.18620 0.00000 0.68086 +0.25384 0.00000 0.68028 +0.32462 0.00000 0.67972 +0.39774 0.00000 0.67916 +0.47241 0.00000 0.67863 +0.54786 0.00000 0.67812 +0.62328 0.00000 0.67765 +0.69790 0.00000 0.67720 +0.77092 0.00000 0.67679 +0.84158 0.00000 0.67641 +0.90908 0.00000 0.67607 +0.97263 0.00000 0.67576 +1.00000 0.00000 0.67548 +1.00000 0.00000 0.67524 +0.00748 0.04758 0.68089 +0.06094 0.04692 0.68043 +0.11991 0.04621 0.67996 +0.18358 0.04543 0.67946 +0.25118 0.04460 0.67897 +0.32191 0.04374 0.67848 +0.39498 0.04285 0.67800 +0.46961 0.04194 0.67754 +0.54501 0.04102 0.67710 +0.62039 0.04010 0.67668 +0.69497 0.03919 0.67629 +0.76797 0.03830 0.67593 +0.83859 0.03743 0.67559 +0.90607 0.03661 0.67528 +0.96960 0.03583 0.67500 +1.00000 0.03512 0.67475 +1.00000 0.03446 0.67453 +0.00459 0.10333 0.67937 +0.05801 0.10267 0.67898 +0.11692 0.10196 0.67857 +0.18055 0.10118 0.67815 +0.24810 0.10035 0.67773 +0.31878 0.09949 0.67731 +0.39181 0.09860 0.67690 +0.46640 0.09769 0.67650 +0.54176 0.09677 0.67612 +0.61711 0.09585 0.67576 +0.69166 0.09494 0.67541 +0.76463 0.09405 0.67509 +0.83523 0.09319 0.67479 +0.90269 0.09236 0.67451 +0.96621 0.09159 0.67425 +1.00000 0.09087 0.67401 +1.00000 0.09022 0.67380 +0.00129 0.16355 0.67799 +0.05467 0.16289 0.67766 +0.11355 0.16218 0.67732 +0.17713 0.16140 0.67696 +0.24464 0.16058 0.67660 +0.31529 0.15971 0.67624 +0.38828 0.15882 0.67589 +0.46283 0.15791 0.67554 +0.53816 0.15699 0.67521 +0.61348 0.15607 0.67488 +0.68801 0.15516 0.67457 +0.76096 0.15427 0.67428 +0.83155 0.15341 0.67399 +0.89900 0.15258 0.67373 +0.96255 0.15182 0.67345 +1.00000 0.15115 0.67310 +1.00000 0.15057 0.67271 +0.00000 0.22749 0.67677 +0.05098 0.22684 0.67649 +0.10982 0.22612 0.67620 +0.17338 0.22535 0.67589 +0.24085 0.22452 0.67558 +0.31146 0.22366 0.67527 +0.38443 0.22277 0.67496 +0.45896 0.22186 0.67465 +0.53427 0.22094 0.67434 +0.60957 0.22002 0.67404 +0.68409 0.21911 0.67375 +0.75711 0.21824 0.67339 +0.82791 0.21746 0.67292 +0.89568 0.21676 0.67233 +0.95962 0.21614 0.67168 +1.00000 0.21560 0.67098 +1.00000 0.21513 0.67027 +0.00000 0.29442 0.67569 +0.04699 0.29377 0.67545 +0.10581 0.29305 0.67520 +0.16934 0.29227 0.67493 +0.23680 0.29145 0.67465 +0.30739 0.29059 0.67437 +0.38034 0.28970 0.67408 +0.45486 0.28879 0.67378 +0.53026 0.28790 0.67339 +0.60583 0.28708 0.67284 +0.68075 0.28632 0.67216 +0.75424 0.28563 0.67135 +0.82548 0.28501 0.67044 +0.89366 0.28445 0.66946 +0.95797 0.28396 0.66844 +1.00000 0.28354 0.66742 +1.00000 0.28317 0.66643 +0.00000 0.36358 0.67473 +0.04279 0.36293 0.67451 +0.10159 0.36221 0.67428 +0.16511 0.36144 0.67403 +0.23257 0.36062 0.67375 +0.30331 0.35981 0.67333 +0.37655 0.35903 0.67276 +0.45152 0.35829 0.67203 +0.52742 0.35759 0.67116 +0.60347 0.35694 0.67014 +0.67885 0.35635 0.66901 +0.75277 0.35580 0.66777 +0.82440 0.35532 0.66647 +0.89294 0.35489 0.66513 +0.95757 0.35451 0.66379 +1.00000 0.35418 0.66248 +1.00000 0.35390 0.66123 +0.00000 0.43424 0.67380 +0.03859 0.43363 0.67348 +0.09760 0.43299 0.67305 +0.16145 0.43234 0.67248 +0.22937 0.43169 0.67176 +0.30058 0.43106 0.67088 +0.37429 0.43045 0.66985 +0.44971 0.42987 0.66868 +0.52606 0.42932 0.66736 +0.60253 0.42882 0.66593 +0.67831 0.42836 0.66439 +0.75259 0.42795 0.66279 +0.82456 0.42757 0.66114 +0.89341 0.42724 0.65948 +0.95831 0.42694 0.65785 +1.00000 0.42669 0.65628 +1.00000 0.42646 0.65482 +0.00000 0.50609 0.67173 +0.03577 0.50561 0.67107 +0.09517 0.50511 0.67026 +0.15942 0.50460 0.66929 +0.22775 0.50410 0.66817 +0.29937 0.50361 0.66688 +0.37348 0.50314 0.66545 +0.44930 0.50269 0.66387 +0.52602 0.50227 0.66217 +0.60285 0.50189 0.66037 +0.67896 0.50153 0.65849 +0.75354 0.50121 0.65656 +0.82579 0.50091 0.65462 +0.89488 0.50065 0.65270 +0.95999 0.50041 0.65083 +1.00000 0.50021 0.64905 +1.00000 0.50002 0.64740 +0.00000 0.57852 0.66808 +0.03452 0.57815 0.66711 +0.09425 0.57776 0.66597 +0.15884 0.57737 0.66466 +0.22752 0.57698 0.66318 +0.29948 0.57660 0.66154 +0.37393 0.57624 0.65976 +0.45007 0.57590 0.65785 +0.52710 0.57557 0.65582 +0.60420 0.57527 0.65371 +0.68057 0.57498 0.65155 +0.75539 0.57472 0.64936 +0.82785 0.57448 0.64717 +0.89712 0.57426 0.64503 +0.96239 0.57405 0.64297 +1.00000 0.57386 0.64103 +1.00000 0.57370 0.63925 +0.00000 0.65066 0.66310 +0.03459 0.65037 0.66186 +0.09459 0.65007 0.66044 +0.15946 0.64977 0.65884 +0.22842 0.64947 0.65707 +0.30065 0.64917 0.65514 +0.37537 0.64888 0.65307 +0.45176 0.64861 0.65088 +0.52902 0.64834 0.64859 +0.60633 0.64809 0.64623 +0.68289 0.64784 0.64384 +0.75787 0.64761 0.64144 +0.83047 0.64739 0.63908 +0.89985 0.64717 0.63678 +0.96522 0.64697 0.63458 +1.00000 0.64678 0.63253 +1.00000 0.64661 0.63065 +0.00000 0.72162 0.65709 +0.03569 0.72139 0.65564 +0.09591 0.72116 0.65399 +0.16100 0.72091 0.65215 +0.23016 0.72067 0.65014 +0.30260 0.72042 0.64798 +0.37751 0.72018 0.64568 +0.45408 0.71994 0.64327 +0.53150 0.71970 0.64078 +0.60895 0.71946 0.63824 +0.68562 0.71923 0.63568 +0.76070 0.71899 0.63314 +0.83336 0.71876 0.63065 +0.90277 0.71853 0.62829 +0.96812 0.71831 0.62609 +1.00000 0.71809 0.62408 +1.00000 0.71789 0.62227 +0.00000 0.79052 0.65040 +0.03753 0.79033 0.64877 +0.09790 0.79013 0.64694 +0.16314 0.78992 0.64491 +0.23246 0.78970 0.64272 +0.30504 0.78948 0.64037 +0.38007 0.78925 0.63790 +0.45675 0.78902 0.63534 +0.53425 0.78877 0.63271 +0.61177 0.78852 0.63006 +0.68845 0.78827 0.62746 +0.76348 0.78800 0.62494 +0.83604 0.78774 0.62255 +0.90534 0.78746 0.62029 +0.97056 0.78719 0.61821 +1.00000 0.78693 0.61632 +1.00000 0.78668 0.61464 +0.00000 0.85647 0.64333 +0.03981 0.85630 0.64157 +0.10028 0.85612 0.63960 +0.16562 0.85592 0.63744 +0.23502 0.85571 0.63511 +0.30768 0.85548 0.63264 +0.38277 0.85524 0.63008 +0.45944 0.85498 0.62748 +0.53690 0.85471 0.62488 +0.61431 0.85442 0.62233 +0.69086 0.85412 0.61985 +0.76575 0.85380 0.61747 +0.83816 0.85347 0.61523 +0.90729 0.85314 0.61314 +0.97233 0.85280 0.61123 +1.00000 0.85247 0.60952 +1.00000 0.85215 0.60800 +0.00000 0.91863 0.63621 +0.04226 0.91846 0.63436 +0.10279 0.91827 0.63229 +0.16816 0.91806 0.63006 +0.23757 0.91783 0.62771 +0.31017 0.91757 0.62527 +0.38517 0.91730 0.62279 +0.46173 0.91700 0.62030 +0.53905 0.91667 0.61784 +0.61630 0.91633 0.61544 +0.69267 0.91596 0.61314 +0.76736 0.91557 0.61095 +0.83956 0.91516 0.60891 +0.90847 0.91474 0.60703 +0.97328 0.91432 0.60533 +1.00000 0.91391 0.60383 +1.00000 0.91351 0.60252 +0.00000 0.97615 0.62935 +0.04461 0.97597 0.62750 +0.10509 0.97576 0.62547 +0.17040 0.97552 0.62331 +0.23970 0.97525 0.62105 +0.31219 0.97495 0.61872 +0.38705 0.97462 0.61638 +0.46345 0.97426 0.61404 +0.54058 0.97387 0.61176 +0.61763 0.97345 0.60956 +0.69378 0.97299 0.60746 +0.76823 0.97252 0.60550 +0.84019 0.97202 0.60370 +0.90884 0.97151 0.60206 +0.97340 0.97099 0.60061 +1.00000 0.97048 0.59934 +1.00000 0.97000 0.59826 +0.00000 1.00000 0.62325 +0.04655 1.00000 0.62146 +0.10695 1.00000 0.61951 +0.17214 1.00000 0.61745 +0.24132 1.00000 0.61531 +0.31367 1.00000 0.61313 +0.38835 1.00000 0.61095 +0.46456 1.00000 0.60880 +0.54148 1.00000 0.60672 +0.61829 1.00000 0.60474 +0.69420 1.00000 0.60288 +0.76839 1.00000 0.60117 +0.84008 1.00000 0.59963 +0.90846 1.00000 0.59825 +0.97276 1.00000 0.59705 +1.00000 1.00000 0.59604 +1.00000 1.00000 0.59519 +0.00965 0.00000 0.74785 +0.06315 0.00000 0.74733 +0.12215 0.00000 0.74679 +0.18587 0.00000 0.74623 +0.25351 0.00000 0.74567 +0.32428 0.00000 0.74512 +0.39740 0.00000 0.74457 +0.47206 0.00000 0.74405 +0.54750 0.00000 0.74355 +0.62291 0.00000 0.74309 +0.69753 0.00000 0.74265 +0.77055 0.00000 0.74224 +0.84120 0.00000 0.74187 +0.90870 0.00000 0.74153 +0.97225 0.00000 0.74123 +1.00000 0.00000 0.74095 +1.00000 0.00000 0.74071 +0.00716 0.04731 0.74627 +0.06061 0.04666 0.74582 +0.11957 0.04594 0.74535 +0.18324 0.04516 0.74487 +0.25083 0.04434 0.74438 +0.32155 0.04347 0.74390 +0.39462 0.04258 0.74343 +0.46924 0.04167 0.74298 +0.54463 0.04075 0.74255 +0.62001 0.03983 0.74214 +0.69459 0.03892 0.74175 +0.76758 0.03803 0.74140 +0.83821 0.03717 0.74106 +0.90568 0.03634 0.74076 +0.96921 0.03557 0.74048 +1.00000 0.03485 0.74023 +1.00000 0.03420 0.74001 +0.00425 0.10306 0.74478 +0.05766 0.10241 0.74440 +0.11657 0.10169 0.74400 +0.18019 0.10091 0.74359 +0.24774 0.10009 0.74317 +0.31841 0.09922 0.74276 +0.39144 0.09833 0.74235 +0.46602 0.09742 0.74196 +0.54138 0.09650 0.74159 +0.61672 0.09558 0.74123 +0.69127 0.09467 0.74089 +0.76424 0.09378 0.74057 +0.83484 0.09292 0.74027 +0.90229 0.09209 0.73999 +0.96582 0.09132 0.73974 +1.00000 0.09060 0.73950 +1.00000 0.08995 0.73929 +0.00093 0.16328 0.74342 +0.05431 0.16263 0.74310 +0.11318 0.16191 0.74277 +0.17676 0.16113 0.74242 +0.24426 0.16031 0.74206 +0.31490 0.15945 0.74171 +0.38789 0.15855 0.74136 +0.46244 0.15764 0.74102 +0.53777 0.15672 0.74069 +0.61309 0.15580 0.74037 +0.68761 0.15489 0.74006 +0.76057 0.15400 0.73976 +0.83116 0.15314 0.73948 +0.89860 0.15232 0.73922 +0.96219 0.15157 0.73891 +1.00000 0.15091 0.73852 +1.00000 0.15034 0.73809 +0.00000 0.22723 0.74223 +0.05060 0.22657 0.74195 +0.10944 0.22586 0.74167 +0.17299 0.22508 0.74137 +0.24046 0.22426 0.74106 +0.31107 0.22339 0.74075 +0.38403 0.22250 0.74044 +0.45856 0.22159 0.74013 +0.53387 0.22067 0.73983 +0.60918 0.21975 0.73953 +0.68370 0.21884 0.73923 +0.75677 0.21800 0.73883 +0.82761 0.21723 0.73831 +0.89543 0.21655 0.73768 +0.95941 0.21594 0.73699 +1.00000 0.21541 0.73626 +1.00000 0.21496 0.73552 +0.00000 0.29415 0.74117 +0.04660 0.29350 0.74093 +0.10542 0.29278 0.74068 +0.16895 0.29201 0.74041 +0.23640 0.29118 0.74014 +0.30699 0.29032 0.73986 +0.37994 0.28943 0.73957 +0.45447 0.28852 0.73926 +0.52993 0.28766 0.73882 +0.60554 0.28686 0.73822 +0.68052 0.28612 0.73749 +0.75405 0.28544 0.73664 +0.82534 0.28483 0.73569 +0.89355 0.28429 0.73467 +0.95789 0.28381 0.73362 +1.00000 0.28340 0.73257 +1.00000 0.28304 0.73155 +0.00000 0.36331 0.74022 +0.04239 0.36266 0.74000 +0.10120 0.36195 0.73977 +0.16471 0.36117 0.73952 +0.23221 0.36036 0.73920 +0.30299 0.35957 0.73874 +0.37628 0.35881 0.73813 +0.45130 0.35808 0.73735 +0.52725 0.35740 0.73643 +0.60333 0.35677 0.73537 +0.67876 0.35619 0.73420 +0.75271 0.35566 0.73293 +0.82438 0.35519 0.73159 +0.89295 0.35477 0.73022 +0.95761 0.35440 0.72885 +1.00000 0.35407 0.72751 +1.00000 0.35380 0.72624 +0.00000 0.43399 0.73925 +0.03826 0.43339 0.73890 +0.09732 0.43277 0.73843 +0.16121 0.43213 0.73782 +0.22917 0.43150 0.73706 +0.30041 0.43088 0.73614 +0.37417 0.43028 0.73507 +0.44963 0.42971 0.73386 +0.52602 0.42919 0.73250 +0.60252 0.42870 0.73103 +0.67834 0.42825 0.72946 +0.75265 0.42784 0.72782 +0.82465 0.42748 0.72614 +0.89352 0.42715 0.72446 +0.95845 0.42686 0.72280 +1.00000 0.42661 0.72121 +1.00000 0.42639 0.71973 +0.00000 0.50590 0.73702 +0.03561 0.50543 0.73633 +0.09504 0.50494 0.73549 +0.15933 0.50445 0.73449 +0.22769 0.50395 0.73333 +0.29934 0.50347 0.73201 +0.37349 0.50301 0.73054 +0.44934 0.50258 0.72893 +0.52610 0.50217 0.72720 +0.60295 0.50179 0.72536 +0.67909 0.50145 0.72345 +0.75370 0.50113 0.72150 +0.82597 0.50084 0.71953 +0.89508 0.50059 0.71758 +0.96021 0.50035 0.71569 +1.00000 0.50015 0.71390 +1.00000 0.49997 0.71224 +0.00000 0.57837 0.73323 +0.03449 0.57801 0.73223 +0.09425 0.57764 0.73107 +0.15887 0.57726 0.72973 +0.22757 0.57688 0.72822 +0.29956 0.57651 0.72655 +0.37404 0.57615 0.72474 +0.45021 0.57582 0.72280 +0.52727 0.57550 0.72074 +0.60439 0.57520 0.71861 +0.68078 0.57492 0.71642 +0.75562 0.57466 0.71421 +0.82809 0.57442 0.71200 +0.89738 0.57420 0.70985 +0.96266 0.57400 0.70777 +1.00000 0.57381 0.70582 +1.00000 0.57365 0.70402 +0.00000 0.65055 0.72813 +0.03467 0.65027 0.72688 +0.09470 0.64998 0.72543 +0.15959 0.64968 0.72381 +0.22857 0.64939 0.72201 +0.30083 0.64910 0.72005 +0.37556 0.64882 0.71796 +0.45198 0.64855 0.71574 +0.52925 0.64828 0.71343 +0.60659 0.64803 0.71105 +0.68316 0.64779 0.70864 +0.75815 0.64756 0.70623 +0.83076 0.64734 0.70385 +0.90015 0.64712 0.70154 +0.96552 0.64692 0.69933 +1.00000 0.64673 0.69727 +1.00000 0.64655 0.69539 +0.00000 0.72154 0.72203 +0.03587 0.72132 0.72056 +0.09610 0.72109 0.71889 +0.16120 0.72085 0.71703 +0.23039 0.72061 0.71500 +0.30284 0.72037 0.71281 +0.37777 0.72013 0.71049 +0.45435 0.71989 0.70807 +0.53178 0.71965 0.70556 +0.60924 0.71941 0.70301 +0.68592 0.71918 0.70043 +0.76101 0.71894 0.69788 +0.83367 0.71871 0.69540 +0.90307 0.71847 0.69304 +0.96840 0.71824 0.69085 +1.00000 0.71802 0.68885 +1.00000 0.71782 0.68705 +0.00000 0.79046 0.71525 +0.03777 0.79027 0.71361 +0.09815 0.79008 0.71176 +0.16340 0.78987 0.70972 +0.23273 0.78965 0.70751 +0.30532 0.78943 0.70515 +0.38036 0.78920 0.70267 +0.45705 0.78896 0.70009 +0.53456 0.78872 0.69745 +0.61207 0.78847 0.69480 +0.68874 0.78821 0.69221 +0.76375 0.78794 0.68971 +0.83631 0.78767 0.68733 +0.90559 0.78739 0.68509 +0.97080 0.78711 0.68302 +1.00000 0.78684 0.68115 +1.00000 0.78658 0.67948 +0.00000 0.85642 0.70812 +0.04009 0.85625 0.70636 +0.10057 0.85607 0.70437 +0.16592 0.85587 0.70220 +0.23533 0.85565 0.69986 +0.30799 0.85543 0.69738 +0.38307 0.85518 0.69482 +0.45973 0.85492 0.69223 +0.53718 0.85464 0.68965 +0.61457 0.85435 0.68711 +0.69111 0.85404 0.68465 +0.76598 0.85372 0.68229 +0.83837 0.85338 0.68007 +0.90747 0.85304 0.67800 +0.97249 0.85269 0.67611 +1.00000 0.85235 0.67441 +1.00000 0.85202 0.67293 +0.00000 0.91858 0.70096 +0.04256 0.91841 0.69910 +0.10309 0.91822 0.69703 +0.16846 0.91800 0.69480 +0.23786 0.91777 0.69246 +0.31045 0.91751 0.69004 +0.38543 0.91723 0.68757 +0.46198 0.91692 0.68510 +0.53928 0.91659 0.68266 +0.61650 0.91624 0.68028 +0.69286 0.91586 0.67799 +0.76752 0.91546 0.67583 +0.83969 0.91504 0.67382 +0.90857 0.91461 0.67197 +0.97336 0.91418 0.67030 +1.00000 0.91376 0.66882 +1.00000 0.91335 0.66754 +0.00000 0.97610 0.69410 +0.04490 0.97591 0.69225 +0.10537 0.97569 0.69023 +0.17067 0.97545 0.68808 +0.23996 0.97518 0.68584 +0.31243 0.97487 0.68353 +0.38727 0.97454 0.68120 +0.46364 0.97417 0.67889 +0.54075 0.97377 0.67663 +0.61777 0.97333 0.67446 +0.69389 0.97287 0.67239 +0.76831 0.97238 0.67046 +0.84023 0.97186 0.66869 +0.90885 0.97134 0.66709 +0.97338 0.97081 0.66567 +1.00000 0.97029 0.66443 +1.00000 0.96980 0.66338 +0.00000 1.00000 0.68802 +0.04681 1.00000 0.68625 +0.10719 1.00000 0.68431 +0.17237 1.00000 0.68227 +0.24153 1.00000 0.68015 +0.31385 1.00000 0.67799 +0.38851 1.00000 0.67584 +0.46469 1.00000 0.67372 +0.54157 1.00000 0.67167 +0.61835 1.00000 0.66972 +0.69422 1.00000 0.66789 +0.76838 1.00000 0.66622 +0.84002 1.00000 0.66471 +0.90837 1.00000 0.66337 +0.97263 1.00000 0.66221 +1.00000 1.00000 0.66123 +1.00000 1.00000 0.66042 +0.00936 0.00000 0.81029 +0.06285 0.00000 0.80978 +0.12185 0.00000 0.80925 +0.18556 0.00000 0.80870 +0.25319 0.00000 0.80815 +0.32396 0.00000 0.80761 +0.39706 0.00000 0.80707 +0.47172 0.00000 0.80656 +0.54715 0.00000 0.80607 +0.62256 0.00000 0.80561 +0.69717 0.00000 0.80518 +0.77019 0.00000 0.80479 +0.84084 0.00000 0.80442 +0.90833 0.00000 0.80408 +0.97188 0.00000 0.80378 +1.00000 0.00000 0.80351 +1.00000 0.00000 0.80328 +0.00685 0.04705 0.80874 +0.06030 0.04640 0.80830 +0.11925 0.04568 0.80784 +0.18291 0.04491 0.80737 +0.25050 0.04408 0.80689 +0.32121 0.04322 0.80642 +0.39427 0.04233 0.80595 +0.46889 0.04142 0.80551 +0.54428 0.04050 0.80508 +0.61965 0.03958 0.80468 +0.69422 0.03866 0.80430 +0.76721 0.03777 0.80395 +0.83784 0.03691 0.80362 +0.90530 0.03609 0.80332 +0.96884 0.03531 0.80305 +1.00000 0.03459 0.80280 +1.00000 0.03394 0.80258 +0.00391 0.10280 0.80728 +0.05732 0.10215 0.80690 +0.11623 0.10143 0.80651 +0.17985 0.10066 0.80611 +0.24739 0.09983 0.80570 +0.31806 0.09897 0.80529 +0.39108 0.09808 0.80490 +0.46566 0.09717 0.80451 +0.54101 0.09625 0.80414 +0.61635 0.09533 0.80379 +0.69090 0.09442 0.80345 +0.76386 0.09353 0.80314 +0.83446 0.09266 0.80284 +0.90192 0.09184 0.80256 +0.96544 0.09106 0.80231 +1.00000 0.09035 0.80208 +1.00000 0.08969 0.80187 +0.00058 0.16302 0.80595 +0.05395 0.16237 0.80563 +0.11282 0.16165 0.80530 +0.17640 0.16088 0.80496 +0.24390 0.16005 0.80461 +0.31454 0.15919 0.80426 +0.38752 0.15830 0.80392 +0.46207 0.15739 0.80358 +0.53739 0.15647 0.80325 +0.61271 0.15555 0.80294 +0.68724 0.15464 0.80263 +0.76019 0.15375 0.80234 +0.83078 0.15289 0.80206 +0.89823 0.15207 0.80178 +0.96186 0.15133 0.80143 +1.00000 0.15069 0.80101 +1.00000 0.15013 0.80054 +0.00000 0.22697 0.80477 +0.05024 0.22632 0.80450 +0.10907 0.22560 0.80422 +0.17262 0.22482 0.80392 +0.24009 0.22400 0.80362 +0.31070 0.22314 0.80332 +0.38366 0.22225 0.80301 +0.45818 0.22134 0.80270 +0.53349 0.22042 0.80240 +0.60880 0.21950 0.80210 +0.68334 0.21860 0.80179 +0.75645 0.21777 0.80134 +0.82735 0.21702 0.80077 +0.89521 0.21635 0.80011 +0.95922 0.21575 0.79938 +1.00000 0.21524 0.79861 +1.00000 0.21480 0.79785 +0.00000 0.29390 0.80373 +0.04623 0.29325 0.80350 +0.10504 0.29253 0.80325 +0.16857 0.29175 0.80298 +0.23602 0.29093 0.80271 +0.30661 0.29007 0.80243 +0.37956 0.28917 0.80214 +0.45412 0.28828 0.80181 +0.52963 0.28744 0.80132 +0.60529 0.28665 0.80068 +0.68031 0.28592 0.79990 +0.75388 0.28526 0.79900 +0.82521 0.28467 0.79802 +0.89346 0.28414 0.79697 +0.95783 0.28367 0.79588 +1.00000 0.28327 0.79480 +1.00000 0.28292 0.79376 +0.00000 0.36306 0.80279 +0.04201 0.36241 0.80258 +0.10082 0.36169 0.80234 +0.16434 0.36092 0.80209 +0.23188 0.36013 0.80173 +0.30270 0.35935 0.80123 +0.37604 0.35861 0.80057 +0.45110 0.35790 0.79975 +0.52709 0.35723 0.79879 +0.60322 0.35661 0.79769 +0.67868 0.35604 0.79648 +0.75267 0.35553 0.79517 +0.82437 0.35507 0.79380 +0.89298 0.35466 0.79240 +0.95766 0.35429 0.79100 +1.00000 0.35398 0.78963 +1.00000 0.35371 0.78834 +0.00000 0.43376 0.80178 +0.03797 0.43317 0.80140 +0.09706 0.43256 0.80089 +0.16099 0.43194 0.80024 +0.22899 0.43132 0.79944 +0.30027 0.43071 0.79849 +0.37407 0.43013 0.79738 +0.44957 0.42957 0.79612 +0.52599 0.42906 0.79473 +0.60253 0.42858 0.79322 +0.67838 0.42814 0.79162 +0.75272 0.42774 0.78995 +0.82475 0.42739 0.78824 +0.89364 0.42707 0.78653 +0.95859 0.42679 0.78485 +1.00000 0.42654 0.78325 +1.00000 0.42633 0.78174 +0.00000 0.50572 0.79940 +0.03546 0.50526 0.79868 +0.09493 0.50478 0.79780 +0.15925 0.50430 0.79677 +0.22764 0.50382 0.79558 +0.29933 0.50335 0.79422 +0.37351 0.50290 0.79272 +0.44940 0.50248 0.79108 +0.52618 0.50208 0.78931 +0.60306 0.50171 0.78745 +0.67922 0.50137 0.78551 +0.75386 0.50106 0.78353 +0.82615 0.50078 0.78154 +0.89528 0.50053 0.77957 +0.96042 0.50030 0.77766 +1.00000 0.50009 0.77585 +1.00000 0.49992 0.77418 +0.00000 0.57824 0.79548 +0.03447 0.57789 0.79445 +0.09426 0.57752 0.79326 +0.15891 0.57715 0.79189 +0.22764 0.57678 0.79035 +0.29966 0.57642 0.78866 +0.37416 0.57607 0.78682 +0.45036 0.57574 0.78485 +0.52743 0.57543 0.78277 +0.60458 0.57514 0.78061 +0.68099 0.57486 0.77840 +0.75585 0.57461 0.77616 +0.82833 0.57437 0.77394 +0.89763 0.57415 0.77177 +0.96292 0.57395 0.76968 +1.00000 0.57377 0.76771 +1.00000 0.57360 0.76591 +0.00000 0.65045 0.79026 +0.03476 0.65018 0.78898 +0.09481 0.64990 0.78752 +0.15973 0.64961 0.78587 +0.22872 0.64932 0.78405 +0.30100 0.64903 0.78207 +0.37576 0.64876 0.77995 +0.45219 0.64849 0.77771 +0.52949 0.64823 0.77538 +0.60683 0.64798 0.77298 +0.68342 0.64774 0.77056 +0.75842 0.64751 0.76813 +0.83103 0.64729 0.76573 +0.90044 0.64708 0.76341 +0.96581 0.64687 0.76119 +1.00000 0.64668 0.75912 +1.00000 0.64650 0.75725 +0.00000 0.72147 0.78407 +0.03604 0.72125 0.78258 +0.09628 0.72103 0.78089 +0.16141 0.72079 0.77901 +0.23061 0.72055 0.77696 +0.30308 0.72032 0.77475 +0.37802 0.72008 0.77242 +0.45461 0.71984 0.76997 +0.53205 0.71960 0.76745 +0.60952 0.71936 0.76488 +0.68621 0.71913 0.76230 +0.76130 0.71889 0.75974 +0.83395 0.71865 0.75726 +0.90335 0.71842 0.75492 +0.96867 0.71818 0.75273 +1.00000 0.71796 0.75074 +1.00000 0.71775 0.74895 +0.00000 0.79040 0.77722 +0.03800 0.79022 0.77556 +0.09839 0.79002 0.77369 +0.16366 0.78982 0.77164 +0.23300 0.78961 0.76941 +0.30560 0.78938 0.76704 +0.38065 0.78915 0.76454 +0.45734 0.78891 0.76195 +0.53485 0.78867 0.75930 +0.61235 0.78841 0.75667 +0.68901 0.78815 0.75409 +0.76402 0.78788 0.75160 +0.83656 0.78760 0.74923 +0.90583 0.78732 0.74700 +0.97101 0.78703 0.74495 +1.00000 0.78676 0.74309 +1.00000 0.78649 0.74144 +0.00000 0.85638 0.77003 +0.04036 0.85621 0.76825 +0.10084 0.85602 0.76626 +0.16620 0.85582 0.76407 +0.23562 0.85561 0.76173 +0.30828 0.85537 0.75924 +0.38335 0.85513 0.75669 +0.46001 0.85486 0.75411 +0.53744 0.85458 0.75154 +0.61482 0.85428 0.74901 +0.69134 0.85397 0.74657 +0.76619 0.85364 0.74423 +0.83856 0.85329 0.74202 +0.90764 0.85294 0.73998 +0.97264 0.85259 0.73811 +1.00000 0.85224 0.73643 +1.00000 0.85190 0.73496 +0.00000 0.91853 0.76283 +0.04286 0.91836 0.76096 +0.10338 0.91817 0.75889 +0.16875 0.91795 0.75667 +0.23813 0.91771 0.75433 +0.31072 0.91745 0.75192 +0.38568 0.91716 0.74947 +0.46221 0.91685 0.74701 +0.53949 0.91651 0.74459 +0.61670 0.91615 0.74223 +0.69302 0.91576 0.73997 +0.76766 0.91535 0.73783 +0.83980 0.91492 0.73584 +0.90866 0.91448 0.73402 +0.97342 0.91404 0.73238 +1.00000 0.91361 0.73093 +1.00000 0.91319 0.72967 +0.00000 0.97604 0.75597 +0.04517 0.97585 0.75413 +0.10564 0.97563 0.75212 +0.17092 0.97538 0.74998 +0.24019 0.97510 0.74775 +0.31265 0.97479 0.74546 +0.38746 0.97445 0.74315 +0.46382 0.97407 0.74086 +0.54090 0.97366 0.73863 +0.61789 0.97322 0.73648 +0.69398 0.97274 0.73444 +0.76837 0.97224 0.73254 +0.84026 0.97172 0.73080 +0.90884 0.97118 0.72923 +0.97334 0.97064 0.72784 +1.00000 0.97011 0.72664 +1.00000 0.96960 0.72561 +0.00000 1.00000 0.74992 +0.04704 1.00000 0.74815 +0.10741 1.00000 0.74624 +0.17258 1.00000 0.74421 +0.24172 1.00000 0.74211 +0.31401 1.00000 0.73997 +0.38865 1.00000 0.73784 +0.46480 1.00000 0.73575 +0.54165 1.00000 0.73373 +0.61840 1.00000 0.73181 +0.69423 1.00000 0.73002 +0.76835 1.00000 0.72838 +0.83996 1.00000 0.72691 +0.90827 1.00000 0.72561 +0.97249 1.00000 0.72448 +1.00000 1.00000 0.72354 +1.00000 1.00000 0.72276 +0.00908 0.00000 0.86910 +0.06257 0.00000 0.86860 +0.12156 0.00000 0.86808 +0.18526 0.00000 0.86754 +0.25289 0.00000 0.86700 +0.32365 0.00000 0.86646 +0.39675 0.00000 0.86594 +0.47140 0.00000 0.86543 +0.54683 0.00000 0.86495 +0.62223 0.00000 0.86450 +0.69684 0.00000 0.86408 +0.76985 0.00000 0.86369 +0.84050 0.00000 0.86332 +0.90798 0.00000 0.86300 +0.97153 0.00000 0.86270 +1.00000 0.00000 0.86243 +1.00000 0.00000 0.86220 +0.00655 0.04681 0.86757 +0.06000 0.04616 0.86714 +0.11894 0.04544 0.86669 +0.18260 0.04467 0.86622 +0.25018 0.04384 0.86575 +0.32089 0.04298 0.86529 +0.39395 0.04209 0.86484 +0.46856 0.04118 0.86440 +0.54394 0.04025 0.86398 +0.61931 0.03933 0.86358 +0.69388 0.03842 0.86321 +0.76687 0.03753 0.86286 +0.83749 0.03667 0.86254 +0.90495 0.03585 0.86224 +0.96848 0.03507 0.86197 +1.00000 0.03435 0.86173 +1.00000 0.03370 0.86151 +0.00360 0.10256 0.86614 +0.05700 0.10191 0.86577 +0.11591 0.10119 0.86538 +0.17952 0.10042 0.86499 +0.24706 0.09959 0.86459 +0.31772 0.09873 0.86419 +0.39074 0.09784 0.86380 +0.46531 0.09693 0.86342 +0.54066 0.09601 0.86305 +0.61600 0.09509 0.86270 +0.69054 0.09418 0.86237 +0.76351 0.09328 0.86206 +0.83411 0.09242 0.86177 +0.90156 0.09160 0.86149 +0.96508 0.09082 0.86124 +1.00000 0.09010 0.86101 +1.00000 0.08945 0.86079 +0.00025 0.16278 0.86483 +0.05362 0.16213 0.86452 +0.11249 0.16141 0.86420 +0.17606 0.16064 0.86386 +0.24356 0.15981 0.86351 +0.31419 0.15895 0.86317 +0.38717 0.15806 0.86283 +0.46172 0.15715 0.86250 +0.53704 0.15623 0.86217 +0.61235 0.15531 0.86186 +0.68688 0.15440 0.86156 +0.75983 0.15351 0.86127 +0.83042 0.15265 0.86099 +0.89790 0.15183 0.86069 +0.96156 0.15111 0.86030 +1.00000 0.15048 0.85984 +1.00000 0.14994 0.85935 +0.00000 0.22673 0.86368 +0.04989 0.22608 0.86341 +0.10873 0.22536 0.86313 +0.17227 0.22458 0.86284 +0.23974 0.22376 0.86254 +0.31034 0.22290 0.86224 +0.38330 0.22201 0.86193 +0.45783 0.22110 0.86163 +0.53313 0.22018 0.86133 +0.60844 0.21926 0.86103 +0.68302 0.21837 0.86068 +0.75617 0.21756 0.86019 +0.82711 0.21682 0.85959 +0.89501 0.21616 0.85888 +0.95905 0.21558 0.85812 +1.00000 0.21508 0.85733 +1.00000 0.21465 0.85653 +0.00000 0.29366 0.86265 +0.04588 0.29301 0.86242 +0.10469 0.29229 0.86217 +0.16821 0.29151 0.86191 +0.23567 0.29069 0.86164 +0.30626 0.28982 0.86136 +0.37920 0.28893 0.86107 +0.45381 0.28806 0.86070 +0.52936 0.28723 0.86016 +0.60506 0.28646 0.85948 +0.68012 0.28575 0.85866 +0.75374 0.28510 0.85773 +0.82509 0.28452 0.85671 +0.89338 0.28400 0.85562 +0.95778 0.28354 0.85451 +1.00000 0.28315 0.85340 +1.00000 0.28281 0.85234 +0.00000 0.36282 0.86172 +0.04165 0.36217 0.86150 +0.10046 0.36145 0.86127 +0.16399 0.36068 0.86100 +0.23158 0.35991 0.86061 +0.30245 0.35915 0.86006 +0.37582 0.35842 0.85936 +0.45092 0.35772 0.85850 +0.52696 0.35707 0.85750 +0.60312 0.35647 0.85637 +0.67862 0.35591 0.85512 +0.75264 0.35541 0.85378 +0.82438 0.35495 0.85238 +0.89301 0.35455 0.85094 +0.95771 0.35420 0.84952 +1.00000 0.35389 0.84813 +1.00000 0.35363 0.84682 +0.00000 0.43354 0.86064 +0.03771 0.43297 0.86023 +0.09683 0.43237 0.85969 +0.16080 0.43176 0.85901 +0.22883 0.43115 0.85818 +0.30015 0.43056 0.85719 +0.37398 0.42998 0.85604 +0.44952 0.42944 0.85475 +0.52598 0.42894 0.85332 +0.60255 0.42847 0.85178 +0.67842 0.42804 0.85015 +0.75279 0.42766 0.84845 +0.82485 0.42731 0.84672 +0.89376 0.42699 0.84498 +0.95873 0.42672 0.84328 +1.00000 0.42648 0.84166 +1.00000 0.42627 0.84014 +0.00000 0.50555 0.85813 +0.03534 0.50510 0.85738 +0.09483 0.50464 0.85648 +0.15918 0.50416 0.85541 +0.22761 0.50370 0.85419 +0.29932 0.50324 0.85280 +0.37354 0.50280 0.85127 +0.44945 0.50238 0.84960 +0.52626 0.50199 0.84780 +0.60317 0.50163 0.84591 +0.67936 0.50130 0.84395 +0.75401 0.50100 0.84194 +0.82632 0.50072 0.83993 +0.89547 0.50047 0.83794 +0.96063 0.50024 0.83602 +1.00000 0.50004 0.83419 +1.00000 0.49987 0.83250 +0.00000 0.57812 0.85408 +0.03447 0.57777 0.85304 +0.09428 0.57741 0.85181 +0.15895 0.57705 0.85042 +0.22771 0.57669 0.84886 +0.29975 0.57634 0.84714 +0.37428 0.57600 0.84527 +0.45050 0.57567 0.84327 +0.52760 0.57537 0.84117 +0.60477 0.57508 0.83899 +0.68119 0.57481 0.83676 +0.75606 0.57456 0.83450 +0.82856 0.57433 0.83226 +0.89787 0.57411 0.83008 +0.96317 0.57391 0.82798 +1.00000 0.57372 0.82600 +1.00000 0.57355 0.82418 +0.00000 0.65036 0.84877 +0.03485 0.65010 0.84747 +0.09492 0.64982 0.84598 +0.15986 0.64954 0.84431 +0.22888 0.64925 0.84246 +0.30117 0.64897 0.84046 +0.37595 0.64870 0.83832 +0.45240 0.64844 0.83606 +0.52971 0.64818 0.83371 +0.60707 0.64793 0.83130 +0.68366 0.64770 0.82886 +0.75868 0.64747 0.82641 +0.83130 0.64724 0.82401 +0.90071 0.64703 0.82168 +0.96609 0.64682 0.81945 +1.00000 0.64663 0.81738 +1.00000 0.64645 0.81552 +0.00000 0.72140 0.84248 +0.03620 0.72119 0.84098 +0.09647 0.72097 0.83927 +0.16161 0.72074 0.83737 +0.23082 0.72050 0.83530 +0.30331 0.72027 0.83308 +0.37826 0.72003 0.83073 +0.45486 0.71979 0.82827 +0.53231 0.71956 0.82574 +0.60979 0.71932 0.82315 +0.68649 0.71908 0.82056 +0.76157 0.71884 0.81799 +0.83422 0.71860 0.81552 +0.90360 0.71836 0.81319 +0.96892 0.71813 0.81101 +1.00000 0.71790 0.80903 +1.00000 0.71768 0.80725 +0.00000 0.79035 0.83556 +0.03822 0.79017 0.83389 +0.09862 0.78998 0.83202 +0.16390 0.78977 0.82995 +0.23325 0.78956 0.82771 +0.30586 0.78934 0.82532 +0.38092 0.78911 0.82281 +0.45761 0.78887 0.82021 +0.53513 0.78862 0.81756 +0.61262 0.78836 0.81493 +0.68927 0.78809 0.81236 +0.76426 0.78782 0.80988 +0.83679 0.78753 0.80752 +0.90604 0.78725 0.80532 +0.97121 0.78696 0.80328 +1.00000 0.78667 0.80144 +1.00000 0.78640 0.79980 +0.00000 0.85633 0.82833 +0.04062 0.85616 0.82654 +0.10111 0.85598 0.82453 +0.16647 0.85578 0.82234 +0.23589 0.85556 0.81998 +0.30855 0.85532 0.81750 +0.38362 0.85507 0.81495 +0.46026 0.85481 0.81238 +0.53768 0.85452 0.80982 +0.61505 0.85422 0.80731 +0.69155 0.85389 0.80488 +0.76638 0.85356 0.80256 +0.83873 0.85321 0.80037 +0.90779 0.85285 0.79835 +0.97277 0.85248 0.79650 +1.00000 0.85213 0.79485 +1.00000 0.85178 0.79340 +0.00000 0.91849 0.82109 +0.04313 0.91831 0.81922 +0.10366 0.91812 0.81715 +0.16901 0.91790 0.81493 +0.23839 0.91765 0.81261 +0.31096 0.91739 0.81021 +0.38591 0.91710 0.80777 +0.46243 0.91678 0.80533 +0.53968 0.91643 0.80292 +0.61687 0.91606 0.80058 +0.69317 0.91566 0.79835 +0.76779 0.91525 0.79623 +0.83990 0.91481 0.79427 +0.90873 0.91436 0.79247 +0.97347 0.91391 0.79085 +1.00000 0.91346 0.78942 +1.00000 0.91304 0.78819 +0.00000 0.97599 0.81424 +0.04543 0.97579 0.81240 +0.10588 0.97557 0.81040 +0.17115 0.97532 0.80827 +0.24041 0.97503 0.80606 +0.31285 0.97472 0.80378 +0.38765 0.97437 0.80149 +0.46398 0.97398 0.79923 +0.54103 0.97356 0.79702 +0.61800 0.97311 0.79489 +0.69406 0.97262 0.79288 +0.76842 0.97211 0.79101 +0.84027 0.97157 0.78930 +0.90883 0.97102 0.78776 +0.97330 0.97047 0.78640 +1.00000 0.96993 0.78523 +1.00000 0.96941 0.78423 +0.00000 1.00000 0.80822 +0.04727 1.00000 0.80646 +0.10762 1.00000 0.80456 +0.17277 1.00000 0.80254 +0.24189 1.00000 0.80046 +0.31416 1.00000 0.79835 +0.38877 1.00000 0.79624 +0.46489 1.00000 0.79417 +0.54172 1.00000 0.79218 +0.61844 1.00000 0.79029 +0.69424 1.00000 0.78854 +0.76832 1.00000 0.78693 +0.83989 1.00000 0.78549 +0.90816 1.00000 0.78423 +0.97234 1.00000 0.78314 +1.00000 1.00000 0.78222 +1.00000 1.00000 0.78148 +0.00882 0.00000 0.92354 +0.06230 0.00000 0.92305 +0.12129 0.00000 0.92254 +0.18499 0.00000 0.92201 +0.25261 0.00000 0.92147 +0.32336 0.00000 0.92095 +0.39646 0.00000 0.92043 +0.47111 0.00000 0.91994 +0.54653 0.00000 0.91946 +0.62193 0.00000 0.91902 +0.69653 0.00000 0.91860 +0.76954 0.00000 0.91822 +0.84018 0.00000 0.91786 +0.90766 0.00000 0.91753 +0.97121 0.00000 0.91724 +1.00000 0.00000 0.91698 +1.00000 0.00000 0.91674 +0.00627 0.04659 0.92204 +0.05971 0.04594 0.92162 +0.11866 0.04522 0.92117 +0.18231 0.04444 0.92072 +0.24988 0.04362 0.92025 +0.32059 0.04275 0.91980 +0.39364 0.04186 0.91935 +0.46825 0.04095 0.91892 +0.54363 0.04003 0.91851 +0.61899 0.03911 0.91812 +0.69356 0.03820 0.91775 +0.76654 0.03731 0.91741 +0.83716 0.03645 0.91709 +0.90463 0.03562 0.91679 +0.96816 0.03485 0.91652 +1.00000 0.03413 0.91628 +1.00000 0.03348 0.91606 +0.00331 0.10234 0.92063 +0.05671 0.10169 0.92027 +0.11561 0.10097 0.91989 +0.17922 0.10019 0.91950 +0.24675 0.09937 0.91910 +0.31741 0.09851 0.91871 +0.39042 0.09761 0.91833 +0.46500 0.09670 0.91795 +0.54034 0.09578 0.91759 +0.61568 0.09486 0.91725 +0.69022 0.09395 0.91692 +0.76318 0.09306 0.91661 +0.83378 0.09220 0.91632 +0.90123 0.09138 0.91605 +0.96475 0.09060 0.91579 +1.00000 0.08988 0.91556 +1.00000 0.08924 0.91534 +0.00000 0.16256 0.91935 +0.05331 0.16191 0.91905 +0.11217 0.16119 0.91872 +0.17575 0.16041 0.91839 +0.24324 0.15959 0.91805 +0.31387 0.15873 0.91771 +0.38685 0.15784 0.91737 +0.46139 0.15693 0.91705 +0.53671 0.15601 0.91672 +0.61203 0.15509 0.91641 +0.68655 0.15418 0.91611 +0.75950 0.15328 0.91582 +0.83009 0.15242 0.91554 +0.89760 0.15162 0.91521 +0.96130 0.15092 0.91479 +1.00000 0.15030 0.91430 +1.00000 0.14977 0.91378 +0.00000 0.22651 0.91821 +0.04957 0.22586 0.91795 +0.10840 0.22514 0.91767 +0.17195 0.22436 0.91738 +0.23941 0.22354 0.91709 +0.31002 0.22267 0.91679 +0.38297 0.22178 0.91649 +0.45750 0.22087 0.91618 +0.53280 0.21995 0.91589 +0.60811 0.21903 0.91559 +0.68273 0.21816 0.91520 +0.75593 0.21736 0.91467 +0.82690 0.21664 0.91402 +0.89483 0.21600 0.91329 +0.95891 0.21543 0.91249 +1.00000 0.21494 0.91167 +1.00000 0.21451 0.91086 +0.00000 0.29343 0.91720 +0.04555 0.29278 0.91697 +0.10436 0.29206 0.91672 +0.16788 0.29129 0.91646 +0.23533 0.29046 0.91619 +0.30593 0.28960 0.91591 +0.37888 0.28871 0.91562 +0.45352 0.28785 0.91520 +0.52912 0.28704 0.91463 +0.60486 0.28628 0.91391 +0.67996 0.28559 0.91305 +0.75361 0.28495 0.91209 +0.82500 0.28438 0.91103 +0.89332 0.28388 0.90991 +0.95775 0.28343 0.90877 +1.00000 0.28304 0.90764 +1.00000 0.28271 0.90656 +0.00000 0.36260 0.91627 +0.04132 0.36195 0.91606 +0.10013 0.36123 0.91583 +0.16369 0.36047 0.91553 +0.23131 0.35971 0.91510 +0.30222 0.35897 0.91452 +0.37563 0.35825 0.91378 +0.45077 0.35757 0.91288 +0.52684 0.35693 0.91185 +0.60304 0.35633 0.91068 +0.67857 0.35579 0.90939 +0.75263 0.35530 0.90802 +0.82439 0.35485 0.90659 +0.89304 0.35446 0.90514 +0.95777 0.35411 0.90369 +1.00000 0.35381 0.90228 +1.00000 0.35355 0.90095 +0.00000 0.43334 0.91513 +0.03747 0.43278 0.91469 +0.09663 0.43219 0.91412 +0.16063 0.43159 0.91341 +0.22869 0.43100 0.91254 +0.30005 0.43042 0.91152 +0.37391 0.42986 0.91034 +0.44948 0.42933 0.90902 +0.52597 0.42883 0.90756 +0.60257 0.42838 0.90599 +0.67847 0.42796 0.90433 +0.75287 0.42758 0.90260 +0.82494 0.42723 0.90085 +0.89388 0.42693 0.89909 +0.95886 0.42666 0.89737 +1.00000 0.42642 0.89573 +1.00000 0.42621 0.89419 +0.00000 0.50540 0.91249 +0.03523 0.50496 0.91171 +0.09475 0.50451 0.91078 +0.15913 0.50404 0.90969 +0.22759 0.50358 0.90844 +0.29933 0.50314 0.90703 +0.37357 0.50270 0.90546 +0.44951 0.50230 0.90376 +0.52635 0.50192 0.90194 +0.60328 0.50156 0.90003 +0.67949 0.50124 0.89804 +0.75416 0.50094 0.89602 +0.82649 0.50067 0.89398 +0.89565 0.50042 0.89198 +0.96082 0.50020 0.89004 +1.00000 0.50000 0.88820 +1.00000 0.49982 0.88650 +0.00000 0.57801 0.90833 +0.03447 0.57767 0.90726 +0.09430 0.57732 0.90602 +0.15900 0.57696 0.90460 +0.22778 0.57661 0.90301 +0.29985 0.57626 0.90127 +0.37440 0.57593 0.89938 +0.45064 0.57561 0.89736 +0.52775 0.57531 0.89523 +0.60494 0.57503 0.89303 +0.68138 0.57476 0.89078 +0.75627 0.57451 0.88851 +0.82878 0.57428 0.88626 +0.89810 0.57407 0.88405 +0.96341 0.57387 0.88194 +1.00000 0.57368 0.87995 +1.00000 0.57351 0.87813 +0.00000 0.65028 0.90292 +0.03495 0.65002 0.90160 +0.09503 0.64975 0.90009 +0.15998 0.64947 0.89840 +0.22902 0.64919 0.89654 +0.30134 0.64892 0.89452 +0.37613 0.64865 0.89236 +0.45259 0.64839 0.89008 +0.52992 0.64814 0.88771 +0.60729 0.64789 0.88529 +0.68390 0.64766 0.88283 +0.75892 0.64743 0.88037 +0.83155 0.64720 0.87796 +0.90096 0.64699 0.87561 +0.96634 0.64678 0.87338 +1.00000 0.64658 0.87131 +1.00000 0.64640 0.86945 +0.00000 0.72134 0.89656 +0.03636 0.72114 0.89504 +0.09664 0.72092 0.89331 +0.16179 0.72069 0.89140 +0.23102 0.72046 0.88932 +0.30352 0.72022 0.88708 +0.37848 0.71999 0.88471 +0.45510 0.71975 0.88224 +0.53256 0.71951 0.87969 +0.61004 0.71928 0.87710 +0.68674 0.71904 0.87449 +0.76183 0.71879 0.87192 +0.83447 0.71855 0.86946 +0.90384 0.71831 0.86713 +0.96915 0.71807 0.86497 +1.00000 0.71784 0.86299 +1.00000 0.71762 0.86123 +0.00000 0.79030 0.88958 +0.03843 0.79013 0.88789 +0.09884 0.78993 0.88600 +0.16413 0.78973 0.88392 +0.23349 0.78952 0.88167 +0.30610 0.78930 0.87927 +0.38117 0.78907 0.87675 +0.45787 0.78882 0.87414 +0.53538 0.78857 0.87149 +0.61286 0.78831 0.86887 +0.68950 0.78804 0.86631 +0.76448 0.78776 0.86384 +0.83700 0.78747 0.86150 +0.90623 0.78718 0.85930 +0.97139 0.78688 0.85728 +1.00000 0.78660 0.85545 +1.00000 0.78632 0.85383 +0.00000 0.85629 0.88229 +0.04086 0.85612 0.88049 +0.10136 0.85594 0.87848 +0.16672 0.85573 0.87628 +0.23615 0.85551 0.87391 +0.30880 0.85528 0.87143 +0.38386 0.85503 0.86889 +0.46050 0.85475 0.86633 +0.53790 0.85446 0.86379 +0.61525 0.85415 0.86129 +0.69174 0.85383 0.85887 +0.76655 0.85348 0.85657 +0.83888 0.85312 0.85440 +0.90792 0.85276 0.85240 +0.97288 0.85239 0.85057 +1.00000 0.85202 0.84893 +1.00000 0.85167 0.84750 +0.00000 0.91844 0.87502 +0.04339 0.91827 0.87315 +0.10391 0.91807 0.87108 +0.16926 0.91785 0.86888 +0.23862 0.91760 0.86656 +0.31118 0.91733 0.86417 +0.38612 0.91703 0.86174 +0.46262 0.91671 0.85932 +0.53986 0.91636 0.85693 +0.61702 0.91598 0.85461 +0.69331 0.91557 0.85239 +0.76790 0.91515 0.85030 +0.83999 0.91470 0.84836 +0.90879 0.91424 0.84659 +0.97350 0.91378 0.84499 +1.00000 0.91333 0.84359 +1.00000 0.91289 0.84238 +0.00000 0.97594 0.86818 +0.04566 0.97574 0.86635 +0.10610 0.97551 0.86436 +0.17136 0.97526 0.86225 +0.24061 0.97497 0.86004 +0.31303 0.97465 0.85778 +0.38781 0.97429 0.85551 +0.46412 0.97389 0.85327 +0.54115 0.97346 0.85108 +0.61809 0.97300 0.84898 +0.69413 0.97250 0.84700 +0.76846 0.97198 0.84515 +0.84028 0.97143 0.84347 +0.90881 0.97087 0.84196 +0.97324 0.97031 0.84063 +1.00000 0.96976 0.83948 +1.00000 0.96923 0.83851 +0.00000 1.00000 0.86219 +0.04747 1.00000 0.86044 +0.10781 1.00000 0.85855 +0.17294 1.00000 0.85655 +0.24204 1.00000 0.85449 +0.31429 1.00000 0.85239 +0.38888 1.00000 0.85031 +0.46498 1.00000 0.84827 +0.54177 1.00000 0.84630 +0.61846 1.00000 0.84445 +0.69423 1.00000 0.84272 +0.76828 1.00000 0.84115 +0.83981 1.00000 0.83974 +0.90805 1.00000 0.83851 +0.97220 1.00000 0.83745 +1.00000 1.00000 0.83657 +1.00000 1.00000 0.83585 +0.00858 0.00000 0.97290 +0.06206 0.00000 0.97241 +0.12104 0.00000 0.97191 +0.18474 0.00000 0.97139 +0.25235 0.00000 0.97086 +0.32310 0.00000 0.97034 +0.39619 0.00000 0.96983 +0.47084 0.00000 0.96934 +0.54625 0.00000 0.96888 +0.62165 0.00000 0.96844 +0.69624 0.00000 0.96803 +0.76925 0.00000 0.96765 +0.83989 0.00000 0.96729 +0.90737 0.00000 0.96697 +0.97092 0.00000 0.96668 +1.00000 0.00000 0.96642 +1.00000 0.00000 0.96619 +0.00602 0.04639 0.97142 +0.05946 0.04574 0.97100 +0.11840 0.04502 0.97056 +0.18205 0.04424 0.97011 +0.24961 0.04342 0.96966 +0.32032 0.04255 0.96921 +0.39336 0.04166 0.96877 +0.46797 0.04075 0.96834 +0.54334 0.03983 0.96793 +0.61871 0.03891 0.96755 +0.69327 0.03800 0.96719 +0.76625 0.03711 0.96685 +0.83687 0.03625 0.96653 +0.90433 0.03542 0.96624 +0.96786 0.03465 0.96597 +1.00000 0.03393 0.96573 +1.00000 0.03328 0.96551 +0.00304 0.10214 0.97003 +0.05644 0.10149 0.96968 +0.11534 0.10077 0.96930 +0.17894 0.09999 0.96891 +0.24647 0.09917 0.96852 +0.31713 0.09830 0.96814 +0.39014 0.09741 0.96776 +0.46471 0.09650 0.96739 +0.54005 0.09558 0.96703 +0.61538 0.09466 0.96669 +0.68992 0.09375 0.96636 +0.76288 0.09286 0.96606 +0.83348 0.09200 0.96577 +0.90093 0.09117 0.96550 +0.96445 0.09040 0.96524 +1.00000 0.08968 0.96501 +1.00000 0.08904 0.96477 +0.00000 0.16236 0.96877 +0.05303 0.16171 0.96847 +0.11189 0.16099 0.96815 +0.17546 0.16021 0.96782 +0.24295 0.15939 0.96748 +0.31358 0.15853 0.96715 +0.38656 0.15763 0.96682 +0.46110 0.15672 0.96649 +0.53641 0.15580 0.96617 +0.61173 0.15488 0.96586 +0.68625 0.15397 0.96556 +0.75920 0.15308 0.96527 +0.82979 0.15222 0.96499 +0.89734 0.15144 0.96463 +0.96107 0.15074 0.96417 +1.00000 0.15013 0.96365 +1.00000 0.14961 0.96311 +0.00000 0.22630 0.96764 +0.04928 0.22565 0.96739 +0.10811 0.22494 0.96711 +0.17165 0.22416 0.96683 +0.23912 0.22334 0.96653 +0.30972 0.22247 0.96623 +0.38267 0.22158 0.96594 +0.45720 0.22067 0.96564 +0.53250 0.21975 0.96534 +0.60782 0.21884 0.96503 +0.68248 0.21798 0.96460 +0.75571 0.21719 0.96404 +0.82672 0.21649 0.96336 +0.89468 0.21585 0.96260 +0.95879 0.21529 0.96177 +1.00000 0.21481 0.96092 +1.00000 0.21439 0.96009 +0.00000 0.29323 0.96664 +0.04525 0.29258 0.96642 +0.10406 0.29186 0.96617 +0.16759 0.29109 0.96591 +0.23503 0.29026 0.96564 +0.30562 0.28940 0.96536 +0.37859 0.28852 0.96506 +0.45328 0.28767 0.96460 +0.52891 0.28687 0.96399 +0.60469 0.28613 0.96324 +0.67982 0.28544 0.96235 +0.75351 0.28482 0.96135 +0.82493 0.28426 0.96026 +0.89327 0.28376 0.95912 +0.95772 0.28333 0.95796 +1.00000 0.28294 0.95680 +1.00000 0.28262 0.95570 +0.00000 0.36239 0.96572 +0.04102 0.36174 0.96551 +0.09983 0.36103 0.96528 +0.16342 0.36028 0.96495 +0.23108 0.35953 0.96449 +0.30202 0.35880 0.96387 +0.37547 0.35810 0.96310 +0.45064 0.35743 0.96217 +0.52674 0.35680 0.96110 +0.60298 0.35622 0.95990 +0.67854 0.35568 0.95859 +0.75262 0.35520 0.95719 +0.82440 0.35477 0.95574 +0.89308 0.35438 0.95425 +0.95783 0.35404 0.95278 +1.00000 0.35374 0.95136 +1.00000 0.35349 0.95001 +0.00000 0.43317 0.96452 +0.03727 0.43261 0.96405 +0.09645 0.43204 0.96345 +0.16048 0.43145 0.96271 +0.22858 0.43086 0.96181 +0.29997 0.43029 0.96076 +0.37386 0.42974 0.95955 +0.44946 0.42922 0.95820 +0.52597 0.42874 0.95672 +0.60260 0.42829 0.95512 +0.67852 0.42788 0.95343 +0.75294 0.42750 0.95168 +0.82504 0.42717 0.94991 +0.89399 0.42687 0.94813 +0.95899 0.42660 0.94639 +1.00000 0.42637 0.94473 +1.00000 0.42616 0.94318 +0.00000 0.50527 0.96176 +0.03514 0.50484 0.96096 +0.09469 0.50439 0.96001 +0.15909 0.50394 0.95889 +0.22757 0.50348 0.95761 +0.29934 0.50304 0.95617 +0.37361 0.50262 0.95458 +0.44957 0.50222 0.95286 +0.52643 0.50185 0.95102 +0.60338 0.50150 0.94908 +0.67961 0.50118 0.94707 +0.75430 0.50089 0.94502 +0.82664 0.50062 0.94297 +0.89582 0.50037 0.94095 +0.96100 0.50015 0.93900 +1.00000 0.49996 0.93715 +1.00000 0.49978 0.93543 +0.00000 0.57791 0.95750 +0.03448 0.57758 0.95641 +0.09433 0.57723 0.95515 +0.15905 0.57688 0.95371 +0.22785 0.57654 0.95210 +0.29994 0.57620 0.95033 +0.37451 0.57587 0.94842 +0.45076 0.57556 0.94638 +0.52790 0.57526 0.94423 +0.60510 0.57498 0.94201 +0.68156 0.57472 0.93974 +0.75646 0.57447 0.93746 +0.82898 0.57424 0.93519 +0.89831 0.57403 0.93298 +0.96362 0.57383 0.93086 +1.00000 0.57364 0.92886 +1.00000 0.57347 0.92703 +0.00000 0.65021 0.95200 +0.03503 0.64996 0.95067 +0.09513 0.64969 0.94914 +0.16011 0.64941 0.94743 +0.22916 0.64914 0.94555 +0.30149 0.64887 0.94351 +0.37630 0.64860 0.94133 +0.45277 0.64835 0.93904 +0.53011 0.64810 0.93666 +0.60749 0.64785 0.93422 +0.68411 0.64762 0.93175 +0.75914 0.64739 0.92928 +0.83177 0.64716 0.92685 +0.90119 0.64695 0.92450 +0.96657 0.64674 0.92226 +1.00000 0.64654 0.92020 +1.00000 0.64636 0.91835 +0.00000 0.72129 0.94557 +0.03651 0.72109 0.94403 +0.09680 0.72087 0.94230 +0.16197 0.72064 0.94037 +0.23121 0.72042 0.93827 +0.30371 0.72018 0.93602 +0.37869 0.71995 0.93364 +0.45531 0.71971 0.93115 +0.53278 0.71948 0.92859 +0.61027 0.71924 0.92599 +0.68697 0.71900 0.92338 +0.76205 0.71875 0.92081 +0.83469 0.71851 0.91836 +0.90405 0.71826 0.91604 +0.96935 0.71802 0.91388 +1.00000 0.71779 0.91192 +1.00000 0.71756 0.91016 +0.00000 0.79026 0.93853 +0.03862 0.79009 0.93684 +0.09905 0.78990 0.93494 +0.16434 0.78969 0.93284 +0.23370 0.78948 0.93058 +0.30632 0.78926 0.92817 +0.38139 0.78903 0.92564 +0.45810 0.78878 0.92303 +0.53560 0.78853 0.92038 +0.61308 0.78827 0.91777 +0.68971 0.78799 0.91522 +0.76468 0.78771 0.91276 +0.83718 0.78741 0.91043 +0.90641 0.78712 0.90825 +0.97155 0.78682 0.90624 +1.00000 0.78652 0.90442 +1.00000 0.78624 0.90282 +0.00000 0.85625 0.93121 +0.04108 0.85608 0.92940 +0.10158 0.85590 0.92738 +0.16695 0.85569 0.92517 +0.23638 0.85547 0.92280 +0.30903 0.85524 0.92032 +0.38408 0.85498 0.91779 +0.46071 0.85470 0.91524 +0.53810 0.85441 0.91270 +0.61544 0.85409 0.91022 +0.69191 0.85376 0.90782 +0.76671 0.85341 0.90553 +0.83902 0.85305 0.90338 +0.90804 0.85267 0.90139 +0.97298 0.85230 0.89958 +1.00000 0.85193 0.89796 +1.00000 0.85157 0.89655 +0.00000 0.91840 0.92391 +0.04362 0.91823 0.92203 +0.10413 0.91803 0.91998 +0.16947 0.91780 0.91777 +0.23883 0.91755 0.91546 +0.31138 0.91728 0.91308 +0.38631 0.91698 0.91067 +0.46279 0.91665 0.90826 +0.54001 0.91629 0.90589 +0.61716 0.91590 0.90359 +0.69342 0.91549 0.90139 +0.76799 0.91505 0.89932 +0.84006 0.91460 0.89740 +0.90884 0.91413 0.89565 +0.97353 0.91367 0.89408 +1.00000 0.91320 0.89269 +1.00000 0.91276 0.89150 +0.00000 0.97589 0.91708 +0.04587 0.97569 0.91526 +0.10630 0.97546 0.91328 +0.17155 0.97520 0.91117 +0.24079 0.97491 0.90898 +0.31319 0.97458 0.90674 +0.38795 0.97421 0.90448 +0.46424 0.97381 0.90226 +0.54125 0.97338 0.90009 +0.61817 0.97290 0.89801 +0.69418 0.97240 0.89605 +0.76848 0.97186 0.89424 +0.84028 0.97131 0.89258 +0.90878 0.97074 0.89109 +0.97319 0.97016 0.88979 +1.00000 0.96960 0.88867 +1.00000 0.96906 0.88772 +0.00000 1.00000 0.91112 +0.04764 1.00000 0.90938 +0.10797 1.00000 0.90750 +0.17309 1.00000 0.90552 +0.24217 1.00000 0.90347 +0.31441 1.00000 0.90139 +0.38897 1.00000 0.89933 +0.46505 1.00000 0.89731 +0.54182 1.00000 0.89537 +0.61847 1.00000 0.89354 +0.69421 1.00000 0.89184 +0.76823 1.00000 0.89030 +0.83974 1.00000 0.88892 +0.90794 1.00000 0.88772 +0.97206 1.00000 0.88669 +1.00000 1.00000 0.88584 +1.00000 1.00000 0.88515 diff --git a/src/assets/lut/freddo.cube b/src/assets/lut/freddo.cube new file mode 100644 index 0000000..70f66f9 --- /dev/null +++ b/src/assets/lut/freddo.cube @@ -0,0 +1,4919 @@ +# DaProd Video · LUT di partenza, create da noi (licenza MIT, come il progetto). +# Generata da scripts/genera-lut.mjs: non si modifica a mano. +TITLE "Freddo" +LUT_3D_SIZE 17 +DOMAIN_MIN 0.0 0.0 0.0 +DOMAIN_MAX 1.0 1.0 1.0 +0.00000 0.00000 0.02495 +0.03895 0.00042 0.02536 +0.09082 0.00087 0.02576 +0.14593 0.00136 0.02613 +0.20377 0.00186 0.02648 +0.26377 0.00239 0.02680 +0.32542 0.00293 0.02708 +0.38816 0.00348 0.02731 +0.45146 0.00403 0.02750 +0.51478 0.00459 0.02765 +0.57756 0.00514 0.02775 +0.63929 0.00568 0.02781 +0.69940 0.00621 0.02784 +0.75736 0.00671 0.02784 +0.81262 0.00720 0.02782 +0.86465 0.00765 0.02777 +0.91290 0.00807 0.02772 +0.00000 0.05165 0.02625 +0.04056 0.05207 0.02654 +0.09247 0.05252 0.02682 +0.14763 0.05301 0.02708 +0.20551 0.05351 0.02731 +0.26556 0.05404 0.02750 +0.32725 0.05458 0.02766 +0.39003 0.05513 0.02778 +0.45337 0.05569 0.02787 +0.51672 0.05624 0.02791 +0.57954 0.05679 0.02792 +0.64130 0.05733 0.02790 +0.70144 0.05786 0.02785 +0.75942 0.05836 0.02778 +0.81471 0.05885 0.02770 +0.86676 0.05930 0.02760 +0.91502 0.05973 0.02750 +0.00000 0.10735 0.02724 +0.04244 0.10777 0.02742 +0.09439 0.10823 0.02759 +0.14959 0.10871 0.02773 +0.20751 0.10922 0.02785 +0.26760 0.10975 0.02793 +0.32933 0.11029 0.02798 +0.39215 0.11084 0.02800 +0.45552 0.11139 0.02799 +0.51891 0.11195 0.02794 +0.58176 0.11250 0.02787 +0.64354 0.11304 0.02777 +0.70371 0.11356 0.02766 +0.76172 0.11407 0.02753 +0.81702 0.11455 0.02740 +0.86908 0.11501 0.02726 +0.91736 0.11543 0.02713 +0.00000 0.16653 0.02788 +0.04458 0.16695 0.02797 +0.09657 0.16741 0.02803 +0.15181 0.16789 0.02807 +0.20976 0.16840 0.02809 +0.26989 0.16893 0.02807 +0.33165 0.16947 0.02803 +0.39450 0.17002 0.02796 +0.45791 0.17057 0.02786 +0.52132 0.17113 0.02774 +0.58420 0.17168 0.02761 +0.64600 0.17222 0.02745 +0.70618 0.17274 0.02729 +0.76420 0.17325 0.02712 +0.81952 0.17374 0.02695 +0.87159 0.17419 0.02679 +0.91987 0.17461 0.02663 +0.00000 0.22861 0.02818 +0.04696 0.22903 0.02817 +0.09898 0.22949 0.02815 +0.15425 0.22997 0.02811 +0.21223 0.23048 0.02804 +0.27239 0.23101 0.02794 +0.33418 0.23155 0.02782 +0.39706 0.23210 0.02768 +0.46049 0.23265 0.02752 +0.52392 0.23321 0.02735 +0.58681 0.23376 0.02717 +0.64863 0.23430 0.02698 +0.70882 0.23482 0.02678 +0.76685 0.23533 0.02659 +0.82217 0.23581 0.02642 +0.87419 0.23627 0.02634 +0.92238 0.23669 0.02635 +0.00129 0.29301 0.02814 +0.04954 0.29343 0.02807 +0.10158 0.29388 0.02798 +0.15688 0.29437 0.02787 +0.21489 0.29487 0.02773 +0.27507 0.29540 0.02758 +0.33688 0.29594 0.02741 +0.39977 0.29649 0.02722 +0.46321 0.29705 0.02702 +0.52666 0.29760 0.02682 +0.58956 0.29815 0.02661 +0.65135 0.29869 0.02646 +0.71145 0.29922 0.02643 +0.76932 0.29972 0.02653 +0.82444 0.30021 0.02673 +0.87626 0.30066 0.02702 +0.92427 0.30108 0.02736 +0.00401 0.35914 0.02784 +0.05228 0.35956 0.02772 +0.10434 0.36002 0.02758 +0.15966 0.36050 0.02742 +0.21768 0.36101 0.02725 +0.27787 0.36153 0.02706 +0.33969 0.36207 0.02686 +0.40260 0.36262 0.02665 +0.46599 0.36318 0.02653 +0.52931 0.36373 0.02655 +0.59201 0.36428 0.02672 +0.65356 0.36482 0.02701 +0.71343 0.36535 0.02741 +0.77108 0.36585 0.02791 +0.82599 0.36634 0.02848 +0.87764 0.36679 0.02911 +0.92549 0.36721 0.02975 +0.00685 0.42643 0.02735 +0.05513 0.42685 0.02720 +0.10720 0.42731 0.02703 +0.16253 0.42779 0.02685 +0.22054 0.42830 0.02668 +0.28066 0.42883 0.02662 +0.34233 0.42937 0.02669 +0.40501 0.42991 0.02690 +0.46815 0.43047 0.02725 +0.53122 0.43102 0.02773 +0.59369 0.43157 0.02832 +0.65501 0.43211 0.02903 +0.71468 0.43263 0.02982 +0.77214 0.43314 0.03068 +0.82688 0.43362 0.03159 +0.87836 0.43408 0.03252 +0.92607 0.43450 0.03345 +0.00974 0.49430 0.02678 +0.05797 0.49472 0.02672 +0.10993 0.49518 0.02675 +0.16508 0.49566 0.02689 +0.22286 0.49617 0.02714 +0.28274 0.49669 0.02752 +0.34417 0.49723 0.02803 +0.40662 0.49778 0.02868 +0.46953 0.49833 0.02945 +0.53239 0.49889 0.03033 +0.59465 0.49944 0.03132 +0.65579 0.49997 0.03240 +0.71527 0.50050 0.03354 +0.77257 0.50100 0.03473 +0.82716 0.50148 0.03593 +0.87851 0.50194 0.03713 +0.92610 0.50236 0.03830 +0.01206 0.56217 0.02724 +0.06009 0.56259 0.02753 +0.11185 0.56305 0.02794 +0.16679 0.56353 0.02846 +0.22437 0.56403 0.02911 +0.28404 0.56456 0.02988 +0.34526 0.56510 0.03079 +0.40751 0.56565 0.03182 +0.47023 0.56620 0.03296 +0.53290 0.56675 0.03421 +0.59499 0.56730 0.03555 +0.65597 0.56784 0.03695 +0.71530 0.56836 0.03839 +0.77247 0.56886 0.03986 +0.82693 0.56935 0.04132 +0.87818 0.56980 0.04275 +0.92567 0.57022 0.04413 +0.01356 0.62946 0.02918 +0.06142 0.62988 0.02979 +0.11301 0.63033 0.03053 +0.16777 0.63081 0.03139 +0.22517 0.63132 0.03239 +0.28466 0.63184 0.03351 +0.34571 0.63238 0.03476 +0.40778 0.63293 0.03613 +0.47034 0.63348 0.03760 +0.53287 0.63403 0.03916 +0.59481 0.63458 0.04078 +0.65566 0.63512 0.04246 +0.71488 0.63564 0.04416 +0.77194 0.63615 0.04586 +0.82631 0.63663 0.04754 +0.87748 0.63708 0.04916 +0.92490 0.63750 0.05070 +0.01435 0.69558 0.03238 +0.06208 0.69600 0.03327 +0.11352 0.69646 0.03429 +0.16813 0.69694 0.03545 +0.22538 0.69744 0.03675 +0.28472 0.69797 0.03817 +0.34563 0.69851 0.03971 +0.40757 0.69905 0.04136 +0.47000 0.69960 0.04311 +0.53241 0.70016 0.04493 +0.59425 0.70070 0.04680 +0.65499 0.70124 0.04870 +0.71413 0.70176 0.05061 +0.77111 0.70227 0.05250 +0.82542 0.70275 0.05435 +0.87653 0.70320 0.05612 +0.92391 0.70362 0.05779 +0.01458 0.75997 0.03658 +0.06219 0.76039 0.03771 +0.11351 0.76084 0.03898 +0.16800 0.76133 0.04039 +0.22513 0.76183 0.04193 +0.28436 0.76235 0.04361 +0.34515 0.76289 0.04539 +0.40699 0.76344 0.04728 +0.46933 0.76399 0.04925 +0.53165 0.76454 0.05127 +0.59341 0.76509 0.05334 +0.65409 0.76563 0.05542 +0.71317 0.76615 0.05749 +0.77011 0.76665 0.05951 +0.82441 0.76713 0.06141 +0.87553 0.76759 0.06318 +0.92294 0.76801 0.06479 +0.01436 0.82204 0.04152 +0.06188 0.82246 0.04284 +0.11311 0.82291 0.04431 +0.16751 0.82339 0.04593 +0.22455 0.82390 0.04768 +0.28369 0.82442 0.04956 +0.34441 0.82496 0.05154 +0.40617 0.82551 0.05361 +0.46845 0.82606 0.05575 +0.53071 0.82661 0.05794 +0.59244 0.82716 0.06012 +0.65312 0.82769 0.06224 +0.71222 0.82822 0.06427 +0.76921 0.82872 0.06619 +0.82357 0.82920 0.06799 +0.87475 0.82966 0.06965 +0.92222 0.83008 0.07116 +0.01384 0.88121 0.04693 +0.06129 0.88163 0.04841 +0.11245 0.88209 0.05004 +0.16679 0.88257 0.05182 +0.22376 0.88307 0.05374 +0.28285 0.88359 0.05577 +0.34352 0.88413 0.05790 +0.40524 0.88468 0.06008 +0.46752 0.88523 0.06225 +0.52981 0.88578 0.06439 +0.59159 0.88633 0.06648 +0.65233 0.88687 0.06848 +0.71151 0.88739 0.07039 +0.76857 0.88790 0.07217 +0.82301 0.88838 0.07382 +0.87427 0.88883 0.07533 +0.92183 0.88925 0.07668 +0.01314 0.93691 0.05254 +0.06054 0.93733 0.05414 +0.11165 0.93778 0.05590 +0.16594 0.93826 0.05781 +0.22289 0.93877 0.05982 +0.28197 0.93929 0.06189 +0.34266 0.93983 0.06398 +0.40444 0.94038 0.06608 +0.46677 0.94093 0.06814 +0.52913 0.94148 0.07016 +0.59099 0.94203 0.07210 +0.65182 0.94257 0.07395 +0.71108 0.94309 0.07569 +0.76825 0.94359 0.07730 +0.82279 0.94408 0.07876 +0.87416 0.94453 0.08008 +0.92182 0.94495 0.08125 +0.01235 0.98855 0.05812 +0.05973 0.98897 0.05979 +0.11084 0.98943 0.06158 +0.16515 0.98991 0.06346 +0.22213 0.99041 0.06541 +0.28126 0.99094 0.06739 +0.34201 0.99147 0.06937 +0.40386 0.99202 0.07134 +0.46627 0.99257 0.07327 +0.52872 0.99312 0.07512 +0.59067 0.99367 0.07689 +0.65160 0.99421 0.07855 +0.71098 0.99473 0.08008 +0.76826 0.99524 0.08148 +0.82292 0.99572 0.08274 +0.87440 0.99618 0.08385 +0.92218 0.99660 0.08481 +0.00000 0.00015 0.07727 +0.03911 0.00057 0.07766 +0.09098 0.00103 0.07805 +0.14611 0.00151 0.07841 +0.20394 0.00202 0.07875 +0.26395 0.00255 0.07905 +0.32560 0.00309 0.07932 +0.38835 0.00364 0.07954 +0.45165 0.00419 0.07972 +0.51497 0.00475 0.07985 +0.57777 0.00530 0.07995 +0.63949 0.00584 0.08000 +0.69961 0.00636 0.08002 +0.75757 0.00687 0.08001 +0.81284 0.00735 0.07998 +0.86487 0.00781 0.07993 +0.91311 0.00823 0.07987 +0.00000 0.05180 0.07853 +0.04074 0.05222 0.07881 +0.09265 0.05268 0.07908 +0.14781 0.05316 0.07932 +0.20569 0.05367 0.07954 +0.26575 0.05420 0.07973 +0.32744 0.05474 0.07987 +0.39023 0.05529 0.07998 +0.45357 0.05584 0.08006 +0.51693 0.05640 0.08009 +0.57975 0.05695 0.08009 +0.64151 0.05749 0.08007 +0.70165 0.05801 0.08001 +0.75964 0.05852 0.07994 +0.81493 0.05901 0.07984 +0.86698 0.05946 0.07974 +0.91524 0.05988 0.07964 +0.00000 0.10751 0.07948 +0.04263 0.10793 0.07965 +0.09458 0.10839 0.07981 +0.14979 0.10887 0.07994 +0.20771 0.10938 0.08005 +0.26781 0.10990 0.08013 +0.32954 0.11044 0.08017 +0.39236 0.11099 0.08018 +0.45574 0.11155 0.08015 +0.51912 0.11210 0.08010 +0.58198 0.11265 0.08002 +0.64376 0.11319 0.07992 +0.70393 0.11372 0.07980 +0.76194 0.11423 0.07967 +0.81725 0.11471 0.07953 +0.86931 0.11517 0.07939 +0.91758 0.11559 0.07925 +0.00000 0.16669 0.08009 +0.04478 0.16711 0.08017 +0.09677 0.16757 0.08022 +0.15201 0.16805 0.08026 +0.20997 0.16856 0.08026 +0.27010 0.16908 0.08024 +0.33187 0.16963 0.08019 +0.39472 0.17018 0.08011 +0.45813 0.17073 0.08001 +0.52154 0.17128 0.07989 +0.58442 0.17183 0.07974 +0.64623 0.17238 0.07959 +0.70641 0.17290 0.07942 +0.76443 0.17341 0.07925 +0.81975 0.17389 0.07908 +0.87182 0.17435 0.07891 +0.92010 0.17477 0.07876 +0.00000 0.22877 0.08035 +0.04717 0.22919 0.08035 +0.09919 0.22965 0.08032 +0.15446 0.23013 0.08026 +0.21245 0.23064 0.08019 +0.27261 0.23116 0.08009 +0.33440 0.23170 0.07996 +0.39728 0.23225 0.07982 +0.46071 0.23281 0.07966 +0.52414 0.23336 0.07948 +0.58704 0.23391 0.07929 +0.64886 0.23445 0.07910 +0.70905 0.23498 0.07891 +0.76708 0.23549 0.07872 +0.82239 0.23597 0.07856 +0.87440 0.23643 0.07851 +0.92257 0.23685 0.07855 +0.00150 0.29316 0.08030 +0.04976 0.29358 0.08022 +0.10180 0.29404 0.08013 +0.15710 0.29452 0.08001 +0.21511 0.29503 0.07987 +0.27529 0.29556 0.07971 +0.33710 0.29610 0.07954 +0.40000 0.29665 0.07935 +0.46344 0.29720 0.07915 +0.52689 0.29776 0.07894 +0.58979 0.29831 0.07874 +0.65156 0.29885 0.07861 +0.71164 0.29937 0.07862 +0.76950 0.29988 0.07876 +0.82459 0.30036 0.07899 +0.87640 0.30082 0.07930 +0.92440 0.30124 0.07967 +0.00424 0.35930 0.07998 +0.05251 0.35972 0.07986 +0.10457 0.36017 0.07971 +0.15988 0.36066 0.07955 +0.21791 0.36116 0.07937 +0.27810 0.36169 0.07918 +0.33992 0.36223 0.07898 +0.40282 0.36278 0.07878 +0.46619 0.36334 0.07870 +0.52949 0.36389 0.07876 +0.59217 0.36444 0.07896 +0.65370 0.36498 0.07928 +0.71355 0.36550 0.07972 +0.77119 0.36601 0.08025 +0.82609 0.36649 0.08085 +0.87772 0.36695 0.08149 +0.92556 0.36737 0.08217 +0.00708 0.42659 0.07948 +0.05536 0.42701 0.07932 +0.10743 0.42746 0.07915 +0.16275 0.42795 0.07897 +0.22076 0.42846 0.07883 +0.28086 0.42898 0.07880 +0.34251 0.42952 0.07891 +0.40516 0.43007 0.07915 +0.46829 0.43063 0.07954 +0.53134 0.43118 0.08005 +0.59379 0.43173 0.08067 +0.65510 0.43227 0.08141 +0.71475 0.43279 0.08223 +0.77220 0.43330 0.08312 +0.82693 0.43378 0.08405 +0.87840 0.43423 0.08501 +0.92610 0.43465 0.08595 +0.00995 0.49446 0.07892 +0.05817 0.49488 0.07889 +0.11011 0.49533 0.07895 +0.16524 0.49582 0.07912 +0.22301 0.49632 0.07941 +0.28287 0.49685 0.07982 +0.34429 0.49739 0.08037 +0.40671 0.49794 0.08104 +0.46961 0.49849 0.08184 +0.53246 0.49904 0.08276 +0.59470 0.49959 0.08377 +0.65583 0.50013 0.08488 +0.71530 0.50065 0.08604 +0.77259 0.50116 0.08725 +0.82717 0.50164 0.08848 +0.87851 0.50209 0.08970 +0.92609 0.50251 0.09088 +0.01221 0.56233 0.07950 +0.06023 0.56275 0.07983 +0.11197 0.56320 0.08026 +0.16690 0.56368 0.08081 +0.22446 0.56419 0.08148 +0.28412 0.56472 0.08229 +0.34533 0.56525 0.08322 +0.40755 0.56580 0.08428 +0.47026 0.56635 0.08545 +0.53292 0.56691 0.08673 +0.59500 0.56745 0.08808 +0.65596 0.56799 0.08951 +0.71529 0.56852 0.09098 +0.77244 0.56902 0.09246 +0.82690 0.56950 0.09394 +0.87814 0.56995 0.09539 +0.92563 0.57037 0.09678 +0.01365 0.62961 0.08155 +0.06150 0.63003 0.08219 +0.11308 0.63049 0.08295 +0.16783 0.63097 0.08384 +0.22521 0.63148 0.08486 +0.28469 0.63200 0.08601 +0.34573 0.63254 0.08728 +0.40779 0.63309 0.08867 +0.47034 0.63364 0.09017 +0.53285 0.63419 0.09175 +0.59479 0.63474 0.09340 +0.65563 0.63527 0.09509 +0.71484 0.63580 0.09681 +0.77189 0.63630 0.09853 +0.82626 0.63678 0.10022 +0.87742 0.63724 0.10186 +0.92484 0.63766 0.10341 +0.01440 0.69574 0.08485 +0.06211 0.69616 0.08576 +0.11354 0.69661 0.08680 +0.16814 0.69710 0.08799 +0.22538 0.69760 0.08930 +0.28471 0.69812 0.09075 +0.34561 0.69866 0.09231 +0.40754 0.69921 0.09398 +0.46997 0.69976 0.09575 +0.53236 0.70031 0.09758 +0.59419 0.70086 0.09947 +0.65494 0.70140 0.10139 +0.71406 0.70192 0.10332 +0.77104 0.70242 0.10522 +0.82535 0.70291 0.10708 +0.87645 0.70336 0.10886 +0.92383 0.70378 0.11054 +0.01458 0.76013 0.08913 +0.06218 0.76055 0.09028 +0.11349 0.76100 0.09156 +0.16798 0.76148 0.09299 +0.22510 0.76199 0.09456 +0.28432 0.76251 0.09625 +0.34511 0.76305 0.09805 +0.40694 0.76359 0.09996 +0.46927 0.76415 0.10194 +0.53158 0.76470 0.10398 +0.59334 0.76524 0.10606 +0.65402 0.76578 0.10816 +0.71309 0.76630 0.11024 +0.77003 0.76681 0.11225 +0.82434 0.76729 0.11414 +0.87546 0.76774 0.11590 +0.92288 0.76816 0.11751 +0.01434 0.82220 0.09414 +0.06185 0.82262 0.09548 +0.11307 0.82307 0.09696 +0.16746 0.82355 0.09860 +0.22449 0.82405 0.10036 +0.28363 0.82458 0.10225 +0.34434 0.82512 0.10425 +0.40610 0.82566 0.10634 +0.46837 0.82621 0.10849 +0.53063 0.82677 0.11069 +0.59236 0.82731 0.11286 +0.65305 0.82785 0.11497 +0.71215 0.82837 0.11699 +0.76915 0.82888 0.11890 +0.82351 0.82936 0.12069 +0.87470 0.82981 0.12234 +0.92218 0.83023 0.12384 +0.01379 0.88137 0.09960 +0.06124 0.88179 0.10109 +0.11239 0.88224 0.10274 +0.16672 0.88272 0.10454 +0.22369 0.88323 0.10646 +0.28277 0.88375 0.10851 +0.34344 0.88429 0.11065 +0.40517 0.88483 0.11282 +0.46745 0.88539 0.11498 +0.52975 0.88594 0.11712 +0.59153 0.88649 0.11919 +0.65228 0.88702 0.12118 +0.71146 0.88755 0.12307 +0.76854 0.88805 0.12484 +0.82298 0.88853 0.12648 +0.87425 0.88899 0.12797 +0.92182 0.88941 0.12931 +0.01307 0.93707 0.10526 +0.06047 0.93749 0.10687 +0.11158 0.93794 0.10864 +0.16587 0.93842 0.11056 +0.22281 0.93892 0.11256 +0.28190 0.93945 0.11462 +0.34260 0.93999 0.11671 +0.40438 0.94053 0.11879 +0.46672 0.94108 0.12085 +0.52909 0.94164 0.12285 +0.59095 0.94218 0.12478 +0.65179 0.94272 0.12661 +0.71107 0.94325 0.12833 +0.76824 0.94375 0.12991 +0.82279 0.94423 0.13136 +0.87417 0.94469 0.13266 +0.92184 0.94511 0.13381 +0.01227 0.98871 0.11087 +0.05965 0.98913 0.11254 +0.11077 0.98958 0.11432 +0.16508 0.99006 0.11619 +0.22207 0.99057 0.11813 +0.28121 0.99109 0.12009 +0.34196 0.99163 0.12207 +0.40382 0.99218 0.12402 +0.46624 0.99273 0.12593 +0.52870 0.99328 0.12777 +0.59066 0.99383 0.12951 +0.65161 0.99437 0.13115 +0.71099 0.99489 0.13266 +0.76829 0.99540 0.13404 +0.82296 0.99588 0.13527 +0.87445 0.99633 0.13636 +0.92224 0.99675 0.13729 +0.00000 0.00032 0.13369 +0.03929 0.00074 0.13407 +0.09117 0.00120 0.13444 +0.14629 0.00168 0.13479 +0.20413 0.00219 0.13512 +0.26415 0.00272 0.13541 +0.32581 0.00326 0.13566 +0.38856 0.00381 0.13587 +0.45186 0.00436 0.13603 +0.51519 0.00491 0.13615 +0.57799 0.00546 0.13624 +0.63971 0.00601 0.13628 +0.69983 0.00653 0.13629 +0.75780 0.00704 0.13628 +0.81307 0.00752 0.13624 +0.86510 0.00798 0.13618 +0.91335 0.00840 0.13612 +0.00000 0.05197 0.13491 +0.04093 0.05239 0.13518 +0.09284 0.05285 0.13543 +0.14801 0.05333 0.13567 +0.20590 0.05384 0.13587 +0.26596 0.05437 0.13604 +0.32766 0.05491 0.13618 +0.39045 0.05546 0.13628 +0.45379 0.05601 0.13634 +0.51715 0.05657 0.13637 +0.57998 0.05712 0.13636 +0.64174 0.05766 0.13632 +0.70189 0.05818 0.13626 +0.75988 0.05869 0.13618 +0.81517 0.05917 0.13608 +0.86722 0.05963 0.13598 +0.91548 0.06005 0.13587 +0.00000 0.10768 0.13582 +0.04283 0.10810 0.13598 +0.09479 0.10855 0.13613 +0.15000 0.10904 0.13625 +0.20793 0.10955 0.13635 +0.26803 0.11007 0.13641 +0.32976 0.11061 0.13645 +0.39259 0.11116 0.13645 +0.45597 0.11172 0.13641 +0.51936 0.11227 0.13635 +0.58222 0.11282 0.13627 +0.64400 0.11336 0.13616 +0.70417 0.11389 0.13604 +0.76218 0.11440 0.13590 +0.81749 0.11488 0.13576 +0.86955 0.11534 0.13562 +0.91783 0.11576 0.13547 +0.00000 0.16686 0.13639 +0.04500 0.16728 0.13646 +0.09699 0.16774 0.13651 +0.15224 0.16822 0.13653 +0.21020 0.16873 0.13653 +0.27033 0.16925 0.13650 +0.33210 0.16979 0.13644 +0.39496 0.17034 0.13636 +0.45837 0.17090 0.13625 +0.52178 0.17145 0.13612 +0.58466 0.17200 0.13597 +0.64647 0.17254 0.13581 +0.70665 0.17307 0.13564 +0.76468 0.17358 0.13547 +0.82000 0.17406 0.13530 +0.87207 0.17452 0.13513 +0.92035 0.17494 0.13497 +0.00000 0.22894 0.13662 +0.04740 0.22936 0.13661 +0.09942 0.22981 0.13657 +0.15470 0.23030 0.13652 +0.21269 0.23081 0.13643 +0.27285 0.23133 0.13633 +0.33464 0.23187 0.13620 +0.39752 0.23242 0.13605 +0.46095 0.23298 0.13588 +0.52439 0.23353 0.13570 +0.58729 0.23408 0.13551 +0.64910 0.23462 0.13532 +0.70930 0.23515 0.13512 +0.76733 0.23566 0.13493 +0.82262 0.23614 0.13480 +0.87461 0.23660 0.13479 +0.92277 0.23702 0.13486 +0.00174 0.29333 0.13654 +0.04999 0.29375 0.13646 +0.10204 0.29421 0.13636 +0.15734 0.29469 0.13624 +0.21536 0.29520 0.13610 +0.27554 0.29573 0.13593 +0.33735 0.29627 0.13576 +0.40025 0.29682 0.13556 +0.46369 0.29737 0.13536 +0.52713 0.29793 0.13516 +0.59003 0.29848 0.13496 +0.65178 0.29902 0.13487 +0.71184 0.29954 0.13492 +0.76968 0.30005 0.13509 +0.82475 0.30053 0.13536 +0.87655 0.30099 0.13570 +0.92453 0.30141 0.13609 +0.00448 0.35947 0.13621 +0.05275 0.35989 0.13608 +0.10481 0.36034 0.13593 +0.16013 0.36083 0.13577 +0.21815 0.36133 0.13559 +0.27835 0.36186 0.13540 +0.34017 0.36240 0.13519 +0.40306 0.36295 0.13502 +0.46641 0.36351 0.13497 +0.52968 0.36406 0.13507 +0.59234 0.36461 0.13531 +0.65386 0.36515 0.13567 +0.71369 0.36567 0.13614 +0.77131 0.36618 0.13670 +0.82619 0.36666 0.13733 +0.87781 0.36712 0.13800 +0.92564 0.36754 0.13870 +0.00732 0.42676 0.13569 +0.05561 0.42718 0.13554 +0.10768 0.42763 0.13537 +0.16300 0.42812 0.13519 +0.22099 0.42863 0.13508 +0.28106 0.42915 0.13509 +0.34269 0.42969 0.13524 +0.40533 0.43024 0.13552 +0.46843 0.43079 0.13594 +0.53147 0.43135 0.13648 +0.59390 0.43190 0.13715 +0.65520 0.43243 0.13791 +0.71483 0.43296 0.13877 +0.77226 0.43347 0.13968 +0.82697 0.43395 0.14064 +0.87844 0.43440 0.14162 +0.92612 0.43482 0.14258 +0.01018 0.49463 0.13518 +0.05838 0.49505 0.13518 +0.11030 0.49550 0.13527 +0.16542 0.49599 0.13547 +0.22317 0.49649 0.13579 +0.28301 0.49702 0.13624 +0.34441 0.49756 0.13682 +0.40682 0.49811 0.13752 +0.46970 0.49866 0.13836 +0.53252 0.49921 0.13930 +0.59476 0.49976 0.14035 +0.65587 0.50030 0.14148 +0.71532 0.50082 0.14268 +0.77260 0.50133 0.14391 +0.82717 0.50181 0.14516 +0.87850 0.50226 0.14640 +0.92607 0.50268 0.14760 +0.01236 0.56250 0.13589 +0.06037 0.56292 0.13624 +0.11210 0.56337 0.13669 +0.16701 0.56385 0.13727 +0.22455 0.56436 0.13798 +0.28419 0.56488 0.13882 +0.34539 0.56542 0.13978 +0.40760 0.56597 0.14087 +0.47030 0.56652 0.14207 +0.53294 0.56708 0.14337 +0.59501 0.56762 0.14475 +0.65596 0.56816 0.14620 +0.71527 0.56868 0.14769 +0.77242 0.56919 0.14920 +0.82687 0.56967 0.15070 +0.87810 0.57012 0.15217 +0.92558 0.57054 0.15357 +0.01374 0.62978 0.13805 +0.06159 0.63020 0.13871 +0.11315 0.63066 0.13950 +0.16788 0.63114 0.14041 +0.22525 0.63164 0.14146 +0.28472 0.63217 0.14264 +0.34574 0.63271 0.14394 +0.40779 0.63325 0.14535 +0.47033 0.63381 0.14687 +0.53283 0.63436 0.14848 +0.59476 0.63490 0.15015 +0.65559 0.63544 0.15186 +0.71479 0.63597 0.15360 +0.77183 0.63647 0.15534 +0.82620 0.63695 0.15704 +0.87735 0.63740 0.15869 +0.92477 0.63782 0.16026 +0.01444 0.69591 0.14145 +0.06214 0.69633 0.14238 +0.11356 0.69678 0.14345 +0.16815 0.69726 0.14465 +0.22538 0.69777 0.14599 +0.28470 0.69829 0.14746 +0.34559 0.69883 0.14905 +0.40751 0.69938 0.15074 +0.46992 0.69993 0.15252 +0.53231 0.70048 0.15438 +0.59413 0.70103 0.15629 +0.65487 0.70157 0.15823 +0.71399 0.70209 0.16017 +0.77096 0.70259 0.16208 +0.82527 0.70307 0.16395 +0.87637 0.70353 0.16575 +0.92375 0.70395 0.16742 +0.01458 0.76030 0.14582 +0.06217 0.76072 0.14698 +0.11347 0.76117 0.14829 +0.16795 0.76165 0.14973 +0.22506 0.76215 0.15132 +0.28427 0.76268 0.15303 +0.34506 0.76322 0.15485 +0.40688 0.76376 0.15678 +0.46920 0.76431 0.15878 +0.53151 0.76487 0.16084 +0.59326 0.76541 0.16293 +0.65393 0.76595 0.16504 +0.71300 0.76647 0.16713 +0.76995 0.76698 0.16913 +0.82426 0.76746 0.17102 +0.87539 0.76791 0.17277 +0.92281 0.76833 0.17437 +0.01430 0.82236 0.15090 +0.06181 0.82278 0.15225 +0.11302 0.82324 0.15375 +0.16741 0.82372 0.15540 +0.22443 0.82422 0.15719 +0.28356 0.82475 0.15909 +0.34427 0.82528 0.16110 +0.40602 0.82583 0.16320 +0.46829 0.82638 0.16537 +0.53055 0.82693 0.16757 +0.59228 0.82748 0.16974 +0.65297 0.82802 0.17184 +0.71209 0.82854 0.17385 +0.76909 0.82905 0.17575 +0.82346 0.82953 0.17753 +0.87465 0.82998 0.17917 +0.92214 0.83040 0.18065 +0.01373 0.88154 0.15642 +0.06117 0.88196 0.15792 +0.11232 0.88241 0.15958 +0.16665 0.88289 0.16139 +0.22361 0.88340 0.16333 +0.28269 0.88392 0.16539 +0.34335 0.88446 0.16753 +0.40509 0.88500 0.16970 +0.46737 0.88555 0.17185 +0.52968 0.88611 0.17397 +0.59147 0.88665 0.17604 +0.65223 0.88719 0.17801 +0.71141 0.88772 0.17989 +0.76850 0.88822 0.18164 +0.82295 0.88870 0.18326 +0.87424 0.88915 0.18474 +0.92181 0.88958 0.18606 +0.01299 0.93723 0.16212 +0.06039 0.93765 0.16374 +0.11150 0.93811 0.16552 +0.16578 0.93859 0.16744 +0.22273 0.93909 0.16944 +0.28182 0.93962 0.17150 +0.34253 0.94015 0.17357 +0.40432 0.94070 0.17564 +0.46666 0.94125 0.17768 +0.52904 0.94180 0.17967 +0.59092 0.94235 0.18158 +0.65176 0.94289 0.18339 +0.71105 0.94341 0.18509 +0.76824 0.94392 0.18666 +0.82280 0.94440 0.18808 +0.87419 0.94486 0.18936 +0.92187 0.94528 0.19049 +0.01219 0.98888 0.16775 +0.05957 0.98930 0.16942 +0.11069 0.98975 0.17119 +0.16501 0.99023 0.17306 +0.22200 0.99074 0.17498 +0.28115 0.99126 0.17694 +0.34191 0.99180 0.17889 +0.40377 0.99234 0.18083 +0.46620 0.99290 0.18272 +0.52867 0.99345 0.18454 +0.59065 0.99400 0.18626 +0.65161 0.99454 0.18788 +0.71101 0.99506 0.18936 +0.76832 0.99557 0.19071 +0.82300 0.99605 0.19192 +0.87451 0.99650 0.19298 +0.92231 0.99692 0.19389 +0.00000 0.00050 0.19363 +0.03948 0.00092 0.19399 +0.09136 0.00138 0.19435 +0.14649 0.00186 0.19469 +0.20434 0.00237 0.19500 +0.26436 0.00289 0.19527 +0.32602 0.00344 0.19551 +0.38878 0.00399 0.19570 +0.45209 0.00454 0.19586 +0.51542 0.00509 0.19597 +0.57822 0.00564 0.19604 +0.63995 0.00619 0.19607 +0.70007 0.00671 0.19608 +0.75804 0.00722 0.19605 +0.81332 0.00770 0.19600 +0.86535 0.00816 0.19594 +0.91360 0.00858 0.19587 +0.00000 0.05215 0.19480 +0.04113 0.05257 0.19506 +0.09305 0.05303 0.19530 +0.14823 0.05351 0.19552 +0.20612 0.05402 0.19571 +0.26618 0.05455 0.19587 +0.32788 0.05509 0.19600 +0.39068 0.05564 0.19609 +0.45403 0.05619 0.19614 +0.51739 0.05675 0.19615 +0.58022 0.05730 0.19614 +0.64199 0.05784 0.19609 +0.70214 0.05836 0.19602 +0.76013 0.05887 0.19593 +0.81542 0.05935 0.19583 +0.86747 0.05981 0.19572 +0.91574 0.06023 0.19561 +0.00000 0.10786 0.19567 +0.04305 0.10828 0.19582 +0.09501 0.10873 0.19596 +0.15023 0.10922 0.19607 +0.20816 0.10973 0.19616 +0.26826 0.11025 0.19621 +0.33000 0.11079 0.19623 +0.39283 0.11134 0.19622 +0.45621 0.11190 0.19618 +0.51961 0.11245 0.19611 +0.58247 0.11300 0.19602 +0.64426 0.11354 0.19591 +0.70443 0.11407 0.19578 +0.76244 0.11458 0.19564 +0.81775 0.11506 0.19549 +0.86981 0.11552 0.19534 +0.91809 0.11594 0.19520 +0.00000 0.16704 0.19620 +0.04523 0.16746 0.19626 +0.09723 0.16792 0.19630 +0.15248 0.16840 0.19632 +0.21044 0.16891 0.19631 +0.27058 0.16943 0.19627 +0.33235 0.16997 0.19620 +0.39521 0.17052 0.19611 +0.45862 0.17108 0.19600 +0.52204 0.17163 0.19586 +0.58492 0.17218 0.19571 +0.64673 0.17272 0.19554 +0.70691 0.17325 0.19537 +0.76494 0.17376 0.19519 +0.82026 0.17424 0.19502 +0.87233 0.17470 0.19485 +0.92061 0.17512 0.19469 +0.00000 0.22912 0.19640 +0.04764 0.22954 0.19638 +0.09967 0.22999 0.19634 +0.15495 0.23048 0.19627 +0.21294 0.23099 0.19619 +0.27310 0.23151 0.19607 +0.33490 0.23205 0.19594 +0.39778 0.23260 0.19578 +0.46121 0.23316 0.19561 +0.52465 0.23371 0.19543 +0.58755 0.23426 0.19524 +0.64936 0.23480 0.19504 +0.70956 0.23533 0.19484 +0.76759 0.23584 0.19466 +0.82286 0.23632 0.19457 +0.87483 0.23678 0.19459 +0.92297 0.23720 0.19469 +0.00199 0.29351 0.19630 +0.05025 0.29393 0.19621 +0.10230 0.29439 0.19611 +0.15760 0.29487 0.19598 +0.21561 0.29538 0.19583 +0.27580 0.29591 0.19567 +0.33761 0.29645 0.19548 +0.40051 0.29700 0.19529 +0.46395 0.29755 0.19509 +0.52740 0.29811 0.19488 +0.59028 0.29866 0.19470 +0.65201 0.29920 0.19466 +0.71205 0.29972 0.19475 +0.76986 0.30023 0.19495 +0.82492 0.30071 0.19525 +0.87670 0.30117 0.19563 +0.92466 0.30159 0.19605 +0.00473 0.35964 0.19594 +0.05301 0.36007 0.19581 +0.10507 0.36052 0.19566 +0.16039 0.36101 0.19549 +0.21842 0.36151 0.19531 +0.27861 0.36204 0.19512 +0.34043 0.36258 0.19491 +0.40330 0.36313 0.19477 +0.46663 0.36369 0.19477 +0.52988 0.36424 0.19491 +0.59252 0.36479 0.19519 +0.65401 0.36533 0.19559 +0.71382 0.36585 0.19609 +0.77143 0.36636 0.19669 +0.82630 0.36684 0.19735 +0.87790 0.36730 0.19805 +0.92571 0.36772 0.19877 +0.00759 0.42694 0.19542 +0.05587 0.42736 0.19526 +0.10794 0.42781 0.19509 +0.16326 0.42830 0.19492 +0.22122 0.42880 0.19485 +0.28128 0.42933 0.19490 +0.34288 0.42987 0.19509 +0.40550 0.43042 0.19541 +0.46858 0.43097 0.19587 +0.53160 0.43153 0.19645 +0.59401 0.43208 0.19715 +0.65529 0.43261 0.19795 +0.71490 0.43314 0.19884 +0.77232 0.43364 0.19978 +0.82702 0.43413 0.20077 +0.87847 0.43458 0.20177 +0.92615 0.43500 0.20276 +0.01041 0.49481 0.19495 +0.05859 0.49523 0.19498 +0.11050 0.49568 0.19511 +0.16560 0.49617 0.19534 +0.22333 0.49667 0.19570 +0.28315 0.49720 0.19618 +0.34453 0.49774 0.19680 +0.40692 0.49829 0.19754 +0.46978 0.49884 0.19841 +0.53259 0.49939 0.19939 +0.59481 0.49994 0.20047 +0.65590 0.50048 0.20163 +0.71535 0.50100 0.20285 +0.77261 0.50151 0.20411 +0.82717 0.50199 0.20538 +0.87849 0.50244 0.20665 +0.92605 0.50286 0.20787 +0.01252 0.56268 0.19580 +0.06051 0.56310 0.19617 +0.11223 0.56355 0.19666 +0.16712 0.56403 0.19728 +0.22465 0.56454 0.19801 +0.28427 0.56506 0.19888 +0.34545 0.56560 0.19988 +0.40765 0.56615 0.20100 +0.47033 0.56670 0.20223 +0.53296 0.56725 0.20356 +0.59501 0.56780 0.20497 +0.65595 0.56834 0.20644 +0.71525 0.56886 0.20796 +0.77239 0.56937 0.20949 +0.82683 0.56985 0.21101 +0.87805 0.57030 0.21249 +0.92553 0.57072 0.21391 +0.01384 0.62996 0.19808 +0.06167 0.63038 0.19877 +0.11321 0.63084 0.19958 +0.16793 0.63132 0.20052 +0.22529 0.63182 0.20160 +0.28474 0.63235 0.20281 +0.34575 0.63289 0.20413 +0.40779 0.63343 0.20558 +0.47032 0.63398 0.20712 +0.53280 0.63454 0.20875 +0.59472 0.63508 0.21044 +0.65554 0.63562 0.21218 +0.71473 0.63614 0.21394 +0.77177 0.63665 0.21570 +0.82613 0.63713 0.21742 +0.87728 0.63758 0.21908 +0.92469 0.63800 0.22066 +0.01448 0.69609 0.20159 +0.06217 0.69651 0.20254 +0.11358 0.69696 0.20363 +0.16816 0.69744 0.20486 +0.22537 0.69795 0.20622 +0.28468 0.69847 0.20772 +0.34556 0.69901 0.20933 +0.40747 0.69956 0.21104 +0.46988 0.70011 0.21285 +0.53225 0.70066 0.21473 +0.59407 0.70121 0.21665 +0.65480 0.70174 0.21861 +0.71391 0.70227 0.22056 +0.77088 0.70277 0.22250 +0.82518 0.70325 0.22438 +0.87628 0.70371 0.22618 +0.92366 0.70413 0.22785 +0.01458 0.76047 0.20605 +0.06216 0.76089 0.20723 +0.11345 0.76135 0.20855 +0.16792 0.76183 0.21002 +0.22502 0.76233 0.21163 +0.28422 0.76286 0.21336 +0.34500 0.76339 0.21520 +0.40681 0.76394 0.21714 +0.46913 0.76449 0.21916 +0.53143 0.76504 0.22124 +0.59318 0.76559 0.22335 +0.65385 0.76613 0.22547 +0.71291 0.76665 0.22756 +0.76987 0.76716 0.22956 +0.82418 0.76764 0.23143 +0.87531 0.76809 0.23318 +0.92274 0.76851 0.23477 +0.01426 0.82254 0.21120 +0.06176 0.82296 0.21257 +0.11297 0.82342 0.21409 +0.16735 0.82390 0.21576 +0.22436 0.82440 0.21756 +0.28349 0.82493 0.21948 +0.34419 0.82546 0.22151 +0.40594 0.82601 0.22362 +0.46820 0.82656 0.22581 +0.53046 0.82711 0.22801 +0.59220 0.82766 0.23016 +0.65290 0.82820 0.23225 +0.71201 0.82872 0.23425 +0.76903 0.82923 0.23614 +0.82340 0.82971 0.23791 +0.87460 0.83016 0.23953 +0.92210 0.83058 0.24099 +0.01367 0.88172 0.21678 +0.06110 0.88214 0.21830 +0.11225 0.88259 0.21997 +0.16657 0.88307 0.22180 +0.22353 0.88357 0.22375 +0.28260 0.88410 0.22582 +0.34327 0.88464 0.22796 +0.40501 0.88518 0.23012 +0.46730 0.88573 0.23227 +0.52960 0.88629 0.23438 +0.59141 0.88683 0.23642 +0.65217 0.88737 0.23839 +0.71137 0.88789 0.24025 +0.76846 0.88840 0.24198 +0.82293 0.88888 0.24359 +0.87422 0.88933 0.24504 +0.92181 0.88975 0.24634 +0.01291 0.93741 0.22253 +0.06030 0.93783 0.22416 +0.11141 0.93829 0.22596 +0.16569 0.93877 0.22788 +0.22265 0.93927 0.22987 +0.28175 0.93980 0.23191 +0.34245 0.94033 0.23398 +0.40425 0.94088 0.23603 +0.46661 0.94143 0.23806 +0.52899 0.94198 0.24003 +0.59088 0.94253 0.24192 +0.65174 0.94307 0.24371 +0.71104 0.94359 0.24539 +0.76824 0.94410 0.24693 +0.82281 0.94458 0.24833 +0.87422 0.94503 0.24959 +0.92191 0.94546 0.25069 +0.01210 0.98906 0.22818 +0.05949 0.98948 0.22984 +0.11061 0.98993 0.23161 +0.16493 0.99041 0.23347 +0.22193 0.99092 0.23538 +0.28108 0.99144 0.23732 +0.34186 0.99198 0.23926 +0.40373 0.99252 0.24118 +0.46617 0.99308 0.24305 +0.52866 0.99363 0.24484 +0.59065 0.99418 0.24654 +0.65162 0.99471 0.24813 +0.71104 0.99524 0.24959 +0.76836 0.99575 0.25092 +0.82306 0.99623 0.25209 +0.87458 0.99668 0.25313 +0.92240 0.99710 0.25401 +0.00000 0.00069 0.25649 +0.03968 0.00111 0.25684 +0.09157 0.00157 0.25718 +0.14670 0.00205 0.25751 +0.20456 0.00256 0.25780 +0.26458 0.00308 0.25806 +0.32625 0.00362 0.25828 +0.38901 0.00417 0.25846 +0.45233 0.00473 0.25860 +0.51566 0.00528 0.25870 +0.57846 0.00583 0.25876 +0.64020 0.00637 0.25879 +0.70033 0.00690 0.25878 +0.75830 0.00741 0.25875 +0.81358 0.00789 0.25869 +0.86561 0.00835 0.25862 +0.91387 0.00877 0.25854 +0.00000 0.05234 0.25762 +0.04135 0.05276 0.25786 +0.09327 0.05322 0.25809 +0.14845 0.05370 0.25830 +0.20635 0.05421 0.25848 +0.26642 0.05473 0.25863 +0.32812 0.05528 0.25874 +0.39092 0.05583 0.25881 +0.45428 0.05638 0.25885 +0.51764 0.05693 0.25886 +0.58048 0.05748 0.25883 +0.64225 0.05803 0.25878 +0.70240 0.05855 0.25870 +0.76039 0.05906 0.25861 +0.81569 0.05954 0.25850 +0.86774 0.06000 0.25838 +0.91601 0.06042 0.25827 +0.00000 0.10805 0.25844 +0.04328 0.10847 0.25859 +0.09525 0.10892 0.25871 +0.15047 0.10941 0.25881 +0.20840 0.10991 0.25889 +0.26851 0.11044 0.25893 +0.33025 0.11098 0.25894 +0.39308 0.11153 0.25892 +0.45647 0.11209 0.25887 +0.51987 0.11264 0.25880 +0.58273 0.11319 0.25870 +0.64452 0.11373 0.25858 +0.70469 0.11426 0.25844 +0.76271 0.11477 0.25830 +0.81802 0.11525 0.25815 +0.87008 0.11570 0.25800 +0.91836 0.11613 0.25785 +0.00000 0.16723 0.25894 +0.04548 0.16765 0.25899 +0.09747 0.16810 0.25902 +0.15273 0.16859 0.25903 +0.21070 0.16910 0.25901 +0.27084 0.16962 0.25896 +0.33261 0.17016 0.25889 +0.39547 0.17071 0.25879 +0.45889 0.17127 0.25867 +0.52231 0.17182 0.25852 +0.58519 0.17237 0.25837 +0.64700 0.17291 0.25820 +0.70719 0.17344 0.25802 +0.76521 0.17395 0.25784 +0.82053 0.17443 0.25766 +0.87261 0.17489 0.25749 +0.92089 0.17531 0.25734 +0.00000 0.22931 0.25911 +0.04790 0.22973 0.25908 +0.09993 0.23018 0.25903 +0.15521 0.23067 0.25896 +0.21320 0.23117 0.25886 +0.27337 0.23170 0.25874 +0.33517 0.23224 0.25860 +0.39805 0.23279 0.25844 +0.46149 0.23335 0.25827 +0.52492 0.23390 0.25808 +0.58782 0.23445 0.25788 +0.64964 0.23499 0.25768 +0.70984 0.23552 0.25749 +0.76785 0.23603 0.25732 +0.82310 0.23651 0.25727 +0.87505 0.23696 0.25733 +0.92317 0.23739 0.25746 +0.00225 0.29370 0.25897 +0.05051 0.29412 0.25888 +0.10256 0.29458 0.25877 +0.15787 0.29506 0.25864 +0.21588 0.29557 0.25849 +0.27607 0.29610 0.25832 +0.33788 0.29664 0.25813 +0.40078 0.29719 0.25794 +0.46423 0.29774 0.25773 +0.52767 0.29830 0.25752 +0.59054 0.29885 0.25738 +0.65224 0.29939 0.25738 +0.71226 0.29991 0.25752 +0.77005 0.30042 0.25776 +0.82509 0.30090 0.25809 +0.87685 0.30136 0.25850 +0.92480 0.30178 0.25895 +0.00501 0.35983 0.25860 +0.05328 0.36026 0.25846 +0.10535 0.36071 0.25831 +0.16066 0.36119 0.25814 +0.21869 0.36170 0.25796 +0.27889 0.36223 0.25776 +0.34070 0.36277 0.25756 +0.40355 0.36332 0.25746 +0.46685 0.36387 0.25751 +0.53008 0.36443 0.25769 +0.59270 0.36498 0.25801 +0.65417 0.36552 0.25845 +0.71396 0.36604 0.25899 +0.77155 0.36655 0.25962 +0.82640 0.36703 0.26031 +0.87799 0.36748 0.26105 +0.92578 0.36790 0.26179 +0.00786 0.42713 0.25806 +0.05614 0.42755 0.25790 +0.10822 0.42800 0.25773 +0.16352 0.42849 0.25759 +0.22146 0.42899 0.25756 +0.28149 0.42952 0.25766 +0.34308 0.43006 0.25789 +0.40567 0.43061 0.25825 +0.46873 0.43116 0.25874 +0.53172 0.43172 0.25937 +0.59412 0.43226 0.26010 +0.65538 0.43280 0.26094 +0.71497 0.43333 0.26186 +0.77238 0.43383 0.26283 +0.82706 0.43431 0.26385 +0.87850 0.43477 0.26487 +0.92617 0.43519 0.26589 +0.01065 0.49500 0.25766 +0.05881 0.49542 0.25773 +0.11070 0.49587 0.25789 +0.16578 0.49636 0.25816 +0.22349 0.49686 0.25855 +0.28329 0.49739 0.25908 +0.34465 0.49793 0.25973 +0.40702 0.49847 0.26051 +0.46987 0.49903 0.26141 +0.53266 0.49958 0.26242 +0.59486 0.50013 0.26354 +0.65594 0.50067 0.26473 +0.71537 0.50119 0.26598 +0.77262 0.50169 0.26726 +0.82716 0.50218 0.26856 +0.87847 0.50263 0.26985 +0.92603 0.50305 0.27109 +0.01268 0.56286 0.25865 +0.06066 0.56328 0.25906 +0.11236 0.56374 0.25958 +0.16723 0.56422 0.26022 +0.22474 0.56473 0.26100 +0.28435 0.56525 0.26190 +0.34551 0.56579 0.26293 +0.40769 0.56634 0.26408 +0.47035 0.56689 0.26534 +0.53297 0.56744 0.26670 +0.59501 0.56799 0.26814 +0.65594 0.56853 0.26964 +0.71523 0.56905 0.27118 +0.77235 0.56956 0.27273 +0.82679 0.57004 0.27427 +0.87800 0.57049 0.27577 +0.92547 0.57091 0.27721 +0.01393 0.63015 0.26106 +0.06175 0.63057 0.26178 +0.11328 0.63102 0.26262 +0.16799 0.63151 0.26359 +0.22533 0.63201 0.26469 +0.28476 0.63254 0.26593 +0.34576 0.63307 0.26729 +0.40778 0.63362 0.26876 +0.47030 0.63417 0.27033 +0.53277 0.63472 0.27198 +0.59468 0.63527 0.27370 +0.65549 0.63581 0.27546 +0.71468 0.63633 0.27724 +0.77171 0.63684 0.27901 +0.82606 0.63732 0.28075 +0.87720 0.63777 0.28243 +0.92460 0.63819 0.28402 +0.01452 0.69628 0.26468 +0.06220 0.69670 0.26565 +0.11359 0.69715 0.26677 +0.16816 0.69763 0.26802 +0.22536 0.69814 0.26941 +0.28466 0.69866 0.27093 +0.34553 0.69920 0.27257 +0.40742 0.69974 0.27431 +0.46982 0.70030 0.27613 +0.53219 0.70085 0.27803 +0.59400 0.70139 0.27998 +0.65472 0.70193 0.28195 +0.71383 0.70245 0.28393 +0.77079 0.70296 0.28587 +0.82509 0.70344 0.28777 +0.87619 0.70389 0.28957 +0.92357 0.70431 0.29124 +0.01457 0.76066 0.26923 +0.06214 0.76108 0.27043 +0.11342 0.76154 0.27178 +0.16788 0.76202 0.27327 +0.22497 0.76252 0.27490 +0.28417 0.76304 0.27665 +0.34493 0.76358 0.27851 +0.40674 0.76413 0.28047 +0.46905 0.76468 0.28251 +0.53134 0.76523 0.28460 +0.59309 0.76578 0.28673 +0.65375 0.76632 0.28887 +0.71282 0.76684 0.29095 +0.76978 0.76734 0.29294 +0.82410 0.76783 0.29481 +0.87524 0.76828 0.29654 +0.92267 0.76870 0.29812 +0.01422 0.82273 0.27446 +0.06171 0.82315 0.27585 +0.11291 0.82360 0.27739 +0.16728 0.82409 0.27907 +0.22429 0.82459 0.28089 +0.28341 0.82511 0.28283 +0.34411 0.82565 0.28487 +0.40585 0.82620 0.28701 +0.46811 0.82675 0.28920 +0.53037 0.82730 0.29139 +0.59212 0.82785 0.29354 +0.65282 0.82838 0.29562 +0.71194 0.82891 0.29761 +0.76896 0.82941 0.29949 +0.82334 0.82989 0.30123 +0.87455 0.83035 0.30284 +0.92206 0.83077 0.30429 +0.01360 0.88190 0.28010 +0.06103 0.88232 0.28164 +0.11217 0.88278 0.28333 +0.16648 0.88326 0.28516 +0.22344 0.88376 0.28713 +0.28251 0.88429 0.28921 +0.34318 0.88482 0.29135 +0.40492 0.88537 0.29350 +0.46722 0.88592 0.29564 +0.52953 0.88647 0.29773 +0.59134 0.88702 0.29976 +0.65212 0.88756 0.30171 +0.71132 0.88808 0.30355 +0.76843 0.88859 0.30527 +0.82290 0.88907 0.30685 +0.87421 0.88952 0.30829 +0.92181 0.88994 0.30957 +0.01283 0.93760 0.28590 +0.06021 0.93802 0.28755 +0.11131 0.93847 0.28935 +0.16560 0.93895 0.29127 +0.22256 0.93946 0.29325 +0.28166 0.93998 0.29528 +0.34238 0.94052 0.29733 +0.40418 0.94107 0.29938 +0.46655 0.94162 0.30139 +0.52894 0.94217 0.30334 +0.59084 0.94272 0.30521 +0.65171 0.94326 0.30698 +0.71103 0.94378 0.30863 +0.76824 0.94429 0.31015 +0.82283 0.94477 0.31153 +0.87425 0.94522 0.31276 +0.92196 0.94564 0.31383 +0.01201 0.98924 0.29157 +0.05940 0.98966 0.29322 +0.11053 0.99012 0.29499 +0.16486 0.99060 0.29683 +0.22186 0.99110 0.29873 +0.28102 0.99163 0.30065 +0.34181 0.99216 0.30258 +0.40369 0.99271 0.30448 +0.46615 0.99326 0.30632 +0.52864 0.99382 0.30809 +0.59065 0.99436 0.30977 +0.65164 0.99490 0.31133 +0.71107 0.99543 0.31276 +0.76841 0.99593 0.31405 +0.82312 0.99642 0.31520 +0.87466 0.99687 0.31620 +0.92250 0.99729 0.31706 +0.00000 0.00088 0.32169 +0.03989 0.00131 0.32203 +0.09178 0.00176 0.32236 +0.14692 0.00225 0.32266 +0.20478 0.00275 0.32294 +0.26482 0.00328 0.32319 +0.32649 0.00382 0.32340 +0.38925 0.00437 0.32356 +0.45257 0.00492 0.32369 +0.51591 0.00548 0.32377 +0.57872 0.00603 0.32382 +0.64046 0.00657 0.32384 +0.70059 0.00710 0.32382 +0.75857 0.00760 0.32378 +0.81385 0.00809 0.32372 +0.86588 0.00854 0.32364 +0.91414 0.00896 0.32356 +0.00000 0.05254 0.32277 +0.04157 0.05296 0.32300 +0.09351 0.05341 0.32322 +0.14869 0.05390 0.32342 +0.20659 0.05440 0.32358 +0.26666 0.05493 0.32372 +0.32837 0.05547 0.32382 +0.39118 0.05602 0.32388 +0.45454 0.05658 0.32391 +0.51791 0.05713 0.32390 +0.58075 0.05768 0.32387 +0.64252 0.05822 0.32380 +0.70267 0.05875 0.32372 +0.76067 0.05925 0.32362 +0.81596 0.05974 0.32350 +0.86802 0.06019 0.32338 +0.91629 0.06062 0.32326 +0.00000 0.10824 0.32356 +0.04353 0.10866 0.32369 +0.09550 0.10912 0.32380 +0.15072 0.10960 0.32389 +0.20866 0.11011 0.32395 +0.26877 0.11064 0.32399 +0.33051 0.11118 0.32399 +0.39335 0.11173 0.32396 +0.45674 0.11228 0.32390 +0.52014 0.11284 0.32382 +0.58301 0.11339 0.32371 +0.64480 0.11393 0.32358 +0.70497 0.11445 0.32344 +0.76299 0.11496 0.32329 +0.81830 0.11544 0.32314 +0.87037 0.11590 0.32298 +0.91865 0.11632 0.32284 +0.00000 0.16742 0.32401 +0.04573 0.16785 0.32405 +0.09773 0.16830 0.32408 +0.15299 0.16878 0.32407 +0.21096 0.16929 0.32404 +0.27110 0.16982 0.32399 +0.33288 0.17036 0.32391 +0.39575 0.17091 0.32380 +0.45916 0.17146 0.32367 +0.52259 0.17202 0.32352 +0.58547 0.17257 0.32336 +0.64728 0.17311 0.32319 +0.70747 0.17364 0.32301 +0.76550 0.17414 0.32283 +0.82082 0.17463 0.32265 +0.87289 0.17508 0.32248 +0.92117 0.17550 0.32232 +0.00000 0.22950 0.32415 +0.04816 0.22992 0.32411 +0.10020 0.23038 0.32405 +0.15548 0.23086 0.32397 +0.21348 0.23137 0.32387 +0.27365 0.23190 0.32375 +0.33545 0.23244 0.32360 +0.39833 0.23299 0.32344 +0.46177 0.23354 0.32326 +0.52521 0.23410 0.32306 +0.58811 0.23465 0.32287 +0.64993 0.23519 0.32267 +0.71012 0.23571 0.32247 +0.76812 0.23622 0.32234 +0.82334 0.23670 0.32233 +0.87527 0.23716 0.32242 +0.92338 0.23758 0.32259 +0.00253 0.29390 0.32399 +0.05079 0.29432 0.32389 +0.10284 0.29477 0.32377 +0.15815 0.29526 0.32364 +0.21617 0.29576 0.32348 +0.27635 0.29629 0.32331 +0.33817 0.29683 0.32312 +0.40107 0.29738 0.32292 +0.46451 0.29794 0.32271 +0.52795 0.29849 0.32251 +0.59079 0.29904 0.32242 +0.65248 0.29958 0.32246 +0.71247 0.30011 0.32264 +0.77024 0.30061 0.32292 +0.82526 0.30110 0.32329 +0.87700 0.30155 0.32373 +0.92493 0.30197 0.32422 +0.00529 0.36003 0.32359 +0.05356 0.36045 0.32345 +0.10563 0.36091 0.32330 +0.16095 0.36139 0.32313 +0.21898 0.36190 0.32294 +0.27917 0.36242 0.32274 +0.34098 0.36296 0.32256 +0.40380 0.36351 0.32251 +0.46708 0.36407 0.32260 +0.53028 0.36462 0.32283 +0.59287 0.36517 0.32319 +0.65432 0.36571 0.32367 +0.71410 0.36624 0.32425 +0.77166 0.36674 0.32492 +0.82650 0.36722 0.32564 +0.87807 0.36768 0.32640 +0.92585 0.36810 0.32718 +0.00815 0.42732 0.32304 +0.05643 0.42774 0.32289 +0.10850 0.42820 0.32272 +0.16378 0.42868 0.32262 +0.22170 0.42919 0.32263 +0.28171 0.42971 0.32277 +0.34327 0.43025 0.32304 +0.40584 0.43080 0.32344 +0.46888 0.43136 0.32398 +0.53185 0.43191 0.32464 +0.59422 0.43246 0.32542 +0.65547 0.43300 0.32629 +0.71505 0.43352 0.32724 +0.77243 0.43403 0.32825 +0.82710 0.43451 0.32929 +0.87853 0.43496 0.33035 +0.92618 0.43538 0.33138 +0.01089 0.49519 0.32273 +0.05903 0.49561 0.32283 +0.11090 0.49607 0.32303 +0.16596 0.49655 0.32334 +0.22365 0.49706 0.32377 +0.28343 0.49758 0.32433 +0.34477 0.49812 0.32502 +0.40712 0.49867 0.32583 +0.46995 0.49922 0.32677 +0.53272 0.49977 0.32782 +0.59490 0.50032 0.32897 +0.65597 0.50086 0.33019 +0.71538 0.50138 0.33147 +0.77262 0.50189 0.33279 +0.82715 0.50237 0.33411 +0.87845 0.50282 0.33541 +0.92600 0.50324 0.33668 +0.01284 0.56306 0.32386 +0.06080 0.56348 0.32430 +0.11248 0.56393 0.32486 +0.16734 0.56442 0.32553 +0.22483 0.56492 0.32634 +0.28442 0.56545 0.32728 +0.34557 0.56598 0.32834 +0.40773 0.56653 0.32952 +0.47038 0.56708 0.33082 +0.53298 0.56764 0.33221 +0.59500 0.56818 0.33367 +0.65592 0.56872 0.33520 +0.71520 0.56925 0.33677 +0.77231 0.56975 0.33834 +0.82674 0.57023 0.33990 +0.87794 0.57068 0.34142 +0.92541 0.57110 0.34287 +0.01402 0.63034 0.32641 +0.06182 0.63077 0.32715 +0.11334 0.63122 0.32802 +0.16803 0.63170 0.32902 +0.22536 0.63221 0.33015 +0.28478 0.63273 0.33142 +0.34577 0.63327 0.33280 +0.40777 0.63382 0.33430 +0.47028 0.63437 0.33590 +0.53274 0.63492 0.33758 +0.59464 0.63547 0.33932 +0.65544 0.63600 0.34111 +0.71461 0.63653 0.34291 +0.77163 0.63703 0.34470 +0.82598 0.63751 0.34646 +0.87711 0.63797 0.34815 +0.92452 0.63839 0.34975 +0.01455 0.69647 0.33013 +0.06222 0.69689 0.33113 +0.11360 0.69734 0.33227 +0.16816 0.69783 0.33355 +0.22535 0.69833 0.33497 +0.28463 0.69885 0.33651 +0.34549 0.69939 0.33817 +0.40738 0.69994 0.33994 +0.46976 0.70049 0.34179 +0.53212 0.70104 0.34371 +0.59392 0.70159 0.34568 +0.65464 0.70213 0.34767 +0.71374 0.70265 0.34966 +0.77070 0.70315 0.35162 +0.82499 0.70364 0.35353 +0.87609 0.70409 0.35533 +0.92348 0.70451 0.35699 +0.01456 0.76086 0.33478 +0.06212 0.76128 0.33600 +0.11339 0.76173 0.33737 +0.16784 0.76221 0.33889 +0.22492 0.76272 0.34054 +0.28411 0.76324 0.34231 +0.34486 0.76378 0.34419 +0.40666 0.76432 0.34617 +0.46897 0.76488 0.34823 +0.53125 0.76543 0.35034 +0.59299 0.76597 0.35248 +0.65365 0.76651 0.35462 +0.71273 0.76703 0.35670 +0.76969 0.76754 0.35868 +0.82402 0.76802 0.36054 +0.87516 0.76847 0.36226 +0.92260 0.76889 0.36383 +0.01417 0.82293 0.34009 +0.06165 0.82335 0.34150 +0.11284 0.82380 0.34305 +0.16721 0.82428 0.34476 +0.22421 0.82478 0.34659 +0.28333 0.82531 0.34855 +0.34402 0.82585 0.35061 +0.40575 0.82639 0.35276 +0.46801 0.82694 0.35496 +0.53028 0.82750 0.35714 +0.59203 0.82804 0.35928 +0.65274 0.82858 0.36135 +0.71187 0.82910 0.36332 +0.76890 0.82961 0.36519 +0.82329 0.83009 0.36692 +0.87451 0.83054 0.36851 +0.92202 0.83096 0.36994 +0.01353 0.88210 0.34580 +0.06095 0.88252 0.34735 +0.11208 0.88297 0.34905 +0.16639 0.88345 0.35090 +0.22334 0.88396 0.35288 +0.28241 0.88448 0.35497 +0.34308 0.88502 0.35710 +0.40483 0.88556 0.35924 +0.46714 0.88612 0.36137 +0.52946 0.88667 0.36345 +0.59128 0.88722 0.36546 +0.65206 0.88775 0.36739 +0.71128 0.88828 0.36921 +0.76840 0.88878 0.37091 +0.82288 0.88926 0.37247 +0.87420 0.88972 0.37388 +0.92181 0.89014 0.37514 +0.01273 0.93780 0.35164 +0.06012 0.93822 0.35330 +0.11122 0.93867 0.35511 +0.16551 0.93915 0.35702 +0.22247 0.93965 0.35899 +0.28158 0.94018 0.36102 +0.34231 0.94072 0.36305 +0.40412 0.94126 0.36508 +0.46649 0.94181 0.36707 +0.52890 0.94237 0.36900 +0.59081 0.94291 0.37085 +0.65170 0.94345 0.37260 +0.71102 0.94398 0.37422 +0.76825 0.94448 0.37571 +0.82285 0.94496 0.37707 +0.87429 0.94542 0.37827 +0.92201 0.94584 0.37932 +0.01192 0.98944 0.35732 +0.05931 0.98986 0.35897 +0.11044 0.99031 0.36072 +0.16478 0.99079 0.36255 +0.22180 0.99130 0.36444 +0.28096 0.99182 0.36635 +0.34176 0.99236 0.36825 +0.40365 0.99291 0.37013 +0.46612 0.99346 0.37195 +0.52863 0.99401 0.37370 +0.59065 0.99456 0.37534 +0.65166 0.99510 0.37687 +0.71110 0.99562 0.37828 +0.76846 0.99613 0.37954 +0.82319 0.99661 0.38065 +0.87475 0.99707 0.38163 +0.92260 0.99749 0.38245 +0.00000 0.00109 0.38865 +0.04011 0.00151 0.38897 +0.09200 0.00196 0.38928 +0.14715 0.00245 0.38957 +0.20502 0.00295 0.38984 +0.26506 0.00348 0.39007 +0.32673 0.00402 0.39026 +0.38950 0.00457 0.39041 +0.45283 0.00513 0.39053 +0.51617 0.00568 0.39060 +0.57899 0.00623 0.39064 +0.64073 0.00677 0.39064 +0.70086 0.00730 0.39061 +0.75884 0.00780 0.39056 +0.81412 0.00829 0.39049 +0.86616 0.00874 0.39041 +0.91442 0.00917 0.39032 +0.00000 0.05274 0.38968 +0.04181 0.05316 0.38990 +0.09375 0.05361 0.39010 +0.14893 0.05410 0.39029 +0.20684 0.05460 0.39044 +0.26692 0.05513 0.39056 +0.32863 0.05567 0.39065 +0.39144 0.05622 0.39070 +0.45480 0.05678 0.39072 +0.51818 0.05733 0.39070 +0.58102 0.05788 0.39065 +0.64279 0.05842 0.39058 +0.70295 0.05895 0.39049 +0.76095 0.05946 0.39038 +0.81625 0.05994 0.39026 +0.86831 0.06039 0.39014 +0.91658 0.06082 0.39001 +0.00000 0.10844 0.39042 +0.04378 0.10886 0.39054 +0.09575 0.10932 0.39064 +0.15098 0.10980 0.39072 +0.20892 0.11031 0.39077 +0.26903 0.11084 0.39080 +0.33078 0.11138 0.39079 +0.39362 0.11193 0.39075 +0.45702 0.11248 0.39068 +0.52042 0.11304 0.39059 +0.58329 0.11359 0.39047 +0.64508 0.11413 0.39034 +0.70526 0.11465 0.39019 +0.76328 0.11516 0.39004 +0.81859 0.11565 0.38988 +0.87066 0.11610 0.38972 +0.91894 0.11652 0.38957 +0.00000 0.16762 0.39084 +0.04599 0.16805 0.39087 +0.09800 0.16850 0.39088 +0.15326 0.16899 0.39087 +0.21124 0.16949 0.39083 +0.27138 0.17002 0.39077 +0.33316 0.17056 0.39068 +0.39603 0.17111 0.39056 +0.45945 0.17166 0.39043 +0.52287 0.17222 0.39028 +0.58576 0.17277 0.39011 +0.64757 0.17331 0.38993 +0.70776 0.17384 0.38975 +0.76579 0.17434 0.38956 +0.82111 0.17483 0.38938 +0.87318 0.17528 0.38921 +0.92145 0.17571 0.38908 +0.00020 0.22970 0.39094 +0.04844 0.23012 0.39089 +0.10047 0.23058 0.39083 +0.15576 0.23106 0.39074 +0.21376 0.23157 0.39063 +0.27393 0.23210 0.39050 +0.33573 0.23264 0.39035 +0.39862 0.23319 0.39018 +0.46206 0.23374 0.39000 +0.52550 0.23430 0.38980 +0.58840 0.23485 0.38960 +0.65022 0.23539 0.38940 +0.71041 0.23591 0.38921 +0.76838 0.23642 0.38913 +0.82358 0.23691 0.38916 +0.87549 0.23736 0.38929 +0.92358 0.23778 0.38949 +0.00281 0.29410 0.39075 +0.05107 0.29452 0.39065 +0.10313 0.29497 0.39053 +0.15844 0.29546 0.39039 +0.21646 0.29597 0.39023 +0.27664 0.29649 0.39005 +0.33846 0.29703 0.38986 +0.40136 0.29758 0.38966 +0.46480 0.29814 0.38945 +0.52823 0.29869 0.38927 +0.59105 0.29924 0.38922 +0.65271 0.29978 0.38932 +0.71267 0.30031 0.38953 +0.77042 0.30081 0.38986 +0.82542 0.30130 0.39027 +0.87715 0.30175 0.39074 +0.92506 0.30217 0.39125 +0.00558 0.36023 0.39034 +0.05385 0.36065 0.39020 +0.10592 0.36111 0.39004 +0.16124 0.36159 0.38986 +0.21927 0.36210 0.38968 +0.27947 0.36263 0.38948 +0.34125 0.36317 0.38934 +0.40404 0.36372 0.38933 +0.46730 0.36427 0.38947 +0.53048 0.36482 0.38974 +0.59305 0.36537 0.39015 +0.65448 0.36591 0.39067 +0.71423 0.36644 0.39128 +0.77178 0.36694 0.39199 +0.82659 0.36742 0.39274 +0.87815 0.36788 0.39354 +0.92592 0.36830 0.39434 +0.00844 0.42752 0.38978 +0.05672 0.42794 0.38962 +0.10878 0.42840 0.38947 +0.16404 0.42888 0.38941 +0.22193 0.42939 0.38947 +0.28192 0.42992 0.38965 +0.34346 0.43046 0.38996 +0.40600 0.43100 0.39041 +0.46902 0.43156 0.39099 +0.53197 0.43211 0.39169 +0.59433 0.43266 0.39250 +0.65555 0.43320 0.39341 +0.71511 0.43372 0.39440 +0.77248 0.43423 0.39544 +0.82714 0.43471 0.39651 +0.87855 0.43516 0.39759 +0.92619 0.43558 0.39865 +0.01113 0.49539 0.38957 +0.05925 0.49581 0.38970 +0.11110 0.49627 0.38994 +0.16613 0.49675 0.39028 +0.22380 0.49726 0.39075 +0.28357 0.49778 0.39135 +0.34488 0.49832 0.39208 +0.40722 0.49887 0.39294 +0.47002 0.49942 0.39391 +0.53278 0.49997 0.39500 +0.59494 0.50052 0.39618 +0.65599 0.50106 0.39743 +0.71539 0.50158 0.39874 +0.77262 0.50209 0.40009 +0.82714 0.50257 0.40143 +0.87843 0.50302 0.40276 +0.92597 0.50344 0.40404 +0.01300 0.56326 0.39085 +0.06094 0.56368 0.39132 +0.11260 0.56413 0.39191 +0.16745 0.56462 0.39262 +0.22492 0.56512 0.39346 +0.28449 0.56565 0.39443 +0.34562 0.56619 0.39553 +0.40776 0.56673 0.39674 +0.47040 0.56729 0.39807 +0.53298 0.56784 0.39949 +0.59499 0.56838 0.40099 +0.65590 0.56892 0.40254 +0.71516 0.56945 0.40413 +0.77227 0.56995 0.40573 +0.82668 0.57043 0.40732 +0.87788 0.57088 0.40885 +0.92534 0.57130 0.41032 +0.01411 0.63055 0.39353 +0.06190 0.63097 0.39429 +0.11340 0.63142 0.39519 +0.16808 0.63190 0.39622 +0.22539 0.63241 0.39739 +0.28480 0.63293 0.39868 +0.34576 0.63347 0.40010 +0.40776 0.63402 0.40163 +0.47025 0.63457 0.40325 +0.53270 0.63512 0.40496 +0.59459 0.63567 0.40673 +0.65538 0.63620 0.40853 +0.71454 0.63673 0.41035 +0.77156 0.63723 0.41217 +0.82589 0.63771 0.41394 +0.87702 0.63817 0.41565 +0.92442 0.63858 0.41726 +0.01458 0.69667 0.39736 +0.06224 0.69709 0.39839 +0.11361 0.69754 0.39956 +0.16815 0.69803 0.40086 +0.22533 0.69853 0.40230 +0.28460 0.69905 0.40387 +0.34545 0.69959 0.40556 +0.40732 0.70014 0.40735 +0.46970 0.70069 0.40922 +0.53205 0.70124 0.41116 +0.59384 0.70179 0.41315 +0.65455 0.70233 0.41516 +0.71365 0.70285 0.41717 +0.77060 0.70335 0.41914 +0.82489 0.70383 0.42106 +0.87599 0.70429 0.42286 +0.92339 0.70471 0.42451 +0.01454 0.76106 0.40211 +0.06209 0.76148 0.40335 +0.11336 0.76193 0.40475 +0.16779 0.76241 0.40628 +0.22487 0.76292 0.40795 +0.28404 0.76344 0.40975 +0.34479 0.76398 0.41165 +0.40658 0.76452 0.41365 +0.46888 0.76508 0.41573 +0.53116 0.76563 0.41785 +0.59289 0.76617 0.42001 +0.65356 0.76671 0.42216 +0.71264 0.76723 0.42422 +0.76961 0.76774 0.42619 +0.82393 0.76822 0.42804 +0.87509 0.76867 0.42975 +0.92253 0.76909 0.43131 +0.01412 0.82313 0.40750 +0.06159 0.82355 0.40892 +0.11278 0.82400 0.41050 +0.16713 0.82448 0.41222 +0.22413 0.82498 0.41407 +0.28324 0.82551 0.41605 +0.34392 0.82605 0.41813 +0.40565 0.82659 0.42029 +0.46791 0.82714 0.42249 +0.53018 0.82770 0.42467 +0.59194 0.82824 0.42679 +0.65266 0.82878 0.42885 +0.71180 0.82930 0.43081 +0.76883 0.82981 0.43265 +0.82323 0.83029 0.43437 +0.87446 0.83074 0.43594 +0.92199 0.83116 0.43736 +0.01345 0.88230 0.41327 +0.06086 0.88272 0.41483 +0.11199 0.88317 0.41655 +0.16629 0.88365 0.41842 +0.22324 0.88416 0.42042 +0.28231 0.88468 0.42250 +0.34299 0.88522 0.42463 +0.40475 0.88576 0.42675 +0.46706 0.88632 0.42887 +0.52939 0.88687 0.43093 +0.59122 0.88742 0.43293 +0.65201 0.88795 0.43484 +0.71124 0.88848 0.43664 +0.76837 0.88898 0.43831 +0.82287 0.88946 0.43985 +0.87420 0.88992 0.44124 +0.92182 0.89034 0.44248 +0.01264 0.93800 0.41917 +0.06002 0.93842 0.42084 +0.11112 0.93887 0.42264 +0.16542 0.93935 0.42454 +0.22239 0.93985 0.42651 +0.28150 0.94038 0.42852 +0.34223 0.94092 0.43054 +0.40405 0.94146 0.43255 +0.46644 0.94201 0.43452 +0.52886 0.94257 0.43643 +0.59078 0.94311 0.43826 +0.65168 0.94365 0.43998 +0.71102 0.94418 0.44158 +0.76827 0.94468 0.44304 +0.82288 0.94516 0.44436 +0.87433 0.94562 0.44554 +0.92207 0.94604 0.44656 +0.01182 0.98964 0.42485 +0.05922 0.99006 0.42648 +0.11036 0.99051 0.42822 +0.16470 0.99099 0.43004 +0.22173 0.99150 0.43191 +0.28091 0.99202 0.43380 +0.34171 0.99256 0.43569 +0.40362 0.99311 0.43755 +0.46610 0.99366 0.43934 +0.52862 0.99421 0.44106 +0.59066 0.99476 0.44268 +0.65168 0.99530 0.44418 +0.71115 0.99582 0.44555 +0.76853 0.99633 0.44678 +0.82327 0.99681 0.44786 +0.87485 0.99727 0.44880 +0.92272 0.99769 0.44959 +0.00000 0.00129 0.45677 +0.04033 0.00171 0.45708 +0.09223 0.00217 0.45737 +0.14739 0.00265 0.45765 +0.20526 0.00316 0.45790 +0.26530 0.00368 0.45812 +0.32698 0.00423 0.45829 +0.38976 0.00478 0.45843 +0.45309 0.00533 0.45853 +0.51644 0.00588 0.45859 +0.57926 0.00643 0.45862 +0.64101 0.00698 0.45861 +0.70114 0.00750 0.45857 +0.75912 0.00801 0.45851 +0.81441 0.00849 0.45844 +0.86645 0.00895 0.45835 +0.91471 0.00937 0.45825 +0.00000 0.05294 0.45776 +0.04205 0.05336 0.45796 +0.09399 0.05382 0.45815 +0.14919 0.05430 0.45832 +0.20709 0.05481 0.45846 +0.26718 0.05534 0.45857 +0.32890 0.05588 0.45864 +0.39171 0.05643 0.45868 +0.45508 0.05698 0.45869 +0.51845 0.05754 0.45866 +0.58130 0.05809 0.45861 +0.64308 0.05863 0.45853 +0.70324 0.05915 0.45843 +0.76124 0.05966 0.45831 +0.81654 0.06014 0.45819 +0.86860 0.06060 0.45806 +0.91687 0.06102 0.45793 +0.00000 0.10865 0.45845 +0.04403 0.10907 0.45856 +0.09601 0.10952 0.45865 +0.15124 0.11001 0.45872 +0.20919 0.11052 0.45876 +0.26931 0.11104 0.45877 +0.33106 0.11158 0.45875 +0.39390 0.11213 0.45870 +0.45730 0.11269 0.45863 +0.52071 0.11324 0.45853 +0.58358 0.11379 0.45840 +0.64537 0.11433 0.45826 +0.70555 0.11486 0.45811 +0.76357 0.11537 0.45795 +0.81889 0.11585 0.45779 +0.87096 0.11631 0.45763 +0.91924 0.11673 0.45748 +0.00000 0.16783 0.45883 +0.04626 0.16825 0.45885 +0.09827 0.16871 0.45886 +0.15354 0.16919 0.45883 +0.21152 0.16970 0.45879 +0.27167 0.17022 0.45872 +0.33345 0.17076 0.45862 +0.39632 0.17131 0.45850 +0.45974 0.17187 0.45835 +0.52317 0.17242 0.45820 +0.58606 0.17297 0.45802 +0.64787 0.17351 0.45784 +0.70806 0.17404 0.45766 +0.76609 0.17455 0.45747 +0.82141 0.17503 0.45729 +0.87348 0.17549 0.45712 +0.92173 0.17591 0.45703 +0.00048 0.22991 0.45890 +0.04872 0.23033 0.45884 +0.10076 0.23078 0.45877 +0.15605 0.23127 0.45868 +0.21405 0.23178 0.45856 +0.27422 0.23230 0.45843 +0.33603 0.23284 0.45827 +0.39892 0.23339 0.45810 +0.46235 0.23395 0.45791 +0.52580 0.23450 0.45771 +0.58870 0.23505 0.45751 +0.65052 0.23559 0.45731 +0.71069 0.23612 0.45714 +0.76864 0.23663 0.45710 +0.82382 0.23711 0.45718 +0.87571 0.23756 0.45735 +0.92378 0.23799 0.45758 +0.00310 0.29430 0.45868 +0.05136 0.29472 0.45858 +0.10342 0.29518 0.45845 +0.15873 0.29566 0.45830 +0.21675 0.29617 0.45814 +0.27694 0.29670 0.45796 +0.33876 0.29724 0.45777 +0.40166 0.29779 0.45756 +0.46510 0.29834 0.45735 +0.52851 0.29890 0.45721 +0.59130 0.29945 0.45721 +0.65293 0.29999 0.45735 +0.71288 0.30051 0.45761 +0.77060 0.30102 0.45798 +0.82558 0.30150 0.45842 +0.87729 0.30196 0.45893 +0.92519 0.30238 0.45948 +0.00587 0.36043 0.45825 +0.05415 0.36086 0.45811 +0.10622 0.36131 0.45795 +0.16154 0.36180 0.45777 +0.21957 0.36230 0.45758 +0.27976 0.36283 0.45739 +0.34152 0.36337 0.45729 +0.40429 0.36392 0.45734 +0.46752 0.36447 0.45752 +0.53067 0.36503 0.45784 +0.59322 0.36558 0.45829 +0.65462 0.36612 0.45885 +0.71436 0.36664 0.45951 +0.77189 0.36715 0.46024 +0.82668 0.36763 0.46104 +0.87823 0.36808 0.46186 +0.92598 0.36850 0.46269 +0.00874 0.42773 0.45769 +0.05702 0.42815 0.45753 +0.10906 0.42860 0.45741 +0.16429 0.42909 0.45740 +0.22216 0.42959 0.45750 +0.28213 0.43012 0.45772 +0.34364 0.43066 0.45808 +0.40617 0.43121 0.45857 +0.46916 0.43176 0.45919 +0.53209 0.43231 0.45993 +0.59443 0.43286 0.46078 +0.65563 0.43340 0.46173 +0.71517 0.43393 0.46275 +0.77253 0.43443 0.46382 +0.82717 0.43491 0.46492 +0.87857 0.43537 0.46603 +0.92620 0.43579 0.46711 +0.01136 0.49560 0.45759 +0.05946 0.49602 0.45776 +0.11129 0.49647 0.45803 +0.16631 0.49696 0.45842 +0.22396 0.49746 0.45893 +0.28370 0.49799 0.45957 +0.34500 0.49853 0.46034 +0.40731 0.49907 0.46123 +0.47010 0.49963 0.46224 +0.53283 0.50018 0.46336 +0.59498 0.50073 0.46458 +0.65601 0.50126 0.46586 +0.71540 0.50179 0.46720 +0.77261 0.50229 0.46857 +0.82712 0.50277 0.46995 +0.87840 0.50323 0.47130 +0.92593 0.50365 0.47260 +0.01315 0.56346 0.45903 +0.06108 0.56388 0.45953 +0.11272 0.56434 0.46015 +0.16755 0.56482 0.46089 +0.22500 0.56533 0.46177 +0.28456 0.56585 0.46277 +0.34566 0.56639 0.46391 +0.40780 0.56694 0.46516 +0.47041 0.56749 0.46651 +0.53298 0.56804 0.46797 +0.59498 0.56859 0.46949 +0.65587 0.56913 0.47108 +0.71513 0.56965 0.47269 +0.77222 0.57015 0.47431 +0.82663 0.57064 0.47592 +0.87782 0.57109 0.47747 +0.92526 0.57151 0.47896 +0.01419 0.63075 0.46183 +0.06197 0.63117 0.46263 +0.11345 0.63162 0.46356 +0.16812 0.63210 0.46462 +0.22541 0.63261 0.46581 +0.28480 0.63313 0.46714 +0.34576 0.63367 0.46858 +0.40774 0.63422 0.47014 +0.47022 0.63477 0.47179 +0.53266 0.63532 0.47353 +0.59453 0.63587 0.47532 +0.65531 0.63641 0.47715 +0.71447 0.63693 0.47899 +0.77148 0.63743 0.48082 +0.82581 0.63792 0.48261 +0.87693 0.63837 0.48433 +0.92433 0.63879 0.48596 +0.01461 0.69687 0.46579 +0.06225 0.69729 0.46684 +0.11361 0.69775 0.46803 +0.16814 0.69823 0.46936 +0.22530 0.69873 0.47083 +0.28457 0.69926 0.47242 +0.34540 0.69980 0.47413 +0.40727 0.70034 0.47594 +0.46963 0.70089 0.47784 +0.53198 0.70145 0.47981 +0.59376 0.70199 0.48181 +0.65446 0.70253 0.48384 +0.71355 0.70305 0.48586 +0.77050 0.70356 0.48786 +0.82479 0.70404 0.48978 +0.87590 0.70449 0.49157 +0.92329 0.70491 0.49321 +0.01452 0.76126 0.47063 +0.06206 0.76168 0.47189 +0.11332 0.76213 0.47331 +0.16774 0.76261 0.47486 +0.22481 0.76312 0.47656 +0.28397 0.76364 0.47837 +0.34471 0.76418 0.48030 +0.40649 0.76473 0.48232 +0.46879 0.76528 0.48441 +0.53106 0.76583 0.48656 +0.59279 0.76638 0.48873 +0.65346 0.76691 0.49087 +0.71254 0.76744 0.49293 +0.76952 0.76794 0.49489 +0.82385 0.76842 0.49672 +0.87501 0.76888 0.49842 +0.92246 0.76930 0.49997 +0.01406 0.82333 0.47610 +0.06153 0.82375 0.47754 +0.11270 0.82420 0.47913 +0.16705 0.82468 0.48087 +0.22405 0.82519 0.48274 +0.28315 0.82571 0.48474 +0.34382 0.82625 0.48683 +0.40555 0.82680 0.48901 +0.46781 0.82735 0.49120 +0.53009 0.82790 0.49337 +0.59186 0.82845 0.49548 +0.65258 0.82898 0.49752 +0.71173 0.82951 0.49947 +0.76877 0.83001 0.50130 +0.82318 0.83049 0.50299 +0.87442 0.83095 0.50455 +0.92195 0.83137 0.50595 +0.01336 0.88250 0.48193 +0.06078 0.88292 0.48351 +0.11190 0.88337 0.48524 +0.16620 0.88386 0.48712 +0.22314 0.88436 0.48913 +0.28222 0.88488 0.49122 +0.34290 0.88542 0.49333 +0.40466 0.88597 0.49545 +0.46698 0.88652 0.49754 +0.52932 0.88707 0.49959 +0.59116 0.88762 0.50157 +0.65196 0.88816 0.50346 +0.71120 0.88868 0.50524 +0.76835 0.88919 0.50689 +0.82286 0.88967 0.50840 +0.87420 0.89012 0.50977 +0.92184 0.89054 0.51098 +0.01254 0.93820 0.48788 +0.05992 0.93862 0.48955 +0.11102 0.93907 0.49135 +0.16532 0.93955 0.49324 +0.22230 0.94006 0.49520 +0.28142 0.94058 0.49720 +0.34216 0.94112 0.49920 +0.40399 0.94167 0.50120 +0.46639 0.94222 0.50315 +0.52882 0.94277 0.50503 +0.59076 0.94332 0.50683 +0.65167 0.94386 0.50853 +0.71103 0.94438 0.51010 +0.76829 0.94489 0.51154 +0.82292 0.94537 0.51283 +0.87438 0.94582 0.51398 +0.92214 0.94624 0.51497 +0.01173 0.98984 0.49355 +0.05914 0.99026 0.49517 +0.11028 0.99072 0.49690 +0.16463 0.99120 0.49871 +0.22166 0.99170 0.50056 +0.28085 0.99222 0.50244 +0.34167 0.99276 0.50430 +0.40359 0.99331 0.50614 +0.46608 0.99386 0.50791 +0.52862 0.99442 0.50960 +0.59068 0.99496 0.51118 +0.65172 0.99550 0.51265 +0.71120 0.99603 0.51399 +0.76860 0.99653 0.51518 +0.82336 0.99702 0.51623 +0.87496 0.99747 0.51713 +0.92284 0.99789 0.51790 +0.00000 0.00150 0.52547 +0.04056 0.00192 0.52577 +0.09247 0.00237 0.52605 +0.14763 0.00286 0.52631 +0.20550 0.00336 0.52654 +0.26555 0.00389 0.52674 +0.32724 0.00443 0.52691 +0.39002 0.00498 0.52703 +0.45336 0.00554 0.52712 +0.51671 0.00609 0.52716 +0.57953 0.00664 0.52718 +0.64129 0.00718 0.52716 +0.70143 0.00771 0.52711 +0.75941 0.00822 0.52705 +0.81470 0.00870 0.52696 +0.86674 0.00915 0.52687 +0.91500 0.00958 0.52677 +0.00000 0.05315 0.52641 +0.04229 0.05357 0.52661 +0.09424 0.05402 0.52678 +0.14944 0.05451 0.52694 +0.20735 0.05502 0.52706 +0.26744 0.05554 0.52716 +0.32917 0.05608 0.52722 +0.39198 0.05663 0.52725 +0.45535 0.05719 0.52724 +0.51874 0.05774 0.52721 +0.58159 0.05829 0.52714 +0.64336 0.05883 0.52705 +0.70353 0.05936 0.52695 +0.76153 0.05987 0.52683 +0.81683 0.06035 0.52670 +0.86889 0.06081 0.52656 +0.91717 0.06123 0.52643 +0.00000 0.10885 0.52707 +0.04429 0.10928 0.52716 +0.09627 0.10973 0.52724 +0.15151 0.11021 0.52730 +0.20946 0.11072 0.52733 +0.26958 0.11125 0.52733 +0.33134 0.11179 0.52730 +0.39419 0.11234 0.52724 +0.45759 0.11289 0.52716 +0.52100 0.11345 0.52705 +0.58387 0.11400 0.52692 +0.64567 0.11454 0.52677 +0.70585 0.11507 0.52662 +0.76387 0.11557 0.52645 +0.81919 0.11606 0.52629 +0.87125 0.11651 0.52613 +0.91954 0.11693 0.52597 +0.00000 0.16803 0.52740 +0.04654 0.16846 0.52742 +0.09855 0.16891 0.52741 +0.15382 0.16940 0.52738 +0.21180 0.16990 0.52732 +0.27195 0.17043 0.52724 +0.33374 0.17097 0.52714 +0.39661 0.17152 0.52701 +0.46003 0.17208 0.52686 +0.52346 0.17263 0.52670 +0.58635 0.17318 0.52652 +0.64817 0.17372 0.52634 +0.70836 0.17425 0.52615 +0.76639 0.17475 0.52596 +0.82171 0.17524 0.52578 +0.87377 0.17569 0.52563 +0.92200 0.17612 0.52557 +0.00076 0.23011 0.52743 +0.04901 0.23053 0.52738 +0.10105 0.23099 0.52730 +0.15634 0.23147 0.52720 +0.21434 0.23198 0.52708 +0.27452 0.23251 0.52693 +0.33632 0.23305 0.52677 +0.39922 0.23360 0.52659 +0.46265 0.23415 0.52640 +0.52610 0.23471 0.52620 +0.58900 0.23526 0.52600 +0.65082 0.23580 0.52580 +0.71097 0.23633 0.52567 +0.76889 0.23683 0.52568 +0.82405 0.23732 0.52580 +0.87592 0.23777 0.52600 +0.92397 0.23819 0.52627 +0.00339 0.29451 0.52720 +0.05166 0.29493 0.52708 +0.10372 0.29539 0.52695 +0.15903 0.29587 0.52680 +0.21705 0.29638 0.52664 +0.27724 0.29690 0.52645 +0.33906 0.29744 0.52626 +0.40196 0.29799 0.52605 +0.46540 0.29855 0.52585 +0.52878 0.29910 0.52576 +0.59154 0.29965 0.52581 +0.65315 0.30019 0.52599 +0.71307 0.30072 0.52630 +0.77078 0.30122 0.52670 +0.82574 0.30171 0.52719 +0.87742 0.30216 0.52773 +0.92531 0.30258 0.52831 +0.00617 0.36064 0.52675 +0.05445 0.36106 0.52660 +0.10652 0.36152 0.52644 +0.16184 0.36200 0.52626 +0.21987 0.36251 0.52607 +0.28005 0.36304 0.52590 +0.34178 0.36358 0.52585 +0.40452 0.36413 0.52594 +0.46773 0.36468 0.52617 +0.53086 0.36523 0.52654 +0.59338 0.36578 0.52703 +0.65477 0.36632 0.52763 +0.71448 0.36685 0.52833 +0.77199 0.36735 0.52910 +0.82677 0.36783 0.52993 +0.87829 0.36829 0.53078 +0.92604 0.36871 0.53164 +0.00904 0.42793 0.52618 +0.05732 0.42835 0.52603 +0.10934 0.42881 0.52595 +0.16454 0.42929 0.52598 +0.22239 0.42980 0.52612 +0.28233 0.43033 0.52639 +0.34382 0.43087 0.52679 +0.40632 0.43141 0.52733 +0.46929 0.43197 0.52799 +0.53220 0.43252 0.52877 +0.59452 0.43307 0.52966 +0.65570 0.43361 0.53064 +0.71523 0.43413 0.53170 +0.77257 0.43464 0.53280 +0.82720 0.43512 0.53393 +0.87858 0.43557 0.53507 +0.92620 0.43599 0.53617 +0.01159 0.49580 0.52622 +0.05967 0.49622 0.52643 +0.11148 0.49668 0.52673 +0.16647 0.49716 0.52716 +0.22410 0.49767 0.52771 +0.28382 0.49819 0.52838 +0.34510 0.49873 0.52919 +0.40739 0.49928 0.53012 +0.47016 0.49983 0.53117 +0.53288 0.50038 0.53233 +0.59501 0.50093 0.53357 +0.65603 0.50147 0.53489 +0.71540 0.50199 0.53626 +0.77260 0.50250 0.53766 +0.82709 0.50298 0.53906 +0.87837 0.50343 0.54043 +0.92588 0.50385 0.54176 +0.01330 0.56367 0.52780 +0.06121 0.56409 0.52834 +0.11283 0.56454 0.52899 +0.16764 0.56503 0.52977 +0.22508 0.56553 0.53068 +0.28461 0.56606 0.53172 +0.34571 0.56659 0.53288 +0.40782 0.56714 0.53417 +0.47042 0.56769 0.53556 +0.53298 0.56825 0.53704 +0.59496 0.56879 0.53860 +0.65584 0.56933 0.54021 +0.71508 0.56985 0.54185 +0.77217 0.57036 0.54349 +0.82656 0.57084 0.54512 +0.87775 0.57129 0.54669 +0.92519 0.57171 0.54819 +0.01427 0.63095 0.53074 +0.06203 0.63138 0.53156 +0.11350 0.63183 0.53252 +0.16815 0.63231 0.53361 +0.22543 0.63282 0.53484 +0.28481 0.63334 0.53619 +0.34575 0.63388 0.53767 +0.40772 0.63442 0.53925 +0.47018 0.63498 0.54093 +0.53261 0.63553 0.54269 +0.59447 0.63607 0.54451 +0.65524 0.63661 0.54636 +0.71439 0.63714 0.54822 +0.77139 0.63764 0.55007 +0.82572 0.63812 0.55188 +0.87684 0.63857 0.55362 +0.92423 0.63899 0.55526 +0.01463 0.69708 0.53481 +0.06226 0.69750 0.53588 +0.11360 0.69795 0.53710 +0.16812 0.69843 0.53846 +0.22527 0.69894 0.53995 +0.28453 0.69946 0.54157 +0.34535 0.70000 0.54331 +0.40720 0.70055 0.54514 +0.46956 0.70110 0.54706 +0.53190 0.70165 0.54905 +0.59367 0.70220 0.55107 +0.65437 0.70273 0.55312 +0.71345 0.70326 0.55516 +0.77040 0.70376 0.55716 +0.82469 0.70424 0.55908 +0.87580 0.70470 0.56087 +0.92320 0.70512 0.56250 +0.01449 0.76147 0.53975 +0.06203 0.76189 0.54103 +0.11327 0.76234 0.54247 +0.16769 0.76282 0.54405 +0.22474 0.76332 0.54576 +0.28390 0.76385 0.54760 +0.34463 0.76439 0.54955 +0.40641 0.76493 0.55158 +0.46869 0.76548 0.55369 +0.53096 0.76604 0.55586 +0.59269 0.76658 0.55804 +0.65336 0.76712 0.56017 +0.71245 0.76764 0.56222 +0.76943 0.76815 0.56417 +0.82377 0.76863 0.56599 +0.87494 0.76908 0.56767 +0.92240 0.76950 0.56921 +0.01400 0.82353 0.54530 +0.06146 0.82395 0.54675 +0.11263 0.82441 0.54836 +0.16697 0.82489 0.55012 +0.22396 0.82539 0.55201 +0.28305 0.82592 0.55402 +0.34372 0.82645 0.55613 +0.40545 0.82700 0.55831 +0.46772 0.82755 0.56050 +0.53000 0.82810 0.56266 +0.59177 0.82865 0.56476 +0.65250 0.82919 0.56678 +0.71166 0.82971 0.56871 +0.76871 0.83022 0.57052 +0.82314 0.83070 0.57220 +0.87439 0.83115 0.57374 +0.92193 0.83157 0.57512 +0.01328 0.88271 0.55119 +0.06069 0.88313 0.55278 +0.11180 0.88358 0.55453 +0.16610 0.88406 0.55643 +0.22304 0.88457 0.55844 +0.28212 0.88509 0.56051 +0.34281 0.88563 0.56262 +0.40458 0.88617 0.56472 +0.46690 0.88672 0.56680 +0.52925 0.88728 0.56884 +0.59110 0.88782 0.57080 +0.65192 0.88836 0.57266 +0.71117 0.88889 0.57442 +0.76833 0.88939 0.57605 +0.82285 0.88987 0.57754 +0.87421 0.89033 0.57888 +0.92186 0.89075 0.58006 +0.01243 0.93840 0.55718 +0.05981 0.93882 0.55886 +0.11092 0.93928 0.56065 +0.16523 0.93976 0.56253 +0.22221 0.94026 0.56448 +0.28134 0.94079 0.56646 +0.34209 0.94132 0.56845 +0.40393 0.94187 0.57043 +0.46634 0.94242 0.57236 +0.52878 0.94298 0.57422 +0.59074 0.94352 0.57599 +0.65167 0.94406 0.57766 +0.71104 0.94459 0.57920 +0.76831 0.94509 0.58061 +0.82296 0.94557 0.58187 +0.87444 0.94603 0.58299 +0.92221 0.94645 0.58396 +0.01164 0.99005 0.56284 +0.05905 0.99047 0.56445 +0.11020 0.99092 0.56617 +0.16456 0.99140 0.56796 +0.22160 0.99191 0.56980 +0.28080 0.99243 0.57166 +0.34163 0.99297 0.57350 +0.40356 0.99352 0.57531 +0.46607 0.99407 0.57705 +0.52863 0.99462 0.57871 +0.59070 0.99517 0.58027 +0.65176 0.99571 0.58170 +0.71126 0.99623 0.58300 +0.76868 0.99674 0.58416 +0.82346 0.99722 0.58517 +0.87508 0.99768 0.58604 +0.92298 0.99810 0.58677 +0.00000 0.00170 0.59417 +0.04079 0.00212 0.59445 +0.09270 0.00258 0.59471 +0.14787 0.00306 0.59496 +0.20575 0.00357 0.59518 +0.26581 0.00410 0.59536 +0.32750 0.00464 0.59551 +0.39028 0.00519 0.59562 +0.45363 0.00574 0.59570 +0.51698 0.00630 0.59573 +0.57981 0.00685 0.59573 +0.64157 0.00739 0.59571 +0.70171 0.00791 0.59565 +0.75970 0.00842 0.59558 +0.81499 0.00891 0.59548 +0.86703 0.00936 0.59538 +0.91530 0.00978 0.59528 +0.00000 0.05335 0.59506 +0.04254 0.05378 0.59524 +0.09449 0.05423 0.59541 +0.14970 0.05471 0.59555 +0.20761 0.05522 0.59566 +0.26771 0.05575 0.59575 +0.32944 0.05629 0.59580 +0.39226 0.05684 0.59581 +0.45563 0.05739 0.59580 +0.51902 0.05795 0.59575 +0.58187 0.05850 0.59568 +0.64365 0.05904 0.59558 +0.70382 0.05957 0.59546 +0.76182 0.06007 0.59534 +0.81713 0.06056 0.59520 +0.86919 0.06101 0.59506 +0.91747 0.06143 0.59493 +0.00000 0.10906 0.59567 +0.04455 0.10948 0.59576 +0.09654 0.10994 0.59583 +0.15178 0.11042 0.59587 +0.20973 0.11093 0.59589 +0.26986 0.11145 0.59588 +0.33162 0.11199 0.59584 +0.39447 0.11254 0.59578 +0.45787 0.11310 0.59568 +0.52129 0.11365 0.59556 +0.58416 0.11420 0.59543 +0.64596 0.11475 0.59528 +0.70615 0.11527 0.59512 +0.76417 0.11578 0.59495 +0.81948 0.11626 0.59478 +0.87155 0.11672 0.59462 +0.91984 0.11714 0.59446 +0.00000 0.16824 0.59597 +0.04681 0.16866 0.59598 +0.09883 0.16912 0.59596 +0.15410 0.16960 0.59592 +0.21208 0.17011 0.59586 +0.27224 0.17064 0.59577 +0.33403 0.17118 0.59566 +0.39690 0.17173 0.59552 +0.46033 0.17228 0.59537 +0.52376 0.17284 0.59520 +0.58665 0.17339 0.59502 +0.64847 0.17393 0.59483 +0.70866 0.17445 0.59464 +0.76669 0.17496 0.59445 +0.82201 0.17544 0.59427 +0.87405 0.17590 0.59415 +0.92226 0.17632 0.59414 +0.00104 0.23032 0.59597 +0.04929 0.23074 0.59591 +0.10133 0.23120 0.59582 +0.15663 0.23168 0.59572 +0.21464 0.23219 0.59559 +0.27481 0.23271 0.59544 +0.33662 0.23325 0.59527 +0.39951 0.23380 0.59509 +0.46295 0.23436 0.59490 +0.52640 0.23491 0.59470 +0.58930 0.23546 0.59449 +0.65111 0.23601 0.59430 +0.71124 0.23653 0.59422 +0.76914 0.23704 0.59427 +0.82427 0.23752 0.59443 +0.87612 0.23798 0.59467 +0.92415 0.23840 0.59498 +0.00369 0.29471 0.59571 +0.05195 0.29514 0.59559 +0.10401 0.29559 0.59546 +0.15933 0.29608 0.59530 +0.21735 0.29658 0.59513 +0.27754 0.29711 0.59495 +0.33936 0.29765 0.59475 +0.40226 0.29820 0.59454 +0.46569 0.29875 0.59436 +0.52904 0.29931 0.59432 +0.59178 0.29986 0.59442 +0.65336 0.30040 0.59465 +0.71326 0.30092 0.59499 +0.77094 0.30143 0.59544 +0.82588 0.30191 0.59596 +0.87755 0.30237 0.59654 +0.92542 0.30279 0.59714 +0.00647 0.36085 0.59524 +0.05475 0.36127 0.59510 +0.10682 0.36172 0.59493 +0.16214 0.36221 0.59475 +0.22017 0.36272 0.59456 +0.28033 0.36324 0.59443 +0.34204 0.36378 0.59443 +0.40475 0.36433 0.59457 +0.46793 0.36489 0.59484 +0.53104 0.36544 0.59525 +0.59354 0.36599 0.59579 +0.65490 0.36653 0.59643 +0.71459 0.36705 0.59716 +0.77208 0.36756 0.59797 +0.82685 0.36804 0.59883 +0.87836 0.36849 0.59972 +0.92609 0.36891 0.60060 +0.00934 0.42814 0.59467 +0.05760 0.42856 0.59454 +0.10960 0.42902 0.59451 +0.16478 0.42950 0.59458 +0.22261 0.43001 0.59476 +0.28252 0.43053 0.59508 +0.34399 0.43107 0.59552 +0.40647 0.43162 0.59610 +0.46942 0.43217 0.59680 +0.53231 0.43273 0.59762 +0.59460 0.43327 0.59855 +0.65577 0.43381 0.59957 +0.71528 0.43434 0.60066 +0.77260 0.43484 0.60179 +0.82722 0.43532 0.60296 +0.87859 0.43578 0.60411 +0.92620 0.43620 0.60524 +0.01180 0.49601 0.59486 +0.05987 0.49643 0.59510 +0.11166 0.49688 0.59545 +0.16663 0.49737 0.59591 +0.22424 0.49787 0.59650 +0.28394 0.49840 0.59721 +0.34520 0.49894 0.59806 +0.40747 0.49948 0.59903 +0.47022 0.50004 0.60011 +0.53292 0.50059 0.60130 +0.59504 0.50114 0.60258 +0.65604 0.50168 0.60393 +0.71540 0.50220 0.60533 +0.77258 0.50270 0.60676 +0.82707 0.50318 0.60818 +0.87833 0.50364 0.60958 +0.92584 0.50406 0.61092 +0.01344 0.56387 0.59659 +0.06133 0.56430 0.59716 +0.11294 0.56475 0.59784 +0.16773 0.56523 0.59866 +0.22515 0.56574 0.59960 +0.28467 0.56626 0.60067 +0.34574 0.56680 0.60187 +0.40784 0.56735 0.60319 +0.47043 0.56790 0.60461 +0.53297 0.56845 0.60612 +0.59494 0.56900 0.60771 +0.65580 0.56954 0.60934 +0.71504 0.57006 0.61101 +0.77211 0.57056 0.61268 +0.82650 0.57105 0.61432 +0.87767 0.57150 0.61592 +0.92511 0.57192 0.61743 +0.01434 0.63116 0.59966 +0.06209 0.63158 0.60051 +0.11354 0.63203 0.60150 +0.16818 0.63252 0.60262 +0.22544 0.63302 0.60387 +0.28481 0.63354 0.60526 +0.34573 0.63408 0.60676 +0.40769 0.63463 0.60837 +0.47014 0.63518 0.61008 +0.53256 0.63573 0.61187 +0.59441 0.63628 0.61371 +0.65517 0.63682 0.61558 +0.71431 0.63734 0.61746 +0.77131 0.63785 0.61933 +0.82563 0.63833 0.62115 +0.87674 0.63878 0.62291 +0.92413 0.63920 0.62456 +0.01464 0.69729 0.60384 +0.06226 0.69771 0.60494 +0.11360 0.69816 0.60618 +0.16810 0.69864 0.60756 +0.22524 0.69914 0.60908 +0.28448 0.69967 0.61073 +0.34529 0.70021 0.61249 +0.40714 0.70075 0.61435 +0.46949 0.70130 0.61629 +0.53181 0.70186 0.61830 +0.59359 0.70240 0.62034 +0.65427 0.70294 0.62240 +0.71335 0.70346 0.62446 +0.77030 0.70397 0.62647 +0.82459 0.70445 0.62838 +0.87571 0.70490 0.63016 +0.92311 0.70532 0.63179 +0.01446 0.76167 0.60888 +0.06199 0.76209 0.61018 +0.11322 0.76254 0.61164 +0.16763 0.76303 0.61324 +0.22467 0.76353 0.61497 +0.28382 0.76405 0.61683 +0.34455 0.76459 0.61880 +0.40632 0.76514 0.62086 +0.46860 0.76569 0.62298 +0.53086 0.76624 0.62516 +0.59259 0.76679 0.62734 +0.65326 0.76732 0.62947 +0.71236 0.76785 0.63151 +0.76935 0.76835 0.63344 +0.82370 0.76883 0.63525 +0.87487 0.76929 0.63692 +0.92234 0.76971 0.63844 +0.01394 0.82374 0.61450 +0.06139 0.82416 0.61597 +0.11255 0.82461 0.61760 +0.16689 0.82509 0.61938 +0.22386 0.82560 0.62129 +0.28295 0.82612 0.62331 +0.34362 0.82666 0.62544 +0.40535 0.82721 0.62762 +0.46762 0.82776 0.62980 +0.52991 0.82831 0.63194 +0.59169 0.82886 0.63403 +0.65243 0.82939 0.63604 +0.71160 0.82992 0.63795 +0.76866 0.83042 0.63974 +0.82309 0.83090 0.64140 +0.87435 0.83136 0.64292 +0.92191 0.83178 0.64428 +0.01319 0.88291 0.62046 +0.06059 0.88333 0.62206 +0.11170 0.88378 0.62383 +0.16599 0.88427 0.62574 +0.22294 0.88477 0.62775 +0.28202 0.88529 0.62981 +0.34272 0.88583 0.63190 +0.40449 0.88638 0.63399 +0.46683 0.88693 0.63606 +0.52919 0.88748 0.63807 +0.59105 0.88803 0.64001 +0.65188 0.88857 0.64186 +0.71114 0.88909 0.64359 +0.76831 0.88960 0.64519 +0.82285 0.89008 0.64666 +0.87422 0.89053 0.64797 +0.92189 0.89095 0.64914 +0.01233 0.93861 0.62649 +0.05971 0.93903 0.62816 +0.11083 0.93948 0.62995 +0.16514 0.93996 0.63182 +0.22213 0.94047 0.63375 +0.28127 0.94099 0.63572 +0.34202 0.94153 0.63770 +0.40388 0.94208 0.63965 +0.46630 0.94263 0.64156 +0.52876 0.94318 0.64340 +0.59072 0.94373 0.64514 +0.65167 0.94427 0.64678 +0.71105 0.94479 0.64829 +0.76835 0.94530 0.64967 +0.82301 0.94578 0.65090 +0.87451 0.94623 0.65199 +0.92230 0.94665 0.65293 +0.01155 0.99025 0.63212 +0.05897 0.99067 0.63373 +0.11012 0.99113 0.63544 +0.16449 0.99161 0.63721 +0.22154 0.99211 0.63903 +0.28075 0.99264 0.64087 +0.34159 0.99317 0.64269 +0.40354 0.99372 0.64447 +0.46607 0.99427 0.64618 +0.52864 0.99483 0.64781 +0.59073 0.99537 0.64934 +0.65180 0.99591 0.65074 +0.71133 0.99644 0.65200 +0.76876 0.99694 0.65313 +0.82357 0.99743 0.65411 +0.87520 0.99788 0.65494 +0.92313 0.99830 0.65563 +0.00000 0.00191 0.66227 +0.04102 0.00233 0.66254 +0.09294 0.00278 0.66279 +0.14811 0.00327 0.66302 +0.20600 0.00378 0.66322 +0.26606 0.00430 0.66340 +0.32775 0.00484 0.66353 +0.39055 0.00539 0.66363 +0.45389 0.00595 0.66369 +0.51725 0.00650 0.66371 +0.58008 0.00705 0.66370 +0.64184 0.00759 0.66366 +0.70199 0.00812 0.66360 +0.75998 0.00863 0.66352 +0.81527 0.00911 0.66342 +0.86732 0.00956 0.66331 +0.91559 0.00999 0.66320 +0.00000 0.05356 0.66312 +0.04279 0.05398 0.66329 +0.09474 0.05444 0.66344 +0.14995 0.05492 0.66357 +0.20788 0.05543 0.66367 +0.26797 0.05595 0.66374 +0.32970 0.05649 0.66378 +0.39253 0.05704 0.66378 +0.45591 0.05760 0.66376 +0.51930 0.05815 0.66370 +0.58216 0.05870 0.66362 +0.64394 0.05924 0.66352 +0.70411 0.05977 0.66339 +0.76212 0.06028 0.66326 +0.81742 0.06076 0.66312 +0.86949 0.06122 0.66298 +0.91776 0.06164 0.66284 +0.00000 0.10926 0.66369 +0.04482 0.10969 0.66377 +0.09681 0.11014 0.66382 +0.15205 0.11063 0.66386 +0.21001 0.11113 0.66387 +0.27014 0.11166 0.66385 +0.33190 0.11220 0.66380 +0.39476 0.11275 0.66372 +0.45816 0.11330 0.66362 +0.52157 0.11386 0.66350 +0.58445 0.11441 0.66335 +0.64626 0.11495 0.66320 +0.70644 0.11548 0.66303 +0.76446 0.11598 0.66286 +0.81978 0.11647 0.66269 +0.87185 0.11692 0.66253 +0.92013 0.11734 0.66237 +0.00000 0.16845 0.66395 +0.04709 0.16887 0.66395 +0.09911 0.16932 0.66392 +0.15438 0.16981 0.66388 +0.21237 0.17031 0.66381 +0.27253 0.17084 0.66371 +0.33431 0.17138 0.66359 +0.39719 0.17193 0.66345 +0.46062 0.17249 0.66329 +0.52405 0.17304 0.66311 +0.58695 0.17359 0.66293 +0.64876 0.17413 0.66274 +0.70896 0.17466 0.66254 +0.76699 0.17517 0.66235 +0.82230 0.17565 0.66218 +0.87432 0.17610 0.66211 +0.92251 0.17653 0.66213 +0.00133 0.23052 0.66392 +0.04958 0.23095 0.66385 +0.10162 0.23140 0.66376 +0.15692 0.23188 0.66365 +0.21493 0.23239 0.66351 +0.27511 0.23292 0.66336 +0.33692 0.23346 0.66319 +0.39981 0.23401 0.66300 +0.46325 0.23456 0.66281 +0.52669 0.23512 0.66260 +0.58960 0.23567 0.66239 +0.65139 0.23621 0.66223 +0.71150 0.23674 0.66220 +0.76937 0.23724 0.66230 +0.82448 0.23773 0.66249 +0.87631 0.23818 0.66277 +0.92432 0.23860 0.66311 +0.00398 0.29492 0.66363 +0.05225 0.29534 0.66351 +0.10431 0.29580 0.66337 +0.15962 0.29628 0.66322 +0.21764 0.29679 0.66304 +0.27784 0.29731 0.66285 +0.33966 0.29785 0.66265 +0.40256 0.29840 0.66245 +0.46597 0.29896 0.66231 +0.52929 0.29951 0.66231 +0.59200 0.30006 0.66246 +0.65356 0.30060 0.66273 +0.71344 0.30113 0.66312 +0.77110 0.30163 0.66360 +0.82602 0.30212 0.66416 +0.87767 0.30257 0.66477 +0.92553 0.30299 0.66541 +0.00676 0.36105 0.66315 +0.05504 0.36147 0.66300 +0.10712 0.36193 0.66284 +0.16244 0.36241 0.66266 +0.22046 0.36292 0.66247 +0.28060 0.36345 0.66239 +0.34228 0.36399 0.66244 +0.40497 0.36454 0.66262 +0.46812 0.36509 0.66294 +0.53121 0.36564 0.66340 +0.59369 0.36619 0.66397 +0.65503 0.36673 0.66465 +0.71470 0.36726 0.66543 +0.77217 0.36776 0.66627 +0.82692 0.36824 0.66716 +0.87841 0.36870 0.66808 +0.92613 0.36912 0.66898 +0.00963 0.42834 0.66258 +0.05788 0.42877 0.66249 +0.10985 0.42922 0.66250 +0.16501 0.42970 0.66261 +0.22281 0.43021 0.66284 +0.28271 0.43074 0.66319 +0.34415 0.43128 0.66368 +0.40661 0.43182 0.66430 +0.46954 0.43238 0.66504 +0.53241 0.43293 0.66590 +0.59468 0.43348 0.66687 +0.65583 0.43402 0.66792 +0.71532 0.43454 0.66904 +0.77263 0.43505 0.67021 +0.82723 0.43553 0.67140 +0.87859 0.43598 0.67258 +0.92619 0.43640 0.67373 +0.01201 0.49621 0.66293 +0.06006 0.49663 0.66321 +0.11183 0.49709 0.66359 +0.16678 0.49757 0.66409 +0.22437 0.49808 0.66471 +0.28405 0.49860 0.66547 +0.34529 0.49914 0.66635 +0.40754 0.49969 0.66736 +0.47028 0.50024 0.66848 +0.53296 0.50079 0.66970 +0.59506 0.50134 0.67102 +0.65604 0.50188 0.67240 +0.71539 0.50240 0.67383 +0.77256 0.50291 0.67528 +0.82703 0.50339 0.67672 +0.87829 0.50384 0.67814 +0.92579 0.50426 0.67950 +0.01357 0.56408 0.66481 +0.06144 0.56450 0.66540 +0.11304 0.56495 0.66612 +0.16781 0.56544 0.66697 +0.22521 0.56594 0.66794 +0.28471 0.56647 0.66905 +0.34577 0.56700 0.67028 +0.40785 0.56755 0.67163 +0.47043 0.56810 0.67309 +0.53295 0.56865 0.67463 +0.59491 0.56920 0.67624 +0.65576 0.56974 0.67790 +0.71499 0.57026 0.67959 +0.77205 0.57077 0.68128 +0.82643 0.57125 0.68295 +0.87760 0.57170 0.68456 +0.92503 0.57212 0.68609 +0.01441 0.63136 0.66801 +0.06214 0.63178 0.66888 +0.11358 0.63224 0.66990 +0.16820 0.63272 0.67105 +0.22545 0.63322 0.67233 +0.28480 0.63375 0.67374 +0.34571 0.63429 0.67528 +0.40766 0.63483 0.67692 +0.47010 0.63538 0.67865 +0.53250 0.63594 0.68046 +0.59435 0.63648 0.68232 +0.65510 0.63702 0.68422 +0.71423 0.63754 0.68612 +0.77122 0.63805 0.68801 +0.82553 0.63853 0.68984 +0.87664 0.63898 0.69161 +0.92402 0.63940 0.69328 +0.01465 0.69749 0.67229 +0.06226 0.69791 0.67342 +0.11358 0.69836 0.67468 +0.16808 0.69884 0.67609 +0.22521 0.69935 0.67763 +0.28444 0.69987 0.67930 +0.34524 0.70041 0.68109 +0.40707 0.70096 0.68297 +0.46941 0.70151 0.68493 +0.53173 0.70206 0.68696 +0.59350 0.70261 0.68902 +0.65418 0.70314 0.69110 +0.71325 0.70367 0.69317 +0.77020 0.70417 0.69519 +0.82449 0.70465 0.69709 +0.87562 0.70510 0.69886 +0.92303 0.70552 0.70048 +0.01443 0.76187 0.67742 +0.06194 0.76229 0.67875 +0.11317 0.76275 0.68022 +0.16757 0.76323 0.68184 +0.22460 0.76373 0.68360 +0.28375 0.76426 0.68548 +0.34446 0.76479 0.68747 +0.40622 0.76534 0.68954 +0.46850 0.76589 0.69169 +0.53076 0.76644 0.69388 +0.59249 0.76699 0.69605 +0.65317 0.76753 0.69817 +0.71227 0.76805 0.70020 +0.76927 0.76856 0.70212 +0.82362 0.76904 0.70392 +0.87481 0.76949 0.70557 +0.92228 0.76991 0.70707 +0.01387 0.82394 0.68312 +0.06132 0.82436 0.68461 +0.11247 0.82482 0.68626 +0.16680 0.82530 0.68805 +0.22377 0.82580 0.68998 +0.28285 0.82632 0.69202 +0.34352 0.82686 0.69416 +0.40525 0.82741 0.69633 +0.46753 0.82796 0.69850 +0.52982 0.82851 0.70063 +0.59161 0.82906 0.70270 +0.65236 0.82960 0.70470 +0.71154 0.83012 0.70659 +0.76861 0.83063 0.70837 +0.82305 0.83111 0.71001 +0.87433 0.83156 0.71150 +0.92189 0.83198 0.71284 +0.01310 0.88312 0.68914 +0.06050 0.88354 0.69076 +0.11160 0.88399 0.69253 +0.16589 0.88447 0.69445 +0.22284 0.88497 0.69646 +0.28193 0.88550 0.69851 +0.34263 0.88603 0.70059 +0.40441 0.88658 0.70267 +0.46676 0.88713 0.70472 +0.52913 0.88769 0.70671 +0.59100 0.88823 0.70863 +0.65184 0.88877 0.71046 +0.71112 0.88930 0.71216 +0.76831 0.88980 0.71374 +0.82286 0.89028 0.71518 +0.87424 0.89074 0.71647 +0.92192 0.89116 0.71761 +0.01223 0.93881 0.69521 +0.05962 0.93923 0.69687 +0.11073 0.93969 0.69865 +0.16505 0.94017 0.70051 +0.22205 0.94067 0.70243 +0.28119 0.94119 0.70438 +0.34196 0.94173 0.70634 +0.40383 0.94228 0.70827 +0.46626 0.94283 0.71016 +0.52873 0.94338 0.71197 +0.59071 0.94393 0.71369 +0.65167 0.94447 0.71530 +0.71108 0.94500 0.71679 +0.76839 0.94550 0.71813 +0.82307 0.94598 0.71933 +0.87459 0.94644 0.72039 +0.92239 0.94686 0.72129 +0.01146 0.99046 0.70081 +0.05889 0.99088 0.70241 +0.11005 0.99133 0.70410 +0.16442 0.99181 0.70586 +0.22148 0.99232 0.70766 +0.28071 0.99284 0.70948 +0.34156 0.99338 0.71128 +0.40352 0.99393 0.71303 +0.46607 0.99448 0.71472 +0.52866 0.99503 0.71632 +0.59076 0.99558 0.71781 +0.65186 0.99612 0.71917 +0.71140 0.99664 0.72040 +0.76886 0.99715 0.72149 +0.82368 0.99763 0.72243 +0.87534 0.99809 0.72323 +0.92328 0.99851 0.72389 +0.00000 0.00211 0.72919 +0.04125 0.00253 0.72945 +0.09318 0.00299 0.72969 +0.14835 0.00347 0.72990 +0.20624 0.00398 0.73009 +0.26631 0.00450 0.73025 +0.32801 0.00504 0.73037 +0.39081 0.00559 0.73046 +0.45416 0.00615 0.73050 +0.51752 0.00670 0.73052 +0.58036 0.00725 0.73050 +0.64212 0.00779 0.73045 +0.70227 0.00832 0.73038 +0.76026 0.00883 0.73029 +0.81556 0.00931 0.73018 +0.86761 0.00977 0.73007 +0.91587 0.01019 0.72996 +0.00000 0.05376 0.73000 +0.04303 0.05418 0.73016 +0.09499 0.05464 0.73030 +0.15021 0.05512 0.73042 +0.20813 0.05563 0.73051 +0.26823 0.05615 0.73056 +0.32997 0.05669 0.73059 +0.39280 0.05724 0.73058 +0.45618 0.05780 0.73055 +0.51957 0.05835 0.73048 +0.58244 0.05890 0.73039 +0.64422 0.05944 0.73028 +0.70439 0.05997 0.73015 +0.76240 0.06048 0.73001 +0.81771 0.06096 0.72987 +0.86978 0.06142 0.72972 +0.91805 0.06184 0.72958 +0.00000 0.10946 0.73053 +0.04507 0.10989 0.73060 +0.09707 0.11034 0.73065 +0.15231 0.11083 0.73067 +0.21027 0.11133 0.73067 +0.27041 0.11186 0.73064 +0.33218 0.11240 0.73058 +0.39503 0.11295 0.73050 +0.45844 0.11351 0.73039 +0.52186 0.11406 0.73026 +0.58474 0.11461 0.73011 +0.64655 0.11515 0.72995 +0.70673 0.11568 0.72978 +0.76475 0.11618 0.72960 +0.82007 0.11667 0.72943 +0.87215 0.11712 0.72926 +0.92043 0.11755 0.72911 +0.00000 0.16865 0.73076 +0.04736 0.16907 0.73075 +0.09938 0.16952 0.73071 +0.15466 0.17001 0.73066 +0.21265 0.17052 0.73058 +0.27281 0.17104 0.73048 +0.33460 0.17158 0.73035 +0.39748 0.17213 0.73020 +0.46091 0.17269 0.73004 +0.52434 0.17324 0.72986 +0.58724 0.17379 0.72967 +0.64906 0.17433 0.72948 +0.70925 0.17486 0.72928 +0.76728 0.17537 0.72909 +0.82258 0.17585 0.72895 +0.87458 0.17631 0.72891 +0.92274 0.17673 0.72897 +0.00161 0.23072 0.73070 +0.04986 0.23115 0.73062 +0.10190 0.23160 0.73052 +0.15720 0.23209 0.73040 +0.21521 0.23259 0.73027 +0.27540 0.23312 0.73011 +0.33721 0.23366 0.72993 +0.40010 0.23421 0.72974 +0.46354 0.23477 0.72954 +0.52699 0.23532 0.72934 +0.58989 0.23587 0.72913 +0.65166 0.23641 0.72901 +0.71174 0.23694 0.72903 +0.76959 0.23744 0.72916 +0.82468 0.23793 0.72940 +0.87649 0.23838 0.72972 +0.92449 0.23880 0.73009 +0.00426 0.29512 0.73039 +0.05253 0.29554 0.73026 +0.10460 0.29600 0.73012 +0.15991 0.29648 0.72996 +0.21794 0.29699 0.72978 +0.27813 0.29751 0.72959 +0.33995 0.29806 0.72939 +0.40285 0.29861 0.72919 +0.46623 0.29916 0.72910 +0.52953 0.29971 0.72915 +0.59221 0.30026 0.72934 +0.65375 0.30080 0.72966 +0.71360 0.30133 0.73009 +0.77125 0.30183 0.73061 +0.82615 0.30232 0.73120 +0.87778 0.30277 0.73185 +0.92562 0.30319 0.73251 +0.00706 0.36125 0.72989 +0.05534 0.36167 0.72974 +0.10741 0.36213 0.72957 +0.16273 0.36261 0.72939 +0.22074 0.36312 0.72923 +0.28085 0.36365 0.72919 +0.34251 0.36419 0.72929 +0.40517 0.36474 0.72952 +0.46830 0.36529 0.72988 +0.53137 0.36584 0.73038 +0.59382 0.36639 0.73099 +0.65514 0.36693 0.73172 +0.71480 0.36746 0.73253 +0.77225 0.36796 0.73340 +0.82698 0.36844 0.73433 +0.87846 0.36890 0.73527 +0.92617 0.36932 0.73620 +0.00992 0.42854 0.72934 +0.05814 0.42897 0.72929 +0.11009 0.42942 0.72933 +0.16523 0.42990 0.72948 +0.22301 0.43041 0.72975 +0.28288 0.43094 0.73015 +0.34430 0.43148 0.73068 +0.40674 0.43202 0.73133 +0.46965 0.43258 0.73212 +0.53250 0.43313 0.73302 +0.59475 0.43368 0.73402 +0.65588 0.43422 0.73511 +0.71536 0.43474 0.73626 +0.77266 0.43525 0.73746 +0.82724 0.43573 0.73867 +0.87859 0.43618 0.73988 +0.92618 0.43660 0.74106 +0.01221 0.49641 0.72985 +0.06023 0.49683 0.73016 +0.11199 0.49729 0.73057 +0.16692 0.49777 0.73111 +0.22449 0.49828 0.73177 +0.28415 0.49880 0.73256 +0.34537 0.49934 0.73348 +0.40761 0.49989 0.73452 +0.47032 0.50044 0.73568 +0.53299 0.50099 0.73694 +0.59507 0.50154 0.73828 +0.65604 0.50208 0.73969 +0.71537 0.50260 0.74115 +0.77253 0.50311 0.74262 +0.82700 0.50359 0.74409 +0.87824 0.50404 0.74553 +0.92573 0.50446 0.74691 +0.01369 0.56428 0.73186 +0.06155 0.56470 0.73249 +0.11313 0.56515 0.73324 +0.16788 0.56564 0.73412 +0.22527 0.56614 0.73512 +0.28475 0.56667 0.73626 +0.34580 0.56720 0.73753 +0.40786 0.56775 0.73891 +0.47042 0.56830 0.74039 +0.53293 0.56885 0.74196 +0.59488 0.56940 0.74360 +0.65572 0.56994 0.74529 +0.71493 0.57046 0.74700 +0.77199 0.57097 0.74871 +0.82636 0.57145 0.75040 +0.87752 0.57190 0.75203 +0.92494 0.57232 0.75357 +0.01446 0.63156 0.73518 +0.06218 0.63198 0.73609 +0.11361 0.63244 0.73713 +0.16822 0.63292 0.73831 +0.22545 0.63342 0.73962 +0.28479 0.63395 0.74106 +0.34569 0.63449 0.74262 +0.40762 0.63503 0.74429 +0.47005 0.63558 0.74605 +0.53245 0.63614 0.74788 +0.59428 0.63668 0.74976 +0.65503 0.63722 0.75168 +0.71415 0.63774 0.75360 +0.77113 0.63825 0.75550 +0.82544 0.63873 0.75736 +0.87655 0.63918 0.75914 +0.92392 0.63960 0.76081 +0.01465 0.69769 0.73958 +0.06225 0.69811 0.74072 +0.11356 0.69856 0.74201 +0.16805 0.69904 0.74344 +0.22517 0.69955 0.74501 +0.28439 0.70007 0.74671 +0.34518 0.70061 0.74851 +0.40700 0.70116 0.75042 +0.46934 0.70171 0.75240 +0.53165 0.70226 0.75445 +0.59340 0.70281 0.75653 +0.65408 0.70334 0.75863 +0.71315 0.70387 0.76071 +0.77010 0.70437 0.76272 +0.82440 0.70485 0.76461 +0.87553 0.70530 0.76637 +0.92294 0.70572 0.76798 +0.01439 0.76207 0.74480 +0.06190 0.76249 0.74614 +0.11311 0.76295 0.74764 +0.16750 0.76343 0.74928 +0.22453 0.76393 0.75105 +0.28367 0.76446 0.75295 +0.34438 0.76499 0.75496 +0.40613 0.76554 0.75705 +0.46840 0.76609 0.75921 +0.53066 0.76664 0.76141 +0.59239 0.76719 0.76358 +0.65308 0.76773 0.76568 +0.71219 0.76825 0.76770 +0.76919 0.76876 0.76961 +0.82356 0.76924 0.77139 +0.87475 0.76969 0.77303 +0.92223 0.77011 0.77452 +0.01380 0.82414 0.75057 +0.06124 0.82456 0.75208 +0.11239 0.82502 0.75374 +0.16671 0.82550 0.75555 +0.22368 0.82600 0.75749 +0.28276 0.82652 0.75954 +0.34342 0.82706 0.76169 +0.40516 0.82761 0.76386 +0.46744 0.82816 0.76601 +0.52974 0.82871 0.76813 +0.59154 0.82926 0.77019 +0.65229 0.82980 0.77217 +0.71148 0.83032 0.77405 +0.76857 0.83083 0.77580 +0.82302 0.83131 0.77742 +0.87430 0.83176 0.77889 +0.92188 0.83218 0.78021 +0.01301 0.88332 0.75664 +0.06040 0.88374 0.75828 +0.11151 0.88419 0.76007 +0.16579 0.88467 0.76199 +0.22275 0.88517 0.76398 +0.28184 0.88570 0.76603 +0.34255 0.88623 0.76810 +0.40434 0.88678 0.77016 +0.46669 0.88733 0.77219 +0.52907 0.88789 0.77417 +0.59096 0.88843 0.77607 +0.65181 0.88897 0.77787 +0.71110 0.88950 0.77955 +0.76830 0.89000 0.78110 +0.82287 0.89048 0.78251 +0.87427 0.89094 0.78378 +0.92196 0.89136 0.78489 +0.01213 0.93901 0.76274 +0.05952 0.93943 0.76440 +0.11065 0.93989 0.76616 +0.16497 0.94037 0.76801 +0.22197 0.94087 0.76992 +0.28113 0.94140 0.77186 +0.34191 0.94193 0.77380 +0.40378 0.94248 0.77571 +0.46623 0.94303 0.77757 +0.52871 0.94358 0.77936 +0.59071 0.94413 0.78105 +0.65168 0.94467 0.78263 +0.71110 0.94520 0.78409 +0.76843 0.94570 0.78540 +0.82313 0.94618 0.78657 +0.87467 0.94664 0.78760 +0.92249 0.94706 0.78847 +0.01138 0.99066 0.76831 +0.05881 0.99108 0.76990 +0.10998 0.99153 0.77158 +0.16436 0.99201 0.77333 +0.22143 0.99252 0.77511 +0.28067 0.99304 0.77690 +0.34154 0.99358 0.77867 +0.40351 0.99413 0.78040 +0.46607 0.99468 0.78206 +0.52868 0.99523 0.78363 +0.59081 0.99578 0.78509 +0.65192 0.99632 0.78642 +0.71148 0.99684 0.78761 +0.76895 0.99735 0.78866 +0.82380 0.99783 0.78957 +0.87548 0.99829 0.79033 +0.92344 0.99871 0.79096 +0.00000 0.00230 0.79435 +0.04148 0.00273 0.79459 +0.09341 0.00318 0.79482 +0.14859 0.00366 0.79502 +0.20648 0.00417 0.79520 +0.26655 0.00470 0.79534 +0.32826 0.00524 0.79545 +0.39106 0.00579 0.79553 +0.45442 0.00634 0.79556 +0.51778 0.00690 0.79556 +0.58062 0.00745 0.79553 +0.64239 0.00799 0.79548 +0.70254 0.00852 0.79540 +0.76054 0.00902 0.79530 +0.81583 0.00951 0.79519 +0.86789 0.00996 0.79507 +0.91615 0.01038 0.79495 +0.00000 0.05395 0.79512 +0.04327 0.05438 0.79527 +0.09524 0.05483 0.79540 +0.15045 0.05532 0.79550 +0.20839 0.05582 0.79558 +0.26849 0.05635 0.79563 +0.33023 0.05689 0.79564 +0.39306 0.05744 0.79563 +0.45645 0.05799 0.79558 +0.51985 0.05855 0.79550 +0.58271 0.05910 0.79541 +0.64450 0.05964 0.79529 +0.70467 0.06017 0.79516 +0.76268 0.06067 0.79501 +0.81799 0.06116 0.79486 +0.87006 0.06161 0.79471 +0.91834 0.06204 0.79457 +0.00000 0.10966 0.79561 +0.04533 0.11008 0.79567 +0.09732 0.11054 0.79571 +0.15257 0.11102 0.79572 +0.21054 0.11153 0.79571 +0.27068 0.11206 0.79567 +0.33245 0.11260 0.79560 +0.39531 0.11315 0.79551 +0.45872 0.11370 0.79540 +0.52214 0.11426 0.79526 +0.58502 0.11481 0.79510 +0.64683 0.11535 0.79494 +0.70701 0.11587 0.79477 +0.76504 0.11638 0.79459 +0.82036 0.11686 0.79441 +0.87243 0.11732 0.79425 +0.92071 0.11774 0.79409 +0.00000 0.16884 0.79580 +0.04762 0.16926 0.79579 +0.09965 0.16972 0.79575 +0.15493 0.17020 0.79568 +0.21292 0.17071 0.79560 +0.27308 0.17124 0.79549 +0.33488 0.17178 0.79535 +0.39776 0.17233 0.79520 +0.46119 0.17288 0.79503 +0.52463 0.17344 0.79485 +0.58752 0.17399 0.79466 +0.64934 0.17453 0.79446 +0.70954 0.17505 0.79426 +0.76757 0.17556 0.79408 +0.82284 0.17605 0.79397 +0.87482 0.17650 0.79398 +0.92297 0.17692 0.79407 +0.00188 0.23092 0.79572 +0.05013 0.23134 0.79563 +0.10218 0.23180 0.79553 +0.15748 0.23228 0.79541 +0.21549 0.23279 0.79526 +0.27568 0.23332 0.79510 +0.33749 0.23386 0.79492 +0.40039 0.23441 0.79473 +0.46383 0.23496 0.79453 +0.52727 0.23552 0.79432 +0.59017 0.23607 0.79413 +0.65192 0.23661 0.79405 +0.71197 0.23713 0.79411 +0.76980 0.23764 0.79429 +0.82487 0.23812 0.79456 +0.87666 0.23858 0.79491 +0.92464 0.23900 0.79532 +0.00454 0.29532 0.79539 +0.05281 0.29574 0.79526 +0.10488 0.29619 0.79511 +0.16019 0.29668 0.79495 +0.21822 0.29718 0.79477 +0.27841 0.29771 0.79457 +0.34023 0.29825 0.79437 +0.40312 0.29880 0.79419 +0.46648 0.29936 0.79415 +0.52975 0.29991 0.79425 +0.59241 0.30046 0.79448 +0.65393 0.30100 0.79484 +0.71376 0.30152 0.79531 +0.77138 0.30203 0.79587 +0.82627 0.30251 0.79650 +0.87788 0.30297 0.79717 +0.92571 0.30339 0.79786 +0.00734 0.36145 0.79488 +0.05562 0.36187 0.79473 +0.10769 0.36233 0.79456 +0.16302 0.36281 0.79437 +0.22101 0.36332 0.79426 +0.28109 0.36384 0.79426 +0.34273 0.36438 0.79440 +0.40537 0.36493 0.79467 +0.46847 0.36549 0.79508 +0.53151 0.36604 0.79561 +0.59395 0.36659 0.79627 +0.65525 0.36713 0.79703 +0.71489 0.36765 0.79787 +0.77232 0.36816 0.79878 +0.82704 0.36864 0.79974 +0.87851 0.36909 0.80071 +0.92620 0.36951 0.80167 +0.01018 0.42874 0.79435 +0.05838 0.42916 0.79434 +0.11032 0.42962 0.79443 +0.16543 0.43010 0.79461 +0.22319 0.43061 0.79492 +0.28304 0.43113 0.79536 +0.34444 0.43167 0.79593 +0.40686 0.43222 0.79662 +0.46975 0.43277 0.79744 +0.53258 0.43333 0.79838 +0.59482 0.43387 0.79942 +0.65593 0.43441 0.80054 +0.71539 0.43494 0.80172 +0.77267 0.43544 0.80295 +0.82725 0.43592 0.80419 +0.87858 0.43638 0.80542 +0.92616 0.43680 0.80662 +0.01239 0.49661 0.79502 +0.06040 0.49703 0.79536 +0.11213 0.49748 0.79581 +0.16705 0.49797 0.79638 +0.22460 0.49847 0.79707 +0.28425 0.49900 0.79790 +0.34545 0.49954 0.79885 +0.40766 0.50008 0.79993 +0.47036 0.50064 0.80112 +0.53301 0.50119 0.80241 +0.59508 0.50174 0.80379 +0.65604 0.50227 0.80523 +0.71536 0.50280 0.80671 +0.77251 0.50330 0.80821 +0.82696 0.50378 0.80970 +0.87819 0.50424 0.81116 +0.92568 0.50466 0.81256 +0.01380 0.56447 0.79717 +0.06164 0.56490 0.79782 +0.11321 0.56535 0.79860 +0.16795 0.56583 0.79951 +0.22532 0.56634 0.80055 +0.28479 0.56686 0.80172 +0.34582 0.56740 0.80302 +0.40787 0.56795 0.80443 +0.47041 0.56850 0.80594 +0.53291 0.56905 0.80754 +0.59484 0.56960 0.80920 +0.65567 0.57013 0.81091 +0.71488 0.57066 0.81265 +0.77193 0.57116 0.81438 +0.82629 0.57164 0.81608 +0.87744 0.57210 0.81773 +0.92486 0.57252 0.81929 +0.01451 0.63176 0.80061 +0.06222 0.63218 0.80154 +0.11364 0.63263 0.80260 +0.16823 0.63311 0.80381 +0.22545 0.63362 0.80515 +0.28478 0.63414 0.80662 +0.34566 0.63468 0.80820 +0.40758 0.63523 0.80989 +0.47000 0.63578 0.81168 +0.53239 0.63633 0.81353 +0.59421 0.63688 0.81544 +0.65495 0.63742 0.81738 +0.71407 0.63794 0.81932 +0.77104 0.63844 0.82123 +0.82535 0.63892 0.82310 +0.87645 0.63938 0.82489 +0.92383 0.63980 0.82657 +0.01465 0.69788 0.80511 +0.06224 0.69830 0.80627 +0.11354 0.69876 0.80758 +0.16802 0.69924 0.80904 +0.22512 0.69974 0.81063 +0.28433 0.70027 0.81235 +0.34512 0.70080 0.81417 +0.40693 0.70135 0.81610 +0.46926 0.70190 0.81810 +0.53156 0.70245 0.82017 +0.59331 0.70300 0.82227 +0.65399 0.70354 0.82438 +0.71306 0.70406 0.82647 +0.77001 0.70457 0.82847 +0.82431 0.70505 0.83035 +0.87545 0.70550 0.83210 +0.92287 0.70592 0.83370 +0.01435 0.76227 0.81041 +0.06185 0.76269 0.81177 +0.11306 0.76314 0.81329 +0.16744 0.76362 0.81495 +0.22446 0.76413 0.81674 +0.28359 0.76465 0.81866 +0.34429 0.76519 0.82068 +0.40604 0.76574 0.82279 +0.46830 0.76629 0.82497 +0.53056 0.76684 0.82717 +0.59230 0.76739 0.82933 +0.65300 0.76792 0.83142 +0.71211 0.76845 0.83343 +0.76912 0.76895 0.83532 +0.82349 0.76943 0.83709 +0.87469 0.76989 0.83872 +0.92218 0.77031 0.84019 +0.01373 0.82434 0.81625 +0.06116 0.82476 0.81777 +0.11231 0.82521 0.81945 +0.16662 0.82569 0.82128 +0.22359 0.82620 0.82323 +0.28266 0.82672 0.82530 +0.34332 0.82726 0.82745 +0.40507 0.82780 0.82960 +0.46735 0.82836 0.83175 +0.52966 0.82891 0.83386 +0.59147 0.82945 0.83590 +0.65223 0.82999 0.83786 +0.71143 0.83052 0.83972 +0.76853 0.83102 0.84145 +0.82299 0.83150 0.84305 +0.87429 0.83196 0.84451 +0.92188 0.83238 0.84580 +0.01292 0.88351 0.82238 +0.06031 0.88393 0.82402 +0.11141 0.88438 0.82583 +0.16570 0.88486 0.82774 +0.22266 0.88537 0.82973 +0.28176 0.88589 0.83177 +0.34247 0.88643 0.83382 +0.40427 0.88698 0.83587 +0.46663 0.88753 0.83788 +0.52902 0.88808 0.83984 +0.59092 0.88863 0.84172 +0.65179 0.88917 0.84349 +0.71109 0.88969 0.84515 +0.76831 0.89020 0.84668 +0.82289 0.89068 0.84807 +0.87430 0.89113 0.84930 +0.92200 0.89155 0.85039 +0.01204 0.93921 0.82849 +0.05943 0.93963 0.83014 +0.11056 0.94008 0.83190 +0.16489 0.94056 0.83374 +0.22190 0.94107 0.83563 +0.28106 0.94159 0.83756 +0.34185 0.94213 0.83948 +0.40374 0.94268 0.84137 +0.46620 0.94323 0.84321 +0.52870 0.94378 0.84497 +0.59071 0.94433 0.84664 +0.65170 0.94487 0.84819 +0.71114 0.94539 0.84961 +0.76848 0.94590 0.85089 +0.82320 0.94638 0.85203 +0.87475 0.94683 0.85302 +0.92259 0.94725 0.85387 +0.01130 0.99085 0.83404 +0.05874 0.99127 0.83561 +0.10992 0.99172 0.83728 +0.16431 0.99221 0.83901 +0.22139 0.99271 0.84077 +0.28063 0.99323 0.84254 +0.34152 0.99377 0.84429 +0.40351 0.99432 0.84600 +0.46608 0.99487 0.84763 +0.52871 0.99543 0.84916 +0.59085 0.99597 0.85059 +0.65198 0.99651 0.85189 +0.71156 0.99704 0.85304 +0.76906 0.99754 0.85406 +0.82392 0.99803 0.85493 +0.87562 0.99848 0.85566 +0.92360 0.99890 0.85625 +0.00000 0.00249 0.85717 +0.04170 0.00291 0.85739 +0.09363 0.00337 0.85761 +0.14881 0.00385 0.85780 +0.20671 0.00436 0.85796 +0.26679 0.00489 0.85809 +0.32850 0.00543 0.85819 +0.39131 0.00598 0.85825 +0.45467 0.00653 0.85827 +0.51804 0.00709 0.85827 +0.58088 0.00764 0.85823 +0.64265 0.00818 0.85816 +0.70280 0.00870 0.85808 +0.76080 0.00921 0.85797 +0.81610 0.00969 0.85786 +0.86815 0.01015 0.85773 +0.91642 0.01057 0.85761 +0.00000 0.05414 0.85789 +0.04350 0.05457 0.85803 +0.09547 0.05502 0.85815 +0.15069 0.05550 0.85824 +0.20863 0.05601 0.85831 +0.26874 0.05654 0.85834 +0.33048 0.05708 0.85835 +0.39332 0.05763 0.85832 +0.45671 0.05818 0.85827 +0.52011 0.05874 0.85819 +0.58297 0.05929 0.85808 +0.64477 0.05983 0.85796 +0.70494 0.06036 0.85782 +0.76295 0.06086 0.85767 +0.81826 0.06135 0.85752 +0.87033 0.06180 0.85736 +0.91861 0.06222 0.85722 +0.00000 0.10985 0.85835 +0.04557 0.11027 0.85840 +0.09757 0.11073 0.85842 +0.15283 0.11121 0.85843 +0.21079 0.11172 0.85841 +0.27093 0.11224 0.85836 +0.33271 0.11278 0.85829 +0.39557 0.11333 0.85819 +0.45899 0.11389 0.85806 +0.52241 0.11444 0.85792 +0.58529 0.11499 0.85776 +0.64710 0.11553 0.85759 +0.70729 0.11606 0.85742 +0.76531 0.11657 0.85724 +0.82063 0.11705 0.85706 +0.87271 0.11751 0.85689 +0.92099 0.11793 0.85673 +0.00000 0.16903 0.85851 +0.04788 0.16945 0.85848 +0.09991 0.16991 0.85843 +0.15519 0.17039 0.85836 +0.21318 0.17090 0.85827 +0.27335 0.17143 0.85815 +0.33515 0.17197 0.85802 +0.39803 0.17252 0.85786 +0.46146 0.17307 0.85768 +0.52490 0.17363 0.85750 +0.58780 0.17418 0.85730 +0.64962 0.17472 0.85710 +0.70981 0.17524 0.85691 +0.76783 0.17575 0.85673 +0.82309 0.17623 0.85667 +0.87504 0.17669 0.85671 +0.92317 0.17711 0.85684 +0.00214 0.23111 0.85839 +0.05040 0.23153 0.85830 +0.10245 0.23199 0.85820 +0.15775 0.23247 0.85807 +0.21576 0.23298 0.85792 +0.27595 0.23350 0.85775 +0.33776 0.23404 0.85757 +0.40066 0.23459 0.85738 +0.46410 0.23515 0.85717 +0.52755 0.23570 0.85696 +0.59043 0.23625 0.85680 +0.65215 0.23679 0.85677 +0.71218 0.23732 0.85687 +0.76999 0.23783 0.85708 +0.82504 0.23831 0.85739 +0.87682 0.23876 0.85778 +0.92478 0.23919 0.85821 +0.00481 0.29550 0.85804 +0.05309 0.29593 0.85791 +0.10515 0.29638 0.85776 +0.16047 0.29687 0.85760 +0.21850 0.29737 0.85741 +0.27869 0.29790 0.85722 +0.34051 0.29844 0.85701 +0.40338 0.29899 0.85687 +0.46671 0.29954 0.85687 +0.52996 0.30010 0.85702 +0.59260 0.30065 0.85729 +0.65409 0.30119 0.85769 +0.71390 0.30171 0.85820 +0.77151 0.30222 0.85879 +0.82637 0.30270 0.85945 +0.87798 0.30315 0.86015 +0.92579 0.30358 0.86087 +0.00762 0.36164 0.85753 +0.05590 0.36206 0.85737 +0.10797 0.36251 0.85720 +0.16329 0.36300 0.85703 +0.22125 0.36351 0.85695 +0.28132 0.36403 0.85700 +0.34293 0.36457 0.85718 +0.40554 0.36512 0.85749 +0.46863 0.36567 0.85794 +0.53165 0.36623 0.85852 +0.59407 0.36678 0.85921 +0.65535 0.36731 0.86000 +0.71497 0.36784 0.86088 +0.77239 0.36834 0.86182 +0.82709 0.36883 0.86280 +0.87854 0.36928 0.86380 +0.92622 0.36970 0.86478 +0.01043 0.42893 0.85705 +0.05861 0.42935 0.85707 +0.11052 0.42981 0.85719 +0.16562 0.43029 0.85742 +0.22336 0.43079 0.85776 +0.28319 0.43132 0.85823 +0.34457 0.43186 0.85884 +0.40697 0.43241 0.85957 +0.46984 0.43296 0.86043 +0.53265 0.43351 0.86140 +0.59487 0.43406 0.86247 +0.65597 0.43460 0.86362 +0.71542 0.43512 0.86484 +0.77269 0.43563 0.86609 +0.82725 0.43611 0.86736 +0.87857 0.43656 0.86861 +0.92614 0.43698 0.86983 +0.01256 0.49680 0.85786 +0.06055 0.49722 0.85823 +0.11227 0.49767 0.85871 +0.16717 0.49815 0.85931 +0.22470 0.49866 0.86004 +0.28433 0.49918 0.86090 +0.34551 0.49972 0.86189 +0.40771 0.50027 0.86300 +0.47040 0.50082 0.86422 +0.53303 0.50138 0.86554 +0.59509 0.50192 0.86694 +0.65603 0.50246 0.86841 +0.71534 0.50298 0.86992 +0.77248 0.50349 0.87144 +0.82692 0.50397 0.87296 +0.87815 0.50442 0.87443 +0.92562 0.50484 0.87585 +0.01390 0.56466 0.86014 +0.06173 0.56508 0.86082 +0.11328 0.56554 0.86162 +0.16800 0.56602 0.86256 +0.22536 0.56652 0.86363 +0.28482 0.56705 0.86483 +0.34583 0.56759 0.86616 +0.40787 0.56813 0.86759 +0.47040 0.56869 0.86913 +0.53289 0.56924 0.87076 +0.59481 0.56978 0.87245 +0.65563 0.57032 0.87418 +0.71482 0.57085 0.87594 +0.77186 0.57135 0.87769 +0.82622 0.57183 0.87941 +0.87737 0.57228 0.88107 +0.92478 0.57270 0.88264 +0.01456 0.63195 0.86369 +0.06225 0.63237 0.86464 +0.11365 0.63282 0.86573 +0.16823 0.63330 0.86696 +0.22545 0.63381 0.86833 +0.28476 0.63433 0.86982 +0.34564 0.63487 0.87143 +0.40754 0.63542 0.87315 +0.46995 0.63597 0.87496 +0.53233 0.63652 0.87683 +0.59415 0.63707 0.87876 +0.65487 0.63760 0.88071 +0.71399 0.63813 0.88267 +0.77096 0.63863 0.88460 +0.82526 0.63911 0.88649 +0.87635 0.63956 0.88829 +0.92374 0.63998 0.88996 +0.01465 0.69807 0.86829 +0.06223 0.69849 0.86947 +0.11352 0.69894 0.87080 +0.16798 0.69943 0.87228 +0.22508 0.69993 0.87389 +0.28428 0.70045 0.87563 +0.34505 0.70099 0.87748 +0.40686 0.70154 0.87942 +0.46918 0.70209 0.88145 +0.53148 0.70264 0.88353 +0.59322 0.70319 0.88564 +0.65389 0.70373 0.88777 +0.71296 0.70425 0.88986 +0.76992 0.70475 0.89185 +0.82423 0.70523 0.89373 +0.87537 0.70569 0.89547 +0.92279 0.70611 0.89706 +0.01431 0.76246 0.87367 +0.06180 0.76288 0.87505 +0.11300 0.76333 0.87658 +0.16737 0.76381 0.87826 +0.22439 0.76432 0.88007 +0.28351 0.76484 0.88201 +0.34421 0.76538 0.88405 +0.40595 0.76592 0.88617 +0.46821 0.76647 0.88836 +0.53047 0.76703 0.89056 +0.59222 0.76757 0.89271 +0.65291 0.76811 0.89479 +0.71204 0.76863 0.89678 +0.76905 0.76914 0.89867 +0.82343 0.76962 0.90042 +0.87464 0.77007 0.90203 +0.92214 0.77049 0.90349 +0.01366 0.82453 0.87958 +0.06109 0.82495 0.88111 +0.11223 0.82540 0.88281 +0.16654 0.82588 0.88464 +0.22350 0.82638 0.88661 +0.28257 0.82691 0.88870 +0.34323 0.82744 0.89083 +0.40498 0.82799 0.89298 +0.46728 0.82854 0.89512 +0.52959 0.82909 0.89721 +0.59140 0.82964 0.89924 +0.65218 0.83018 0.90118 +0.71139 0.83070 0.90302 +0.76850 0.83121 0.90474 +0.82297 0.83169 0.90632 +0.87428 0.83214 0.90775 +0.92188 0.83256 0.90903 +0.01283 0.88370 0.88576 +0.06022 0.88412 0.88741 +0.11131 0.88457 0.88922 +0.16561 0.88505 0.89113 +0.22257 0.88556 0.89311 +0.28168 0.88608 0.89513 +0.34240 0.88662 0.89718 +0.40421 0.88716 0.89921 +0.46658 0.88772 0.90121 +0.52898 0.88827 0.90314 +0.59089 0.88882 0.90500 +0.65177 0.88935 0.90675 +0.71109 0.88988 0.90839 +0.76831 0.89038 0.90989 +0.82291 0.89087 0.91125 +0.87434 0.89132 0.91246 +0.92205 0.89174 0.91353 +0.01195 0.93940 0.89188 +0.05935 0.93982 0.89352 +0.11048 0.94027 0.89527 +0.16482 0.94075 0.89710 +0.22184 0.94125 0.89898 +0.28101 0.94178 0.90088 +0.34181 0.94232 0.90278 +0.40370 0.94286 0.90466 +0.46617 0.94342 0.90647 +0.52869 0.94397 0.90821 +0.59072 0.94452 0.90985 +0.65172 0.94505 0.91137 +0.71118 0.94558 0.91276 +0.76854 0.94608 0.91402 +0.82327 0.94657 0.91513 +0.87484 0.94702 0.91609 +0.92269 0.94744 0.91691 +0.01123 0.99104 0.89739 +0.05867 0.99146 0.89896 +0.10986 0.99191 0.90061 +0.16426 0.99239 0.90232 +0.22135 0.99290 0.90407 +0.28061 0.99342 0.90582 +0.34150 0.99396 0.90755 +0.40351 0.99451 0.90922 +0.46610 0.99506 0.91082 +0.52874 0.99561 0.91233 +0.59090 0.99616 0.91372 +0.65205 0.99670 0.91498 +0.71165 0.99723 0.91611 +0.76917 0.99773 0.91709 +0.82405 0.99822 0.91792 +0.87576 0.99867 0.91862 +0.92376 0.99909 0.91917 +0.00000 0.00267 0.91704 +0.04191 0.00309 0.91726 +0.09384 0.00355 0.91746 +0.14903 0.00403 0.91764 +0.20694 0.00454 0.91779 +0.26702 0.00507 0.91791 +0.32873 0.00561 0.91799 +0.39154 0.00616 0.91804 +0.45490 0.00671 0.91806 +0.51828 0.00727 0.91804 +0.58112 0.00782 0.91799 +0.64290 0.00836 0.91792 +0.70305 0.00888 0.91783 +0.76105 0.00939 0.91772 +0.81635 0.00987 0.91760 +0.86841 0.01033 0.91747 +0.91668 0.01075 0.91734 +0.00000 0.05432 0.91773 +0.04373 0.05475 0.91786 +0.09570 0.05520 0.91796 +0.15092 0.05568 0.91805 +0.20886 0.05619 0.91810 +0.26898 0.05672 0.91813 +0.33073 0.05726 0.91813 +0.39357 0.05781 0.91809 +0.45696 0.05836 0.91803 +0.52036 0.05892 0.91794 +0.58323 0.05947 0.91783 +0.64502 0.06001 0.91770 +0.70520 0.06053 0.91755 +0.76321 0.06104 0.91740 +0.81852 0.06153 0.91725 +0.87059 0.06198 0.91709 +0.91887 0.06240 0.91694 +0.00000 0.11003 0.91815 +0.04581 0.11045 0.91819 +0.09781 0.11091 0.91821 +0.15307 0.11139 0.91821 +0.21104 0.11190 0.91818 +0.27118 0.11242 0.91812 +0.33296 0.11296 0.91804 +0.39582 0.11351 0.91794 +0.45924 0.11407 0.91781 +0.52266 0.11462 0.91766 +0.58555 0.11517 0.91749 +0.64736 0.11571 0.91732 +0.70755 0.11624 0.91714 +0.76557 0.11675 0.91696 +0.82090 0.11723 0.91678 +0.87297 0.11769 0.91661 +0.92125 0.11811 0.91646 +0.00000 0.16921 0.91828 +0.04812 0.16963 0.91825 +0.10016 0.17009 0.91820 +0.15544 0.17057 0.91812 +0.21344 0.17108 0.91802 +0.27360 0.17161 0.91790 +0.33540 0.17215 0.91775 +0.39829 0.17270 0.91759 +0.46172 0.17325 0.91741 +0.52516 0.17381 0.91722 +0.58806 0.17436 0.91703 +0.64988 0.17490 0.91683 +0.71007 0.17542 0.91663 +0.76808 0.17593 0.91648 +0.82331 0.17641 0.91646 +0.87525 0.17687 0.91653 +0.92336 0.17729 0.91669 +0.00239 0.23129 0.91814 +0.05065 0.23171 0.91805 +0.10270 0.23217 0.91794 +0.15801 0.23265 0.91780 +0.21602 0.23316 0.91765 +0.27621 0.23368 0.91748 +0.33802 0.23422 0.91730 +0.40092 0.23477 0.91710 +0.46437 0.23533 0.91689 +0.52781 0.23588 0.91668 +0.59067 0.23643 0.91656 +0.65237 0.23697 0.91657 +0.71238 0.23750 0.91671 +0.77017 0.23801 0.91696 +0.82520 0.23849 0.91731 +0.87696 0.23894 0.91772 +0.92491 0.23936 0.91818 +0.00507 0.29568 0.91778 +0.05335 0.29611 0.91764 +0.10541 0.29656 0.91749 +0.16073 0.29705 0.91732 +0.21876 0.29755 0.91714 +0.27895 0.29808 0.91694 +0.34077 0.29862 0.91674 +0.40361 0.29917 0.91664 +0.46692 0.29972 0.91668 +0.53015 0.30028 0.91687 +0.59277 0.30083 0.91718 +0.65424 0.30137 0.91762 +0.71403 0.30189 0.91816 +0.77162 0.30240 0.91879 +0.82647 0.30288 0.91948 +0.87806 0.30333 0.92021 +0.92586 0.30375 0.92096 +0.00788 0.36182 0.91725 +0.05616 0.36224 0.91709 +0.10823 0.36269 0.91692 +0.16354 0.36318 0.91677 +0.22148 0.36369 0.91674 +0.28152 0.36421 0.91682 +0.34311 0.36475 0.91704 +0.40571 0.36530 0.91739 +0.46877 0.36585 0.91788 +0.53177 0.36641 0.91849 +0.59417 0.36696 0.91922 +0.65544 0.36749 0.92005 +0.71504 0.36802 0.92096 +0.77244 0.36852 0.92193 +0.82713 0.36901 0.92294 +0.87857 0.36946 0.92396 +0.92624 0.36988 0.92496 +0.01066 0.42911 0.91683 +0.05882 0.42953 0.91689 +0.11072 0.42998 0.91704 +0.16580 0.43047 0.91730 +0.22352 0.43097 0.91768 +0.28333 0.43150 0.91819 +0.34469 0.43204 0.91883 +0.40707 0.43259 0.91960 +0.46992 0.43314 0.92049 +0.53272 0.43369 0.92149 +0.59492 0.43424 0.92259 +0.65600 0.43478 0.92378 +0.71544 0.43530 0.92502 +0.77269 0.43581 0.92630 +0.82724 0.43629 0.92759 +0.87856 0.43674 0.92886 +0.92612 0.43716 0.93010 +0.01271 0.49698 0.91778 +0.06069 0.49740 0.91818 +0.11239 0.49785 0.91869 +0.16728 0.49833 0.91932 +0.22479 0.49884 0.92008 +0.28440 0.49936 0.92097 +0.34557 0.49990 0.92199 +0.40776 0.50045 0.92313 +0.47042 0.50100 0.92438 +0.53305 0.50156 0.92573 +0.59509 0.50210 0.92716 +0.65602 0.50264 0.92866 +0.71531 0.50316 0.93019 +0.77244 0.50367 0.93173 +0.82688 0.50415 0.93327 +0.87810 0.50460 0.93476 +0.92557 0.50502 0.93619 +0.01399 0.56484 0.92018 +0.06181 0.56526 0.92088 +0.11334 0.56572 0.92172 +0.16805 0.56620 0.92268 +0.22540 0.56670 0.92378 +0.28484 0.56723 0.92501 +0.34584 0.56777 0.92636 +0.40786 0.56831 0.92782 +0.47038 0.56886 0.92939 +0.53286 0.56942 0.93104 +0.59477 0.56996 0.93275 +0.65558 0.57050 0.93451 +0.71477 0.57102 0.93628 +0.77180 0.57153 0.93805 +0.82615 0.57201 0.93979 +0.87729 0.57246 0.94146 +0.92470 0.57288 0.94305 +0.01459 0.63213 0.92384 +0.06227 0.63255 0.92481 +0.11367 0.63300 0.92593 +0.16823 0.63348 0.92718 +0.22544 0.63399 0.92857 +0.28474 0.63451 0.93009 +0.34560 0.63505 0.93172 +0.40750 0.63559 0.93346 +0.46990 0.63615 0.93529 +0.53227 0.63670 0.93719 +0.59408 0.63724 0.93913 +0.65480 0.63778 0.94110 +0.71391 0.63831 0.94308 +0.77087 0.63881 0.94502 +0.82517 0.63929 0.94692 +0.87627 0.63974 0.94872 +0.92365 0.64016 0.95039 +0.01464 0.69825 0.92852 +0.06221 0.69867 0.92973 +0.11349 0.69912 0.93108 +0.16795 0.69960 0.93258 +0.22504 0.70011 0.93421 +0.28423 0.70063 0.93597 +0.34499 0.70117 0.93784 +0.40679 0.70172 0.93980 +0.46911 0.70227 0.94184 +0.53140 0.70282 0.94394 +0.59314 0.70337 0.94607 +0.65380 0.70390 0.94821 +0.71288 0.70443 0.95029 +0.76984 0.70493 0.95227 +0.82415 0.70541 0.95414 +0.87530 0.70587 0.95587 +0.92273 0.70629 0.95745 +0.01426 0.76264 0.93398 +0.06175 0.76306 0.93538 +0.11294 0.76351 0.93693 +0.16731 0.76399 0.93862 +0.22432 0.76449 0.94045 +0.28343 0.76502 0.94240 +0.34413 0.76556 0.94446 +0.40586 0.76610 0.94660 +0.46812 0.76665 0.94880 +0.53039 0.76721 0.95099 +0.59214 0.76775 0.95313 +0.65284 0.76829 0.95520 +0.71197 0.76881 0.95718 +0.76899 0.76932 0.95905 +0.82338 0.76980 0.96079 +0.87460 0.77025 0.96238 +0.92211 0.77067 0.96383 +0.01359 0.82470 0.93995 +0.06102 0.82512 0.94150 +0.11215 0.82558 0.94321 +0.16646 0.82606 0.94506 +0.22341 0.82656 0.94704 +0.28248 0.82709 0.94913 +0.34315 0.82762 0.95126 +0.40490 0.82817 0.95340 +0.46720 0.82872 0.95552 +0.52953 0.82927 0.95761 +0.59135 0.82982 0.95962 +0.65213 0.83036 0.96155 +0.71135 0.83088 0.96337 +0.76847 0.83139 0.96506 +0.82295 0.83187 0.96662 +0.87427 0.83232 0.96804 +0.92188 0.83274 0.96929 +0.01274 0.88388 0.94618 +0.06013 0.88430 0.94784 +0.11123 0.88475 0.94965 +0.16552 0.88523 0.95155 +0.22249 0.88573 0.95353 +0.28160 0.88626 0.95554 +0.34233 0.88680 0.95757 +0.40415 0.88734 0.95959 +0.46653 0.88790 0.96157 +0.52894 0.88845 0.96349 +0.59086 0.88899 0.96532 +0.65175 0.88953 0.96706 +0.71108 0.89006 0.96867 +0.76832 0.89056 0.97014 +0.82293 0.89104 0.97148 +0.87437 0.89150 0.97267 +0.92211 0.89192 0.97371 +0.01187 0.93957 0.95230 +0.05927 0.93999 0.95394 +0.11041 0.94045 0.95568 +0.16475 0.94093 0.95749 +0.22178 0.94143 0.95936 +0.28096 0.94196 0.96125 +0.34176 0.94249 0.96313 +0.40367 0.94304 0.96498 +0.46616 0.94359 0.96678 +0.52868 0.94415 0.96849 +0.59073 0.94469 0.97010 +0.65175 0.94523 0.97160 +0.71122 0.94576 0.97296 +0.76860 0.94626 0.97419 +0.82335 0.94675 0.97527 +0.87493 0.94720 0.97620 +0.92280 0.94762 0.97699 +0.01116 0.99122 0.95779 +0.05861 0.99164 0.95934 +0.10980 0.99209 0.96098 +0.16421 0.99257 0.96268 +0.22132 0.99308 0.96441 +0.28058 0.99360 0.96613 +0.34149 0.99414 0.96784 +0.40351 0.99469 0.96949 +0.46611 0.99524 0.97106 +0.52877 0.99579 0.97254 +0.59095 0.99634 0.97390 +0.65212 0.99688 0.97513 +0.71174 0.99741 0.97622 +0.76927 0.99791 0.97717 +0.82418 0.99840 0.97797 +0.87591 0.99885 0.97863 +0.92392 0.99927 0.97915 +0.00000 0.00284 0.97340 +0.04211 0.00326 0.97360 +0.09405 0.00372 0.97379 +0.14924 0.00420 0.97396 +0.20715 0.00471 0.97410 +0.26723 0.00524 0.97421 +0.32895 0.00578 0.97428 +0.39177 0.00633 0.97432 +0.45513 0.00688 0.97433 +0.51851 0.00744 0.97430 +0.58136 0.00799 0.97425 +0.64313 0.00853 0.97417 +0.70329 0.00905 0.97407 +0.76129 0.00956 0.97395 +0.81660 0.01004 0.97383 +0.86865 0.01050 0.97370 +0.91693 0.01092 0.97357 +0.00000 0.05449 0.97405 +0.04394 0.05491 0.97417 +0.09591 0.05537 0.97427 +0.15114 0.05585 0.97434 +0.20909 0.05636 0.97439 +0.26920 0.05689 0.97441 +0.33095 0.05743 0.97439 +0.39380 0.05798 0.97435 +0.45719 0.05853 0.97428 +0.52059 0.05909 0.97418 +0.58347 0.05964 0.97406 +0.64526 0.06018 0.97393 +0.70544 0.06070 0.97378 +0.76346 0.06121 0.97362 +0.81877 0.06170 0.97347 +0.87084 0.06215 0.97331 +0.91912 0.06257 0.97316 +0.00000 0.11020 0.97444 +0.04603 0.11062 0.97447 +0.09804 0.11108 0.97449 +0.15330 0.11156 0.97447 +0.21127 0.11207 0.97444 +0.27142 0.11259 0.97438 +0.33319 0.11313 0.97429 +0.39606 0.11368 0.97417 +0.45948 0.11424 0.97404 +0.52290 0.11479 0.97389 +0.58579 0.11534 0.97372 +0.64760 0.11588 0.97354 +0.70779 0.11641 0.97336 +0.76582 0.11692 0.97318 +0.82114 0.11740 0.97300 +0.87322 0.11786 0.97283 +0.92148 0.11828 0.97269 +0.00012 0.16938 0.97454 +0.04836 0.16980 0.97451 +0.10039 0.17026 0.97445 +0.15568 0.17074 0.97436 +0.21367 0.17125 0.97426 +0.27384 0.17177 0.97413 +0.33564 0.17232 0.97398 +0.39853 0.17287 0.97381 +0.46197 0.17342 0.97363 +0.52541 0.17398 0.97344 +0.58831 0.17453 0.97324 +0.65013 0.17507 0.97304 +0.71032 0.17559 0.97284 +0.76830 0.17610 0.97274 +0.82352 0.17658 0.97275 +0.87544 0.17704 0.97285 +0.92354 0.17746 0.97304 +0.00263 0.23146 0.97438 +0.05089 0.23188 0.97429 +0.10294 0.23234 0.97417 +0.15825 0.23282 0.97403 +0.21627 0.23333 0.97388 +0.27645 0.23385 0.97370 +0.33827 0.23439 0.97351 +0.40117 0.23494 0.97331 +0.46461 0.23550 0.97311 +0.52805 0.23605 0.97291 +0.59089 0.23660 0.97282 +0.65257 0.23714 0.97287 +0.71256 0.23767 0.97305 +0.77033 0.23818 0.97333 +0.82535 0.23866 0.97371 +0.87709 0.23911 0.97415 +0.92502 0.23953 0.97464 +0.00531 0.29585 0.97400 +0.05359 0.29628 0.97386 +0.10566 0.29673 0.97371 +0.16098 0.29721 0.97354 +0.21900 0.29772 0.97335 +0.27920 0.29825 0.97315 +0.34101 0.29879 0.97297 +0.40383 0.29934 0.97291 +0.46711 0.29989 0.97299 +0.53032 0.30045 0.97321 +0.59292 0.30100 0.97357 +0.65437 0.30154 0.97404 +0.71415 0.30206 0.97461 +0.77172 0.30257 0.97527 +0.82656 0.30305 0.97599 +0.87813 0.30350 0.97675 +0.92592 0.30392 0.97752 +0.00812 0.36199 0.97346 +0.05641 0.36241 0.97331 +0.10848 0.36286 0.97314 +0.16376 0.36335 0.97302 +0.22169 0.36385 0.97302 +0.28171 0.36438 0.97314 +0.34328 0.36492 0.97340 +0.40586 0.36547 0.97379 +0.46890 0.36602 0.97431 +0.53188 0.36658 0.97496 +0.59426 0.36712 0.97572 +0.65551 0.36766 0.97658 +0.71510 0.36819 0.97752 +0.77249 0.36869 0.97852 +0.82717 0.36917 0.97955 +0.87860 0.36963 0.98059 +0.92626 0.37005 0.98162 +0.01087 0.42928 0.97311 +0.05901 0.42970 0.97320 +0.11089 0.43015 0.97338 +0.16596 0.43064 0.97368 +0.22366 0.43114 0.97409 +0.28345 0.43167 0.97463 +0.34480 0.43221 0.97531 +0.40716 0.43276 0.97611 +0.46999 0.43331 0.97703 +0.53277 0.43386 0.97806 +0.59496 0.43441 0.97919 +0.65603 0.43495 0.98040 +0.71545 0.43547 0.98167 +0.77270 0.43598 0.98297 +0.82724 0.43646 0.98429 +0.87854 0.43691 0.98558 +0.92609 0.43733 0.98683 +0.01285 0.49715 0.97419 +0.06082 0.49757 0.97461 +0.11251 0.49802 0.97515 +0.16737 0.49850 0.97581 +0.22487 0.49901 0.97661 +0.28447 0.49953 0.97753 +0.34562 0.50007 0.97857 +0.40779 0.50062 0.97974 +0.47045 0.50117 0.98102 +0.53306 0.50172 0.98240 +0.59508 0.50227 0.98386 +0.65601 0.50281 0.98537 +0.71529 0.50333 0.98692 +0.77241 0.50384 0.98849 +0.82684 0.50432 0.99004 +0.87805 0.50477 0.99155 +0.92551 0.50519 0.99300 +0.01407 0.56501 0.97670 +0.06188 0.56543 0.97743 +0.11340 0.56588 0.97829 +0.16810 0.56637 0.97928 +0.22543 0.56687 0.98040 +0.28485 0.56740 0.98166 +0.34584 0.56793 0.98303 +0.40786 0.56848 0.98452 +0.47036 0.56903 0.98611 +0.53283 0.56958 0.98778 +0.59473 0.57013 0.98952 +0.65553 0.57067 0.99129 +0.71471 0.57119 0.99309 +0.77174 0.57170 0.99487 +0.82608 0.57218 0.99662 +0.87722 0.57263 0.99831 +0.92462 0.57305 0.99991 +0.01462 0.63229 0.98046 +0.06229 0.63271 0.98146 +0.11368 0.63317 0.98259 +0.16823 0.63365 0.98387 +0.22542 0.63415 0.98528 +0.28472 0.63468 0.98682 +0.34557 0.63522 0.98847 +0.40746 0.63576 0.99023 +0.46985 0.63631 0.99208 +0.53221 0.63687 0.99400 +0.59401 0.63741 0.99596 +0.65473 0.63795 0.99795 +0.71383 0.63847 0.99994 +0.77079 0.63898 1.00000 +0.82508 0.63946 1.00000 +0.87618 0.63991 1.00000 +0.92357 0.64033 1.00000 +0.01463 0.69842 0.98523 +0.06219 0.69884 0.98645 +0.11346 0.69929 0.98783 +0.16791 0.69977 0.98934 +0.22499 0.70028 0.99099 +0.28418 0.70080 0.99277 +0.34493 0.70134 0.99465 +0.40673 0.70189 0.99664 +0.46903 0.70244 0.99869 +0.53132 0.70299 1.00000 +0.59306 0.70354 1.00000 +0.65372 0.70407 1.00000 +0.71280 0.70460 1.00000 +0.76976 0.70510 1.00000 +0.82408 0.70558 1.00000 +0.87523 0.70603 1.00000 +0.92267 0.70645 1.00000 +0.01422 0.76280 0.99076 +0.06170 0.76322 0.99217 +0.11289 0.76368 0.99374 +0.16725 0.76416 0.99545 +0.22425 0.76466 0.99729 +0.28336 0.76519 0.99926 +0.34405 0.76572 1.00000 +0.40578 0.76627 1.00000 +0.46804 0.76682 1.00000 +0.53031 0.76737 1.00000 +0.59206 0.76792 1.00000 +0.65277 0.76846 1.00000 +0.71191 0.76898 1.00000 +0.76894 0.76949 1.00000 +0.82333 0.76997 1.00000 +0.87456 0.77042 1.00000 +0.92208 0.77084 1.00000 +0.01353 0.82487 0.99679 +0.06094 0.82529 0.99835 +0.11207 0.82575 1.00000 +0.16638 0.82623 1.00000 +0.22332 0.82673 1.00000 +0.28239 0.82725 1.00000 +0.34307 0.82779 1.00000 +0.40483 0.82834 1.00000 +0.46713 0.82889 1.00000 +0.52947 0.82944 1.00000 +0.59129 0.82999 1.00000 +0.65209 0.83053 1.00000 +0.71131 0.83105 1.00000 +0.76844 0.83156 1.00000 +0.82294 0.83204 1.00000 +0.87427 0.83249 1.00000 +0.92189 0.83291 1.00000 +0.01266 0.88405 1.00000 +0.06004 0.88447 1.00000 +0.11114 0.88492 1.00000 +0.16544 0.88540 1.00000 +0.22242 0.88590 1.00000 +0.28153 0.88643 1.00000 +0.34227 0.88696 1.00000 +0.40409 0.88751 1.00000 +0.46648 0.88806 1.00000 +0.52891 0.88862 1.00000 +0.59084 0.88916 1.00000 +0.65174 0.88970 1.00000 +0.71109 0.89023 1.00000 +0.76834 0.89073 1.00000 +0.82296 0.89121 1.00000 +0.87442 0.89167 1.00000 +0.92216 0.89209 1.00000 +0.01179 0.93974 1.00000 +0.05920 0.94016 1.00000 +0.11034 0.94062 1.00000 +0.16469 0.94110 1.00000 +0.22172 0.94160 1.00000 +0.28091 0.94213 1.00000 +0.34173 0.94266 1.00000 +0.40365 0.94321 1.00000 +0.46614 0.94376 1.00000 +0.52868 0.94432 1.00000 +0.59074 0.94486 1.00000 +0.65178 0.94540 1.00000 +0.71126 0.94593 1.00000 +0.76866 0.94643 1.00000 +0.82342 0.94692 1.00000 +0.87502 0.94737 1.00000 +0.92290 0.94779 1.00000 +0.01110 0.99139 1.00000 +0.05856 0.99181 1.00000 +0.10976 0.99226 1.00000 +0.16417 0.99274 1.00000 +0.22129 0.99325 1.00000 +0.28056 0.99377 1.00000 +0.34148 0.99431 1.00000 +0.40352 0.99486 1.00000 +0.46614 0.99541 1.00000 +0.52881 0.99596 1.00000 +0.59101 0.99651 1.00000 +0.65219 0.99705 1.00000 +0.71183 0.99757 1.00000 +0.76938 0.99808 1.00000 +0.82430 0.99856 1.00000 +0.87605 0.99902 1.00000 +0.92408 0.99944 1.00000 +0.00000 0.00300 1.00000 +0.04229 0.00342 1.00000 +0.09424 0.00388 1.00000 +0.14943 0.00436 1.00000 +0.20735 0.00487 1.00000 +0.26743 0.00539 1.00000 +0.32916 0.00593 1.00000 +0.39197 0.00648 1.00000 +0.45534 0.00704 1.00000 +0.51872 0.00759 1.00000 +0.58157 0.00814 1.00000 +0.64335 0.00868 1.00000 +0.70351 0.00921 1.00000 +0.76152 0.00972 1.00000 +0.81682 0.01020 1.00000 +0.86888 0.01066 1.00000 +0.91715 0.01108 1.00000 +0.00000 0.05465 1.00000 +0.04414 0.05507 1.00000 +0.09611 0.05553 1.00000 +0.15135 0.05601 1.00000 +0.20929 0.05652 1.00000 +0.26941 0.05704 1.00000 +0.33117 0.05758 1.00000 +0.39401 0.05813 1.00000 +0.45741 0.05869 1.00000 +0.52081 0.05924 1.00000 +0.58369 0.05979 1.00000 +0.64548 0.06033 1.00000 +0.70566 0.06086 1.00000 +0.76368 0.06137 1.00000 +0.81900 0.06185 1.00000 +0.87107 0.06231 1.00000 +0.91935 0.06273 1.00000 +0.00000 0.11036 1.00000 +0.04624 0.11078 1.00000 +0.09825 0.11123 1.00000 +0.15351 0.11172 1.00000 +0.21148 0.11222 1.00000 +0.27163 0.11275 1.00000 +0.33341 0.11329 1.00000 +0.39628 0.11384 1.00000 +0.45970 0.11440 1.00000 +0.52313 0.11495 1.00000 +0.58602 0.11550 1.00000 +0.64783 0.11604 1.00000 +0.70802 0.11657 1.00000 +0.76605 0.11707 1.00000 +0.82137 0.11756 1.00000 +0.87344 0.11801 1.00000 +0.92170 0.11844 1.00000 +0.00033 0.16954 1.00000 +0.04857 0.16996 1.00000 +0.10061 0.17041 1.00000 +0.15589 0.17090 1.00000 +0.21390 0.17141 1.00000 +0.27407 0.17193 1.00000 +0.33587 0.17247 1.00000 +0.39876 0.17302 1.00000 +0.46219 0.17358 1.00000 +0.52563 0.17413 1.00000 +0.58853 0.17468 1.00000 +0.65035 0.17522 1.00000 +0.71054 0.17575 1.00000 +0.76851 0.17626 1.00000 +0.82371 0.17674 1.00000 +0.87561 0.17719 1.00000 +0.92369 0.17762 1.00000 +0.00285 0.23161 1.00000 +0.05111 0.23204 1.00000 +0.10317 0.23249 1.00000 +0.15847 0.23298 1.00000 +0.21649 0.23348 1.00000 +0.27668 0.23401 1.00000 +0.33850 0.23455 1.00000 +0.40140 0.23510 1.00000 +0.46484 0.23566 1.00000 +0.52827 0.23621 1.00000 +0.59109 0.23676 1.00000 +0.65275 0.23730 1.00000 +0.71272 0.23783 1.00000 +0.77047 0.23833 1.00000 +0.82548 0.23882 1.00000 +0.87720 0.23927 1.00000 +0.92512 0.23969 1.00000 +0.00554 0.29601 1.00000 +0.05382 0.29643 1.00000 +0.10588 0.29689 1.00000 +0.16120 0.29737 1.00000 +0.21923 0.29788 1.00000 +0.27943 0.29841 1.00000 +0.34122 0.29895 1.00000 +0.40403 0.29950 1.00000 +0.46729 0.30005 1.00000 +0.53048 0.30060 1.00000 +0.59306 0.30115 1.00000 +0.65450 0.30169 1.00000 +0.71426 0.30222 1.00000 +0.77181 0.30272 1.00000 +0.82663 0.30321 1.00000 +0.87820 0.30366 1.00000 +0.92597 0.30408 1.00000 +0.00835 0.36214 1.00000 +0.05664 0.36257 1.00000 +0.10870 0.36302 1.00000 +0.16397 0.36350 1.00000 +0.22188 0.36401 1.00000 +0.28188 0.36454 1.00000 +0.34343 0.36508 1.00000 +0.40599 0.36563 1.00000 +0.46902 0.36618 1.00000 +0.53198 0.36673 1.00000 +0.59435 0.36728 1.00000 +0.65558 0.36782 1.00000 +0.71515 0.36834 1.00000 +0.77254 0.36885 1.00000 +0.82720 0.36933 1.00000 +0.87862 0.36978 1.00000 +0.92627 0.37020 1.00000 +0.01105 0.42943 1.00000 +0.05919 0.42986 1.00000 +0.11105 0.43031 1.00000 +0.16610 0.43079 1.00000 +0.22378 0.43130 1.00000 +0.28356 0.43182 1.00000 +0.34489 0.43236 1.00000 +0.40723 0.43291 1.00000 +0.47005 0.43346 1.00000 +0.53282 0.43402 1.00000 +0.59500 0.43457 1.00000 +0.65605 0.43510 1.00000 +0.71546 0.43563 1.00000 +0.77270 0.43613 1.00000 +0.82723 0.43661 1.00000 +0.87852 0.43707 1.00000 +0.92607 0.43749 1.00000 +0.01298 0.49730 1.00000 +0.06093 0.49772 1.00000 +0.11260 0.49818 1.00000 +0.16746 0.49866 1.00000 +0.22494 0.49916 1.00000 +0.28453 0.49969 1.00000 +0.34566 0.50023 1.00000 +0.40782 0.50078 1.00000 +0.47046 0.50133 1.00000 +0.53306 0.50188 1.00000 +0.59508 0.50243 1.00000 +0.65599 0.50296 1.00000 +0.71527 0.50349 1.00000 +0.77238 0.50399 1.00000 +0.82680 0.50447 1.00000 +0.87800 0.50493 1.00000 +0.92546 0.50535 1.00000 +0.01414 0.56517 1.00000 +0.06194 0.56559 1.00000 +0.11345 0.56604 1.00000 +0.16813 0.56652 1.00000 +0.22545 0.56703 1.00000 +0.28487 0.56755 1.00000 +0.34584 0.56809 1.00000 +0.40785 0.56864 1.00000 +0.47034 0.56919 1.00000 +0.53280 0.56974 1.00000 +0.59469 0.57029 1.00000 +0.65549 0.57083 1.00000 +0.71466 0.57135 1.00000 +0.77168 0.57185 1.00000 +0.82602 0.57233 1.00000 +0.87715 0.57279 1.00000 +0.92455 0.57321 1.00000 +0.01465 0.63245 1.00000 +0.06231 0.63287 1.00000 +0.11368 0.63332 1.00000 +0.16823 0.63381 1.00000 +0.22541 0.63431 1.00000 +0.28469 0.63483 1.00000 +0.34554 0.63537 1.00000 +0.40742 0.63592 1.00000 +0.46980 0.63647 1.00000 +0.53216 0.63702 1.00000 +0.59395 0.63757 1.00000 +0.65466 0.63811 1.00000 +0.71376 0.63863 1.00000 +0.77072 0.63913 1.00000 +0.82500 0.63962 1.00000 +0.87611 0.64007 1.00000 +0.92350 0.64049 1.00000 +0.01462 0.69858 1.00000 +0.06217 0.69900 1.00000 +0.11344 0.69945 1.00000 +0.16787 0.69993 1.00000 +0.22495 0.70043 1.00000 +0.28413 0.70096 1.00000 +0.34487 0.70149 1.00000 +0.40666 0.70204 1.00000 +0.46896 0.70259 1.00000 +0.53125 0.70314 1.00000 +0.59298 0.70369 1.00000 +0.65364 0.70423 1.00000 +0.71272 0.70475 1.00000 +0.76969 0.70526 1.00000 +0.82402 0.70574 1.00000 +0.87517 0.70619 1.00000 +0.92261 0.70661 1.00000 +0.01418 0.76296 1.00000 +0.06165 0.76338 1.00000 +0.11283 0.76383 1.00000 +0.16719 0.76431 1.00000 +0.22418 0.76482 1.00000 +0.28329 0.76534 1.00000 +0.34397 0.76588 1.00000 +0.40570 0.76643 1.00000 +0.46796 0.76698 1.00000 +0.53024 0.76753 1.00000 +0.59199 0.76808 1.00000 +0.65271 0.76861 1.00000 +0.71185 0.76914 1.00000 +0.76889 0.76964 1.00000 +0.82329 0.77012 1.00000 +0.87453 0.77058 1.00000 +0.92205 0.77100 1.00000 +0.01346 0.82503 1.00000 +0.06088 0.82545 1.00000 +0.11200 0.82590 1.00000 +0.16630 0.82638 1.00000 +0.22325 0.82689 1.00000 +0.28232 0.82741 1.00000 +0.34300 0.82795 1.00000 +0.40476 0.82849 1.00000 +0.46707 0.82905 1.00000 +0.52941 0.82960 1.00000 +0.59125 0.83015 1.00000 +0.65205 0.83068 1.00000 +0.71128 0.83121 1.00000 +0.76842 0.83171 1.00000 +0.82293 0.83219 1.00000 +0.87427 0.83265 1.00000 +0.92190 0.83307 1.00000 +0.01259 0.88420 1.00000 +0.05996 0.88462 1.00000 +0.11107 0.88507 1.00000 +0.16537 0.88555 1.00000 +0.22235 0.88606 1.00000 +0.28147 0.88658 1.00000 +0.34221 0.88712 1.00000 +0.40405 0.88767 1.00000 +0.46644 0.88822 1.00000 +0.52888 0.88877 1.00000 +0.59082 0.88932 1.00000 +0.65173 0.88986 1.00000 +0.71109 0.89038 1.00000 +0.76836 0.89089 1.00000 +0.82299 0.89137 1.00000 +0.87446 0.89182 1.00000 +0.92221 0.89225 1.00000 +0.01172 0.93990 1.00000 +0.05913 0.94032 1.00000 +0.11028 0.94077 1.00000 +0.16463 0.94125 1.00000 +0.22167 0.94176 1.00000 +0.28087 0.94228 1.00000 +0.34170 0.94282 1.00000 +0.40363 0.94337 1.00000 +0.46613 0.94392 1.00000 +0.52869 0.94447 1.00000 +0.59076 0.94502 1.00000 +0.65181 0.94556 1.00000 +0.71131 0.94608 1.00000 +0.76872 0.94659 1.00000 +0.82350 0.94707 1.00000 +0.87511 0.94753 1.00000 +0.92301 0.94795 1.00000 +0.01105 0.99154 1.00000 +0.05851 0.99196 1.00000 +0.10971 0.99242 1.00000 +0.16414 0.99290 1.00000 +0.22126 0.99340 1.00000 +0.28055 0.99393 1.00000 +0.34148 0.99446 1.00000 +0.40353 0.99501 1.00000 +0.46616 0.99557 1.00000 +0.52885 0.99612 1.00000 +0.59106 0.99667 1.00000 +0.65226 0.99721 1.00000 +0.71192 0.99773 1.00000 +0.76949 0.99824 1.00000 +0.82442 0.99872 1.00000 +0.87619 0.99918 1.00000 +0.92424 0.99960 1.00000 diff --git a/src/assets/lut/pellicola-anni-70.cube b/src/assets/lut/pellicola-anni-70.cube new file mode 100644 index 0000000..60f6eea --- /dev/null +++ b/src/assets/lut/pellicola-anni-70.cube @@ -0,0 +1,4919 @@ +# DaProd Video · LUT di partenza, create da noi (licenza MIT, come il progetto). +# Generata da scripts/genera-lut.mjs: non si modifica a mano. +TITLE "Pellicola anni 70" +LUT_3D_SIZE 17 +DOMAIN_MIN 0.0 0.0 0.0 +DOMAIN_MAX 1.0 1.0 1.0 +0.07320 0.09615 0.04500 +0.10963 0.09763 0.04500 +0.15025 0.09907 0.04500 +0.19453 0.10048 0.04500 +0.24199 0.10183 0.04500 +0.29209 0.10313 0.04500 +0.34434 0.10438 0.04545 +0.39824 0.10557 0.04710 +0.45327 0.10670 0.04878 +0.50893 0.10779 0.05049 +0.56472 0.10883 0.05222 +0.62015 0.10983 0.05397 +0.67470 0.11080 0.05573 +0.72788 0.11176 0.05752 +0.77920 0.11271 0.05932 +0.82814 0.11366 0.06113 +0.87422 0.11463 0.06294 +0.07826 0.13560 0.04500 +0.11529 0.13717 0.04500 +0.15642 0.13870 0.04500 +0.20114 0.14018 0.04599 +0.24894 0.14160 0.04762 +0.29932 0.14297 0.04929 +0.35178 0.14429 0.05099 +0.40580 0.14554 0.05271 +0.46088 0.14675 0.05445 +0.51652 0.14791 0.05622 +0.57223 0.14903 0.05802 +0.62749 0.15011 0.05983 +0.68181 0.15118 0.06166 +0.73469 0.15224 0.06350 +0.78563 0.15331 0.06535 +0.83413 0.15438 0.06721 +0.87970 0.15548 0.06907 +0.08316 0.17955 0.04658 +0.12076 0.18118 0.04821 +0.16239 0.18276 0.04986 +0.20753 0.18428 0.05154 +0.25567 0.18575 0.05325 +0.30632 0.18716 0.05499 +0.35897 0.18851 0.05675 +0.41310 0.18981 0.05854 +0.46823 0.19107 0.06035 +0.52385 0.19228 0.06219 +0.57945 0.19346 0.06404 +0.63455 0.19462 0.06591 +0.68863 0.19577 0.06780 +0.74120 0.19692 0.06969 +0.79177 0.19808 0.07159 +0.83983 0.19927 0.07350 +0.88488 0.20049 0.07540 +0.08784 0.22726 0.05218 +0.12602 0.22893 0.05388 +0.16813 0.23053 0.05560 +0.21368 0.23208 0.05735 +0.26216 0.23357 0.05913 +0.31307 0.23500 0.06093 +0.36590 0.23638 0.06276 +0.42015 0.23771 0.06461 +0.47532 0.23900 0.06649 +0.53091 0.24025 0.06838 +0.58641 0.24149 0.07029 +0.64134 0.24271 0.07222 +0.69518 0.24393 0.07415 +0.74745 0.24516 0.07609 +0.79764 0.24642 0.07803 +0.84525 0.24771 0.07997 +0.88979 0.24904 0.08191 +0.09231 0.27805 0.05805 +0.13104 0.27973 0.05981 +0.17364 0.28135 0.06159 +0.21960 0.28290 0.06341 +0.26841 0.28440 0.06525 +0.31957 0.28584 0.06711 +0.37259 0.28724 0.06900 +0.42695 0.28859 0.07091 +0.48217 0.28991 0.07284 +0.53773 0.29121 0.07478 +0.59314 0.29249 0.07674 +0.64790 0.29378 0.07871 +0.70151 0.29507 0.08068 +0.75348 0.29639 0.08266 +0.80330 0.29774 0.08464 +0.85052 0.29915 0.08658 +0.89468 0.30066 0.08846 +0.09657 0.33127 0.06416 +0.13586 0.33296 0.06598 +0.17893 0.33457 0.06782 +0.22530 0.33613 0.06969 +0.27444 0.33763 0.07159 +0.32587 0.33908 0.07351 +0.37907 0.34049 0.07545 +0.43356 0.34187 0.07741 +0.48882 0.34323 0.07938 +0.54436 0.34457 0.08137 +0.59969 0.34591 0.08336 +0.65430 0.34727 0.08536 +0.70780 0.34869 0.08730 +0.75969 0.35019 0.08916 +0.80945 0.35177 0.09096 +0.85657 0.35344 0.09271 +0.90052 0.35518 0.09441 +0.10065 0.38633 0.07050 +0.14050 0.38802 0.07237 +0.18407 0.38963 0.07426 +0.23084 0.39119 0.07618 +0.28032 0.39270 0.07812 +0.33202 0.39416 0.08009 +0.38542 0.39559 0.08207 +0.44003 0.39700 0.08407 +0.49538 0.39841 0.08606 +0.55107 0.39988 0.08798 +0.60659 0.40141 0.08982 +0.66143 0.40300 0.09160 +0.71509 0.40467 0.09331 +0.76703 0.40642 0.09497 +0.81675 0.40825 0.09658 +0.86373 0.41015 0.09815 +0.90743 0.41212 0.09970 +0.10464 0.44268 0.07703 +0.14505 0.44436 0.07894 +0.18911 0.44598 0.08087 +0.23630 0.44754 0.08283 +0.28613 0.44906 0.08481 +0.33817 0.45058 0.08677 +0.39197 0.45212 0.08865 +0.44703 0.45371 0.09048 +0.50286 0.45536 0.09223 +0.55893 0.45706 0.09391 +0.61475 0.45882 0.09554 +0.66980 0.46066 0.09710 +0.72356 0.46257 0.09862 +0.77552 0.46455 0.10010 +0.82515 0.46660 0.10154 +0.87193 0.46873 0.10297 +0.91534 0.47091 0.10440 +0.10861 0.49979 0.08370 +0.14963 0.50149 0.08562 +0.19431 0.50316 0.08750 +0.24216 0.50484 0.08934 +0.29269 0.50653 0.09112 +0.34540 0.50825 0.09285 +0.39980 0.51001 0.09451 +0.45538 0.51182 0.09611 +0.51163 0.51368 0.09765 +0.56804 0.51560 0.09913 +0.62411 0.51760 0.10056 +0.67931 0.51966 0.10195 +0.73313 0.52179 0.10330 +0.78504 0.52399 0.10463 +0.83453 0.52625 0.10595 +0.88107 0.52858 0.10726 +0.92413 0.53095 0.10859 +0.11336 0.55747 0.09001 +0.15528 0.55930 0.09174 +0.20079 0.56114 0.09344 +0.24941 0.56298 0.09508 +0.30064 0.56485 0.09666 +0.35397 0.56676 0.09819 +0.40891 0.56871 0.09966 +0.46494 0.57072 0.10107 +0.52157 0.57279 0.10243 +0.57826 0.57492 0.10374 +0.63452 0.57712 0.10501 +0.68981 0.57939 0.10626 +0.74362 0.58173 0.10748 +0.79543 0.58412 0.10870 +0.84472 0.58658 0.10991 +0.89095 0.58908 0.11114 +0.93361 0.59162 0.11240 +0.11953 0.61544 0.09556 +0.16230 0.61740 0.09714 +0.20860 0.61937 0.09866 +0.25793 0.62137 0.10013 +0.30980 0.62340 0.10155 +0.36370 0.62548 0.10291 +0.41912 0.62761 0.10422 +0.47555 0.62980 0.10548 +0.53248 0.63205 0.10669 +0.58939 0.63438 0.10787 +0.64577 0.63677 0.10903 +0.70109 0.63922 0.11017 +0.75484 0.64173 0.11130 +0.80648 0.64431 0.11243 +0.85551 0.64692 0.11358 +0.90138 0.64958 0.11476 +0.94359 0.65226 0.11598 +0.12691 0.67306 0.10049 +0.17048 0.67513 0.10193 +0.21752 0.67723 0.10332 +0.26751 0.67935 0.10465 +0.31997 0.68153 0.10594 +0.37437 0.68376 0.10717 +0.43021 0.68604 0.10835 +0.48698 0.68840 0.10949 +0.54415 0.69082 0.11060 +0.60121 0.69330 0.11169 +0.65765 0.69586 0.11276 +0.71294 0.69847 0.11383 +0.76655 0.70114 0.11490 +0.81797 0.70386 0.11599 +0.86668 0.70661 0.11711 +0.91213 0.70939 0.11827 +0.95382 0.71216 0.11949 +0.13529 0.72968 0.10495 +0.17961 0.73184 0.10629 +0.22732 0.73403 0.10757 +0.27793 0.73627 0.10880 +0.33091 0.73856 0.10998 +0.38575 0.74091 0.11112 +0.44195 0.74333 0.11221 +0.49898 0.74582 0.11328 +0.55634 0.74838 0.11432 +0.61349 0.75100 0.11535 +0.66992 0.75369 0.11637 +0.72511 0.75643 0.11741 +0.77853 0.75922 0.11846 +0.82963 0.76199 0.11955 +0.87788 0.76472 0.12071 +0.92277 0.76741 0.12193 +0.96378 0.77005 0.12322 +0.14441 0.78460 0.10912 +0.18943 0.78681 0.11038 +0.23777 0.78908 0.11159 +0.28892 0.79140 0.11274 +0.34237 0.79378 0.11386 +0.39760 0.79623 0.11493 +0.45409 0.79875 0.11597 +0.51133 0.80135 0.11699 +0.56881 0.80401 0.11800 +0.62598 0.80673 0.11900 +0.68230 0.80943 0.12004 +0.73724 0.81211 0.12112 +0.79027 0.81475 0.12224 +0.84089 0.81735 0.12343 +0.88858 0.81991 0.12468 +0.93281 0.82242 0.12599 +0.96500 0.82488 0.12738 +0.15403 0.83708 0.11315 +0.19971 0.83933 0.11436 +0.24862 0.84163 0.11552 +0.30027 0.84400 0.11663 +0.35412 0.84644 0.11771 +0.40968 0.84896 0.11875 +0.46640 0.85154 0.11977 +0.52375 0.85412 0.12080 +0.58119 0.85669 0.12185 +0.63819 0.85923 0.12293 +0.69424 0.86175 0.12406 +0.74882 0.86423 0.12523 +0.80141 0.86666 0.12646 +0.85150 0.86906 0.12776 +0.89857 0.87140 0.12912 +0.94211 0.87370 0.13056 +0.96500 0.87594 0.13207 +0.16392 0.88637 0.11720 +0.21020 0.88861 0.11838 +0.25964 0.89092 0.11952 +0.31173 0.89330 0.12061 +0.36591 0.89571 0.12169 +0.42165 0.89811 0.12277 +0.47844 0.90050 0.12386 +0.53575 0.90287 0.12497 +0.59305 0.90522 0.12611 +0.64983 0.90754 0.12730 +0.70557 0.90982 0.12853 +0.75974 0.91206 0.12983 +0.81185 0.91425 0.13118 +0.86136 0.91639 0.13261 +0.90778 0.91849 0.13410 +0.95060 0.92053 0.13567 +0.96500 0.92253 0.13730 +0.17388 0.93166 0.12139 +0.22069 0.93382 0.12258 +0.27055 0.93600 0.12374 +0.32293 0.93818 0.12489 +0.37730 0.94035 0.12604 +0.43315 0.94252 0.12720 +0.48994 0.94467 0.12838 +0.54716 0.94679 0.12959 +0.60429 0.94888 0.13085 +0.66081 0.95094 0.13215 +0.71620 0.95295 0.13351 +0.76994 0.95491 0.13493 +0.82153 0.95500 0.13643 +0.87045 0.95500 0.13799 +0.91620 0.95500 0.13962 +0.95828 0.95500 0.14131 +0.96500 0.95500 0.14308 +0.07372 0.09665 0.07063 +0.11021 0.09812 0.07232 +0.15088 0.09956 0.07403 +0.19521 0.10095 0.07577 +0.24270 0.10229 0.07753 +0.29283 0.10359 0.07931 +0.34510 0.10482 0.08113 +0.39901 0.10600 0.08296 +0.45404 0.10712 0.08483 +0.50970 0.10820 0.08672 +0.56549 0.10923 0.08863 +0.62090 0.11022 0.09056 +0.67543 0.11118 0.09251 +0.72858 0.11213 0.09448 +0.77986 0.11307 0.09646 +0.82876 0.11402 0.09844 +0.87478 0.11499 0.10043 +0.07877 0.13613 0.07639 +0.11585 0.13770 0.07815 +0.15703 0.13922 0.07992 +0.20179 0.14069 0.08172 +0.24963 0.14210 0.08355 +0.30004 0.14346 0.08540 +0.35252 0.14476 0.08728 +0.40655 0.14601 0.08918 +0.46164 0.14720 0.09111 +0.51728 0.14835 0.09306 +0.57297 0.14946 0.09504 +0.62822 0.15054 0.09703 +0.68251 0.15160 0.09903 +0.73536 0.15266 0.10105 +0.78627 0.15371 0.10308 +0.83472 0.15478 0.10511 +0.88024 0.15588 0.10715 +0.08365 0.18010 0.08238 +0.12131 0.18173 0.08420 +0.16299 0.18330 0.08604 +0.20817 0.18481 0.08790 +0.25635 0.18627 0.08980 +0.30703 0.18767 0.09171 +0.35969 0.18901 0.09366 +0.41384 0.19030 0.09563 +0.46897 0.19155 0.09762 +0.52459 0.19275 0.09963 +0.58018 0.19392 0.10166 +0.63526 0.19508 0.10371 +0.68932 0.19622 0.10577 +0.74186 0.19737 0.10783 +0.79239 0.19852 0.10990 +0.84040 0.19971 0.11198 +0.88540 0.20093 0.11405 +0.08832 0.22783 0.08861 +0.12655 0.22949 0.09049 +0.16871 0.23109 0.09239 +0.21431 0.23262 0.09432 +0.26282 0.23410 0.09628 +0.31375 0.23552 0.09826 +0.36660 0.23689 0.10027 +0.42087 0.23821 0.10230 +0.47604 0.23949 0.10435 +0.53163 0.24074 0.10641 +0.58712 0.24197 0.10849 +0.64203 0.24319 0.11059 +0.69586 0.24441 0.11269 +0.74809 0.24564 0.11480 +0.79824 0.24689 0.11691 +0.84581 0.24818 0.11902 +0.89030 0.24952 0.12112 +0.09277 0.27862 0.09509 +0.13156 0.28030 0.09702 +0.17421 0.28191 0.09899 +0.22021 0.28345 0.10098 +0.26905 0.28494 0.10299 +0.32024 0.28638 0.10503 +0.37328 0.28776 0.10709 +0.42766 0.28911 0.10918 +0.48287 0.29042 0.11128 +0.53843 0.29172 0.11339 +0.59384 0.29300 0.11552 +0.64858 0.29428 0.11765 +0.70217 0.29557 0.11979 +0.75411 0.29689 0.12193 +0.80389 0.29824 0.12407 +0.85110 0.29967 0.12615 +0.89524 0.30119 0.12818 +0.09702 0.33185 0.10180 +0.13636 0.33352 0.10379 +0.17949 0.33514 0.10580 +0.22590 0.33669 0.10785 +0.27508 0.33818 0.10992 +0.32653 0.33963 0.11201 +0.37975 0.34103 0.11412 +0.43425 0.34241 0.11624 +0.48952 0.34376 0.11838 +0.54506 0.34510 0.12054 +0.60038 0.34644 0.12270 +0.65499 0.34780 0.12485 +0.70850 0.34924 0.12692 +0.76039 0.35075 0.12893 +0.81014 0.35235 0.13087 +0.85724 0.35403 0.13276 +0.90117 0.35579 0.13460 +0.10110 0.38691 0.10872 +0.14100 0.38858 0.11076 +0.18462 0.39019 0.11282 +0.23143 0.39175 0.11491 +0.28095 0.39325 0.11702 +0.33267 0.39471 0.11915 +0.38610 0.39614 0.12130 +0.44072 0.39755 0.12346 +0.49611 0.39897 0.12560 +0.55183 0.40045 0.12766 +0.60737 0.40199 0.12964 +0.66223 0.40361 0.13156 +0.71589 0.40529 0.13341 +0.76783 0.40706 0.13520 +0.81754 0.40890 0.13695 +0.86449 0.41082 0.13867 +0.90816 0.41281 0.14036 +0.10508 0.44325 0.11582 +0.14555 0.44493 0.11789 +0.18965 0.44654 0.12000 +0.23689 0.44810 0.12212 +0.28676 0.44962 0.12426 +0.33886 0.45115 0.12636 +0.39272 0.45272 0.12838 +0.44783 0.45432 0.13035 +0.50369 0.45598 0.13224 +0.55979 0.45769 0.13406 +0.61563 0.45948 0.13582 +0.67069 0.46133 0.13753 +0.72446 0.46326 0.13918 +0.77641 0.46526 0.14080 +0.82602 0.46733 0.14238 +0.87278 0.46946 0.14395 +0.91615 0.47166 0.14552 +0.10906 0.50036 0.12305 +0.15017 0.50207 0.12511 +0.19493 0.50376 0.12714 +0.24285 0.50545 0.12912 +0.29344 0.50715 0.13104 +0.34621 0.50889 0.13291 +0.40066 0.51066 0.13471 +0.45628 0.51248 0.13645 +0.51256 0.51436 0.13813 +0.56900 0.51630 0.13974 +0.62508 0.51831 0.14131 +0.68029 0.52039 0.14284 +0.73411 0.52254 0.14433 +0.78601 0.52476 0.14580 +0.83547 0.52704 0.14725 +0.88198 0.52938 0.14870 +0.92500 0.53177 0.15017 +0.11393 0.55809 0.12983 +0.15593 0.55993 0.13171 +0.20152 0.56178 0.13354 +0.25021 0.56364 0.13532 +0.30149 0.56552 0.13705 +0.35488 0.56745 0.13871 +0.40986 0.56942 0.14032 +0.46594 0.57144 0.14187 +0.52259 0.57353 0.14336 +0.57930 0.57568 0.14481 +0.63557 0.57790 0.14623 +0.69086 0.58018 0.14761 +0.74467 0.58253 0.14897 +0.79646 0.58495 0.15032 +0.84572 0.58742 0.15167 +0.89192 0.58994 0.15304 +0.93453 0.59249 0.15444 +0.12021 0.61610 0.13585 +0.16305 0.61807 0.13757 +0.20942 0.62006 0.13923 +0.25882 0.62207 0.14084 +0.31075 0.62412 0.14240 +0.36470 0.62621 0.14390 +0.42016 0.62836 0.14534 +0.47662 0.63057 0.14674 +0.53358 0.63284 0.14809 +0.59051 0.63518 0.14941 +0.64689 0.63759 0.15070 +0.70221 0.64006 0.15197 +0.75594 0.64260 0.15324 +0.80757 0.64518 0.15451 +0.85656 0.64782 0.15580 +0.90239 0.65049 0.15712 +0.94455 0.65318 0.15848 +0.12769 0.67376 0.14124 +0.17133 0.67584 0.14283 +0.21843 0.67795 0.14436 +0.26849 0.68009 0.14583 +0.32100 0.68229 0.14725 +0.37545 0.68453 0.14862 +0.43132 0.68684 0.14994 +0.48812 0.68921 0.15122 +0.54531 0.69164 0.15246 +0.60239 0.69415 0.15369 +0.65882 0.69672 0.15489 +0.71410 0.69936 0.15610 +0.76770 0.70204 0.15731 +0.81909 0.70478 0.15854 +0.86776 0.70755 0.15979 +0.91318 0.71034 0.16109 +0.95480 0.71311 0.16244 +0.13614 0.73041 0.14618 +0.18054 0.73258 0.14765 +0.22832 0.73479 0.14907 +0.27897 0.73704 0.15044 +0.33200 0.73935 0.15176 +0.38689 0.74172 0.15303 +0.44312 0.74416 0.15426 +0.50018 0.74666 0.15546 +0.55755 0.74924 0.15664 +0.61470 0.75188 0.15780 +0.67113 0.75459 0.15896 +0.72631 0.75736 0.16013 +0.77970 0.76015 0.16132 +0.83076 0.76291 0.16256 +0.87896 0.76564 0.16386 +0.92378 0.76832 0.16522 +0.96472 0.77096 0.16665 +0.14533 0.78535 0.15081 +0.19042 0.78758 0.15221 +0.23883 0.78986 0.15355 +0.29003 0.79219 0.15484 +0.34352 0.79459 0.15609 +0.39878 0.79706 0.15730 +0.45531 0.79960 0.15848 +0.51257 0.80221 0.15963 +0.57005 0.80490 0.16078 +0.62722 0.80762 0.16192 +0.68351 0.81032 0.16310 +0.73842 0.81299 0.16432 +0.79141 0.81562 0.16559 +0.84198 0.81822 0.16691 +0.88961 0.82077 0.16830 +0.93378 0.82328 0.16976 +0.96500 0.82573 0.17129 +0.15501 0.83784 0.15531 +0.20075 0.84010 0.15665 +0.24972 0.84242 0.15795 +0.30141 0.84481 0.15919 +0.35531 0.84727 0.16040 +0.41090 0.84980 0.16158 +0.46764 0.85239 0.16274 +0.52499 0.85496 0.16391 +0.58242 0.85753 0.16510 +0.63940 0.86006 0.16633 +0.69542 0.86257 0.16759 +0.74997 0.86504 0.16891 +0.80251 0.86747 0.17028 +0.85254 0.86986 0.17172 +0.89955 0.87219 0.17323 +0.94302 0.87448 0.17480 +0.96500 0.87671 0.17645 +0.16495 0.88712 0.15981 +0.21129 0.88938 0.16113 +0.26078 0.89171 0.16240 +0.31290 0.89410 0.16364 +0.36711 0.89650 0.16486 +0.42287 0.89889 0.16607 +0.47966 0.90128 0.16730 +0.53696 0.90364 0.16856 +0.59425 0.90598 0.16984 +0.65100 0.90829 0.17117 +0.70670 0.91057 0.17254 +0.76084 0.91280 0.17398 +0.81289 0.91498 0.17548 +0.86235 0.91711 0.17704 +0.90870 0.91920 0.17868 +0.95144 0.92123 0.18038 +0.96500 0.92321 0.18215 +0.17493 0.93240 0.16446 +0.22179 0.93456 0.16579 +0.27168 0.93672 0.16710 +0.32409 0.93890 0.16839 +0.37848 0.94107 0.16968 +0.43433 0.94323 0.17098 +0.49113 0.94537 0.17230 +0.54834 0.94748 0.17365 +0.60545 0.94956 0.17504 +0.66194 0.95161 0.17649 +0.71729 0.95361 0.17799 +0.77098 0.95500 0.17955 +0.82251 0.95500 0.18118 +0.87137 0.95500 0.18288 +0.91705 0.95500 0.18465 +0.95905 0.95500 0.18649 +0.96500 0.95500 0.18839 +0.07423 0.09716 0.10905 +0.11078 0.09861 0.11092 +0.15150 0.10004 0.11280 +0.19588 0.10142 0.11470 +0.24340 0.10275 0.11663 +0.29356 0.10403 0.11859 +0.34585 0.10525 0.12057 +0.39977 0.10642 0.12257 +0.45481 0.10753 0.12460 +0.51047 0.10859 0.12665 +0.56625 0.10961 0.12873 +0.62164 0.11059 0.13082 +0.67614 0.11155 0.13294 +0.72927 0.11249 0.13506 +0.78050 0.11342 0.13720 +0.82936 0.11437 0.13934 +0.87533 0.11533 0.14149 +0.07927 0.13666 0.11539 +0.11641 0.13822 0.11731 +0.15764 0.13972 0.11925 +0.20245 0.14118 0.12122 +0.25032 0.14258 0.12321 +0.30076 0.14393 0.12523 +0.35325 0.14522 0.12727 +0.40729 0.14645 0.12934 +0.46239 0.14764 0.13143 +0.51803 0.14878 0.13354 +0.57371 0.14988 0.13568 +0.62894 0.15095 0.13783 +0.68321 0.15200 0.13999 +0.73603 0.15305 0.14216 +0.78689 0.15410 0.14434 +0.83531 0.15517 0.14653 +0.88077 0.15626 0.14872 +0.08413 0.18065 0.12194 +0.12185 0.18226 0.12392 +0.16358 0.18382 0.12593 +0.20880 0.18533 0.12796 +0.25702 0.18677 0.13001 +0.30772 0.18816 0.13209 +0.36040 0.18949 0.13419 +0.41456 0.19077 0.13632 +0.46970 0.19201 0.13847 +0.52531 0.19320 0.14064 +0.58090 0.19437 0.14283 +0.63596 0.19552 0.14503 +0.68999 0.19665 0.14724 +0.74251 0.19779 0.14946 +0.79299 0.19895 0.15168 +0.84096 0.20013 0.15390 +0.88591 0.20135 0.15612 +0.08879 0.22838 0.12872 +0.12707 0.23003 0.13076 +0.16929 0.23162 0.13283 +0.21492 0.23315 0.13492 +0.26347 0.23462 0.13703 +0.31443 0.23603 0.13917 +0.36730 0.23739 0.14133 +0.42157 0.23870 0.14352 +0.47675 0.23998 0.14572 +0.53234 0.24122 0.14794 +0.58782 0.24244 0.15018 +0.64272 0.24365 0.15242 +0.69652 0.24487 0.15467 +0.74872 0.24610 0.15693 +0.79883 0.24735 0.15919 +0.84636 0.24864 0.16144 +0.89079 0.24997 0.16369 +0.09322 0.27918 0.13574 +0.13207 0.28085 0.13783 +0.17477 0.28245 0.13995 +0.22081 0.28399 0.14210 +0.26969 0.28547 0.14427 +0.32090 0.28689 0.14646 +0.37396 0.28827 0.14868 +0.42835 0.28961 0.15091 +0.48357 0.29092 0.15316 +0.53913 0.29221 0.15543 +0.59452 0.29349 0.15770 +0.64925 0.29477 0.15998 +0.70282 0.29606 0.16227 +0.75472 0.29738 0.16455 +0.80449 0.29874 0.16682 +0.85168 0.30018 0.16903 +0.89580 0.30171 0.17117 +0.09746 0.33240 0.14298 +0.13686 0.33407 0.14512 +0.18004 0.33568 0.14729 +0.22649 0.33722 0.14949 +0.27570 0.33871 0.15171 +0.32718 0.34015 0.15395 +0.38042 0.34155 0.15620 +0.43493 0.34292 0.15848 +0.49021 0.34427 0.16077 +0.54575 0.34561 0.16307 +0.60106 0.34695 0.16537 +0.65569 0.34832 0.16764 +0.70921 0.34978 0.16984 +0.76110 0.35131 0.17196 +0.81084 0.35292 0.17402 +0.85793 0.35462 0.17603 +0.90182 0.35640 0.17800 +0.10153 0.38746 0.15041 +0.14150 0.38913 0.15260 +0.18516 0.39074 0.15482 +0.23201 0.39229 0.15705 +0.28157 0.39379 0.15931 +0.33332 0.39524 0.16159 +0.38676 0.39667 0.16388 +0.44140 0.39808 0.16618 +0.49683 0.39952 0.16844 +0.55258 0.40101 0.17061 +0.60815 0.40257 0.17272 +0.66303 0.40420 0.17475 +0.71670 0.40591 0.17672 +0.76864 0.40769 0.17863 +0.81834 0.40955 0.18050 +0.86527 0.41148 0.18234 +0.90891 0.41349 0.18415 +0.10552 0.44381 0.15801 +0.14604 0.44547 0.16024 +0.19019 0.44708 0.16249 +0.23747 0.44864 0.16475 +0.28740 0.45017 0.16702 +0.33956 0.45172 0.16924 +0.39347 0.45330 0.17139 +0.44863 0.45492 0.17346 +0.50453 0.45659 0.17547 +0.56066 0.45833 0.17741 +0.61653 0.46013 0.17929 +0.67160 0.46200 0.18111 +0.72537 0.46394 0.18289 +0.77731 0.46596 0.18462 +0.82691 0.46805 0.18632 +0.87364 0.47020 0.18801 +0.91697 0.47242 0.18970 +0.10951 0.50092 0.16572 +0.15070 0.50264 0.16791 +0.19554 0.50434 0.17006 +0.24354 0.50604 0.17216 +0.29420 0.50776 0.17420 +0.34703 0.50951 0.17618 +0.40152 0.51130 0.17810 +0.45719 0.51314 0.17996 +0.51351 0.51504 0.18175 +0.56997 0.51700 0.18349 +0.62607 0.51903 0.18517 +0.68129 0.52113 0.18682 +0.73510 0.52329 0.18842 +0.78699 0.52553 0.19001 +0.83644 0.52783 0.19158 +0.88291 0.53018 0.19315 +0.92589 0.53259 0.19473 +0.11451 0.55870 0.17290 +0.15659 0.56056 0.17490 +0.20226 0.56242 0.17686 +0.25101 0.56429 0.17876 +0.30236 0.56619 0.18060 +0.35580 0.56813 0.18238 +0.41083 0.57012 0.18411 +0.46695 0.57216 0.18577 +0.52363 0.57426 0.18738 +0.58036 0.57643 0.18895 +0.63664 0.57867 0.19048 +0.69194 0.58098 0.19197 +0.74574 0.58335 0.19345 +0.79751 0.58578 0.19492 +0.84675 0.58827 0.19639 +0.89291 0.59080 0.19788 +0.93548 0.59338 0.19939 +0.12090 0.61675 0.17932 +0.16382 0.61874 0.18116 +0.21027 0.62074 0.18294 +0.25973 0.62277 0.18467 +0.31172 0.62483 0.18634 +0.36571 0.62694 0.18796 +0.42122 0.62911 0.18952 +0.47772 0.63134 0.19103 +0.53470 0.63363 0.19250 +0.59164 0.63599 0.19394 +0.64803 0.63842 0.19534 +0.70335 0.64091 0.19673 +0.75707 0.64346 0.19811 +0.80867 0.64607 0.19950 +0.85763 0.64872 0.20091 +0.90343 0.65141 0.20234 +0.94553 0.65412 0.20382 +0.12848 0.67446 0.18511 +0.17220 0.67655 0.18681 +0.21937 0.67868 0.18846 +0.26949 0.68084 0.19005 +0.32205 0.68304 0.19159 +0.37654 0.68531 0.19307 +0.43246 0.68763 0.19451 +0.48928 0.69002 0.19590 +0.54649 0.69248 0.19726 +0.60358 0.69501 0.19860 +0.66002 0.69760 0.19992 +0.71529 0.70025 0.20124 +0.76887 0.70296 0.20257 +0.82024 0.70572 0.20391 +0.86887 0.70850 0.20529 +0.91424 0.71131 0.20670 +0.95580 0.71408 0.20818 +0.13702 0.73114 0.19044 +0.18148 0.73332 0.19203 +0.22933 0.73555 0.19357 +0.28005 0.73782 0.19506 +0.33312 0.74014 0.19649 +0.38805 0.74253 0.19787 +0.44431 0.74499 0.19922 +0.50139 0.74752 0.20054 +0.55878 0.75012 0.20183 +0.61594 0.75278 0.20311 +0.67237 0.75551 0.20438 +0.72753 0.75829 0.20567 +0.78089 0.76109 0.20698 +0.83190 0.76385 0.20834 +0.88005 0.76657 0.20976 +0.92481 0.76924 0.21124 +0.96500 0.77187 0.21280 +0.14628 0.78610 0.19547 +0.19144 0.78835 0.19698 +0.23990 0.79064 0.19844 +0.29116 0.79299 0.19985 +0.34469 0.79541 0.20121 +0.39999 0.79790 0.20254 +0.45654 0.80046 0.20383 +0.51382 0.80310 0.20510 +0.57132 0.80580 0.20635 +0.62847 0.80852 0.20762 +0.68474 0.81121 0.20892 +0.73962 0.81388 0.21026 +0.79257 0.81651 0.21165 +0.84309 0.81910 0.21310 +0.89065 0.82164 0.21461 +0.93475 0.82414 0.21619 +0.96500 0.82659 0.21785 +0.15601 0.83861 0.20036 +0.20182 0.84088 0.20182 +0.25085 0.84322 0.20323 +0.30259 0.84563 0.20459 +0.35653 0.84810 0.20591 +0.41214 0.85066 0.20720 +0.46890 0.85324 0.20849 +0.52624 0.85581 0.20978 +0.58366 0.85837 0.21109 +0.64063 0.86090 0.21244 +0.69662 0.86340 0.21382 +0.75112 0.86586 0.21526 +0.80362 0.86829 0.21676 +0.85359 0.87066 0.21832 +0.90054 0.87299 0.21994 +0.94393 0.87526 0.22164 +0.96500 0.87749 0.22341 +0.16599 0.88789 0.20526 +0.21240 0.89017 0.20669 +0.26194 0.89251 0.20807 +0.31410 0.89490 0.20943 +0.36832 0.89730 0.21077 +0.42410 0.89969 0.21211 +0.48089 0.90206 0.21346 +0.53818 0.90442 0.21483 +0.59545 0.90675 0.21623 +0.65218 0.90906 0.21768 +0.70785 0.91132 0.21918 +0.76194 0.91354 0.22074 +0.81394 0.91571 0.22236 +0.86333 0.91783 0.22404 +0.90962 0.91990 0.22580 +0.95229 0.92193 0.22762 +0.96500 0.92390 0.22951 +0.17600 0.93314 0.21030 +0.22290 0.93529 0.21175 +0.27283 0.93746 0.21317 +0.32527 0.93963 0.21458 +0.37967 0.94179 0.21599 +0.43553 0.94394 0.21741 +0.49233 0.94607 0.21885 +0.54953 0.94818 0.22032 +0.60661 0.95025 0.22184 +0.66307 0.95228 0.22340 +0.71838 0.95427 0.22503 +0.77203 0.95500 0.22671 +0.82350 0.95500 0.22846 +0.87229 0.95500 0.23028 +0.91790 0.95500 0.23217 +0.95982 0.95500 0.23412 +0.96500 0.95500 0.23614 +0.07474 0.09765 0.15092 +0.11136 0.09910 0.15293 +0.15213 0.10051 0.15496 +0.19654 0.10188 0.15702 +0.24410 0.10320 0.15910 +0.29429 0.10446 0.16120 +0.34660 0.10567 0.16332 +0.40053 0.10682 0.16547 +0.45558 0.10792 0.16765 +0.51123 0.10897 0.16985 +0.56700 0.10998 0.17206 +0.62237 0.11095 0.17430 +0.67685 0.11190 0.17655 +0.72994 0.11283 0.17882 +0.78114 0.11376 0.18109 +0.82995 0.11469 0.18337 +0.87588 0.11565 0.18565 +0.07976 0.13719 0.15776 +0.11696 0.13873 0.15983 +0.15824 0.14022 0.16192 +0.20309 0.14167 0.16403 +0.25100 0.14306 0.16617 +0.30146 0.14439 0.16833 +0.35398 0.14567 0.17051 +0.40803 0.14689 0.17272 +0.46313 0.14806 0.17496 +0.51876 0.14919 0.17721 +0.57444 0.15028 0.17948 +0.62965 0.15134 0.18177 +0.68390 0.15239 0.18407 +0.73668 0.15343 0.18638 +0.78751 0.15447 0.18869 +0.83588 0.15554 0.19101 +0.88129 0.15663 0.19333 +0.08461 0.18119 0.16480 +0.12239 0.18279 0.16693 +0.16416 0.18434 0.16907 +0.20943 0.18583 0.17125 +0.25768 0.18726 0.17344 +0.30841 0.18864 0.17566 +0.36111 0.18996 0.17791 +0.41528 0.19123 0.18017 +0.47042 0.19245 0.18246 +0.52603 0.19364 0.18477 +0.58161 0.19480 0.18709 +0.63665 0.19594 0.18942 +0.69066 0.19707 0.19177 +0.74314 0.19820 0.19412 +0.79359 0.19935 0.19647 +0.84151 0.20053 0.19882 +0.88641 0.20175 0.20117 +0.08925 0.22893 0.17207 +0.12759 0.23057 0.17425 +0.16985 0.23214 0.17645 +0.21553 0.23366 0.17868 +0.26411 0.23512 0.18093 +0.31510 0.23652 0.18321 +0.36799 0.23787 0.18551 +0.42227 0.23918 0.18783 +0.47746 0.24044 0.19016 +0.53304 0.24168 0.19252 +0.58851 0.24289 0.19488 +0.64339 0.24410 0.19726 +0.69716 0.24531 0.19964 +0.74934 0.24654 0.20202 +0.79942 0.24779 0.20440 +0.84689 0.24907 0.20678 +0.89128 0.25041 0.20916 +0.09367 0.27972 0.17955 +0.13257 0.28138 0.18178 +0.17532 0.28297 0.18404 +0.22140 0.28450 0.18632 +0.27031 0.28597 0.18863 +0.32156 0.28739 0.19095 +0.37463 0.28877 0.19330 +0.42903 0.29010 0.19567 +0.48426 0.29140 0.19805 +0.53982 0.29269 0.20044 +0.59520 0.29396 0.20284 +0.64991 0.29524 0.20525 +0.70346 0.29653 0.20766 +0.75533 0.29785 0.21007 +0.80509 0.29922 0.21244 +0.85227 0.30068 0.21474 +0.89636 0.30223 0.21699 +0.09789 0.33294 0.18725 +0.13735 0.33461 0.18953 +0.18058 0.33620 0.19183 +0.22706 0.33774 0.19416 +0.27631 0.33922 0.19651 +0.32782 0.34066 0.19888 +0.38108 0.34205 0.20126 +0.43561 0.34342 0.20366 +0.49089 0.34477 0.20608 +0.54643 0.34610 0.20850 +0.60173 0.34744 0.21093 +0.65638 0.34884 0.21329 +0.70991 0.35031 0.21558 +0.76181 0.35186 0.21780 +0.81155 0.35349 0.21996 +0.85862 0.35520 0.22207 +0.90249 0.35699 0.22414 +0.10196 0.38800 0.19513 +0.14198 0.38966 0.19745 +0.18569 0.39126 0.19979 +0.23259 0.39281 0.20216 +0.28218 0.39430 0.20454 +0.33395 0.39576 0.20694 +0.38742 0.39719 0.20936 +0.44209 0.39860 0.21178 +0.49756 0.40006 0.21413 +0.55335 0.40157 0.21640 +0.60895 0.40315 0.21860 +0.66384 0.40480 0.22073 +0.71752 0.40652 0.22279 +0.76946 0.40832 0.22480 +0.81915 0.41019 0.22677 +0.86605 0.41214 0.22870 +0.90966 0.41416 0.23061 +0.10594 0.44434 0.20316 +0.14652 0.44601 0.20551 +0.19072 0.44761 0.20789 +0.23804 0.44917 0.21028 +0.28804 0.45071 0.21265 +0.34026 0.45228 0.21496 +0.39423 0.45387 0.21721 +0.44944 0.45551 0.21938 +0.50538 0.45720 0.22148 +0.56154 0.45895 0.22352 +0.61743 0.46077 0.22549 +0.67252 0.46266 0.22741 +0.72629 0.46463 0.22928 +0.77823 0.46666 0.23111 +0.82781 0.46877 0.23291 +0.87451 0.47094 0.23470 +0.91781 0.47317 0.23648 +0.10997 0.50147 0.21127 +0.15125 0.50320 0.21356 +0.19617 0.50491 0.21581 +0.24424 0.50663 0.21801 +0.29497 0.50837 0.22015 +0.34785 0.51014 0.22223 +0.40240 0.51194 0.22425 +0.45811 0.51380 0.22620 +0.51447 0.51572 0.22809 +0.57096 0.51770 0.22992 +0.62708 0.51974 0.23170 +0.68230 0.52186 0.23343 +0.73611 0.52405 0.23514 +0.78799 0.52630 0.23682 +0.83742 0.52862 0.23848 +0.88386 0.53099 0.24015 +0.92680 0.53341 0.24183 +0.11510 0.55930 0.21878 +0.15726 0.56117 0.22088 +0.20301 0.56305 0.22293 +0.25183 0.56494 0.22493 +0.30325 0.56685 0.22687 +0.35674 0.56881 0.22875 +0.41182 0.57082 0.23057 +0.46797 0.57288 0.23233 +0.52468 0.57500 0.23403 +0.58144 0.57719 0.23570 +0.63773 0.57945 0.23732 +0.69303 0.58178 0.23891 +0.74682 0.58417 0.24048 +0.79858 0.58662 0.24205 +0.84779 0.58913 0.24361 +0.89392 0.59168 0.24520 +0.93645 0.59427 0.24681 +0.12160 0.61741 0.22552 +0.16461 0.61941 0.22746 +0.21113 0.62142 0.22934 +0.26066 0.62347 0.23117 +0.31270 0.62555 0.23293 +0.36675 0.62768 0.23465 +0.42230 0.62987 0.23630 +0.47883 0.63211 0.23791 +0.53583 0.63443 0.23947 +0.59279 0.63681 0.24100 +0.64919 0.63926 0.24250 +0.70451 0.64177 0.24399 +0.75822 0.64434 0.24546 +0.80980 0.64697 0.24695 +0.85873 0.64964 0.24845 +0.90448 0.65235 0.24998 +0.94654 0.65508 0.25155 +0.12928 0.67516 0.23163 +0.17308 0.67727 0.23344 +0.22032 0.67940 0.23518 +0.27050 0.68158 0.23687 +0.32312 0.68381 0.23850 +0.37766 0.68609 0.24008 +0.43361 0.68844 0.24161 +0.49046 0.69085 0.24310 +0.54770 0.69333 0.24455 +0.60479 0.69587 0.24598 +0.66123 0.69849 0.24740 +0.71650 0.70116 0.24882 +0.77006 0.70389 0.25024 +0.82140 0.70667 0.25168 +0.87000 0.70947 0.25314 +0.91531 0.71228 0.25466 +0.95681 0.71505 0.25624 +0.13791 0.73187 0.23729 +0.18245 0.73407 0.23898 +0.23036 0.73631 0.24061 +0.28114 0.73860 0.24219 +0.33426 0.74095 0.24372 +0.38923 0.74336 0.24520 +0.44553 0.74583 0.24664 +0.50263 0.74838 0.24805 +0.56003 0.75100 0.24944 +0.61720 0.75369 0.25081 +0.67362 0.75644 0.25218 +0.72877 0.75924 0.25356 +0.78209 0.76203 0.25498 +0.83306 0.76478 0.25644 +0.88115 0.76750 0.25796 +0.92585 0.77017 0.25954 +0.96500 0.77279 0.26120 +0.14725 0.78686 0.24264 +0.19248 0.78912 0.24425 +0.24100 0.79143 0.24581 +0.29231 0.79381 0.24731 +0.34589 0.79625 0.24877 +0.40123 0.79875 0.25018 +0.45780 0.80134 0.25157 +0.51510 0.80399 0.25293 +0.57260 0.80671 0.25429 +0.62974 0.80942 0.25566 +0.68599 0.81211 0.25706 +0.74083 0.81477 0.25850 +0.79374 0.81739 0.25999 +0.84420 0.81998 0.26154 +0.89171 0.82251 0.26316 +0.93574 0.82500 0.26484 +0.96500 0.82744 0.26659 +0.15704 0.83938 0.24785 +0.20291 0.84168 0.24941 +0.25199 0.84403 0.25091 +0.30378 0.84646 0.25237 +0.35776 0.84895 0.25379 +0.41341 0.85152 0.25517 +0.47017 0.85410 0.25656 +0.52751 0.85667 0.25795 +0.58492 0.85922 0.25936 +0.64186 0.86174 0.26081 +0.69783 0.86424 0.26230 +0.75229 0.86669 0.26384 +0.80474 0.86910 0.26544 +0.85465 0.87147 0.26710 +0.90153 0.87378 0.26883 +0.94485 0.87605 0.27062 +0.96500 0.87827 0.27249 +0.16706 0.88867 0.25308 +0.21352 0.89097 0.25460 +0.26312 0.89333 0.25608 +0.31531 0.89571 0.25753 +0.36956 0.89810 0.25897 +0.42534 0.90048 0.26041 +0.48213 0.90285 0.26186 +0.53942 0.90520 0.26334 +0.59667 0.90753 0.26485 +0.65338 0.90982 0.26640 +0.70901 0.91207 0.26800 +0.76305 0.91428 0.26965 +0.81499 0.91644 0.27137 +0.86433 0.91855 0.27316 +0.91054 0.92061 0.27502 +0.95313 0.92262 0.27694 +0.96500 0.92459 0.27893 +0.17708 0.93389 0.25845 +0.22403 0.93604 0.25999 +0.27400 0.93820 0.26152 +0.32646 0.94036 0.26302 +0.38088 0.94251 0.26453 +0.43675 0.94466 0.26605 +0.49353 0.94678 0.26759 +0.55072 0.94887 0.26917 +0.60779 0.95093 0.27078 +0.66421 0.95295 0.27245 +0.71948 0.95493 0.27417 +0.77307 0.95500 0.27596 +0.82449 0.95500 0.27781 +0.87321 0.95500 0.27973 +0.91875 0.95500 0.28172 +0.96059 0.95500 0.28377 +0.96500 0.95500 0.28588 +0.07525 0.09814 0.19577 +0.11192 0.09958 0.19791 +0.15274 0.10098 0.20007 +0.19720 0.10233 0.20226 +0.24480 0.10364 0.20446 +0.29501 0.10489 0.20669 +0.34734 0.10608 0.20895 +0.40128 0.10722 0.21122 +0.45633 0.10830 0.21352 +0.51198 0.10934 0.21584 +0.56774 0.11034 0.21818 +0.62309 0.11130 0.22054 +0.67755 0.11223 0.22291 +0.73061 0.11316 0.22529 +0.78177 0.11408 0.22768 +0.83054 0.11501 0.23008 +0.87641 0.11596 0.23247 +0.08025 0.13770 0.20304 +0.11751 0.13923 0.20524 +0.15884 0.14071 0.20745 +0.20373 0.14215 0.20969 +0.25168 0.14352 0.21196 +0.30216 0.14484 0.21424 +0.35469 0.14610 0.21655 +0.40876 0.14731 0.21888 +0.46386 0.14847 0.22123 +0.51949 0.14959 0.22361 +0.57516 0.15067 0.22600 +0.63035 0.15172 0.22840 +0.68457 0.15276 0.23082 +0.73733 0.15379 0.23324 +0.78812 0.15483 0.23567 +0.83644 0.15589 0.23810 +0.88180 0.15698 0.24052 +0.08508 0.18171 0.21051 +0.12292 0.18330 0.21276 +0.16474 0.18484 0.21503 +0.21005 0.18632 0.21732 +0.25833 0.18774 0.21964 +0.30908 0.18911 0.22198 +0.36180 0.19042 0.22435 +0.41599 0.19167 0.22673 +0.47113 0.19289 0.22914 +0.52674 0.19407 0.23156 +0.58230 0.19521 0.23399 +0.63733 0.19635 0.23644 +0.69132 0.19747 0.23889 +0.74377 0.19860 0.24136 +0.79418 0.19975 0.24382 +0.84206 0.20092 0.24628 +0.88690 0.20214 0.24873 +0.08970 0.22946 0.21819 +0.12810 0.23109 0.22049 +0.17041 0.23265 0.22281 +0.21613 0.23416 0.22516 +0.26475 0.23561 0.22753 +0.31576 0.23700 0.22992 +0.36866 0.23834 0.23234 +0.42296 0.23963 0.23477 +0.47815 0.24089 0.23722 +0.53373 0.24212 0.23969 +0.58920 0.24333 0.24216 +0.64405 0.24453 0.24465 +0.69781 0.24574 0.24713 +0.74995 0.24696 0.24962 +0.79999 0.24821 0.25211 +0.84742 0.24950 0.25460 +0.89175 0.25084 0.25707 +0.09411 0.28025 0.22608 +0.13307 0.28190 0.22843 +0.17586 0.28348 0.23080 +0.22198 0.28501 0.23319 +0.27093 0.28647 0.23561 +0.32220 0.28788 0.23805 +0.37529 0.28924 0.24051 +0.42971 0.29057 0.24298 +0.48494 0.29187 0.24547 +0.54049 0.29315 0.24797 +0.59587 0.29442 0.25048 +0.65057 0.29570 0.25299 +0.70409 0.29699 0.25551 +0.75594 0.29830 0.25801 +0.80569 0.29969 0.26047 +0.85286 0.30117 0.26285 +0.89693 0.30274 0.26517 +0.09831 0.33347 0.23416 +0.13783 0.33513 0.23655 +0.18111 0.33672 0.23897 +0.22764 0.33825 0.24141 +0.27692 0.33972 0.24387 +0.32845 0.34115 0.24634 +0.38174 0.34254 0.24884 +0.43627 0.34391 0.25134 +0.49156 0.34525 0.25386 +0.54710 0.34659 0.25639 +0.60241 0.34793 0.25890 +0.65708 0.34935 0.26135 +0.71063 0.35083 0.26371 +0.76253 0.35240 0.26601 +0.81227 0.35405 0.26825 +0.85932 0.35578 0.27043 +0.90316 0.35759 0.27258 +0.10237 0.38852 0.24242 +0.14245 0.39018 0.24485 +0.18621 0.39178 0.24730 +0.23315 0.39332 0.24977 +0.28278 0.39481 0.25226 +0.33458 0.39626 0.25477 +0.38806 0.39769 0.25728 +0.44278 0.39911 0.25978 +0.49830 0.40059 0.26221 +0.55412 0.40212 0.26456 +0.60975 0.40372 0.26683 +0.66466 0.40538 0.26903 +0.71835 0.40713 0.27117 +0.77029 0.40894 0.27326 +0.81997 0.41084 0.27530 +0.86686 0.41280 0.27731 +0.91043 0.41484 0.27930 +0.10635 0.44486 0.25081 +0.14699 0.44653 0.25327 +0.19125 0.44813 0.25575 +0.23861 0.44969 0.25824 +0.28868 0.45125 0.26069 +0.34097 0.45283 0.26307 +0.39500 0.45444 0.26539 +0.45025 0.45610 0.26764 +0.50624 0.45781 0.26982 +0.56244 0.45958 0.27193 +0.61835 0.46142 0.27398 +0.67345 0.46333 0.27597 +0.72722 0.46531 0.27791 +0.77916 0.46737 0.27981 +0.82872 0.46949 0.28169 +0.87540 0.47168 0.28356 +0.91867 0.47393 0.28541 +0.11043 0.50201 0.25924 +0.15180 0.50375 0.26161 +0.19680 0.50548 0.26394 +0.24495 0.50722 0.26622 +0.29574 0.50897 0.26843 +0.34869 0.51075 0.27059 +0.40330 0.51258 0.27268 +0.45905 0.51446 0.27470 +0.51544 0.51639 0.27667 +0.57196 0.51839 0.27857 +0.62809 0.52046 0.28043 +0.68333 0.52260 0.28224 +0.73714 0.52481 0.28401 +0.78901 0.52708 0.28577 +0.83841 0.52942 0.28751 +0.88483 0.53181 0.28926 +0.92773 0.53425 0.29102 +0.11570 0.55990 0.26700 +0.15794 0.56179 0.26918 +0.20377 0.56368 0.27131 +0.25266 0.56558 0.27339 +0.30414 0.56752 0.27540 +0.35770 0.56949 0.27736 +0.41282 0.57152 0.27925 +0.46901 0.57360 0.28108 +0.52575 0.57574 0.28286 +0.58253 0.57796 0.28460 +0.63884 0.58024 0.28630 +0.69414 0.58258 0.28796 +0.74793 0.58499 0.28961 +0.79967 0.58747 0.29125 +0.84885 0.58999 0.29289 +0.89495 0.59257 0.29455 +0.93743 0.59517 0.29624 +0.12232 0.61806 0.27400 +0.16541 0.62008 0.27601 +0.21200 0.62211 0.27797 +0.26160 0.62417 0.27987 +0.31370 0.62627 0.28172 +0.36780 0.62842 0.28350 +0.42339 0.63063 0.28523 +0.47996 0.63289 0.28691 +0.53699 0.63523 0.28855 +0.59396 0.63763 0.29015 +0.65037 0.64010 0.29173 +0.70568 0.64264 0.29329 +0.75938 0.64523 0.29484 +0.81094 0.64788 0.29640 +0.85984 0.65057 0.29798 +0.90556 0.65330 0.29958 +0.94756 0.65604 0.30123 +0.13011 0.67585 0.28037 +0.17398 0.67798 0.28224 +0.22129 0.68014 0.28406 +0.27154 0.68233 0.28583 +0.32421 0.68458 0.28753 +0.37879 0.68688 0.28918 +0.43478 0.68925 0.29079 +0.49166 0.69168 0.29235 +0.54892 0.69418 0.29388 +0.60602 0.69675 0.29539 +0.66247 0.69939 0.29688 +0.71772 0.70208 0.29837 +0.77127 0.70483 0.29986 +0.82259 0.70763 0.30138 +0.87115 0.71045 0.30292 +0.91640 0.71326 0.30451 +0.95783 0.71602 0.30617 +0.13883 0.73261 0.28627 +0.18344 0.73483 0.28804 +0.23142 0.73708 0.28975 +0.28225 0.73939 0.29140 +0.33542 0.74176 0.29300 +0.39043 0.74419 0.29456 +0.44676 0.74669 0.29607 +0.50389 0.74926 0.29756 +0.56130 0.75190 0.29902 +0.61848 0.75461 0.30046 +0.67490 0.75738 0.30191 +0.73002 0.76019 0.30337 +0.78331 0.76298 0.30486 +0.83423 0.76573 0.30641 +0.88226 0.76844 0.30801 +0.92690 0.77110 0.30968 +0.96500 0.77372 0.31141 +0.14823 0.78763 0.29188 +0.19353 0.78991 0.29357 +0.24212 0.79224 0.29519 +0.29348 0.79463 0.29677 +0.34710 0.79709 0.29830 +0.40248 0.79962 0.29979 +0.45908 0.80222 0.30125 +0.51640 0.80490 0.30269 +0.57390 0.80762 0.30412 +0.63102 0.81033 0.30557 +0.68724 0.81301 0.30706 +0.74204 0.81567 0.30858 +0.79491 0.81828 0.31016 +0.84532 0.82086 0.31179 +0.89277 0.82339 0.31348 +0.93673 0.82587 0.31524 +0.96500 0.82830 0.31708 +0.15808 0.84017 0.29735 +0.20402 0.84248 0.29898 +0.25316 0.84485 0.30056 +0.30500 0.84730 0.30209 +0.35902 0.84982 0.30357 +0.41468 0.85239 0.30504 +0.47145 0.85497 0.30650 +0.52879 0.85753 0.30797 +0.58618 0.86007 0.30947 +0.64311 0.86259 0.31100 +0.69904 0.86507 0.31257 +0.75346 0.86752 0.31420 +0.80586 0.86992 0.31588 +0.85571 0.87227 0.31762 +0.90252 0.87458 0.31943 +0.94577 0.87684 0.32130 +0.96500 0.87904 0.32325 +0.16815 0.88947 0.30282 +0.21467 0.89178 0.30442 +0.26432 0.89414 0.30598 +0.31653 0.89652 0.30751 +0.37080 0.89891 0.30903 +0.42659 0.90128 0.31055 +0.48339 0.90365 0.31208 +0.54066 0.90599 0.31364 +0.59790 0.90830 0.31522 +0.65457 0.91059 0.31686 +0.71016 0.91283 0.31854 +0.76416 0.91502 0.32028 +0.81605 0.91717 0.32208 +0.86532 0.91927 0.32395 +0.91146 0.92132 0.32588 +0.95397 0.92332 0.32789 +0.96500 0.92527 0.32995 +0.17818 0.93464 0.30845 +0.22518 0.93679 0.31008 +0.27518 0.93894 0.31168 +0.32766 0.94109 0.31327 +0.38209 0.94324 0.31486 +0.43797 0.94537 0.31645 +0.49475 0.94749 0.31808 +0.55192 0.94957 0.31973 +0.60896 0.95162 0.32143 +0.66535 0.95363 0.32318 +0.72057 0.95500 0.32498 +0.77412 0.95500 0.32685 +0.82547 0.95500 0.32878 +0.87413 0.95500 0.33078 +0.91959 0.95500 0.33285 +0.96134 0.95500 0.33497 +0.96500 0.95500 0.33716 +0.07576 0.09863 0.24315 +0.11249 0.10005 0.24541 +0.15336 0.10143 0.24768 +0.19786 0.10278 0.24997 +0.24548 0.10406 0.25228 +0.29573 0.10530 0.25462 +0.34807 0.10648 0.25698 +0.40203 0.10760 0.25936 +0.45708 0.10868 0.26176 +0.51273 0.10970 0.26419 +0.56847 0.11068 0.26663 +0.62381 0.11163 0.26908 +0.67824 0.11256 0.27155 +0.73127 0.11347 0.27403 +0.78239 0.11439 0.27652 +0.83111 0.11531 0.27901 +0.87693 0.11626 0.28150 +0.08074 0.13820 0.25079 +0.11806 0.13972 0.25310 +0.15944 0.14119 0.25542 +0.20437 0.14261 0.25776 +0.25234 0.14397 0.26013 +0.30286 0.14528 0.26252 +0.35541 0.14653 0.26493 +0.40948 0.14773 0.26736 +0.46459 0.14887 0.26981 +0.52022 0.14998 0.27228 +0.57587 0.15105 0.27477 +0.63104 0.15209 0.27727 +0.68524 0.15312 0.27978 +0.73797 0.15415 0.28230 +0.78872 0.15518 0.28482 +0.83699 0.15624 0.28734 +0.88230 0.15732 0.28986 +0.08555 0.18223 0.25862 +0.12344 0.18381 0.26097 +0.16531 0.18533 0.26334 +0.21066 0.18680 0.26574 +0.25898 0.18821 0.26816 +0.30976 0.18956 0.27060 +0.36249 0.19086 0.27306 +0.41669 0.19211 0.27554 +0.47184 0.19331 0.27804 +0.52744 0.19448 0.28056 +0.58300 0.19562 0.28309 +0.63800 0.19674 0.28563 +0.69197 0.19786 0.28817 +0.74438 0.19899 0.29072 +0.79476 0.20013 0.29327 +0.84259 0.20130 0.29582 +0.88738 0.20252 0.29836 +0.09015 0.22998 0.26664 +0.12861 0.23159 0.26904 +0.17097 0.23315 0.27146 +0.21672 0.23465 0.27391 +0.26537 0.23608 0.27637 +0.31641 0.23747 0.27886 +0.36933 0.23880 0.28137 +0.42364 0.24008 0.28390 +0.47884 0.24133 0.28644 +0.53441 0.24255 0.28900 +0.58987 0.24376 0.29156 +0.64471 0.24496 0.29413 +0.69844 0.24616 0.29671 +0.75055 0.24738 0.29928 +0.80055 0.24863 0.30186 +0.84794 0.24992 0.30442 +0.89222 0.25125 0.30698 +0.09454 0.28077 0.27486 +0.13355 0.28241 0.27730 +0.17639 0.28398 0.27977 +0.22256 0.28550 0.28226 +0.27154 0.28695 0.28477 +0.32284 0.28835 0.28730 +0.37595 0.28971 0.28985 +0.43037 0.29103 0.29242 +0.48561 0.29232 0.29499 +0.54116 0.29360 0.29758 +0.59653 0.29487 0.30017 +0.65121 0.29614 0.30277 +0.70471 0.29743 0.30536 +0.75655 0.29876 0.30794 +0.80630 0.30017 0.31045 +0.85346 0.30166 0.31289 +0.89751 0.30324 0.31527 +0.09873 0.33398 0.28326 +0.13831 0.33563 0.28575 +0.18163 0.33722 0.28825 +0.22820 0.33874 0.29078 +0.27752 0.34021 0.29333 +0.32908 0.34163 0.29589 +0.38238 0.34302 0.29847 +0.43693 0.34438 0.30107 +0.49222 0.34572 0.30367 +0.54776 0.34706 0.30628 +0.60309 0.34842 0.30885 +0.65779 0.34985 0.31135 +0.71136 0.35136 0.31377 +0.76326 0.35294 0.31612 +0.81299 0.35461 0.31841 +0.86003 0.35636 0.32065 +0.90385 0.35819 0.32286 +0.10279 0.38903 0.29183 +0.14292 0.39069 0.29434 +0.18673 0.39228 0.29688 +0.23371 0.39382 0.29944 +0.28337 0.39530 0.30201 +0.33520 0.39676 0.30460 +0.38871 0.39818 0.30720 +0.44347 0.39962 0.30976 +0.49904 0.40112 0.31223 +0.55491 0.40267 0.31463 +0.61056 0.40428 0.31696 +0.66550 0.40597 0.31922 +0.71919 0.40773 0.32141 +0.77113 0.40957 0.32355 +0.82080 0.41148 0.32565 +0.86767 0.41347 0.32772 +0.91122 0.41553 0.32976 +0.10676 0.44537 0.30051 +0.14746 0.44703 0.30305 +0.19176 0.44864 0.30561 +0.23919 0.45020 0.30817 +0.28933 0.45178 0.31068 +0.34170 0.45337 0.31312 +0.39578 0.45500 0.31549 +0.45108 0.45668 0.31779 +0.50711 0.45841 0.32002 +0.56334 0.46020 0.32219 +0.61928 0.46206 0.32429 +0.67439 0.46400 0.32633 +0.72817 0.46600 0.32833 +0.78010 0.46807 0.33029 +0.82965 0.47022 0.33222 +0.87631 0.47242 0.33414 +0.91954 0.47469 0.33605 +0.11090 0.50255 0.30918 +0.15236 0.50430 0.31161 +0.19744 0.50605 0.31400 +0.24567 0.50780 0.31633 +0.29653 0.50957 0.31860 +0.34954 0.51137 0.32081 +0.40420 0.51322 0.32295 +0.46000 0.51511 0.32503 +0.51643 0.51707 0.32705 +0.57297 0.51909 0.32901 +0.62913 0.52118 0.33091 +0.68437 0.52334 0.33278 +0.73818 0.52557 0.33461 +0.79004 0.52786 0.33642 +0.83942 0.53022 0.33822 +0.88581 0.53263 0.34002 +0.92867 0.53509 0.34183 +0.11631 0.56050 0.31712 +0.15864 0.56240 0.31936 +0.20454 0.56430 0.32155 +0.25351 0.56623 0.32368 +0.30505 0.56818 0.32575 +0.35866 0.57018 0.32776 +0.41384 0.57222 0.32970 +0.47007 0.57432 0.33159 +0.52684 0.57649 0.33342 +0.58364 0.57872 0.33521 +0.63996 0.58103 0.33696 +0.69527 0.58339 0.33868 +0.74905 0.58583 0.34038 +0.80078 0.58832 0.34207 +0.84993 0.59087 0.34377 +0.89599 0.59346 0.34549 +0.93843 0.59608 0.34723 +0.12305 0.61872 0.32430 +0.16622 0.62075 0.32637 +0.21289 0.62279 0.32839 +0.26256 0.62487 0.33035 +0.31472 0.62699 0.33224 +0.36887 0.62916 0.33408 +0.42450 0.63139 0.33586 +0.48110 0.63368 0.33760 +0.53816 0.63604 0.33929 +0.59515 0.63846 0.34094 +0.65156 0.64095 0.34257 +0.70687 0.64351 0.34418 +0.76056 0.64613 0.34579 +0.81210 0.64880 0.34740 +0.86097 0.65151 0.34904 +0.90664 0.65425 0.35070 +0.94860 0.65702 0.35240 +0.13095 0.67656 0.33085 +0.17490 0.67870 0.33279 +0.22228 0.68087 0.33466 +0.27259 0.68309 0.33648 +0.32531 0.68535 0.33824 +0.37994 0.68768 0.33994 +0.43597 0.69006 0.34160 +0.49288 0.69252 0.34322 +0.55015 0.69504 0.34480 +0.60727 0.69764 0.34636 +0.66372 0.70029 0.34790 +0.71897 0.70301 0.34945 +0.77250 0.70579 0.35099 +0.82378 0.70860 0.35256 +0.87230 0.71144 0.35416 +0.91750 0.71424 0.35582 +0.95885 0.71700 0.35754 +0.13976 0.73336 0.33694 +0.18444 0.73559 0.33876 +0.23248 0.73786 0.34053 +0.28337 0.74019 0.34224 +0.33660 0.74257 0.34389 +0.39165 0.74503 0.34550 +0.44801 0.74755 0.34707 +0.50516 0.75014 0.34860 +0.56259 0.75281 0.35012 +0.61977 0.75554 0.35162 +0.67618 0.75833 0.35311 +0.73129 0.76114 0.35463 +0.78453 0.76393 0.35619 +0.83540 0.76667 0.35780 +0.88338 0.76937 0.35946 +0.92795 0.77203 0.36119 +0.96500 0.77464 0.36298 +0.14924 0.78840 0.34273 +0.19460 0.79070 0.34447 +0.24325 0.79305 0.34616 +0.29466 0.79546 0.34779 +0.34833 0.79794 0.34937 +0.40374 0.80049 0.35091 +0.46037 0.80312 0.35243 +0.51771 0.80582 0.35392 +0.57520 0.80854 0.35541 +0.63230 0.81124 0.35692 +0.68850 0.81392 0.35847 +0.74327 0.81657 0.36005 +0.79609 0.81918 0.36169 +0.84645 0.82174 0.36338 +0.89383 0.82426 0.36514 +0.93772 0.82673 0.36696 +0.96500 0.82916 0.36886 +0.15914 0.84097 0.34839 +0.20514 0.84329 0.35007 +0.25434 0.84569 0.35170 +0.30623 0.84815 0.35328 +0.36028 0.85069 0.35483 +0.41597 0.85327 0.35635 +0.47274 0.85583 0.35787 +0.53008 0.85839 0.35941 +0.58746 0.86093 0.36096 +0.64435 0.86343 0.36256 +0.70025 0.86591 0.36419 +0.75463 0.86834 0.36587 +0.80698 0.87074 0.36762 +0.85678 0.87308 0.36942 +0.90352 0.87538 0.37129 +0.94669 0.87762 0.37323 +0.96500 0.87982 0.37523 +0.16925 0.89027 0.35405 +0.21584 0.89260 0.35570 +0.26552 0.89496 0.35731 +0.31776 0.89734 0.35890 +0.37205 0.89972 0.36048 +0.42785 0.90209 0.36206 +0.48465 0.90444 0.36365 +0.54191 0.90678 0.36527 +0.59913 0.90908 0.36692 +0.65577 0.91135 0.36861 +0.71132 0.91358 0.37036 +0.76527 0.91576 0.37216 +0.81710 0.91790 0.37402 +0.86631 0.91999 0.37595 +0.91238 0.92202 0.37795 +0.95480 0.92401 0.38001 +0.96500 0.92595 0.38213 +0.17929 0.93540 0.35987 +0.22633 0.93753 0.36155 +0.27636 0.93968 0.36321 +0.32886 0.94183 0.36486 +0.38331 0.94397 0.36651 +0.43919 0.94609 0.36817 +0.49596 0.94819 0.36985 +0.55312 0.95027 0.37156 +0.61013 0.95230 0.37332 +0.66649 0.95430 0.37513 +0.72167 0.95500 0.37700 +0.77516 0.95500 0.37893 +0.82645 0.95500 0.38092 +0.87504 0.95500 0.38298 +0.92042 0.95500 0.38510 +0.96209 0.95500 0.38729 +0.96500 0.95500 0.38953 +0.07626 0.09910 0.29262 +0.11305 0.10051 0.29496 +0.15397 0.10189 0.29733 +0.19851 0.10321 0.29971 +0.24617 0.10449 0.30211 +0.29644 0.10571 0.30453 +0.34880 0.10687 0.30697 +0.40277 0.10798 0.30944 +0.45782 0.10904 0.31192 +0.51347 0.11005 0.31443 +0.56920 0.11102 0.31695 +0.62452 0.11196 0.31949 +0.67893 0.11287 0.32203 +0.73192 0.11378 0.32459 +0.78301 0.11468 0.32715 +0.83168 0.11560 0.32971 +0.87745 0.11654 0.33228 +0.08122 0.13870 0.30056 +0.11860 0.14021 0.30295 +0.16003 0.14166 0.30535 +0.20500 0.14307 0.30778 +0.25301 0.14442 0.31023 +0.30355 0.14571 0.31270 +0.35611 0.14694 0.31520 +0.41020 0.14813 0.31771 +0.46531 0.14926 0.32024 +0.52093 0.15035 0.32279 +0.57657 0.15141 0.32535 +0.63173 0.15245 0.32793 +0.68591 0.15347 0.33051 +0.73860 0.15449 0.33310 +0.78931 0.15552 0.33570 +0.83754 0.15657 0.33829 +0.88280 0.15765 0.34087 +0.08601 0.18273 0.30867 +0.12396 0.18430 0.31110 +0.16588 0.18582 0.31356 +0.21127 0.18727 0.31603 +0.25962 0.18867 0.31853 +0.31042 0.19001 0.32105 +0.36318 0.19129 0.32359 +0.41738 0.19253 0.32615 +0.47254 0.19372 0.32873 +0.52813 0.19488 0.33132 +0.58368 0.19601 0.33392 +0.63867 0.19713 0.33653 +0.69261 0.19824 0.33914 +0.74500 0.19936 0.34176 +0.79533 0.20050 0.34438 +0.84312 0.20168 0.34699 +0.88786 0.20289 0.34960 +0.09059 0.23048 0.31697 +0.12910 0.23209 0.31944 +0.17151 0.23364 0.32194 +0.21731 0.23512 0.32447 +0.26599 0.23655 0.32701 +0.31706 0.23792 0.32957 +0.37000 0.23924 0.33215 +0.42432 0.24052 0.33475 +0.47952 0.24176 0.33737 +0.53509 0.24297 0.33999 +0.59054 0.24417 0.34263 +0.64536 0.24537 0.34527 +0.69907 0.24657 0.34791 +0.75115 0.24779 0.35055 +0.80111 0.24904 0.35318 +0.84846 0.25032 0.35581 +0.89270 0.25167 0.35842 +0.09496 0.28128 0.32545 +0.13403 0.28291 0.32797 +0.17692 0.28447 0.33051 +0.22313 0.28598 0.33307 +0.27214 0.28742 0.33565 +0.32347 0.28882 0.33826 +0.37660 0.29017 0.34087 +0.43103 0.29148 0.34351 +0.48628 0.29277 0.34615 +0.54183 0.29404 0.34880 +0.59719 0.29531 0.35146 +0.65185 0.29658 0.35412 +0.70533 0.29787 0.35678 +0.75717 0.29921 0.35939 +0.80692 0.30064 0.36194 +0.85408 0.30215 0.36441 +0.89810 0.30375 0.36683 +0.09915 0.33449 0.33410 +0.13878 0.33613 0.33666 +0.18215 0.33771 0.33923 +0.22876 0.33922 0.34183 +0.27811 0.34069 0.34444 +0.32970 0.34211 0.34708 +0.38302 0.34349 0.34972 +0.43758 0.34485 0.35238 +0.49288 0.34619 0.35504 +0.54842 0.34752 0.35771 +0.60379 0.34890 0.36032 +0.65851 0.35035 0.36285 +0.71209 0.35188 0.36530 +0.76401 0.35349 0.36769 +0.81373 0.35517 0.37001 +0.86075 0.35694 0.37229 +0.90455 0.35878 0.37453 +0.10319 0.38954 0.34290 +0.14338 0.39118 0.34548 +0.18724 0.39277 0.34809 +0.23426 0.39430 0.35071 +0.28396 0.39579 0.35335 +0.33582 0.39724 0.35600 +0.38936 0.39867 0.35865 +0.44418 0.40013 0.36124 +0.49980 0.40164 0.36375 +0.55570 0.40321 0.36618 +0.61139 0.40485 0.36854 +0.66634 0.40656 0.37083 +0.72005 0.40834 0.37305 +0.77199 0.41020 0.37523 +0.82165 0.41213 0.37736 +0.86850 0.41414 0.37946 +0.91202 0.41621 0.38154 +0.10717 0.44588 0.35181 +0.14792 0.44753 0.35441 +0.19228 0.44914 0.35703 +0.23979 0.45072 0.35963 +0.29000 0.45231 0.36217 +0.34243 0.45392 0.36464 +0.39657 0.45557 0.36705 +0.45193 0.45727 0.36938 +0.50799 0.45902 0.37164 +0.56426 0.46083 0.37384 +0.62022 0.46271 0.37597 +0.67535 0.46467 0.37805 +0.72914 0.46669 0.38008 +0.78106 0.46878 0.38207 +0.83060 0.47095 0.38404 +0.87723 0.47318 0.38599 +0.92042 0.47546 0.38794 +0.11139 0.50309 0.36064 +0.15293 0.50485 0.36311 +0.19810 0.50661 0.36553 +0.24640 0.50838 0.36790 +0.29733 0.51017 0.37020 +0.35041 0.51199 0.37244 +0.40512 0.51386 0.37462 +0.46096 0.51578 0.37673 +0.51743 0.51775 0.37878 +0.57400 0.51980 0.38077 +0.63018 0.52191 0.38270 +0.68543 0.52409 0.38460 +0.73924 0.52634 0.38647 +0.79109 0.52865 0.38831 +0.84045 0.53103 0.39014 +0.88680 0.53346 0.39198 +0.92962 0.53594 0.39383 +0.11693 0.56110 0.36869 +0.15935 0.56301 0.37097 +0.20533 0.56494 0.37319 +0.25437 0.56688 0.37535 +0.30598 0.56885 0.37746 +0.35964 0.57086 0.37950 +0.41487 0.57293 0.38147 +0.47114 0.57505 0.38339 +0.52794 0.57724 0.38526 +0.58477 0.57950 0.38708 +0.64110 0.58182 0.38886 +0.69641 0.58421 0.39061 +0.75018 0.58667 0.39235 +0.80189 0.58919 0.39407 +0.85102 0.59175 0.39581 +0.89705 0.59436 0.39756 +0.93944 0.59701 0.39933 +0.12380 0.61937 0.37598 +0.16705 0.62142 0.37809 +0.21379 0.62348 0.38014 +0.26353 0.62558 0.38213 +0.31575 0.62772 0.38406 +0.36995 0.62991 0.38593 +0.42563 0.63216 0.38775 +0.48226 0.63447 0.38951 +0.53934 0.63685 0.39123 +0.59635 0.63930 0.39292 +0.65277 0.64182 0.39458 +0.70808 0.64440 0.39623 +0.76175 0.64704 0.39787 +0.81327 0.64973 0.39952 +0.86211 0.65246 0.40118 +0.90774 0.65522 0.40288 +0.94965 0.65800 0.40461 +0.13180 0.67727 0.38264 +0.17583 0.67942 0.38461 +0.22328 0.68161 0.38652 +0.27365 0.68385 0.38837 +0.32643 0.68613 0.39016 +0.38111 0.68848 0.39190 +0.43717 0.69089 0.39359 +0.49411 0.69337 0.39524 +0.55140 0.69591 0.39686 +0.60853 0.69853 0.39845 +0.66498 0.70121 0.40003 +0.72022 0.70396 0.40160 +0.77373 0.70675 0.40318 +0.82499 0.70959 0.40478 +0.87346 0.71243 0.40642 +0.91860 0.71522 0.40812 +0.95988 0.71798 0.40988 +0.14070 0.73411 0.38884 +0.18546 0.73635 0.39070 +0.23357 0.73865 0.39250 +0.28451 0.74099 0.39424 +0.33779 0.74340 0.39593 +0.39288 0.74588 0.39757 +0.44927 0.74842 0.39917 +0.50645 0.75104 0.40074 +0.56389 0.75373 0.40228 +0.62107 0.75648 0.40382 +0.67748 0.75929 0.40535 +0.73255 0.76210 0.40691 +0.78576 0.76488 0.40851 +0.83658 0.76762 0.41016 +0.88450 0.77031 0.41186 +0.92900 0.77297 0.41363 +0.96500 0.77557 0.41546 +0.15025 0.78919 0.39475 +0.19569 0.79150 0.39653 +0.24440 0.79387 0.39824 +0.29586 0.79630 0.39991 +0.34958 0.79880 0.40152 +0.40502 0.80138 0.40310 +0.46168 0.80402 0.40464 +0.51903 0.80674 0.40617 +0.57651 0.80946 0.40770 +0.63360 0.81216 0.40925 +0.68976 0.81483 0.41084 +0.74450 0.81747 0.41247 +0.79727 0.82007 0.41415 +0.84757 0.82262 0.41588 +0.89489 0.82514 0.41768 +0.93871 0.82760 0.41954 +0.96500 0.83001 0.42148 +0.16022 0.84177 0.40052 +0.20628 0.84412 0.40224 +0.25553 0.84653 0.40390 +0.30747 0.84901 0.40552 +0.36156 0.85157 0.40709 +0.41726 0.85414 0.40865 +0.47404 0.85670 0.41022 +0.53137 0.85925 0.41179 +0.58873 0.86178 0.41339 +0.64560 0.86428 0.41503 +0.70147 0.86674 0.41670 +0.75580 0.86917 0.41843 +0.80810 0.87155 0.42021 +0.85783 0.87389 0.42206 +0.90450 0.87617 0.42397 +0.94760 0.87841 0.42595 +0.96500 0.88059 0.42799 +0.17037 0.89108 0.40630 +0.21701 0.89342 0.40798 +0.26673 0.89579 0.40963 +0.31900 0.89816 0.41126 +0.37330 0.90053 0.41288 +0.42911 0.90289 0.41450 +0.48591 0.90524 0.41614 +0.54316 0.90756 0.41779 +0.60035 0.90986 0.41948 +0.65696 0.91211 0.42122 +0.71248 0.91433 0.42301 +0.76638 0.91650 0.42485 +0.81815 0.91863 0.42676 +0.86729 0.92070 0.42872 +0.91328 0.92272 0.43076 +0.95563 0.92470 0.43286 +0.96500 0.92662 0.43502 +0.18040 0.93615 0.41225 +0.22748 0.93828 0.41397 +0.27755 0.94042 0.41567 +0.33007 0.94256 0.41735 +0.38453 0.94469 0.41904 +0.44041 0.94681 0.42074 +0.49718 0.94890 0.42246 +0.55432 0.95096 0.42422 +0.61130 0.95299 0.42601 +0.66762 0.95497 0.42787 +0.72276 0.95500 0.42977 +0.77619 0.95500 0.43174 +0.82742 0.95500 0.43378 +0.87594 0.95500 0.43588 +0.92124 0.95500 0.43804 +0.96283 0.95500 0.44026 +0.96500 0.95500 0.44253 +0.07676 0.09957 0.34372 +0.11361 0.10097 0.34613 +0.15457 0.10233 0.34856 +0.19916 0.10364 0.35101 +0.24685 0.10490 0.35348 +0.29714 0.10610 0.35597 +0.34953 0.10725 0.35847 +0.40350 0.10835 0.36100 +0.45856 0.10939 0.36355 +0.51420 0.11039 0.36612 +0.56992 0.11134 0.36870 +0.62522 0.11227 0.37129 +0.67961 0.11318 0.37390 +0.73257 0.11408 0.37651 +0.78361 0.11497 0.37913 +0.83224 0.11589 0.38174 +0.87796 0.11682 0.38436 +0.08170 0.13919 0.35189 +0.11913 0.14068 0.35434 +0.16061 0.14213 0.35681 +0.20562 0.14352 0.35930 +0.25366 0.14485 0.36182 +0.30423 0.14613 0.36435 +0.35681 0.14735 0.36690 +0.41091 0.14852 0.36948 +0.46602 0.14964 0.37207 +0.52164 0.15072 0.37467 +0.57727 0.15177 0.37729 +0.63241 0.15280 0.37992 +0.68656 0.15381 0.38256 +0.73922 0.15482 0.38520 +0.78990 0.15585 0.38784 +0.83808 0.15689 0.39048 +0.88328 0.15798 0.39312 +0.08647 0.18323 0.36021 +0.12447 0.18479 0.36271 +0.16644 0.18629 0.36522 +0.21187 0.18773 0.36776 +0.26025 0.18912 0.37032 +0.31108 0.19044 0.37289 +0.36386 0.19171 0.37549 +0.41807 0.19294 0.37811 +0.47323 0.19412 0.38074 +0.52882 0.19527 0.38338 +0.58436 0.19640 0.38603 +0.63933 0.19751 0.38869 +0.69325 0.19861 0.39136 +0.74560 0.19973 0.39403 +0.79590 0.20087 0.39669 +0.84364 0.20204 0.39935 +0.88833 0.20325 0.40200 +0.09103 0.23098 0.36871 +0.12960 0.23258 0.37125 +0.17205 0.23412 0.37381 +0.21789 0.23559 0.37639 +0.26661 0.23701 0.37898 +0.31770 0.23837 0.38160 +0.37066 0.23968 0.38424 +0.42499 0.24095 0.38689 +0.48019 0.24218 0.38955 +0.53576 0.24339 0.39223 +0.59120 0.24458 0.39491 +0.64601 0.24577 0.39759 +0.69969 0.24697 0.40028 +0.75174 0.24819 0.40296 +0.80167 0.24944 0.40564 +0.84897 0.25073 0.40831 +0.89318 0.25208 0.41094 +0.09538 0.28177 0.37739 +0.13451 0.28340 0.37996 +0.17745 0.28495 0.38256 +0.22369 0.28645 0.38517 +0.27274 0.28788 0.38780 +0.32409 0.28927 0.39046 +0.37724 0.29062 0.39312 +0.43169 0.29192 0.39580 +0.48694 0.29321 0.39849 +0.54249 0.29448 0.40119 +0.59784 0.29574 0.40389 +0.65249 0.29701 0.40659 +0.70595 0.29831 0.40929 +0.75780 0.29967 0.41192 +0.80755 0.30111 0.41447 +0.85470 0.30264 0.41696 +0.89871 0.30426 0.41940 +0.09955 0.33498 0.38622 +0.13924 0.33662 0.38883 +0.18266 0.33819 0.39145 +0.22932 0.33970 0.39410 +0.27870 0.34116 0.39676 +0.33031 0.34257 0.39944 +0.38366 0.34395 0.40213 +0.43823 0.34530 0.40483 +0.49354 0.34664 0.40753 +0.54909 0.34799 0.41023 +0.60449 0.34939 0.41285 +0.65925 0.35086 0.41539 +0.71284 0.35241 0.41786 +0.76476 0.35403 0.42026 +0.81448 0.35574 0.42259 +0.86149 0.35752 0.42489 +0.90526 0.35939 0.42714 +0.10359 0.39003 0.39519 +0.14384 0.39167 0.39781 +0.18775 0.39326 0.40046 +0.23482 0.39479 0.40313 +0.28454 0.39627 0.40581 +0.33643 0.39772 0.40850 +0.39002 0.39916 0.41118 +0.44490 0.40064 0.41377 +0.50056 0.40217 0.41630 +0.55651 0.40377 0.41874 +0.61222 0.40542 0.42111 +0.66720 0.40715 0.42341 +0.72092 0.40895 0.42565 +0.77286 0.41083 0.42783 +0.82251 0.41279 0.42998 +0.86934 0.41481 0.43210 +0.91282 0.41690 0.43419 +0.10757 0.44637 0.40424 +0.14838 0.44803 0.40689 +0.19280 0.44963 0.40954 +0.24039 0.45123 0.41215 +0.29068 0.45284 0.41471 +0.34317 0.45447 0.41719 +0.39737 0.45614 0.41961 +0.45278 0.45786 0.42196 +0.50889 0.45963 0.42423 +0.56519 0.46146 0.42644 +0.62117 0.46337 0.42858 +0.67632 0.46534 0.43067 +0.73011 0.46739 0.43271 +0.78203 0.46950 0.43471 +0.83155 0.47169 0.43669 +0.87816 0.47393 0.43866 +0.92132 0.47624 0.44063 +0.11188 0.50362 0.41315 +0.15352 0.50541 0.41564 +0.19877 0.50718 0.41808 +0.24714 0.50897 0.42046 +0.29815 0.51077 0.42278 +0.35129 0.51262 0.42503 +0.40605 0.51450 0.42722 +0.46194 0.51644 0.42934 +0.51844 0.51844 0.43140 +0.57505 0.52051 0.43340 +0.63124 0.52264 0.43535 +0.68650 0.52484 0.43726 +0.74031 0.52711 0.43914 +0.79214 0.52945 0.44099 +0.84149 0.53185 0.44284 +0.88781 0.53430 0.44469 +0.93059 0.53679 0.44655 +0.11756 0.56170 0.42125 +0.16007 0.56363 0.42354 +0.20613 0.56557 0.42578 +0.25524 0.56753 0.42796 +0.30691 0.56952 0.43007 +0.36064 0.57156 0.43212 +0.41591 0.57364 0.43411 +0.47222 0.57579 0.43604 +0.52906 0.57800 0.43792 +0.58590 0.58028 0.43975 +0.64224 0.58263 0.44155 +0.69756 0.58504 0.44331 +0.75132 0.58752 0.44506 +0.80302 0.59006 0.44680 +0.85212 0.59264 0.44854 +0.89811 0.59528 0.45031 +0.94045 0.59794 0.45210 +0.12456 0.62003 0.42857 +0.16789 0.62210 0.43070 +0.21471 0.62418 0.43277 +0.26451 0.62630 0.43477 +0.31679 0.62846 0.43671 +0.37105 0.63067 0.43860 +0.42676 0.63294 0.44042 +0.48343 0.63527 0.44220 +0.54054 0.63768 0.44394 +0.59756 0.64015 0.44563 +0.65399 0.64269 0.44731 +0.70929 0.64529 0.44897 +0.76296 0.64795 0.45062 +0.81445 0.65066 0.45228 +0.86326 0.65342 0.45396 +0.90885 0.65620 0.45567 +0.95070 0.65900 0.45742 +0.13267 0.67798 0.43528 +0.17678 0.68015 0.43727 +0.22430 0.68236 0.43919 +0.27473 0.68462 0.44105 +0.32756 0.68692 0.44286 +0.38228 0.68929 0.44461 +0.43839 0.69172 0.44631 +0.49535 0.69422 0.44797 +0.55266 0.69680 0.44960 +0.60980 0.69944 0.45120 +0.66625 0.70214 0.45279 +0.72148 0.70491 0.45438 +0.77497 0.70773 0.45598 +0.82620 0.71058 0.45759 +0.87462 0.71341 0.45926 +0.91970 0.71621 0.46097 +0.96091 0.71895 0.46275 +0.14166 0.73486 0.44153 +0.18649 0.73713 0.44340 +0.23466 0.73944 0.44522 +0.28566 0.74181 0.44697 +0.33899 0.74424 0.44867 +0.39412 0.74673 0.45032 +0.45054 0.74930 0.45193 +0.50774 0.75194 0.45352 +0.56519 0.75465 0.45507 +0.62238 0.75743 0.45662 +0.67878 0.76026 0.45817 +0.73382 0.76306 0.45975 +0.78698 0.76583 0.46137 +0.83775 0.76856 0.46304 +0.88561 0.77125 0.46476 +0.93005 0.77390 0.46655 +0.96500 0.77649 0.46841 +0.15128 0.78998 0.44749 +0.19679 0.79231 0.44927 +0.24555 0.79470 0.45100 +0.29707 0.79715 0.45268 +0.35083 0.79967 0.45431 +0.40631 0.80227 0.45589 +0.46299 0.80494 0.45745 +0.52035 0.80766 0.45899 +0.57782 0.81038 0.46055 +0.63489 0.81307 0.46212 +0.69103 0.81573 0.46373 +0.74572 0.81836 0.46538 +0.79845 0.82096 0.46708 +0.84869 0.82351 0.46884 +0.89595 0.82601 0.47066 +0.93969 0.82846 0.47254 +0.96500 0.83086 0.47449 +0.16130 0.84258 0.45330 +0.20743 0.84495 0.45503 +0.25674 0.84738 0.45671 +0.30872 0.84989 0.45833 +0.36284 0.85245 0.45993 +0.41855 0.85501 0.46151 +0.47533 0.85757 0.46309 +0.53266 0.86011 0.46469 +0.59000 0.86263 0.46631 +0.64685 0.86512 0.46796 +0.70268 0.86758 0.46966 +0.75697 0.86999 0.47141 +0.80921 0.87236 0.47321 +0.85888 0.87469 0.47508 +0.90549 0.87696 0.47701 +0.94850 0.87918 0.47901 +0.96500 0.88136 0.48107 +0.17149 0.89191 0.45912 +0.21818 0.89425 0.46082 +0.26794 0.89661 0.46249 +0.32024 0.89897 0.46414 +0.37456 0.90133 0.46578 +0.43037 0.90369 0.46742 +0.48716 0.90603 0.46908 +0.54441 0.90834 0.47075 +0.60158 0.91063 0.47247 +0.65815 0.91287 0.47422 +0.71363 0.91508 0.47603 +0.76748 0.91724 0.47790 +0.81919 0.91935 0.47982 +0.86826 0.92141 0.48181 +0.91418 0.92342 0.48387 +0.95645 0.92538 0.48598 +0.96500 0.92729 0.48816 +0.18152 0.93691 0.46514 +0.22864 0.93903 0.46687 +0.27873 0.94117 0.46859 +0.33128 0.94330 0.47029 +0.38575 0.94542 0.47200 +0.44163 0.94752 0.47372 +0.49839 0.94961 0.47546 +0.55551 0.95165 0.47724 +0.61247 0.95367 0.47906 +0.66875 0.95500 0.48093 +0.72384 0.95500 0.48286 +0.77722 0.95500 0.48485 +0.82839 0.95500 0.48690 +0.87683 0.95500 0.48902 +0.92206 0.95500 0.49120 +0.96356 0.95500 0.49344 +0.96500 0.95500 0.49573 +0.07726 0.10003 0.39600 +0.11416 0.10142 0.39846 +0.15518 0.10276 0.40094 +0.19980 0.10406 0.40343 +0.24752 0.10530 0.40595 +0.29784 0.10649 0.40848 +0.35024 0.10763 0.41103 +0.40423 0.10870 0.41360 +0.45929 0.10973 0.41619 +0.51493 0.11072 0.41880 +0.57064 0.11166 0.42142 +0.62592 0.11258 0.42405 +0.68028 0.11348 0.42669 +0.73321 0.11437 0.42934 +0.78422 0.11526 0.43199 +0.83280 0.11616 0.43464 +0.87846 0.11710 0.43728 +0.08218 0.13967 0.40432 +0.11966 0.14115 0.40682 +0.16119 0.14258 0.40934 +0.20624 0.14396 0.41187 +0.25432 0.14528 0.41443 +0.30491 0.14654 0.41700 +0.35751 0.14775 0.41959 +0.41162 0.14891 0.42221 +0.46673 0.15002 0.42483 +0.52235 0.15109 0.42748 +0.57797 0.15212 0.43013 +0.63309 0.15314 0.43280 +0.68721 0.15415 0.43547 +0.73984 0.15515 0.43814 +0.79048 0.15617 0.44081 +0.83862 0.15721 0.44348 +0.88377 0.15829 0.44614 +0.08692 0.18372 0.41280 +0.12498 0.18527 0.41533 +0.16700 0.18675 0.41789 +0.21247 0.18818 0.42046 +0.26088 0.18956 0.42306 +0.31174 0.19087 0.42567 +0.36453 0.19213 0.42831 +0.41876 0.19334 0.43096 +0.47392 0.19452 0.43362 +0.52951 0.19566 0.43629 +0.58503 0.19677 0.43898 +0.63999 0.19788 0.44167 +0.69388 0.19898 0.44436 +0.74621 0.20010 0.44706 +0.79647 0.20123 0.44975 +0.84416 0.20240 0.45243 +0.88880 0.20361 0.45510 +0.09146 0.23147 0.42143 +0.13009 0.23306 0.42401 +0.17259 0.23459 0.42660 +0.21847 0.23605 0.42921 +0.26722 0.23746 0.43185 +0.31833 0.23881 0.43450 +0.37131 0.24011 0.43716 +0.42566 0.24137 0.43984 +0.48086 0.24259 0.44254 +0.53643 0.24380 0.44524 +0.59186 0.24499 0.44795 +0.64665 0.24617 0.45066 +0.70031 0.24737 0.45337 +0.75233 0.24859 0.45608 +0.80222 0.24983 0.45878 +0.84948 0.25113 0.46146 +0.89368 0.25250 0.46409 +0.09580 0.28226 0.43023 +0.13498 0.28388 0.43284 +0.17797 0.28542 0.43546 +0.22426 0.28691 0.43811 +0.27334 0.28834 0.44077 +0.32472 0.28972 0.44345 +0.37788 0.29106 0.44615 +0.43235 0.29236 0.44886 +0.48760 0.29364 0.45157 +0.54315 0.29491 0.45429 +0.59849 0.29617 0.45702 +0.65312 0.29744 0.45974 +0.70658 0.29875 0.46244 +0.75844 0.30013 0.46506 +0.80820 0.30159 0.46761 +0.85533 0.30314 0.47010 +0.89932 0.30478 0.47253 +0.09996 0.33547 0.43917 +0.13970 0.33710 0.44181 +0.18317 0.33866 0.44446 +0.22987 0.34017 0.44713 +0.27929 0.34162 0.44982 +0.33093 0.34303 0.45252 +0.38429 0.34441 0.45524 +0.43888 0.34576 0.45796 +0.49419 0.34710 0.46069 +0.54977 0.34846 0.46338 +0.60521 0.34988 0.46599 +0.65999 0.35137 0.46853 +0.71360 0.35294 0.47098 +0.76553 0.35458 0.47337 +0.81524 0.35631 0.47570 +0.86224 0.35811 0.47799 +0.90598 0.35999 0.48024 +0.10399 0.39052 0.44823 +0.14430 0.39216 0.45089 +0.18825 0.39374 0.45356 +0.23536 0.39526 0.45625 +0.28513 0.39674 0.45895 +0.33704 0.39819 0.46166 +0.39070 0.39965 0.46433 +0.44563 0.40115 0.46692 +0.50135 0.40271 0.46943 +0.55733 0.40432 0.47186 +0.61307 0.40600 0.47422 +0.66807 0.40775 0.47651 +0.72180 0.40957 0.47874 +0.77374 0.41147 0.48092 +0.82338 0.41345 0.48306 +0.87019 0.41549 0.48517 +0.91364 0.41760 0.48726 +0.10797 0.44686 0.45737 +0.14884 0.44852 0.46004 +0.19333 0.45013 0.46269 +0.24100 0.45175 0.46530 +0.29137 0.45337 0.46784 +0.34393 0.45503 0.47032 +0.39819 0.45671 0.47273 +0.45365 0.45845 0.47506 +0.50980 0.46025 0.47733 +0.56614 0.46210 0.47953 +0.62214 0.46403 0.48166 +0.67730 0.46602 0.48374 +0.73110 0.46809 0.48577 +0.78301 0.47023 0.48777 +0.83252 0.47243 0.48974 +0.87910 0.47470 0.49171 +0.92222 0.47702 0.49367 +0.11239 0.50417 0.46628 +0.15412 0.50596 0.46876 +0.19945 0.50776 0.47120 +0.24790 0.50956 0.47357 +0.29898 0.51138 0.47588 +0.35218 0.51325 0.47813 +0.40699 0.51515 0.48031 +0.46293 0.51711 0.48242 +0.51947 0.51913 0.48447 +0.57610 0.52122 0.48646 +0.63231 0.52338 0.48840 +0.68758 0.52560 0.49030 +0.74138 0.52790 0.49217 +0.79321 0.53026 0.49402 +0.84253 0.53267 0.49586 +0.88882 0.53515 0.49770 +0.93156 0.53766 0.49956 +0.11821 0.56231 0.47434 +0.16081 0.56426 0.47663 +0.20694 0.56621 0.47887 +0.25613 0.56819 0.48104 +0.30786 0.57020 0.48314 +0.36165 0.57226 0.48519 +0.41697 0.57437 0.48717 +0.47331 0.57653 0.48909 +0.53018 0.57877 0.49096 +0.58705 0.58107 0.49278 +0.64340 0.58344 0.49457 +0.69872 0.58588 0.49632 +0.75248 0.58838 0.49806 +0.80416 0.59094 0.49980 +0.85323 0.59355 0.50154 +0.89918 0.59620 0.50329 +0.94148 0.59888 0.50508 +0.12534 0.62070 0.48164 +0.16875 0.62278 0.48377 +0.21564 0.62488 0.48583 +0.26551 0.62702 0.48782 +0.31785 0.62920 0.48976 +0.37215 0.63143 0.49163 +0.42791 0.63372 0.49345 +0.48461 0.63608 0.49522 +0.54174 0.63851 0.49695 +0.59879 0.64100 0.49864 +0.65522 0.64357 0.50030 +0.71052 0.64619 0.50195 +0.76416 0.64888 0.50360 +0.81564 0.65161 0.50525 +0.86441 0.65439 0.50692 +0.90996 0.65719 0.50863 +0.95176 0.66001 0.51037 +0.13355 0.67870 0.48833 +0.17773 0.68089 0.49031 +0.22532 0.68312 0.49222 +0.27582 0.68539 0.49408 +0.32870 0.68772 0.49587 +0.38347 0.69011 0.49762 +0.43961 0.69257 0.49931 +0.49660 0.69509 0.50096 +0.55393 0.69768 0.50258 +0.61108 0.70035 0.50418 +0.66753 0.70308 0.50576 +0.72275 0.70587 0.50734 +0.77622 0.70871 0.50893 +0.82741 0.71157 0.51054 +0.87578 0.71440 0.51221 +0.92079 0.71719 0.51392 +0.96194 0.71993 0.51570 +0.14263 0.73563 0.49455 +0.18753 0.73791 0.49642 +0.23576 0.74024 0.49822 +0.28682 0.74263 0.49997 +0.34020 0.74508 0.50166 +0.39537 0.74760 0.50330 +0.45182 0.75019 0.50491 +0.50904 0.75285 0.50648 +0.56651 0.75559 0.50803 +0.62370 0.75839 0.50957 +0.68007 0.76122 0.51112 +0.73508 0.76401 0.51270 +0.78820 0.76678 0.51432 +0.83892 0.76950 0.51599 +0.88673 0.77219 0.51772 +0.93109 0.77482 0.51950 +0.96500 0.77741 0.52136 +0.15232 0.79078 0.50048 +0.19789 0.79312 0.50227 +0.24672 0.79553 0.50399 +0.29829 0.79801 0.50565 +0.35209 0.80055 0.50727 +0.40760 0.80317 0.50885 +0.46431 0.80587 0.51040 +0.52166 0.80859 0.51194 +0.57913 0.81129 0.51350 +0.63617 0.81398 0.51507 +0.69228 0.81664 0.51668 +0.74694 0.81926 0.51833 +0.79962 0.82184 0.52003 +0.84981 0.82438 0.52179 +0.89699 0.82687 0.52361 +0.94067 0.82932 0.52550 +0.96500 0.83171 0.52744 +0.16239 0.84340 0.50628 +0.20858 0.84579 0.50800 +0.25795 0.84824 0.50967 +0.30997 0.85077 0.51129 +0.36412 0.85333 0.51288 +0.41984 0.85589 0.51446 +0.47663 0.85844 0.51604 +0.53394 0.86097 0.51764 +0.59127 0.86348 0.51926 +0.64809 0.86596 0.52092 +0.70388 0.86841 0.52261 +0.75813 0.87081 0.52436 +0.81031 0.87317 0.52617 +0.85993 0.87548 0.52804 +0.90646 0.87775 0.52997 +0.94940 0.87996 0.53197 +0.96500 0.88212 0.53402 +0.17262 0.89274 0.51208 +0.21935 0.89507 0.51378 +0.26915 0.89743 0.51544 +0.32147 0.89979 0.51709 +0.37581 0.90214 0.51873 +0.43163 0.90449 0.52037 +0.48842 0.90682 0.52202 +0.54564 0.90912 0.52370 +0.60279 0.91140 0.52542 +0.65934 0.91363 0.52717 +0.71477 0.91582 0.52898 +0.76857 0.91797 0.53085 +0.82022 0.92007 0.53278 +0.86922 0.92212 0.53477 +0.91507 0.92411 0.53682 +0.95725 0.92606 0.53894 +0.96500 0.92796 0.54111 +0.18263 0.93766 0.51809 +0.22979 0.93978 0.51982 +0.27991 0.94191 0.52153 +0.33248 0.94403 0.52324 +0.38697 0.94614 0.52494 +0.44284 0.94824 0.52666 +0.49959 0.95031 0.52840 +0.55669 0.95234 0.53018 +0.61362 0.95434 0.53200 +0.66987 0.95500 0.53387 +0.72491 0.95500 0.53580 +0.77823 0.95500 0.53779 +0.82934 0.95500 0.53985 +0.87771 0.95500 0.54196 +0.92286 0.95500 0.54414 +0.96427 0.95500 0.54637 +0.96500 0.95500 0.54866 +0.07775 0.10049 0.44901 +0.11471 0.10186 0.45150 +0.15577 0.10319 0.45400 +0.20044 0.10447 0.45652 +0.24820 0.10570 0.45906 +0.29854 0.10687 0.46161 +0.35096 0.10799 0.46419 +0.40495 0.10906 0.46678 +0.46002 0.11007 0.46939 +0.51565 0.11104 0.47202 +0.57135 0.11198 0.47466 +0.62662 0.11288 0.47731 +0.68095 0.11377 0.47996 +0.73385 0.11465 0.48262 +0.78482 0.11554 0.48529 +0.83336 0.11644 0.48795 +0.87897 0.11737 0.49060 +0.08265 0.14014 0.45742 +0.12019 0.14161 0.45994 +0.16176 0.14303 0.46248 +0.20686 0.14439 0.46504 +0.25496 0.14570 0.46761 +0.30558 0.14695 0.47021 +0.35820 0.14814 0.47282 +0.41232 0.14928 0.47545 +0.46744 0.15038 0.47809 +0.52305 0.15144 0.48075 +0.57866 0.15247 0.48342 +0.63376 0.15348 0.48610 +0.68786 0.15448 0.48878 +0.74046 0.15548 0.49146 +0.79106 0.15649 0.49414 +0.83915 0.15753 0.49682 +0.88425 0.15861 0.49949 +0.08737 0.18420 0.46597 +0.12549 0.18574 0.46853 +0.16755 0.18721 0.47110 +0.21306 0.18863 0.47369 +0.26151 0.18999 0.47631 +0.31239 0.19129 0.47894 +0.36520 0.19254 0.48158 +0.41944 0.19374 0.48425 +0.47460 0.19491 0.48692 +0.53019 0.19604 0.48961 +0.58570 0.19715 0.49231 +0.64064 0.19825 0.49501 +0.69451 0.19935 0.49771 +0.74681 0.20046 0.50041 +0.79703 0.20159 0.50310 +0.84468 0.20276 0.50579 +0.88927 0.20397 0.50846 +0.09189 0.23196 0.47467 +0.13057 0.23354 0.47726 +0.17313 0.23505 0.47987 +0.21905 0.23650 0.48250 +0.26783 0.23790 0.48514 +0.31897 0.23924 0.48780 +0.37197 0.24053 0.49048 +0.42632 0.24178 0.49317 +0.48153 0.24300 0.49588 +0.53709 0.24420 0.49859 +0.59251 0.24539 0.50130 +0.64729 0.24657 0.50402 +0.70093 0.24776 0.50673 +0.75292 0.24898 0.50944 +0.80277 0.25023 0.51214 +0.85001 0.25153 0.51481 +0.89419 0.25293 0.51742 +0.09621 0.28275 0.48352 +0.13545 0.28435 0.48614 +0.17849 0.28589 0.48877 +0.22482 0.28737 0.49143 +0.27393 0.28879 0.49411 +0.32534 0.29017 0.49679 +0.37852 0.29150 0.49950 +0.43300 0.29280 0.50221 +0.48826 0.29407 0.50493 +0.54380 0.29534 0.50765 +0.59913 0.29660 0.51038 +0.65375 0.29787 0.51310 +0.70722 0.29919 0.51578 +0.75910 0.30059 0.51837 +0.80885 0.30208 0.52089 +0.85598 0.30365 0.52335 +0.89994 0.30530 0.52576 +0.10036 0.33595 0.49250 +0.14016 0.33758 0.49514 +0.18368 0.33913 0.49780 +0.23042 0.34063 0.50048 +0.27987 0.34208 0.50317 +0.33154 0.34349 0.50588 +0.38492 0.34486 0.50860 +0.43952 0.34621 0.51132 +0.49484 0.34755 0.51405 +0.55047 0.34893 0.51671 +0.60595 0.35037 0.51929 +0.66075 0.35189 0.52180 +0.71438 0.35347 0.52423 +0.76631 0.35514 0.52659 +0.81602 0.35689 0.52889 +0.86300 0.35871 0.53115 +0.90671 0.36061 0.53338 +0.10439 0.39100 0.50158 +0.14475 0.39264 0.50424 +0.18876 0.39421 0.50692 +0.23591 0.39574 0.50961 +0.28571 0.39722 0.51231 +0.33767 0.39867 0.51501 +0.39139 0.40015 0.51765 +0.44638 0.40167 0.52021 +0.50214 0.40325 0.52269 +0.55816 0.40488 0.52509 +0.61394 0.40658 0.52742 +0.66895 0.40835 0.52968 +0.72269 0.41020 0.53189 +0.77463 0.41212 0.53404 +0.82426 0.41411 0.53615 +0.87105 0.41618 0.53823 +0.91447 0.41831 0.54030 +0.10837 0.44735 0.51073 +0.14931 0.44901 0.51339 +0.19388 0.45064 0.51603 +0.24164 0.45227 0.51861 +0.29207 0.45391 0.52112 +0.34470 0.45559 0.52357 +0.39902 0.45730 0.52595 +0.45453 0.45905 0.52826 +0.51073 0.46087 0.53049 +0.56709 0.46275 0.53266 +0.62312 0.46470 0.53476 +0.67830 0.46671 0.53681 +0.73210 0.46880 0.53882 +0.78400 0.47096 0.54079 +0.83349 0.47319 0.54273 +0.88004 0.47547 0.54467 +0.92313 0.47782 0.54660 +0.11291 0.50471 0.51957 +0.15473 0.50653 0.52202 +0.20015 0.50833 0.52443 +0.24868 0.51016 0.52678 +0.29982 0.51200 0.52906 +0.35308 0.51388 0.53128 +0.40795 0.51581 0.53343 +0.46393 0.51779 0.53551 +0.52050 0.51984 0.53753 +0.57716 0.52195 0.53949 +0.63339 0.52413 0.54140 +0.68866 0.52637 0.54328 +0.74247 0.52869 0.54512 +0.79428 0.53107 0.54694 +0.84358 0.53351 0.54875 +0.88984 0.53600 0.55057 +0.93254 0.53853 0.55240 +0.11888 0.56292 0.52753 +0.16155 0.56489 0.52980 +0.20777 0.56686 0.53200 +0.25703 0.56885 0.53415 +0.30883 0.57089 0.53622 +0.36266 0.57296 0.53824 +0.41803 0.57509 0.54019 +0.47442 0.57728 0.54208 +0.53131 0.57954 0.54392 +0.58820 0.58187 0.54572 +0.64457 0.58426 0.54747 +0.69988 0.58672 0.54920 +0.75363 0.58924 0.55091 +0.80530 0.59182 0.55262 +0.85434 0.59445 0.55433 +0.90026 0.59713 0.55606 +0.94251 0.59982 0.55782 +0.12612 0.62138 0.53473 +0.16961 0.62347 0.53683 +0.21658 0.62559 0.53886 +0.26651 0.62775 0.54083 +0.31891 0.62995 0.54274 +0.37326 0.63220 0.54459 +0.42907 0.63452 0.54637 +0.48580 0.63690 0.54811 +0.54296 0.63935 0.54981 +0.60001 0.64187 0.55147 +0.65645 0.64445 0.55311 +0.71174 0.64710 0.55473 +0.76538 0.64981 0.55635 +0.81683 0.65257 0.55798 +0.86556 0.65536 0.55962 +0.91107 0.65819 0.56130 +0.95282 0.66102 0.56302 +0.13444 0.67943 0.54132 +0.17870 0.68164 0.54328 +0.22636 0.68388 0.54517 +0.27691 0.68618 0.54699 +0.32985 0.68853 0.54876 +0.38466 0.69094 0.55047 +0.44084 0.69341 0.55214 +0.49786 0.69596 0.55376 +0.55520 0.69858 0.55535 +0.61236 0.70127 0.55692 +0.66881 0.70402 0.55848 +0.72402 0.70684 0.56003 +0.77747 0.70970 0.56159 +0.82862 0.71256 0.56318 +0.87693 0.71538 0.56482 +0.92188 0.71817 0.56652 +0.96296 0.72090 0.56828 +0.14360 0.73640 0.54746 +0.18858 0.73870 0.54930 +0.23687 0.74105 0.55107 +0.28799 0.74346 0.55279 +0.34141 0.74593 0.55445 +0.39662 0.74847 0.55607 +0.45310 0.75109 0.55764 +0.51034 0.75378 0.55919 +0.56782 0.75653 0.56071 +0.62501 0.75936 0.56222 +0.68136 0.76217 0.56375 +0.73634 0.76496 0.56531 +0.78942 0.76772 0.56691 +0.84009 0.77044 0.56856 +0.88783 0.77312 0.57027 +0.93213 0.77575 0.57204 +0.96500 0.77833 0.57387 +0.15336 0.79158 0.55330 +0.19900 0.79395 0.55505 +0.24789 0.79638 0.55674 +0.29951 0.79887 0.55838 +0.35335 0.80144 0.55997 +0.40889 0.80408 0.56152 +0.46562 0.80679 0.56305 +0.52298 0.80951 0.56457 +0.58043 0.81221 0.56610 +0.63746 0.81489 0.56766 +0.69353 0.81754 0.56925 +0.74815 0.82015 0.57088 +0.80078 0.82272 0.57256 +0.85091 0.82525 0.57430 +0.89803 0.82774 0.57610 +0.94163 0.83017 0.57796 +0.96500 0.83255 0.57989 +0.16349 0.84423 0.55900 +0.20974 0.84663 0.56069 +0.25916 0.84911 0.56233 +0.31122 0.85165 0.56392 +0.36539 0.85420 0.56549 +0.42113 0.85676 0.56705 +0.47791 0.85930 0.56862 +0.53522 0.86183 0.57019 +0.59253 0.86433 0.57180 +0.64932 0.86680 0.57343 +0.70508 0.86924 0.57511 +0.75928 0.87163 0.57685 +0.81141 0.87398 0.57863 +0.86096 0.87628 0.58048 +0.90742 0.87853 0.58239 +0.95028 0.88072 0.58437 +0.96500 0.88287 0.58640 +0.17374 0.89356 0.56471 +0.22052 0.89590 0.56639 +0.27035 0.89824 0.56803 +0.32270 0.90059 0.56966 +0.37705 0.90294 0.57128 +0.43288 0.90528 0.57289 +0.48966 0.90760 0.57453 +0.54687 0.90990 0.57619 +0.60400 0.91216 0.57788 +0.66051 0.91438 0.57962 +0.71590 0.91656 0.58141 +0.76964 0.91870 0.58326 +0.82124 0.92078 0.58517 +0.87017 0.92281 0.58714 +0.91594 0.92479 0.58917 +0.95804 0.92673 0.59126 +0.96500 0.92861 0.59341 +0.18373 0.93841 0.57065 +0.23093 0.94052 0.57236 +0.28109 0.94264 0.57405 +0.33368 0.94476 0.57573 +0.38817 0.94686 0.57741 +0.44405 0.94894 0.57911 +0.50079 0.95100 0.58083 +0.55787 0.95302 0.58259 +0.61477 0.95500 0.58439 +0.67097 0.95500 0.58624 +0.72596 0.95500 0.58815 +0.77923 0.95500 0.59012 +0.83027 0.95500 0.59215 +0.87858 0.95500 0.59425 +0.92364 0.95500 0.59640 +0.96497 0.95500 0.59861 +0.96500 0.95500 0.60087 +0.07824 0.10094 0.50230 +0.11525 0.10229 0.50479 +0.15637 0.10361 0.50730 +0.20107 0.10488 0.50982 +0.24886 0.10609 0.51236 +0.29923 0.10725 0.51492 +0.35167 0.10835 0.51750 +0.40567 0.10940 0.52009 +0.46074 0.11041 0.52270 +0.51637 0.11136 0.52533 +0.57206 0.11229 0.52796 +0.62731 0.11318 0.53061 +0.68162 0.11406 0.53326 +0.73448 0.11494 0.53591 +0.78541 0.11581 0.53857 +0.83391 0.11671 0.54122 +0.87946 0.11764 0.54386 +0.08312 0.14061 0.51072 +0.12072 0.14206 0.51325 +0.16234 0.14347 0.51579 +0.20747 0.14482 0.51834 +0.25561 0.14611 0.52092 +0.30625 0.14735 0.52351 +0.35889 0.14853 0.52612 +0.41302 0.14966 0.52875 +0.46814 0.15075 0.53139 +0.52375 0.15179 0.53404 +0.57935 0.15281 0.53671 +0.63443 0.15381 0.53937 +0.68851 0.15481 0.54205 +0.74108 0.15580 0.54472 +0.79163 0.15681 0.54739 +0.83969 0.15785 0.55005 +0.88473 0.15892 0.55270 +0.08782 0.18468 0.51928 +0.12599 0.18620 0.52183 +0.16811 0.18767 0.52440 +0.21366 0.18907 0.52700 +0.26214 0.19042 0.52960 +0.31304 0.19171 0.53223 +0.36587 0.19295 0.53487 +0.42012 0.19414 0.53753 +0.47529 0.19529 0.54020 +0.53087 0.19642 0.54287 +0.58638 0.19752 0.54556 +0.64130 0.19861 0.54825 +0.69514 0.19971 0.55093 +0.74740 0.20082 0.55362 +0.79759 0.20195 0.55630 +0.84520 0.20312 0.55897 +0.88973 0.20433 0.56162 +0.09232 0.23244 0.52797 +0.13106 0.23401 0.53056 +0.17366 0.23551 0.53316 +0.21962 0.23695 0.53578 +0.26843 0.23834 0.53842 +0.31960 0.23967 0.54107 +0.37262 0.24095 0.54374 +0.42698 0.24220 0.54642 +0.48220 0.24341 0.54911 +0.53776 0.24460 0.55181 +0.59317 0.24579 0.55451 +0.64793 0.24697 0.55721 +0.70154 0.24816 0.55990 +0.75351 0.24938 0.56259 +0.80332 0.25063 0.56527 +0.85055 0.25195 0.56790 +0.89472 0.25336 0.57046 +0.09663 0.28323 0.53680 +0.13592 0.28483 0.53941 +0.17901 0.28636 0.54204 +0.22538 0.28783 0.54469 +0.27453 0.28924 0.54735 +0.32595 0.29061 0.55002 +0.37916 0.29194 0.55271 +0.43365 0.29323 0.55541 +0.48891 0.29450 0.55811 +0.54446 0.29576 0.56082 +0.59978 0.29703 0.56353 +0.65439 0.29830 0.56622 +0.70788 0.29964 0.56885 +0.75977 0.30106 0.57140 +0.80952 0.30257 0.57387 +0.85664 0.30416 0.57628 +0.90058 0.30583 0.57864 +0.10077 0.33644 0.54575 +0.14062 0.33805 0.54838 +0.18419 0.33960 0.55103 +0.23097 0.34110 0.55369 +0.28046 0.34254 0.55637 +0.33215 0.34395 0.55906 +0.38556 0.34532 0.56176 +0.44017 0.34667 0.56446 +0.49552 0.34801 0.56715 +0.55119 0.34941 0.56977 +0.60669 0.35088 0.57230 +0.66152 0.35241 0.57476 +0.71516 0.35402 0.57713 +0.76710 0.35571 0.57945 +0.81680 0.35747 0.58170 +0.86376 0.35932 0.58392 +0.90746 0.36123 0.58610 +0.10479 0.39148 0.55479 +0.14521 0.39312 0.55743 +0.18926 0.39469 0.56009 +0.23646 0.39621 0.56276 +0.28629 0.39769 0.56545 +0.33832 0.39916 0.56811 +0.39210 0.40066 0.57069 +0.44714 0.40220 0.57320 +0.50295 0.40380 0.57563 +0.55901 0.40545 0.57798 +0.61481 0.40717 0.58026 +0.66984 0.40897 0.58248 +0.72359 0.41083 0.58463 +0.77553 0.41278 0.58673 +0.82515 0.41479 0.58880 +0.87191 0.41687 0.59083 +0.91531 0.41902 0.59285 +0.10878 0.44784 0.56388 +0.14979 0.44950 0.56651 +0.19445 0.45115 0.56909 +0.24228 0.45280 0.57163 +0.29279 0.45446 0.57410 +0.34549 0.45615 0.57650 +0.39987 0.45789 0.57882 +0.45543 0.45966 0.58108 +0.51166 0.46150 0.58326 +0.56806 0.46340 0.58538 +0.62411 0.46537 0.58744 +0.67930 0.46741 0.58944 +0.73310 0.46952 0.59139 +0.78500 0.47170 0.59331 +0.83447 0.47395 0.59521 +0.88100 0.47626 0.59710 +0.92405 0.47862 0.59899 +0.11345 0.50527 0.57256 +0.15536 0.50710 0.57497 +0.20086 0.50892 0.57733 +0.24946 0.51076 0.57963 +0.30067 0.51263 0.58187 +0.35399 0.51453 0.58403 +0.40892 0.51648 0.58613 +0.46494 0.51848 0.58816 +0.52155 0.52055 0.59013 +0.57823 0.52268 0.59205 +0.63448 0.52488 0.59391 +0.68976 0.52715 0.59573 +0.74356 0.52949 0.59752 +0.79536 0.53189 0.59930 +0.84464 0.53435 0.60106 +0.89086 0.53686 0.60283 +0.93352 0.53941 0.60462 +0.11955 0.56355 0.58035 +0.16231 0.56552 0.58257 +0.20861 0.56751 0.58473 +0.25794 0.56953 0.58683 +0.30980 0.57158 0.58886 +0.36369 0.57368 0.59082 +0.41910 0.57583 0.59273 +0.47553 0.57804 0.59457 +0.53245 0.58032 0.59636 +0.58936 0.58267 0.59810 +0.64574 0.58509 0.59981 +0.70105 0.58757 0.60149 +0.75480 0.59012 0.60315 +0.80644 0.59272 0.60481 +0.85546 0.59537 0.60648 +0.90133 0.59806 0.60816 +0.94353 0.60078 0.60987 +0.12692 0.62206 0.58739 +0.17049 0.62417 0.58944 +0.21753 0.62631 0.59143 +0.26752 0.62848 0.59335 +0.31998 0.63070 0.59521 +0.37439 0.63298 0.59701 +0.43023 0.63532 0.59875 +0.48700 0.63772 0.60044 +0.54417 0.64019 0.60208 +0.60124 0.64274 0.60370 +0.65768 0.64535 0.60528 +0.71297 0.64802 0.60686 +0.76659 0.65075 0.60843 +0.81801 0.65353 0.61001 +0.86672 0.65634 0.61161 +0.91218 0.65919 0.61323 +0.95387 0.66203 0.61491 +0.13534 0.68016 0.59382 +0.17967 0.68239 0.59573 +0.22740 0.68465 0.59757 +0.27801 0.68697 0.59935 +0.33100 0.68934 0.60107 +0.38586 0.69177 0.60273 +0.44207 0.69427 0.60435 +0.49911 0.69684 0.60592 +0.55648 0.69948 0.60746 +0.61364 0.70220 0.60898 +0.67008 0.70497 0.61049 +0.72528 0.70781 0.61199 +0.77871 0.71069 0.61351 +0.82982 0.71354 0.61506 +0.87807 0.71636 0.61666 +0.92296 0.71914 0.61832 +0.96396 0.72187 0.62004 +0.14458 0.73718 0.59979 +0.18963 0.73950 0.60158 +0.23799 0.74187 0.60331 +0.28916 0.74430 0.60498 +0.34262 0.74679 0.60660 +0.39787 0.74935 0.60816 +0.45438 0.75199 0.60969 +0.51165 0.75470 0.61118 +0.56913 0.75748 0.61266 +0.62632 0.76032 0.61412 +0.68264 0.76313 0.61561 +0.73758 0.76591 0.61713 +0.79062 0.76866 0.61870 +0.84124 0.77138 0.62031 +0.88892 0.77404 0.62197 +0.93315 0.77666 0.62370 +0.96500 0.77924 0.62549 +0.15441 0.79239 0.60547 +0.20011 0.79478 0.60718 +0.24906 0.79723 0.60882 +0.30073 0.79974 0.61041 +0.35461 0.80233 0.61196 +0.41019 0.80500 0.61346 +0.46693 0.80771 0.61494 +0.52428 0.81042 0.61642 +0.58172 0.81312 0.61791 +0.63873 0.81579 0.61943 +0.69477 0.81843 0.62098 +0.74935 0.82104 0.62257 +0.80193 0.82360 0.62421 +0.85200 0.82612 0.62591 +0.89905 0.82859 0.62767 +0.94258 0.83102 0.62949 +0.96500 0.83339 0.63138 +0.16458 0.84507 0.61102 +0.21089 0.84749 0.61266 +0.26037 0.84998 0.61425 +0.31247 0.85252 0.61580 +0.36666 0.85507 0.61733 +0.42240 0.85762 0.61885 +0.47919 0.86016 0.62037 +0.53649 0.86268 0.62191 +0.59378 0.86517 0.62347 +0.65055 0.86763 0.62507 +0.70626 0.87006 0.62671 +0.76041 0.87244 0.62840 +0.81249 0.87477 0.63015 +0.86197 0.87706 0.63196 +0.90836 0.87930 0.63383 +0.95114 0.88149 0.63576 +0.96500 0.88362 0.63775 +0.17486 0.89438 0.61658 +0.22168 0.89671 0.61821 +0.27155 0.89905 0.61981 +0.32392 0.90140 0.62140 +0.37829 0.90374 0.62297 +0.43412 0.90607 0.62455 +0.49090 0.90838 0.62614 +0.54809 0.91067 0.62776 +0.60519 0.91292 0.62942 +0.66167 0.91513 0.63111 +0.71701 0.91729 0.63287 +0.77071 0.91941 0.63467 +0.82224 0.92148 0.63654 +0.87111 0.92350 0.63847 +0.91680 0.92547 0.64046 +0.95882 0.92739 0.64251 +0.96500 0.92926 0.64461 +0.18483 0.93916 0.62237 +0.23207 0.94126 0.62404 +0.28225 0.94337 0.62569 +0.33486 0.94548 0.62732 +0.38936 0.94757 0.62896 +0.44524 0.94964 0.63062 +0.50197 0.95169 0.63230 +0.55903 0.95370 0.63402 +0.61590 0.95500 0.63578 +0.67206 0.95500 0.63759 +0.72701 0.95500 0.63946 +0.78022 0.95500 0.64139 +0.83120 0.95500 0.64338 +0.87943 0.95500 0.64543 +0.92441 0.95500 0.64754 +0.96500 0.95500 0.64971 +0.96500 0.95500 0.65192 +0.07872 0.10138 0.55540 +0.11579 0.10272 0.55788 +0.15696 0.10403 0.56037 +0.20170 0.10528 0.56288 +0.24953 0.10648 0.56541 +0.29992 0.10762 0.56795 +0.35238 0.10871 0.57051 +0.40639 0.10975 0.57308 +0.46146 0.11074 0.57567 +0.51709 0.11168 0.57827 +0.57277 0.11259 0.58088 +0.62800 0.11348 0.58350 +0.68228 0.11435 0.58613 +0.73512 0.11522 0.58875 +0.78601 0.11609 0.59138 +0.83446 0.11698 0.59400 +0.87996 0.11791 0.59661 +0.08358 0.14107 0.56377 +0.12124 0.14251 0.56628 +0.16291 0.14391 0.56880 +0.20808 0.14524 0.57134 +0.25625 0.14652 0.57390 +0.30692 0.14774 0.57647 +0.35957 0.14891 0.57906 +0.41372 0.15003 0.58166 +0.46884 0.15111 0.58427 +0.52445 0.15214 0.58690 +0.58003 0.15316 0.58953 +0.63510 0.15415 0.59217 +0.68916 0.15513 0.59482 +0.74169 0.15613 0.59746 +0.79221 0.15713 0.60009 +0.84022 0.15817 0.60272 +0.88521 0.15924 0.60534 +0.08826 0.18515 0.57227 +0.12649 0.18666 0.57480 +0.16866 0.18812 0.57735 +0.21425 0.18951 0.57992 +0.26276 0.19084 0.58250 +0.31369 0.19212 0.58510 +0.36654 0.19335 0.58772 +0.42080 0.19454 0.59035 +0.47597 0.19568 0.59299 +0.53155 0.19680 0.59563 +0.58704 0.19789 0.59828 +0.64195 0.19898 0.60094 +0.69577 0.20007 0.60359 +0.74800 0.20118 0.60624 +0.79815 0.20231 0.60888 +0.84572 0.20348 0.61151 +0.89020 0.20469 0.61413 +0.09275 0.23292 0.58088 +0.13154 0.23447 0.58344 +0.17419 0.23597 0.58602 +0.22019 0.23740 0.58861 +0.26904 0.23878 0.59122 +0.32023 0.24010 0.59385 +0.37327 0.24138 0.59649 +0.42765 0.24261 0.59914 +0.48287 0.24382 0.60179 +0.53843 0.24501 0.60445 +0.59383 0.24619 0.60712 +0.64857 0.24737 0.60978 +0.70216 0.24856 0.61244 +0.75409 0.24978 0.61509 +0.80388 0.25103 0.61772 +0.85111 0.25237 0.62028 +0.89526 0.25380 0.62277 +0.09704 0.28371 0.58963 +0.13639 0.28530 0.59221 +0.17953 0.28682 0.59481 +0.22594 0.28828 0.59742 +0.27512 0.28969 0.60005 +0.32657 0.29105 0.60269 +0.37980 0.29238 0.60535 +0.43430 0.29367 0.60801 +0.48957 0.29494 0.61067 +0.54511 0.29620 0.61334 +0.60043 0.29746 0.61601 +0.65505 0.29875 0.61865 +0.70856 0.30011 0.62120 +0.76045 0.30155 0.62368 +0.81021 0.30307 0.62609 +0.85731 0.30468 0.62843 +0.90123 0.30637 0.63073 +0.10117 0.33692 0.59847 +0.14108 0.33853 0.60107 +0.18470 0.34007 0.60368 +0.23152 0.34157 0.60631 +0.28104 0.34301 0.60895 +0.33277 0.34441 0.61160 +0.38619 0.34578 0.61426 +0.44082 0.34713 0.61693 +0.49620 0.34849 0.61956 +0.55192 0.34991 0.62210 +0.60746 0.35139 0.62457 +0.66231 0.35295 0.62695 +0.71596 0.35458 0.62926 +0.76790 0.35628 0.63150 +0.81760 0.35807 0.63369 +0.86454 0.35993 0.63584 +0.90821 0.36187 0.63795 +0.10519 0.39197 0.60740 +0.14567 0.39360 0.61000 +0.18977 0.39517 0.61262 +0.23701 0.39669 0.61525 +0.28688 0.39817 0.61789 +0.33898 0.39966 0.62049 +0.39282 0.40118 0.62300 +0.44792 0.40274 0.62544 +0.50377 0.40436 0.62780 +0.55987 0.40603 0.63008 +0.61570 0.40778 0.63229 +0.67075 0.40959 0.63443 +0.72450 0.41148 0.63652 +0.77644 0.41344 0.63855 +0.82605 0.41548 0.64055 +0.87279 0.41758 0.64252 +0.91615 0.41975 0.64447 +0.10918 0.44834 0.61635 +0.15028 0.45001 0.61892 +0.19503 0.45168 0.62144 +0.24295 0.45334 0.62391 +0.29353 0.45502 0.62631 +0.34629 0.45673 0.62864 +0.40072 0.45848 0.63090 +0.45633 0.46028 0.63308 +0.51261 0.46214 0.63520 +0.56904 0.46407 0.63724 +0.62511 0.46606 0.63923 +0.68031 0.46812 0.64116 +0.73411 0.47025 0.64305 +0.78600 0.47245 0.64490 +0.83546 0.47472 0.64673 +0.88195 0.47705 0.64855 +0.92496 0.47942 0.65037 +0.11401 0.50583 0.62480 +0.15600 0.50768 0.62715 +0.20158 0.50952 0.62944 +0.25026 0.51138 0.63168 +0.30154 0.51326 0.63384 +0.35492 0.51518 0.63594 +0.40989 0.51715 0.63797 +0.46596 0.51918 0.63993 +0.52260 0.52127 0.64183 +0.57931 0.52342 0.64367 +0.63557 0.52564 0.64547 +0.69086 0.52794 0.64722 +0.74466 0.53030 0.64894 +0.79644 0.53272 0.65065 +0.84569 0.53520 0.65234 +0.89189 0.53773 0.65405 +0.93450 0.54030 0.65577 +0.12024 0.56418 0.63236 +0.16309 0.56617 0.63452 +0.20946 0.56818 0.63661 +0.25885 0.57021 0.63864 +0.31078 0.57228 0.64060 +0.36472 0.57440 0.64249 +0.42018 0.57658 0.64433 +0.47665 0.57881 0.64610 +0.53360 0.58111 0.64782 +0.59052 0.58348 0.64950 +0.64691 0.58592 0.65113 +0.70222 0.58843 0.65274 +0.75596 0.59100 0.65434 +0.80758 0.59362 0.65593 +0.85657 0.59629 0.65753 +0.90240 0.59900 0.65914 +0.94455 0.60174 0.66079 +0.12772 0.62275 0.63917 +0.17137 0.62488 0.64115 +0.21848 0.62703 0.64307 +0.26854 0.62923 0.64492 +0.32106 0.63147 0.64671 +0.37551 0.63377 0.64844 +0.43139 0.63613 0.65011 +0.48819 0.63855 0.65173 +0.54539 0.64105 0.65331 +0.60247 0.64361 0.65486 +0.65891 0.64625 0.65638 +0.71420 0.64894 0.65788 +0.76780 0.65169 0.65938 +0.81920 0.65449 0.66089 +0.86787 0.65733 0.66243 +0.91328 0.66019 0.66399 +0.95491 0.66303 0.66560 +0.13624 0.68090 0.64536 +0.18065 0.68315 0.64720 +0.22844 0.68543 0.64898 +0.27911 0.68777 0.65069 +0.33216 0.69016 0.65234 +0.38705 0.69261 0.65394 +0.44330 0.69514 0.65548 +0.50037 0.69773 0.65699 +0.55775 0.70039 0.65846 +0.61492 0.70313 0.65991 +0.67136 0.70593 0.66135 +0.72655 0.70879 0.66279 +0.77994 0.71167 0.66424 +0.83100 0.71452 0.66573 +0.87920 0.71734 0.66727 +0.92402 0.72011 0.66887 +0.96496 0.72283 0.67052 +0.14557 0.73796 0.65111 +0.19068 0.74030 0.65283 +0.23910 0.74269 0.65449 +0.29033 0.74514 0.65610 +0.34384 0.74765 0.65764 +0.39912 0.75024 0.65914 +0.45566 0.75290 0.66060 +0.51294 0.75563 0.66202 +0.57044 0.75844 0.66343 +0.62761 0.76127 0.66483 +0.68391 0.76408 0.66626 +0.73882 0.76685 0.66772 +0.79181 0.76960 0.66922 +0.84238 0.77230 0.67077 +0.89000 0.77496 0.67238 +0.93416 0.77758 0.67405 +0.96500 0.78014 0.67578 +0.15545 0.79321 0.65656 +0.20122 0.79561 0.65820 +0.25022 0.79808 0.65978 +0.30194 0.80062 0.66130 +0.35587 0.80323 0.66277 +0.41148 0.80591 0.66421 +0.46823 0.80863 0.66562 +0.52558 0.81133 0.66704 +0.58300 0.81402 0.66847 +0.63998 0.81669 0.66993 +0.69600 0.81932 0.67142 +0.75053 0.82192 0.67295 +0.80306 0.82447 0.67454 +0.85308 0.82698 0.67618 +0.90006 0.82944 0.67787 +0.94351 0.83186 0.67963 +0.96500 0.83422 0.68146 +0.16567 0.84590 0.66188 +0.21205 0.84834 0.66346 +0.26157 0.85085 0.66498 +0.31370 0.85339 0.66646 +0.36791 0.85594 0.66793 +0.42367 0.85848 0.66939 +0.48045 0.86101 0.67085 +0.53774 0.86352 0.67233 +0.59502 0.86600 0.67383 +0.65175 0.86845 0.67537 +0.70743 0.87087 0.67695 +0.76153 0.87324 0.67858 +0.81355 0.87556 0.68027 +0.86297 0.87784 0.68201 +0.90929 0.88006 0.68382 +0.95199 0.88224 0.68569 +0.96500 0.88437 0.68762 +0.17597 0.89520 0.66722 +0.22283 0.89752 0.66879 +0.27273 0.89986 0.67033 +0.32513 0.90220 0.67185 +0.37951 0.90453 0.67336 +0.43534 0.90685 0.67488 +0.49211 0.90915 0.67641 +0.54930 0.91143 0.67797 +0.60637 0.91367 0.67957 +0.66281 0.91586 0.68120 +0.71811 0.91802 0.68289 +0.77175 0.92013 0.68464 +0.82323 0.92218 0.68645 +0.87203 0.92419 0.68831 +0.91764 0.92614 0.69024 +0.95958 0.92805 0.69222 +0.96500 0.92991 0.69426 +0.18592 0.93989 0.67280 +0.23319 0.94199 0.67441 +0.28341 0.94409 0.67599 +0.33603 0.94619 0.67757 +0.39054 0.94827 0.67914 +0.44642 0.95033 0.68074 +0.50314 0.95237 0.68236 +0.56017 0.95437 0.68401 +0.61701 0.95500 0.68571 +0.67314 0.95500 0.68746 +0.72804 0.95500 0.68927 +0.78119 0.95500 0.69114 +0.83210 0.95500 0.69307 +0.88026 0.95500 0.69505 +0.92517 0.95500 0.69710 +0.96500 0.95500 0.69920 +0.96500 0.95500 0.70134 +0.07920 0.10181 0.60788 +0.11633 0.10315 0.61032 +0.15754 0.10444 0.61278 +0.20233 0.10567 0.61525 +0.25019 0.10686 0.61774 +0.30061 0.10799 0.62024 +0.35308 0.10907 0.62276 +0.40711 0.11009 0.62529 +0.46218 0.11107 0.62784 +0.51780 0.11200 0.63040 +0.57347 0.11290 0.63296 +0.62869 0.11378 0.63554 +0.68295 0.11464 0.63811 +0.73575 0.11550 0.64069 +0.78661 0.11637 0.64327 +0.83501 0.11726 0.64584 +0.88046 0.11818 0.64840 +0.08404 0.14153 0.61613 +0.12176 0.14296 0.61860 +0.16347 0.14434 0.62108 +0.20869 0.14566 0.62358 +0.25690 0.14693 0.62609 +0.30759 0.14814 0.62862 +0.36026 0.14930 0.63116 +0.41441 0.15040 0.63372 +0.46954 0.15147 0.63629 +0.52514 0.15250 0.63887 +0.58072 0.15350 0.64145 +0.63577 0.15449 0.64404 +0.68980 0.15547 0.64663 +0.74231 0.15645 0.64922 +0.79279 0.15746 0.65181 +0.84075 0.15849 0.65438 +0.88569 0.15956 0.65694 +0.08871 0.18562 0.62449 +0.12699 0.18712 0.62698 +0.16920 0.18856 0.62948 +0.21484 0.18995 0.63201 +0.26338 0.19127 0.63455 +0.31434 0.19254 0.63710 +0.36720 0.19376 0.63967 +0.42148 0.19493 0.64225 +0.47665 0.19607 0.64484 +0.53223 0.19718 0.64743 +0.58772 0.19827 0.65003 +0.64261 0.19935 0.65263 +0.69640 0.20044 0.65523 +0.74860 0.20155 0.65782 +0.79872 0.20268 0.66041 +0.84624 0.20384 0.66298 +0.89067 0.20506 0.66553 +0.09318 0.23339 0.63296 +0.13203 0.23494 0.63547 +0.17472 0.23643 0.63800 +0.22077 0.23785 0.64055 +0.26965 0.23922 0.64311 +0.32087 0.24053 0.64568 +0.37392 0.24180 0.64827 +0.42831 0.24303 0.65086 +0.48353 0.24424 0.65346 +0.53909 0.24542 0.65607 +0.59449 0.24659 0.65868 +0.64921 0.24777 0.66128 +0.70278 0.24897 0.66388 +0.75468 0.25018 0.66647 +0.80446 0.25145 0.66902 +0.85168 0.25281 0.67150 +0.89581 0.25426 0.67391 +0.09745 0.28419 0.64154 +0.13686 0.28577 0.64407 +0.18005 0.28729 0.64662 +0.22650 0.28874 0.64918 +0.27571 0.29015 0.65176 +0.32720 0.29150 0.65435 +0.38044 0.29282 0.65694 +0.43496 0.29411 0.65955 +0.49023 0.29537 0.66215 +0.54577 0.29663 0.66476 +0.60108 0.29790 0.66737 +0.65572 0.29920 0.66992 +0.70925 0.30058 0.67239 +0.76115 0.30204 0.67478 +0.81090 0.30359 0.67710 +0.85799 0.30521 0.67936 +0.90189 0.30692 0.68156 +0.10157 0.33740 0.65022 +0.14154 0.33901 0.65276 +0.18521 0.34055 0.65532 +0.23207 0.34204 0.65789 +0.28163 0.34347 0.66047 +0.33338 0.34487 0.66306 +0.38683 0.34624 0.66566 +0.44147 0.34759 0.66826 +0.49691 0.34897 0.67080 +0.55266 0.35041 0.67326 +0.60823 0.35192 0.67563 +0.66311 0.35349 0.67792 +0.71677 0.35514 0.68014 +0.76871 0.35687 0.68230 +0.81840 0.35868 0.68440 +0.86533 0.36056 0.68646 +0.90896 0.36251 0.68849 +0.10560 0.39246 0.65895 +0.14613 0.39409 0.66150 +0.19028 0.39566 0.66406 +0.23756 0.39718 0.66663 +0.28749 0.39867 0.66920 +0.33965 0.40017 0.67170 +0.39356 0.40171 0.67413 +0.44871 0.40329 0.67647 +0.50461 0.40493 0.67874 +0.56074 0.40663 0.68094 +0.61659 0.40839 0.68305 +0.67166 0.41023 0.68511 +0.72542 0.41213 0.68710 +0.77736 0.41412 0.68905 +0.82695 0.41617 0.69096 +0.87367 0.41829 0.69284 +0.91699 0.42048 0.69471 +0.10961 0.44884 0.66770 +0.15080 0.45053 0.67018 +0.19563 0.45221 0.67262 +0.24362 0.45389 0.67500 +0.29428 0.45559 0.67731 +0.34710 0.45732 0.67955 +0.40159 0.45909 0.68172 +0.45725 0.46092 0.68381 +0.51356 0.46280 0.68584 +0.57002 0.46474 0.68779 +0.62611 0.46675 0.68969 +0.68132 0.46884 0.69153 +0.73513 0.47099 0.69333 +0.78701 0.47321 0.69509 +0.83644 0.47550 0.69684 +0.88291 0.47784 0.69857 +0.92588 0.48024 0.70030 +0.11458 0.50641 0.67584 +0.15665 0.50827 0.67811 +0.20232 0.51013 0.68031 +0.25107 0.51200 0.68246 +0.30242 0.51390 0.68454 +0.35585 0.51585 0.68655 +0.41088 0.51784 0.68849 +0.46699 0.51988 0.69036 +0.52366 0.52199 0.69217 +0.58039 0.52417 0.69392 +0.63666 0.52642 0.69562 +0.69196 0.52873 0.69729 +0.74575 0.53111 0.69892 +0.79752 0.53356 0.70054 +0.84675 0.53606 0.70215 +0.89291 0.53861 0.70376 +0.93547 0.54119 0.70540 +0.12094 0.56482 0.68311 +0.16387 0.56683 0.68517 +0.21031 0.56885 0.68718 +0.25978 0.57091 0.68912 +0.31176 0.57300 0.69099 +0.36576 0.57514 0.69280 +0.42127 0.57733 0.69454 +0.47776 0.57959 0.69623 +0.53474 0.58191 0.69786 +0.59169 0.58431 0.69944 +0.64808 0.58677 0.70099 +0.70339 0.58929 0.70251 +0.75711 0.59188 0.70402 +0.80871 0.59453 0.70552 +0.85767 0.59722 0.70703 +0.90347 0.59995 0.70856 +0.94557 0.60270 0.71012 +0.12853 0.62345 0.68961 +0.17226 0.62560 0.69151 +0.21944 0.62777 0.69334 +0.26957 0.62998 0.69511 +0.32214 0.63224 0.69681 +0.37663 0.63456 0.69845 +0.43256 0.63694 0.70003 +0.48938 0.63939 0.70156 +0.54660 0.64191 0.70305 +0.60369 0.64450 0.70450 +0.66014 0.64715 0.70593 +0.71542 0.64987 0.70735 +0.76900 0.65264 0.70876 +0.82037 0.65546 0.71019 +0.86900 0.65832 0.71163 +0.91437 0.66119 0.71311 +0.95593 0.66403 0.71463 +0.13715 0.68166 0.69551 +0.18163 0.68392 0.69726 +0.22949 0.68622 0.69895 +0.28022 0.68857 0.70057 +0.33331 0.69098 0.70213 +0.38825 0.69346 0.70364 +0.44452 0.69600 0.70510 +0.50162 0.69862 0.70651 +0.55901 0.70131 0.70790 +0.61619 0.70407 0.70926 +0.67263 0.70689 0.71061 +0.72780 0.70977 0.71196 +0.78116 0.71265 0.71333 +0.83217 0.71549 0.71474 +0.88031 0.71830 0.71620 +0.92507 0.72107 0.71771 +0.96500 0.72379 0.71929 +0.14655 0.73876 0.70096 +0.19173 0.74111 0.70260 +0.24022 0.74352 0.70417 +0.29149 0.74599 0.70568 +0.34505 0.74852 0.70714 +0.40037 0.75113 0.70855 +0.45694 0.75381 0.70991 +0.51423 0.75657 0.71125 +0.57174 0.75939 0.71257 +0.62889 0.76221 0.71389 +0.68517 0.76502 0.71524 +0.74004 0.76779 0.71662 +0.79299 0.77053 0.71804 +0.84350 0.77322 0.71951 +0.89105 0.77587 0.72104 +0.93515 0.77848 0.72262 +0.96500 0.78103 0.72427 +0.15650 0.79403 0.70612 +0.20233 0.79645 0.70767 +0.25138 0.79894 0.70916 +0.30315 0.80149 0.71059 +0.35711 0.80413 0.71197 +0.41275 0.80683 0.71332 +0.46951 0.80954 0.71465 +0.52685 0.81224 0.71599 +0.58427 0.81492 0.71734 +0.64123 0.81757 0.71872 +0.69721 0.82020 0.72013 +0.75170 0.82279 0.72158 +0.80418 0.82533 0.72308 +0.85413 0.82783 0.72464 +0.90105 0.83028 0.72626 +0.94443 0.83269 0.72793 +0.96500 0.83504 0.72967 +0.16676 0.84675 0.71114 +0.21319 0.84920 0.71263 +0.26276 0.85172 0.71407 +0.31492 0.85425 0.71547 +0.36915 0.85679 0.71685 +0.42492 0.85933 0.71823 +0.48170 0.86185 0.71961 +0.53898 0.86435 0.72100 +0.59623 0.86683 0.72242 +0.65294 0.86927 0.72388 +0.70858 0.87167 0.72538 +0.76264 0.87403 0.72693 +0.81460 0.87634 0.72854 +0.86396 0.87861 0.73020 +0.91020 0.88082 0.73193 +0.95283 0.88298 0.73371 +0.96500 0.88510 0.73555 +0.17706 0.89601 0.71619 +0.22397 0.89833 0.71768 +0.27390 0.90066 0.71914 +0.32632 0.90299 0.72058 +0.38071 0.90531 0.72201 +0.43655 0.90763 0.72344 +0.49332 0.90992 0.72489 +0.55048 0.91218 0.72637 +0.60753 0.91441 0.72788 +0.66394 0.91659 0.72944 +0.71920 0.91874 0.73105 +0.77279 0.92083 0.73271 +0.82420 0.92287 0.73444 +0.87293 0.92486 0.73622 +0.91847 0.92680 0.73806 +0.96032 0.92870 0.73996 +0.96500 0.93054 0.74191 +0.18699 0.94062 0.72150 +0.23430 0.94271 0.72302 +0.28454 0.94481 0.72452 +0.33718 0.94689 0.72601 +0.39170 0.94897 0.72750 +0.44758 0.95102 0.72901 +0.50429 0.95304 0.73055 +0.56130 0.95500 0.73212 +0.61811 0.95500 0.73374 +0.67420 0.95500 0.73541 +0.72905 0.95500 0.73713 +0.78215 0.95500 0.73892 +0.83299 0.95500 0.74076 +0.88108 0.95500 0.74267 +0.92591 0.95500 0.74463 +0.96500 0.95500 0.74664 +0.96500 0.95500 0.74869 +0.07968 0.10224 0.65928 +0.11687 0.10357 0.66166 +0.15813 0.10484 0.66406 +0.20296 0.10607 0.66648 +0.25085 0.10724 0.66890 +0.30129 0.10836 0.67135 +0.35379 0.10942 0.67380 +0.40782 0.11043 0.67627 +0.46290 0.11140 0.67876 +0.51852 0.11232 0.68125 +0.57418 0.11321 0.68375 +0.62938 0.11408 0.68626 +0.68361 0.11494 0.68877 +0.73639 0.11579 0.69128 +0.78720 0.11665 0.69378 +0.83556 0.11754 0.69628 +0.88096 0.11846 0.69876 +0.08450 0.14198 0.66733 +0.12227 0.14340 0.66974 +0.16404 0.14477 0.67216 +0.20930 0.14608 0.67460 +0.25754 0.14733 0.67705 +0.30825 0.14853 0.67951 +0.36095 0.14968 0.68199 +0.41511 0.15078 0.68448 +0.47024 0.15183 0.68699 +0.52584 0.15285 0.68950 +0.58141 0.15385 0.69201 +0.63645 0.15483 0.69453 +0.69045 0.15580 0.69705 +0.74293 0.15679 0.69956 +0.79337 0.15779 0.70207 +0.84129 0.15882 0.70457 +0.88618 0.15989 0.70705 +0.08915 0.18609 0.67548 +0.12749 0.18758 0.67791 +0.16975 0.18901 0.68035 +0.21543 0.19038 0.68281 +0.26401 0.19170 0.68528 +0.31499 0.19296 0.68777 +0.36787 0.19417 0.69027 +0.42216 0.19533 0.69278 +0.47734 0.19646 0.69530 +0.53291 0.19756 0.69782 +0.58839 0.19865 0.70035 +0.64326 0.19973 0.70287 +0.69704 0.20082 0.70539 +0.74921 0.20192 0.70791 +0.79928 0.20305 0.71041 +0.84676 0.20422 0.71290 +0.89114 0.20544 0.71538 +0.09360 0.23387 0.68374 +0.13251 0.23541 0.68618 +0.17526 0.23689 0.68864 +0.22134 0.23830 0.69112 +0.27026 0.23966 0.69361 +0.32150 0.24097 0.69611 +0.37458 0.24223 0.69863 +0.42898 0.24346 0.70115 +0.48421 0.24465 0.70368 +0.53976 0.24583 0.70621 +0.59515 0.24701 0.70874 +0.64986 0.24819 0.71126 +0.70341 0.24938 0.71378 +0.75528 0.25060 0.71629 +0.80506 0.25189 0.71873 +0.85227 0.25326 0.72110 +0.89637 0.25473 0.72340 +0.09787 0.28467 0.69209 +0.13734 0.28625 0.69455 +0.18057 0.28776 0.69703 +0.22706 0.28921 0.69952 +0.27631 0.29060 0.70202 +0.32782 0.29196 0.70453 +0.38109 0.29327 0.70705 +0.43561 0.29455 0.70958 +0.49090 0.29582 0.71210 +0.54644 0.29708 0.71463 +0.60175 0.29835 0.71715 +0.65641 0.29967 0.71959 +0.70996 0.30107 0.72195 +0.76186 0.30255 0.72423 +0.81161 0.30412 0.72645 +0.85869 0.30576 0.72860 +0.90256 0.30749 0.73070 +0.10198 0.33789 0.70052 +0.14201 0.33949 0.70299 +0.18573 0.34103 0.70547 +0.23263 0.34251 0.70797 +0.28222 0.34395 0.71047 +0.33401 0.34534 0.71299 +0.38747 0.34671 0.71550 +0.44215 0.34807 0.71801 +0.49763 0.34947 0.72044 +0.55342 0.35093 0.72279 +0.60902 0.35246 0.72505 +0.66392 0.35405 0.72723 +0.71760 0.35572 0.72934 +0.76953 0.35747 0.73139 +0.81922 0.35930 0.73338 +0.86612 0.36120 0.73533 +0.90973 0.36317 0.73725 +0.10600 0.39296 0.70900 +0.14659 0.39458 0.71147 +0.19080 0.39615 0.71395 +0.23812 0.39767 0.71644 +0.28812 0.39917 0.71891 +0.34035 0.40070 0.72130 +0.39431 0.40225 0.72362 +0.44952 0.40386 0.72585 +0.50546 0.40551 0.72801 +0.56162 0.40723 0.73009 +0.61750 0.40902 0.73210 +0.67258 0.41087 0.73405 +0.72635 0.41280 0.73593 +0.77828 0.41480 0.73777 +0.82785 0.41688 0.73957 +0.87455 0.41902 0.74134 +0.91784 0.42122 0.74310 +0.11005 0.44936 0.71746 +0.15133 0.45107 0.71984 +0.19625 0.45276 0.72217 +0.24432 0.45446 0.72444 +0.29504 0.45618 0.72665 +0.34793 0.45793 0.72878 +0.40247 0.45972 0.73084 +0.45817 0.46156 0.73282 +0.51452 0.46346 0.73473 +0.57101 0.46542 0.73658 +0.62712 0.46746 0.73837 +0.68234 0.46956 0.74010 +0.73614 0.47174 0.74179 +0.78801 0.47398 0.74344 +0.83743 0.47629 0.74508 +0.88386 0.47865 0.74671 +0.92679 0.48106 0.74833 +0.11516 0.50700 0.72524 +0.15732 0.50887 0.72740 +0.20307 0.51075 0.72950 +0.25189 0.51264 0.73154 +0.30330 0.51456 0.73350 +0.35679 0.51652 0.73540 +0.41187 0.51853 0.73723 +0.46801 0.52060 0.73900 +0.52472 0.52273 0.74070 +0.58148 0.52493 0.74234 +0.63776 0.52720 0.74393 +0.69306 0.52953 0.74549 +0.74684 0.53194 0.74701 +0.79860 0.53440 0.74852 +0.84780 0.53692 0.75002 +0.89392 0.53949 0.75153 +0.93644 0.54209 0.75306 +0.12165 0.56547 0.73213 +0.16466 0.56750 0.73409 +0.21118 0.56954 0.73599 +0.26071 0.57161 0.73783 +0.31275 0.57372 0.73959 +0.36680 0.57588 0.74129 +0.42235 0.57809 0.74292 +0.47888 0.58037 0.74449 +0.53589 0.58272 0.74602 +0.59285 0.58513 0.74749 +0.64924 0.58762 0.74893 +0.70455 0.59016 0.75034 +0.75826 0.59278 0.75174 +0.80984 0.59544 0.75314 +0.85877 0.59815 0.75454 +0.90452 0.60090 0.75596 +0.94657 0.60367 0.75741 +0.12935 0.62416 0.73827 +0.17315 0.62632 0.74006 +0.22040 0.62851 0.74179 +0.27059 0.63074 0.74344 +0.32321 0.63302 0.74504 +0.37776 0.63536 0.74657 +0.43372 0.63777 0.74804 +0.49057 0.64024 0.74946 +0.54781 0.64278 0.75084 +0.60491 0.64538 0.75219 +0.66136 0.64806 0.75351 +0.71662 0.65080 0.75481 +0.77019 0.65359 0.75612 +0.82153 0.65644 0.75744 +0.87013 0.65931 0.75877 +0.91544 0.66219 0.76014 +0.95693 0.66502 0.76157 +0.13805 0.68241 0.74381 +0.18261 0.68469 0.74545 +0.23053 0.68701 0.74703 +0.28132 0.68938 0.74855 +0.33446 0.69181 0.75000 +0.38944 0.69431 0.75140 +0.44574 0.69688 0.75274 +0.50286 0.69952 0.75405 +0.56027 0.70222 0.75532 +0.61745 0.70500 0.75658 +0.67388 0.70785 0.75782 +0.72903 0.71074 0.75906 +0.78235 0.71362 0.76033 +0.83332 0.71646 0.76164 +0.88141 0.71926 0.76299 +0.92610 0.72202 0.76441 +0.96500 0.72473 0.76588 +0.14753 0.73955 0.74889 +0.19278 0.74192 0.75042 +0.24132 0.74435 0.75189 +0.29265 0.74684 0.75329 +0.34625 0.74939 0.75464 +0.40160 0.75202 0.75594 +0.45820 0.75472 0.75719 +0.51551 0.75750 0.75842 +0.57302 0.76033 0.75963 +0.63015 0.76315 0.76086 +0.68640 0.76595 0.76210 +0.74124 0.76871 0.76338 +0.79414 0.77144 0.76470 +0.84460 0.77413 0.76607 +0.89209 0.77678 0.76749 +0.93611 0.77937 0.76897 +0.96500 0.78192 0.77052 +0.15753 0.79486 0.75369 +0.20343 0.79730 0.75513 +0.25254 0.79980 0.75651 +0.30435 0.80237 0.75783 +0.35835 0.80503 0.75911 +0.41401 0.80773 0.76035 +0.47077 0.81044 0.76158 +0.52811 0.81313 0.76281 +0.58551 0.81580 0.76406 +0.64245 0.81845 0.76534 +0.69840 0.82107 0.76665 +0.75285 0.82365 0.76800 +0.80527 0.82618 0.76940 +0.85517 0.82868 0.77086 +0.90202 0.83112 0.77237 +0.94532 0.83351 0.77394 +0.96500 0.83585 0.77558 +0.16783 0.84759 0.75835 +0.21432 0.85006 0.75973 +0.26393 0.85258 0.76106 +0.31612 0.85511 0.76236 +0.37037 0.85764 0.76364 +0.42615 0.86017 0.76491 +0.48293 0.86268 0.76619 +0.54020 0.86518 0.76748 +0.59743 0.86764 0.76880 +0.65411 0.87008 0.77016 +0.70971 0.87247 0.77155 +0.76372 0.87482 0.77300 +0.81563 0.87712 0.77451 +0.86492 0.87937 0.77607 +0.91109 0.88157 0.77769 +0.95364 0.88372 0.77937 +0.96500 0.88583 0.78111 +0.17814 0.89681 0.76305 +0.22509 0.89912 0.76443 +0.27505 0.90145 0.76579 +0.32749 0.90377 0.76712 +0.38190 0.90609 0.76845 +0.43774 0.90839 0.76978 +0.49450 0.91067 0.77113 +0.55165 0.91292 0.77250 +0.60867 0.91514 0.77391 +0.66505 0.91731 0.77537 +0.72026 0.91944 0.77687 +0.77380 0.92152 0.77844 +0.82515 0.92355 0.78006 +0.87381 0.92553 0.78174 +0.91928 0.92746 0.78347 +0.96105 0.92934 0.78526 +0.96500 0.93117 0.78711 +0.18804 0.94134 0.76800 +0.23539 0.94343 0.76942 +0.28566 0.94551 0.77081 +0.33832 0.94759 0.77220 +0.39285 0.94965 0.77359 +0.44872 0.95169 0.77500 +0.50542 0.95370 0.77643 +0.56241 0.95500 0.77790 +0.61919 0.95500 0.77941 +0.67524 0.95500 0.78098 +0.73004 0.95500 0.78260 +0.78309 0.95500 0.78428 +0.83387 0.95500 0.78602 +0.88189 0.95500 0.78782 +0.92664 0.95500 0.78967 +0.96500 0.95500 0.79157 +0.96500 0.95500 0.79351 +0.08016 0.10267 0.70914 +0.11740 0.10398 0.71145 +0.15872 0.10525 0.71377 +0.20359 0.10646 0.71610 +0.25151 0.10762 0.71845 +0.30198 0.10872 0.72081 +0.35449 0.10977 0.72319 +0.40854 0.11077 0.72558 +0.46363 0.11173 0.72798 +0.51924 0.11264 0.73038 +0.57489 0.11353 0.73280 +0.63007 0.11439 0.73522 +0.68428 0.11524 0.73764 +0.73703 0.11608 0.74006 +0.78780 0.11694 0.74247 +0.83612 0.11783 0.74487 +0.88147 0.11874 0.74726 +0.08497 0.14243 0.71693 +0.12279 0.14384 0.71925 +0.16461 0.14520 0.72159 +0.20991 0.14650 0.72395 +0.25818 0.14774 0.72632 +0.30892 0.14893 0.72870 +0.36163 0.15007 0.73109 +0.41581 0.15115 0.73350 +0.47095 0.15220 0.73591 +0.52654 0.15321 0.73833 +0.58210 0.15420 0.74076 +0.63712 0.15517 0.74318 +0.69110 0.15615 0.74561 +0.74355 0.15713 0.74803 +0.79396 0.15813 0.75044 +0.84183 0.15916 0.75284 +0.88667 0.16023 0.75522 +0.08960 0.18656 0.72480 +0.12800 0.18804 0.72715 +0.17030 0.18946 0.72950 +0.21602 0.19082 0.73188 +0.26463 0.19213 0.73426 +0.31564 0.19338 0.73666 +0.36854 0.19458 0.73907 +0.42284 0.19574 0.74149 +0.47802 0.19686 0.74391 +0.53360 0.19796 0.74634 +0.58907 0.19904 0.74878 +0.64392 0.20012 0.75121 +0.69767 0.20120 0.75363 +0.74982 0.20230 0.75605 +0.79986 0.20343 0.75845 +0.84729 0.20460 0.76084 +0.89162 0.20583 0.76321 +0.09403 0.23435 0.73277 +0.13300 0.23588 0.73513 +0.17579 0.23735 0.73750 +0.22192 0.23876 0.73989 +0.27087 0.24011 0.74229 +0.32214 0.24141 0.74470 +0.37524 0.24267 0.74712 +0.42965 0.24389 0.74954 +0.48488 0.24508 0.75198 +0.54044 0.24626 0.75441 +0.59582 0.24743 0.75684 +0.65051 0.24861 0.75926 +0.70404 0.24980 0.76168 +0.75590 0.25103 0.76408 +0.80567 0.25234 0.76640 +0.85287 0.25373 0.76864 +0.89695 0.25521 0.77082 +0.09829 0.28516 0.74083 +0.13781 0.28673 0.74319 +0.18109 0.28823 0.74558 +0.22763 0.28968 0.74797 +0.27692 0.29107 0.75038 +0.32845 0.29242 0.75279 +0.38174 0.29373 0.75522 +0.43628 0.29501 0.75764 +0.49157 0.29628 0.76007 +0.54711 0.29754 0.76250 +0.60243 0.29881 0.76490 +0.65712 0.30016 0.76721 +0.71068 0.30158 0.76944 +0.76259 0.30308 0.77160 +0.81233 0.30466 0.77368 +0.85939 0.30632 0.77571 +0.90324 0.30806 0.77768 +0.10240 0.33839 0.74894 +0.14248 0.33998 0.75132 +0.18625 0.34152 0.75370 +0.23320 0.34300 0.75610 +0.28282 0.34443 0.75850 +0.33463 0.34583 0.76092 +0.38812 0.34720 0.76333 +0.44284 0.34857 0.76572 +0.49837 0.34999 0.76802 +0.55420 0.35147 0.77023 +0.60983 0.35301 0.77236 +0.66474 0.35463 0.77442 +0.71843 0.35632 0.77640 +0.77036 0.35808 0.77832 +0.82004 0.35993 0.78018 +0.86692 0.36185 0.78201 +0.91049 0.36384 0.78380 +0.10642 0.39346 0.75710 +0.14707 0.39509 0.75946 +0.19132 0.39665 0.76184 +0.23870 0.39818 0.76423 +0.28877 0.39970 0.76656 +0.34106 0.40124 0.76883 +0.39508 0.40281 0.77102 +0.45034 0.40443 0.77312 +0.50631 0.40611 0.77515 +0.56251 0.40785 0.77710 +0.61841 0.40965 0.77898 +0.67351 0.41153 0.78080 +0.72728 0.41348 0.78255 +0.77920 0.41550 0.78426 +0.82876 0.41759 0.78594 +0.87543 0.41975 0.78758 +0.91868 0.42197 0.78922 +0.11051 0.44990 0.76519 +0.15188 0.45162 0.76744 +0.19688 0.45333 0.76965 +0.24502 0.45504 0.77179 +0.29582 0.45678 0.77387 +0.34876 0.45855 0.77587 +0.40336 0.46035 0.77780 +0.45911 0.46222 0.77966 +0.51549 0.46414 0.78144 +0.57200 0.46612 0.78316 +0.62813 0.46818 0.78481 +0.68336 0.47030 0.78641 +0.73716 0.47249 0.78798 +0.78902 0.47476 0.78950 +0.83841 0.47708 0.79101 +0.88481 0.47946 0.79251 +0.92770 0.48190 0.79401 +0.11576 0.50760 0.77253 +0.15800 0.50949 0.77456 +0.20382 0.51138 0.77654 +0.25272 0.51329 0.77845 +0.30419 0.51523 0.78029 +0.35774 0.51721 0.78206 +0.41286 0.51924 0.78376 +0.46905 0.52133 0.78539 +0.52578 0.52348 0.78696 +0.58256 0.52570 0.78848 +0.63885 0.52799 0.78994 +0.69415 0.53034 0.79137 +0.74793 0.53277 0.79277 +0.79966 0.53525 0.79415 +0.84884 0.53779 0.79552 +0.89492 0.54037 0.79690 +0.93739 0.54300 0.79830 +0.12236 0.56614 0.77899 +0.16545 0.56818 0.78083 +0.21204 0.57024 0.78260 +0.26164 0.57232 0.78430 +0.31374 0.57445 0.78594 +0.36784 0.57663 0.78751 +0.42343 0.57887 0.78901 +0.48000 0.58117 0.79046 +0.53702 0.58353 0.79185 +0.59400 0.58597 0.79319 +0.65040 0.58847 0.79451 +0.70571 0.59104 0.79579 +0.75940 0.59367 0.79706 +0.81096 0.59636 0.79833 +0.85985 0.59908 0.79960 +0.90556 0.60185 0.80089 +0.94756 0.60463 0.80222 +0.13017 0.62488 0.78470 +0.17405 0.62706 0.78636 +0.22136 0.62927 0.78796 +0.27161 0.63151 0.78949 +0.32429 0.63381 0.79095 +0.37888 0.63617 0.79235 +0.43487 0.63859 0.79370 +0.49175 0.64108 0.79499 +0.54901 0.64365 0.79624 +0.60612 0.64628 0.79745 +0.66256 0.64897 0.79865 +0.71782 0.65173 0.79983 +0.77137 0.65455 0.80100 +0.82268 0.65741 0.80219 +0.87124 0.66030 0.80340 +0.91649 0.66317 0.80465 +0.95791 0.66600 0.80595 +0.13895 0.68318 0.78980 +0.18358 0.68547 0.79132 +0.23157 0.68781 0.79277 +0.28241 0.69020 0.79416 +0.33560 0.69265 0.79548 +0.39062 0.69517 0.79675 +0.44695 0.69775 0.79797 +0.50409 0.70041 0.79914 +0.56151 0.70314 0.80029 +0.61869 0.70594 0.80141 +0.67512 0.70881 0.80252 +0.73025 0.71170 0.80364 +0.78353 0.71457 0.80479 +0.83445 0.71741 0.80598 +0.88248 0.72021 0.80721 +0.92711 0.72296 0.80850 +0.96500 0.72567 0.80985 +0.14850 0.74036 0.79446 +0.19381 0.74274 0.79586 +0.24242 0.74518 0.79719 +0.29380 0.74769 0.79847 +0.34744 0.75027 0.79969 +0.40282 0.75291 0.80086 +0.45944 0.75564 0.80199 +0.51677 0.75843 0.80308 +0.57427 0.76127 0.80417 +0.63139 0.76408 0.80527 +0.68761 0.76687 0.80640 +0.74241 0.76963 0.80755 +0.79527 0.77235 0.80875 +0.84568 0.77503 0.81000 +0.89311 0.77767 0.81130 +0.93706 0.78026 0.81266 +0.96500 0.78280 0.81407 +0.15855 0.79569 0.79882 +0.20451 0.79814 0.80014 +0.25368 0.80066 0.80139 +0.30553 0.80325 0.80258 +0.35957 0.80592 0.80372 +0.41525 0.80863 0.80484 +0.47201 0.81133 0.80595 +0.52935 0.81401 0.80706 +0.58674 0.81668 0.80819 +0.64365 0.81932 0.80934 +0.69956 0.82193 0.81053 +0.75397 0.82450 0.81176 +0.80635 0.82703 0.81304 +0.85619 0.82951 0.81437 +0.90297 0.83194 0.81576 +0.94620 0.83432 0.81721 +0.96500 0.83666 0.81872 +0.16889 0.84843 0.80306 +0.21544 0.85091 0.80431 +0.26509 0.85343 0.80551 +0.31731 0.85595 0.80668 +0.37157 0.85848 0.80784 +0.42735 0.86100 0.80899 +0.48414 0.86351 0.81015 +0.54140 0.86599 0.81132 +0.59861 0.86845 0.81251 +0.65526 0.87087 0.81375 +0.71082 0.87325 0.81502 +0.76478 0.87559 0.81635 +0.81663 0.87788 0.81773 +0.86586 0.88012 0.81917 +0.91197 0.88231 0.82067 +0.95443 0.88445 0.82222 +0.96500 0.88654 0.82383 +0.17919 0.89760 0.80734 +0.22618 0.89991 0.80859 +0.27618 0.90222 0.80982 +0.32864 0.90454 0.81103 +0.38306 0.90685 0.81223 +0.43891 0.90914 0.81344 +0.49566 0.91142 0.81467 +0.55279 0.91366 0.81592 +0.60979 0.91586 0.81720 +0.66613 0.91802 0.81854 +0.72130 0.92014 0.81992 +0.77479 0.92221 0.82136 +0.82608 0.92422 0.82285 +0.87468 0.92619 0.82441 +0.92007 0.92810 0.82602 +0.96176 0.92997 0.82768 +0.96500 0.93179 0.82939 +0.18907 0.94205 0.81187 +0.23646 0.94413 0.81316 +0.28675 0.94621 0.81443 +0.33943 0.94828 0.81569 +0.39397 0.95033 0.81696 +0.44984 0.95236 0.81824 +0.50653 0.95436 0.81955 +0.56350 0.95500 0.82089 +0.62026 0.95500 0.82228 +0.67626 0.95500 0.82372 +0.73102 0.95500 0.82522 +0.78401 0.95500 0.82677 +0.83473 0.95500 0.82839 +0.88268 0.95500 0.83006 +0.92735 0.95500 0.83178 +0.96500 0.95500 0.83355 +0.96500 0.95500 0.83536 +0.08064 0.10310 0.75701 +0.11794 0.10440 0.75922 +0.15930 0.10565 0.76145 +0.20422 0.10685 0.76368 +0.25217 0.10800 0.76593 +0.30267 0.10909 0.76819 +0.35520 0.11013 0.77046 +0.40926 0.11112 0.77274 +0.46435 0.11207 0.77504 +0.51996 0.11297 0.77734 +0.57560 0.11385 0.77965 +0.63076 0.11470 0.78196 +0.68495 0.11554 0.78427 +0.73767 0.11639 0.78657 +0.78841 0.11724 0.78887 +0.83668 0.11813 0.79116 +0.88198 0.11904 0.79344 +0.08543 0.14289 0.76447 +0.12331 0.14429 0.76669 +0.16518 0.14563 0.76893 +0.21052 0.14692 0.77118 +0.25882 0.14816 0.77344 +0.30960 0.14933 0.77572 +0.36233 0.15046 0.77801 +0.41651 0.15154 0.78030 +0.47165 0.15257 0.78261 +0.52725 0.15358 0.78492 +0.58280 0.15456 0.78723 +0.63780 0.15553 0.78955 +0.69176 0.15650 0.79186 +0.74417 0.15748 0.79416 +0.79455 0.15848 0.79646 +0.84238 0.15951 0.79874 +0.88716 0.16058 0.80100 +0.09004 0.18703 0.77200 +0.12850 0.18850 0.77424 +0.17086 0.18991 0.77649 +0.21661 0.19127 0.77875 +0.26526 0.19256 0.78103 +0.31630 0.19381 0.78332 +0.36922 0.19500 0.78562 +0.42353 0.19615 0.78792 +0.47872 0.19727 0.79024 +0.53429 0.19836 0.79255 +0.58975 0.19944 0.79487 +0.64459 0.20051 0.79718 +0.69832 0.20160 0.79949 +0.75043 0.20270 0.80178 +0.80043 0.20383 0.80407 +0.84782 0.20500 0.80634 +0.89211 0.20623 0.80858 +0.09447 0.23483 0.77961 +0.13349 0.23636 0.78186 +0.17633 0.23782 0.78412 +0.22250 0.23922 0.78639 +0.27149 0.24057 0.78868 +0.32279 0.24186 0.79098 +0.37590 0.24311 0.79328 +0.43033 0.24433 0.79559 +0.48557 0.24552 0.79791 +0.54112 0.24670 0.80022 +0.59649 0.24787 0.80253 +0.65117 0.24904 0.80484 +0.70467 0.25024 0.80713 +0.75653 0.25148 0.80939 +0.80630 0.25281 0.81156 +0.85348 0.25422 0.81366 +0.89755 0.25572 0.81569 +0.09872 0.28566 0.78729 +0.13830 0.28722 0.78955 +0.18163 0.28872 0.79181 +0.22820 0.29016 0.79409 +0.27752 0.29155 0.79638 +0.32909 0.29289 0.79868 +0.38240 0.29420 0.80099 +0.43695 0.29548 0.80329 +0.49225 0.29674 0.80560 +0.54779 0.29800 0.80790 +0.60313 0.29930 0.81016 +0.65785 0.30066 0.81233 +0.71142 0.30210 0.81441 +0.76333 0.30362 0.81642 +0.81306 0.30522 0.81835 +0.86010 0.30690 0.82023 +0.90392 0.30866 0.82206 +0.10282 0.33889 0.79503 +0.14296 0.34049 0.79728 +0.18678 0.34202 0.79955 +0.23377 0.34350 0.80182 +0.28343 0.34493 0.80411 +0.33527 0.34632 0.80640 +0.38878 0.34769 0.80869 +0.44355 0.34908 0.81093 +0.49912 0.35052 0.81308 +0.55499 0.35202 0.81515 +0.61064 0.35358 0.81713 +0.66557 0.35522 0.81903 +0.71926 0.35693 0.82087 +0.77120 0.35871 0.82264 +0.82086 0.36057 0.82436 +0.86772 0.36251 0.82604 +0.91126 0.36452 0.82769 +0.10684 0.39398 0.80278 +0.14755 0.39560 0.80503 +0.19185 0.39717 0.80728 +0.23929 0.39870 0.80953 +0.28943 0.40024 0.81172 +0.34179 0.40180 0.81384 +0.39587 0.40339 0.81588 +0.45117 0.40503 0.81784 +0.50718 0.40672 0.81972 +0.56341 0.40848 0.82152 +0.61933 0.41031 0.82325 +0.67444 0.41220 0.82491 +0.72821 0.41417 0.82652 +0.78012 0.41621 0.82808 +0.82966 0.41832 0.82961 +0.87630 0.42050 0.83111 +0.91952 0.42273 0.83260 +0.11099 0.45045 0.81043 +0.15245 0.45218 0.81254 +0.19753 0.45391 0.81460 +0.24574 0.45564 0.81660 +0.29660 0.45739 0.81853 +0.34961 0.45918 0.82038 +0.40426 0.46101 0.82216 +0.46004 0.46289 0.82387 +0.51646 0.46483 0.82550 +0.57300 0.46683 0.82707 +0.62914 0.46890 0.82857 +0.68437 0.47105 0.83003 +0.73817 0.47326 0.83144 +0.79001 0.47554 0.83282 +0.83938 0.47789 0.83418 +0.88575 0.48028 0.83553 +0.92860 0.48273 0.83689 +0.11636 0.50822 0.81727 +0.15869 0.51012 0.81916 +0.20459 0.51203 0.82099 +0.25355 0.51396 0.82275 +0.30509 0.51591 0.82445 +0.35869 0.51791 0.82607 +0.41386 0.51996 0.82762 +0.47008 0.52207 0.82910 +0.52684 0.52424 0.83052 +0.58363 0.52648 0.83189 +0.63994 0.52879 0.83320 +0.69523 0.53116 0.83448 +0.74900 0.53360 0.83573 +0.80072 0.53611 0.83696 +0.84986 0.53866 0.83819 +0.89591 0.54126 0.83942 +0.93833 0.54390 0.84067 +0.12308 0.56682 0.82323 +0.16625 0.56887 0.82492 +0.21291 0.57095 0.82655 +0.26258 0.57305 0.82811 +0.31473 0.57520 0.82959 +0.36888 0.57739 0.83101 +0.42451 0.57965 0.83237 +0.48110 0.58197 0.83366 +0.53815 0.58435 0.83491 +0.59514 0.58681 0.83610 +0.65154 0.58933 0.83726 +0.70685 0.59192 0.83840 +0.76053 0.59457 0.83952 +0.81206 0.59727 0.84064 +0.86092 0.60002 0.84176 +0.90658 0.60280 0.84291 +0.94853 0.60560 0.84409 +0.13098 0.62561 0.82844 +0.17494 0.62780 0.82996 +0.22232 0.63003 0.83141 +0.27263 0.63229 0.83279 +0.32535 0.63461 0.83411 +0.37999 0.63699 0.83536 +0.43601 0.63943 0.83655 +0.49292 0.64194 0.83769 +0.55019 0.64452 0.83879 +0.60731 0.64717 0.83986 +0.66375 0.64988 0.84091 +0.71900 0.65266 0.84194 +0.77253 0.65550 0.84296 +0.82381 0.65837 0.84400 +0.87232 0.66127 0.84506 +0.91752 0.66414 0.84617 +0.95887 0.66696 0.84733 +0.13985 0.68395 0.83305 +0.18455 0.68626 0.83442 +0.23259 0.68862 0.83572 +0.28349 0.69102 0.83696 +0.33672 0.69349 0.83813 +0.39178 0.69603 0.83925 +0.44815 0.69863 0.84032 +0.50530 0.70131 0.84135 +0.56274 0.70406 0.84235 +0.61992 0.70688 0.84332 +0.67634 0.70976 0.84428 +0.73144 0.71266 0.84525 +0.78468 0.71552 0.84626 +0.83555 0.71835 0.84730 +0.88352 0.72115 0.84840 +0.92809 0.72389 0.84954 +0.96500 0.72659 0.85075 +0.14946 0.74116 0.83720 +0.19484 0.74356 0.83846 +0.24350 0.74602 0.83965 +0.29493 0.74854 0.84077 +0.34861 0.75114 0.84184 +0.40403 0.75380 0.84286 +0.46067 0.75655 0.84384 +0.51802 0.75936 0.84479 +0.57551 0.76219 0.84573 +0.63261 0.76500 0.84669 +0.68880 0.76778 0.84767 +0.74357 0.77053 0.84869 +0.79638 0.77325 0.84974 +0.84673 0.77592 0.85084 +0.89410 0.77855 0.85200 +0.93798 0.78113 0.85321 +0.96500 0.78366 0.85449 +0.15956 0.79652 0.84108 +0.20558 0.79898 0.84224 +0.25480 0.80152 0.84334 +0.30670 0.80413 0.84438 +0.36077 0.80681 0.84538 +0.41646 0.80951 0.84635 +0.47323 0.81220 0.84732 +0.53056 0.81489 0.84829 +0.58793 0.81755 0.84927 +0.64482 0.82018 0.85028 +0.70071 0.82278 0.85132 +0.75507 0.82534 0.85241 +0.80740 0.82786 0.85355 +0.85718 0.83033 0.85474 +0.90390 0.83275 0.85598 +0.94705 0.83513 0.85728 +0.96500 0.83745 0.85865 +0.16993 0.84926 0.84481 +0.21653 0.85175 0.84591 +0.26622 0.85427 0.84697 +0.31846 0.85679 0.84800 +0.37274 0.85931 0.84901 +0.42854 0.86182 0.85002 +0.48532 0.86432 0.85103 +0.54257 0.86680 0.85206 +0.59976 0.86924 0.85311 +0.65638 0.87166 0.85420 +0.71191 0.87403 0.85533 +0.76582 0.87635 0.85652 +0.81762 0.87863 0.85775 +0.86679 0.88086 0.85905 +0.91282 0.88304 0.86040 +0.95521 0.88517 0.86180 +0.96500 0.88725 0.86326 +0.18022 0.89838 0.84860 +0.22726 0.90068 0.84971 +0.27728 0.90299 0.85080 +0.32977 0.90530 0.85186 +0.38420 0.90760 0.85292 +0.44005 0.90989 0.85398 +0.49680 0.91215 0.85506 +0.55392 0.91438 0.85617 +0.61089 0.91657 0.85731 +0.66720 0.91872 0.85850 +0.72233 0.92083 0.85974 +0.77576 0.92288 0.86103 +0.82700 0.92489 0.86238 +0.87553 0.92684 0.86379 +0.92085 0.92874 0.86525 +0.96246 0.93060 0.86676 +0.96500 0.93241 0.86832 +0.19008 0.94275 0.85265 +0.23750 0.94482 0.85379 +0.28783 0.94689 0.85491 +0.34052 0.94895 0.85603 +0.39507 0.95099 0.85715 +0.45094 0.95301 0.85828 +0.50761 0.95500 0.85945 +0.56457 0.95500 0.86064 +0.62130 0.95500 0.86189 +0.67727 0.95500 0.86318 +0.73198 0.95500 0.86453 +0.78491 0.95500 0.86594 +0.83557 0.95500 0.86741 +0.88345 0.95500 0.86893 +0.92805 0.95500 0.87050 +0.96500 0.95500 0.87212 +0.96500 0.95500 0.87377 +0.08112 0.10352 0.80245 +0.11848 0.10482 0.80454 +0.15989 0.10606 0.80664 +0.20484 0.10725 0.80876 +0.25284 0.10839 0.81088 +0.30336 0.10947 0.81302 +0.35591 0.11050 0.81517 +0.40998 0.11148 0.81733 +0.46508 0.11241 0.81949 +0.52069 0.11331 0.82167 +0.57632 0.11418 0.82385 +0.63147 0.11502 0.82603 +0.68563 0.11586 0.82821 +0.73832 0.11670 0.83038 +0.78902 0.11756 0.83254 +0.83725 0.11844 0.83470 +0.88250 0.11935 0.83684 +0.08589 0.14334 0.80950 +0.12383 0.14473 0.81160 +0.16575 0.14607 0.81371 +0.21113 0.14735 0.81584 +0.25947 0.14857 0.81798 +0.31027 0.14974 0.82013 +0.36302 0.15086 0.82228 +0.41722 0.15193 0.82445 +0.47237 0.15296 0.82663 +0.52796 0.15396 0.82881 +0.58350 0.15494 0.83099 +0.63849 0.15590 0.83317 +0.69242 0.15687 0.83535 +0.74481 0.15784 0.83751 +0.79514 0.15884 0.83967 +0.84293 0.15987 0.84181 +0.88767 0.16095 0.84394 +0.09049 0.18750 0.81661 +0.12901 0.18897 0.81872 +0.17142 0.19037 0.82085 +0.21721 0.19172 0.82298 +0.26590 0.19301 0.82513 +0.31696 0.19424 0.82729 +0.36990 0.19543 0.82946 +0.42422 0.19658 0.83163 +0.47942 0.19769 0.83381 +0.53499 0.19878 0.83599 +0.59044 0.19985 0.83817 +0.64527 0.20093 0.84034 +0.69897 0.20201 0.84251 +0.75106 0.20311 0.84467 +0.80102 0.20424 0.84681 +0.84837 0.20542 0.84894 +0.89263 0.20666 0.85102 +0.09491 0.23533 0.82379 +0.13399 0.23684 0.82591 +0.17688 0.23830 0.82804 +0.22309 0.23969 0.83018 +0.27211 0.24103 0.83234 +0.32344 0.24232 0.83450 +0.37657 0.24357 0.83667 +0.43101 0.24478 0.83885 +0.48626 0.24597 0.84102 +0.54181 0.24715 0.84320 +0.59717 0.24832 0.84537 +0.65184 0.24950 0.84753 +0.70532 0.25069 0.84968 +0.75718 0.25195 0.85177 +0.80695 0.25329 0.85378 +0.85411 0.25472 0.85571 +0.89815 0.25624 0.85758 +0.09915 0.28616 0.83103 +0.13879 0.28772 0.83315 +0.18217 0.28922 0.83529 +0.22878 0.29065 0.83743 +0.27814 0.29204 0.83958 +0.32974 0.29338 0.84174 +0.38306 0.29468 0.84391 +0.43763 0.29596 0.84608 +0.49293 0.29723 0.84824 +0.54848 0.29849 0.85040 +0.60385 0.29980 0.85249 +0.65858 0.30118 0.85449 +0.71217 0.30264 0.85640 +0.76408 0.30418 0.85824 +0.81380 0.30579 0.86001 +0.86082 0.30749 0.86172 +0.90461 0.30927 0.86339 +0.10325 0.33941 0.83831 +0.14345 0.34100 0.84043 +0.18731 0.34253 0.84256 +0.23435 0.34401 0.84470 +0.28405 0.34544 0.84684 +0.33591 0.34683 0.84899 +0.38946 0.34821 0.85113 +0.44428 0.34962 0.85320 +0.49989 0.35107 0.85518 +0.55579 0.35259 0.85708 +0.61147 0.35417 0.85889 +0.66641 0.35582 0.86063 +0.72011 0.35755 0.86230 +0.77204 0.35935 0.86390 +0.82168 0.36123 0.86545 +0.86852 0.36319 0.86696 +0.91202 0.36521 0.86845 +0.10727 0.39451 0.84560 +0.14804 0.39614 0.84771 +0.19240 0.39770 0.84982 +0.23990 0.39924 0.85191 +0.29011 0.40080 0.85393 +0.34253 0.40237 0.85588 +0.39666 0.40398 0.85775 +0.45201 0.40564 0.85954 +0.50806 0.40735 0.86125 +0.56431 0.40913 0.86288 +0.62026 0.41097 0.86445 +0.67537 0.41289 0.86594 +0.72914 0.41487 0.86738 +0.78104 0.41693 0.86878 +0.83056 0.41906 0.87014 +0.87717 0.42125 0.87147 +0.92035 0.42350 0.87279 +0.11149 0.45102 0.85273 +0.15303 0.45277 0.85468 +0.19819 0.45451 0.85657 +0.24648 0.45626 0.85841 +0.29740 0.45802 0.86017 +0.35046 0.45983 0.86185 +0.40516 0.46167 0.86347 +0.46098 0.46357 0.86500 +0.51743 0.46553 0.86647 +0.57399 0.46755 0.86787 +0.63015 0.46964 0.86920 +0.68538 0.47181 0.87049 +0.73917 0.47404 0.87173 +0.79100 0.47634 0.87295 +0.84034 0.47870 0.87414 +0.88668 0.48111 0.87533 +0.92948 0.48357 0.87651 +0.11698 0.50886 0.85901 +0.15939 0.51077 0.86073 +0.20536 0.51270 0.86240 +0.25439 0.51464 0.86400 +0.30599 0.51661 0.86552 +0.35964 0.51862 0.86697 +0.41485 0.52069 0.86836 +0.47110 0.52282 0.86967 +0.52789 0.52501 0.87092 +0.58470 0.52726 0.87212 +0.64101 0.52959 0.87327 +0.69631 0.53198 0.87437 +0.75006 0.53444 0.87545 +0.80176 0.53696 0.87652 +0.85087 0.53954 0.87758 +0.89688 0.54215 0.87864 +0.93925 0.54480 0.87973 +0.12381 0.56751 0.86441 +0.16705 0.56958 0.86593 +0.21378 0.57167 0.86739 +0.26351 0.57379 0.86878 +0.31572 0.57595 0.87010 +0.36991 0.57816 0.87135 +0.42558 0.58044 0.87254 +0.48220 0.58277 0.87366 +0.53927 0.58518 0.87474 +0.59627 0.58765 0.87577 +0.65268 0.59019 0.87676 +0.70797 0.59280 0.87773 +0.76163 0.59547 0.87868 +0.81314 0.59819 0.87963 +0.86196 0.60095 0.88058 +0.90758 0.60374 0.88156 +0.94947 0.60656 0.88257 +0.13180 0.62635 0.86905 +0.17582 0.62856 0.87040 +0.22327 0.63080 0.87169 +0.27364 0.63308 0.87290 +0.32641 0.63541 0.87404 +0.38108 0.63781 0.87513 +0.43714 0.64027 0.87615 +0.49408 0.64279 0.87713 +0.55136 0.64539 0.87806 +0.60849 0.64806 0.87896 +0.66492 0.65080 0.87983 +0.72016 0.65359 0.88069 +0.77366 0.65644 0.88155 +0.82491 0.65934 0.88242 +0.87338 0.66224 0.88332 +0.91851 0.66510 0.88426 +0.95980 0.66792 0.88526 +0.14074 0.68473 0.87309 +0.18550 0.68706 0.87430 +0.23361 0.68942 0.87543 +0.28456 0.69185 0.87650 +0.33784 0.69433 0.87751 +0.39293 0.69688 0.87846 +0.44932 0.69951 0.87936 +0.50650 0.70220 0.88021 +0.56394 0.70497 0.88104 +0.62112 0.70781 0.88185 +0.67753 0.71071 0.88264 +0.73260 0.71360 0.88345 +0.78580 0.71646 0.88429 +0.83662 0.71928 0.88517 +0.88454 0.72207 0.88610 +0.92904 0.72481 0.88708 +0.96500 0.72750 0.88812 +0.15040 0.74197 0.87669 +0.19585 0.74439 0.87777 +0.24456 0.74686 0.87879 +0.29604 0.74940 0.87975 +0.34976 0.75201 0.88065 +0.40521 0.75469 0.88150 +0.46188 0.75745 0.88231 +0.51923 0.76028 0.88309 +0.57671 0.76310 0.88387 +0.63380 0.76590 0.88466 +0.68996 0.76868 0.88548 +0.74469 0.77143 0.88633 +0.79746 0.77413 0.88722 +0.84776 0.77680 0.88816 +0.89507 0.77942 0.88915 +0.93888 0.78199 0.89020 +0.96500 0.78452 0.89131 +0.16055 0.79734 0.87999 +0.20663 0.79982 0.88099 +0.25590 0.80237 0.88192 +0.30784 0.80500 0.88279 +0.36194 0.80769 0.88362 +0.41765 0.81038 0.88443 +0.47442 0.81307 0.88523 +0.53175 0.81575 0.88603 +0.58911 0.81840 0.88685 +0.64597 0.82103 0.88770 +0.70182 0.82362 0.88858 +0.75615 0.82617 0.88950 +0.80842 0.82868 0.89047 +0.85815 0.83114 0.89150 +0.90480 0.83355 0.89258 +0.94788 0.83592 0.89371 +0.96500 0.83823 0.89491 +0.17095 0.85009 0.88316 +0.21760 0.85258 0.88409 +0.26732 0.85509 0.88499 +0.31959 0.85761 0.88585 +0.37389 0.86012 0.88670 +0.42969 0.86263 0.88754 +0.48647 0.86512 0.88839 +0.54371 0.86759 0.88925 +0.60089 0.87003 0.89014 +0.65748 0.87243 0.89106 +0.71297 0.87479 0.89203 +0.76684 0.87711 0.89305 +0.81858 0.87938 0.89412 +0.86769 0.88159 0.89525 +0.91365 0.88376 0.89643 +0.95596 0.88588 0.89767 +0.96500 0.88795 0.89896 +0.18123 0.89915 0.88640 +0.22830 0.90144 0.88734 +0.27836 0.90375 0.88826 +0.33087 0.90605 0.88916 +0.38532 0.90834 0.89005 +0.44117 0.91062 0.89095 +0.49791 0.91287 0.89186 +0.55502 0.91509 0.89280 +0.61196 0.91727 0.89378 +0.66824 0.91941 0.89480 +0.72333 0.92151 0.89587 +0.77672 0.92355 0.89700 +0.82789 0.92554 0.89818 +0.87636 0.92748 0.89942 +0.92161 0.92937 0.90071 +0.96314 0.93122 0.90206 +0.96500 0.93302 0.90344 +0.19106 0.94344 0.88988 +0.23852 0.94550 0.89086 +0.28887 0.94756 0.89181 +0.34159 0.94961 0.89276 +0.39614 0.95164 0.89371 +0.45201 0.95365 0.89468 +0.50868 0.95500 0.89568 +0.56562 0.95500 0.89671 +0.62232 0.95500 0.89779 +0.67825 0.95500 0.89891 +0.73292 0.95500 0.90009 +0.78580 0.95500 0.90133 +0.83640 0.95500 0.90263 +0.88421 0.95500 0.90398 +0.92874 0.95500 0.90538 +0.96500 0.95500 0.90682 +0.96500 0.95500 0.90830 diff --git a/src/assets/lut/teal-e-orange.cube b/src/assets/lut/teal-e-orange.cube new file mode 100644 index 0000000..edb8755 --- /dev/null +++ b/src/assets/lut/teal-e-orange.cube @@ -0,0 +1,4919 @@ +# DaProd Video · LUT di partenza, create da noi (licenza MIT, come il progetto). +# Generata da scripts/genera-lut.mjs: non si modifica a mano. +TITLE "Teal & orange" +LUT_3D_SIZE 17 +DOMAIN_MIN 0.0 0.0 0.0 +DOMAIN_MAX 1.0 1.0 1.0 +0.00000 0.02838 0.03430 +0.04032 0.02828 0.03438 +0.08902 0.02797 0.03424 +0.14269 0.02745 0.03388 +0.20063 0.02675 0.03331 +0.26213 0.02587 0.03255 +0.32648 0.02484 0.03161 +0.39294 0.02366 0.03051 +0.46078 0.02235 0.02926 +0.52926 0.02092 0.02787 +0.59762 0.01941 0.02637 +0.66506 0.01781 0.02477 +0.73077 0.01616 0.02309 +0.79394 0.01446 0.02135 +0.85369 0.01275 0.01957 +0.90914 0.01105 0.01778 +0.95938 0.00937 0.01599 +0.00000 0.07190 0.03418 +0.03690 0.07158 0.03391 +0.08597 0.07106 0.03339 +0.14021 0.07034 0.03264 +0.19889 0.06943 0.03166 +0.26130 0.06835 0.03048 +0.32672 0.06712 0.02911 +0.39441 0.06575 0.02757 +0.46361 0.06426 0.02587 +0.53355 0.06267 0.02403 +0.60343 0.06098 0.02207 +0.67244 0.05924 0.02002 +0.73975 0.05744 0.01789 +0.80448 0.05562 0.01571 +0.86574 0.05379 0.01350 +0.92260 0.05199 0.01128 +0.97413 0.05023 0.00909 +0.00000 0.12044 0.03236 +0.03327 0.12000 0.03168 +0.08294 0.11936 0.03073 +0.13794 0.11853 0.02955 +0.19755 0.11751 0.02813 +0.26106 0.11633 0.02650 +0.32771 0.11500 0.02467 +0.39675 0.11354 0.02268 +0.46739 0.11197 0.02052 +0.53885 0.11030 0.01823 +0.61029 0.10855 0.01583 +0.68087 0.10675 0.01334 +0.74971 0.10491 0.01078 +0.81592 0.10306 0.00819 +0.87857 0.10122 0.00558 +0.93669 0.09942 0.00299 +0.98932 0.09768 0.00044 +0.00000 0.17387 0.02872 +0.02942 0.17341 0.02759 +0.07984 0.17274 0.02621 +0.13577 0.17188 0.02457 +0.19646 0.17085 0.02270 +0.26118 0.16966 0.02061 +0.32916 0.16832 0.01834 +0.39962 0.16686 0.01590 +0.47176 0.16529 0.01331 +0.54474 0.16364 0.01059 +0.61771 0.16191 0.00778 +0.68979 0.16014 0.00489 +0.76007 0.15835 0.00195 +0.82762 0.15657 0.00000 +0.89148 0.15489 0.00000 +0.95061 0.15334 0.00000 +1.00000 0.15196 0.00000 +0.00000 0.23203 0.02324 +0.02532 0.23162 0.02167 +0.07662 0.23102 0.01983 +0.13359 0.23022 0.01775 +0.19545 0.22925 0.01544 +0.26146 0.22812 0.01293 +0.33082 0.22685 0.01023 +0.40272 0.22546 0.00738 +0.47633 0.22397 0.00439 +0.55078 0.22240 0.00130 +0.62522 0.22079 0.00000 +0.69874 0.21921 0.00000 +0.77034 0.21769 0.00000 +0.83904 0.21626 0.00000 +0.90381 0.21494 0.00000 +0.96362 0.21377 0.00000 +1.00000 0.21277 0.00000 +0.00000 0.29467 0.01598 +0.02095 0.29439 0.01398 +0.07323 0.29390 0.01172 +0.13129 0.29323 0.00922 +0.19438 0.29237 0.00651 +0.26169 0.29136 0.00361 +0.33243 0.29022 0.00054 +0.40582 0.28898 0.00000 +0.48099 0.28770 0.00000 +0.55700 0.28640 0.00000 +0.63289 0.28510 0.00000 +0.70766 0.28384 0.00000 +0.78031 0.28263 0.00000 +0.84982 0.28152 0.00000 +0.91517 0.28053 0.00000 +0.97532 0.27968 0.00000 +1.00000 0.27902 0.00000 +0.00000 0.36141 0.00709 +0.01631 0.36129 0.00469 +0.06960 0.36096 0.00205 +0.12883 0.36044 0.00000 +0.19333 0.35977 0.00000 +0.26224 0.35897 0.00000 +0.33467 0.35807 0.00000 +0.40968 0.35709 0.00000 +0.48633 0.35607 0.00000 +0.56365 0.35502 0.00000 +0.64065 0.35397 0.00000 +0.71632 0.35296 0.00000 +0.78965 0.35201 0.00000 +0.85961 0.35115 0.00000 +0.92517 0.35040 0.00000 +0.98529 0.34980 0.00000 +1.00000 0.34938 0.00000 +0.00000 0.43169 0.00000 +0.01185 0.43175 0.00000 +0.06665 0.43161 0.00000 +0.12757 0.43129 0.00000 +0.19373 0.43082 0.00000 +0.26423 0.43021 0.00000 +0.33812 0.42950 0.00000 +0.41446 0.42870 0.00000 +0.49226 0.42785 0.00000 +0.57053 0.42697 0.00000 +0.64827 0.42609 0.00000 +0.72446 0.42523 0.00000 +0.79806 0.42443 0.00000 +0.86806 0.42372 0.00000 +0.93343 0.42312 0.00000 +0.99314 0.42266 0.00000 +1.00000 0.42237 0.00000 +0.00000 0.50467 0.00000 +0.00952 0.50487 0.00000 +0.06587 0.50485 0.00000 +0.12829 0.50464 0.00000 +0.19587 0.50427 0.00000 +0.26766 0.50375 0.00000 +0.34271 0.50312 0.00000 +0.42002 0.50239 0.00000 +0.49859 0.50160 0.00000 +0.57742 0.50078 0.00000 +0.65549 0.49994 0.00000 +0.73176 0.49913 0.00000 +0.80521 0.49836 0.00000 +0.87482 0.49768 0.00000 +0.93957 0.49709 0.00000 +0.99847 0.49664 0.00000 +1.00000 0.49635 0.00000 +0.00000 0.57901 0.00000 +0.00965 0.57923 0.00000 +0.06734 0.57922 0.00000 +0.13101 0.57900 0.00000 +0.19971 0.57861 0.00000 +0.27248 0.57805 0.00000 +0.34830 0.57737 0.00000 +0.42619 0.57659 0.00000 +0.50513 0.57574 0.00000 +0.58407 0.57484 0.00000 +0.66201 0.57392 0.00000 +0.73791 0.57301 0.00000 +0.81076 0.57214 0.00000 +0.87953 0.57133 0.00000 +0.94323 0.57062 0.00000 +1.00000 0.57004 0.00000 +1.00000 0.56960 0.00000 +0.00000 0.65317 0.00000 +0.01230 0.65327 0.00000 +0.07107 0.65312 0.00000 +0.13569 0.65276 0.00000 +0.20518 0.65220 0.00000 +0.27854 0.65148 0.00000 +0.35475 0.65061 0.00000 +0.43278 0.64963 0.00000 +0.51162 0.64857 0.00000 +0.59022 0.64745 0.00000 +0.66755 0.64630 0.00000 +0.74260 0.64515 0.00000 +0.81436 0.64403 0.00000 +0.88182 0.64297 0.00000 +0.94408 0.64200 0.00000 +1.00000 0.64122 0.00000 +1.00000 0.64065 0.00000 +0.00000 0.72547 0.00000 +0.01745 0.72531 0.00000 +0.07700 0.72488 0.00000 +0.14223 0.72422 0.00000 +0.21213 0.72336 0.00000 +0.28567 0.72231 0.00000 +0.36182 0.72112 0.00000 +0.43954 0.71980 0.00000 +0.51779 0.71838 0.00000 +0.59555 0.71690 0.00000 +0.67178 0.71538 0.00000 +0.74562 0.71391 0.00000 +0.81632 0.71256 0.00000 +0.88302 0.71136 0.00000 +0.94484 0.71034 0.00000 +1.00000 0.70950 0.00000 +1.00000 0.70887 0.00000 +0.00000 0.79421 0.00000 +0.02501 0.79364 0.00000 +0.08501 0.79278 0.00000 +0.15047 0.79169 0.00000 +0.22037 0.79037 0.00000 +0.29365 0.78887 0.00000 +0.36926 0.78720 0.00000 +0.44618 0.78541 0.00000 +0.52353 0.78363 0.00000 +0.60042 0.78191 0.00000 +0.67596 0.78029 0.00000 +0.74924 0.77877 0.00000 +0.81941 0.77738 0.00000 +0.88560 0.77615 0.00000 +0.94698 0.77509 0.00000 +1.00000 0.77421 0.00000 +1.00000 0.77355 0.00000 +0.00000 0.85771 0.00000 +0.03483 0.85657 0.00000 +0.09491 0.85516 0.00000 +0.16019 0.85349 0.00000 +0.22966 0.85163 0.00000 +0.30235 0.84975 0.00000 +0.37733 0.84787 0.00000 +0.45365 0.84602 0.00000 +0.53039 0.84421 0.00000 +0.60666 0.84248 0.00000 +0.68156 0.84084 0.00000 +0.75423 0.83931 0.00000 +0.82381 0.83792 0.00000 +0.88946 0.83668 0.00000 +0.95036 0.83561 0.00000 +1.00000 0.83473 0.00000 +1.00000 0.83406 0.00000 +0.00000 0.91434 0.00000 +0.04667 0.91265 0.00000 +0.10649 0.91087 0.00000 +0.17137 0.90904 0.00000 +0.24036 0.90716 0.00000 +0.31250 0.90527 0.00000 +0.38686 0.90339 0.00000 +0.46251 0.90155 0.00000 +0.53857 0.89976 0.00000 +0.61414 0.89805 0.00000 +0.68835 0.89644 0.00000 +0.76035 0.89494 0.00000 +0.82930 0.89358 0.00000 +0.89438 0.89238 0.00000 +0.95475 0.89134 0.00000 +1.00000 0.89050 0.00000 +1.00000 0.88987 0.00000 +0.00678 0.96401 0.00000 +0.06026 0.96233 0.00000 +0.11967 0.96057 0.00000 +0.18404 0.95875 0.00000 +0.25243 0.95691 0.00000 +0.32390 0.95507 0.00000 +0.39754 0.95325 0.00000 +0.47245 0.95146 0.00000 +0.54774 0.94974 0.00000 +0.62254 0.94810 0.00000 +0.69600 0.94656 0.00000 +0.76729 0.94515 0.00000 +0.83558 0.94387 0.00000 +0.90004 0.94275 0.00000 +0.95987 0.94180 0.00000 +1.00000 0.94104 0.00000 +1.00000 0.94050 0.00000 +0.02211 1.00000 0.00000 +0.07516 1.00000 0.00000 +0.13403 1.00000 0.00000 +0.19776 1.00000 0.00000 +0.26543 1.00000 0.00000 +0.33613 0.99867 0.00000 +0.40895 0.99695 0.00000 +0.48302 0.99528 0.00000 +0.55747 0.99368 0.00000 +0.63145 0.99217 0.00000 +0.70412 0.99076 0.00000 +0.77466 0.98947 0.00000 +0.84224 0.98833 0.00000 +0.90606 0.98734 0.00000 +0.96531 0.98652 0.00000 +1.00000 0.98590 0.00000 +1.00000 0.98548 0.00000 +0.00000 0.02836 0.07840 +0.03996 0.02823 0.07848 +0.08868 0.02788 0.07834 +0.14240 0.02734 0.07800 +0.20041 0.02660 0.07748 +0.26200 0.02569 0.07678 +0.32644 0.02462 0.07592 +0.39301 0.02340 0.07491 +0.46099 0.02206 0.07377 +0.52962 0.02060 0.07251 +0.59812 0.01904 0.07114 +0.66572 0.01741 0.06970 +0.73160 0.01571 0.06818 +0.79492 0.01398 0.06661 +0.85483 0.01223 0.06502 +0.91043 0.01049 0.06343 +0.96081 0.00877 0.06185 +0.00000 0.07180 0.07832 +0.03657 0.07146 0.07811 +0.08569 0.07091 0.07765 +0.14000 0.07015 0.07699 +0.19877 0.06922 0.07611 +0.26128 0.06811 0.07504 +0.32682 0.06684 0.07380 +0.39464 0.06544 0.07240 +0.46398 0.06392 0.07086 +0.53407 0.06228 0.06919 +0.60411 0.06057 0.06741 +0.67328 0.05878 0.06554 +0.74075 0.05695 0.06361 +0.80563 0.05510 0.06164 +0.86703 0.05324 0.05964 +0.92404 0.05140 0.05765 +0.97568 0.04962 0.05569 +0.00000 0.12030 0.07674 +0.03296 0.11984 0.07616 +0.08270 0.11917 0.07534 +0.13778 0.11831 0.07429 +0.19750 0.11726 0.07302 +0.26113 0.11605 0.07155 +0.32791 0.11469 0.06990 +0.39709 0.11320 0.06808 +0.46788 0.11160 0.06612 +0.53949 0.10990 0.06403 +0.61109 0.10812 0.06184 +0.68183 0.10628 0.05957 +0.75082 0.10441 0.05724 +0.81717 0.10254 0.05487 +0.87995 0.10067 0.05250 +0.93819 0.09884 0.05015 +0.99091 0.09709 0.04785 +0.00000 0.17372 0.07351 +0.02912 0.17323 0.07254 +0.07963 0.17254 0.07132 +0.13566 0.17166 0.06986 +0.19646 0.17060 0.06817 +0.26131 0.16938 0.06629 +0.32943 0.16802 0.06422 +0.40004 0.16653 0.06199 +0.47232 0.16493 0.05962 +0.54546 0.16325 0.05713 +0.61858 0.16149 0.05455 +0.69080 0.15970 0.05190 +0.76123 0.15788 0.04921 +0.82891 0.15609 0.04651 +0.89287 0.15441 0.04384 +0.95208 0.15287 0.04124 +1.00000 0.15150 0.03874 +0.00000 0.23190 0.06859 +0.02502 0.23147 0.06722 +0.07643 0.23084 0.06558 +0.13350 0.23002 0.06370 +0.19549 0.22902 0.06161 +0.26163 0.22787 0.05932 +0.33113 0.22658 0.05685 +0.40317 0.22516 0.05423 +0.47693 0.22364 0.05149 +0.55153 0.22204 0.04864 +0.62613 0.22043 0.04573 +0.69978 0.21885 0.04279 +0.77151 0.21733 0.03986 +0.84031 0.21590 0.03697 +0.90515 0.21459 0.03415 +0.96502 0.21343 0.03144 +1.00000 0.21244 0.02886 +0.00000 0.29458 0.06201 +0.02065 0.29428 0.06023 +0.07303 0.29377 0.05820 +0.13121 0.29307 0.05593 +0.19442 0.29219 0.05345 +0.26187 0.29116 0.05079 +0.33276 0.28999 0.04798 +0.40633 0.28875 0.04504 +0.48167 0.28746 0.04202 +0.55783 0.28615 0.03895 +0.63384 0.28485 0.03586 +0.70872 0.28358 0.03278 +0.78145 0.28238 0.02974 +0.85103 0.28127 0.02678 +0.91642 0.28029 0.02394 +0.97658 0.27945 0.02125 +1.00000 0.27880 0.01874 +0.00000 0.36138 0.05388 +0.01601 0.36124 0.05172 +0.06940 0.36088 0.04933 +0.12880 0.36034 0.04673 +0.19348 0.35965 0.04395 +0.26256 0.35884 0.04104 +0.33515 0.35793 0.03801 +0.41031 0.35695 0.03491 +0.48709 0.35591 0.03176 +0.56453 0.35486 0.02859 +0.64162 0.35381 0.02544 +0.71736 0.35280 0.02235 +0.79074 0.35184 0.01935 +0.86072 0.35099 0.01647 +0.92628 0.35025 0.01375 +0.98638 0.34966 0.01123 +1.00000 0.34925 0.00894 +0.00000 0.43171 0.04440 +0.01170 0.43176 0.04197 +0.06667 0.43160 0.03934 +0.12775 0.43127 0.03655 +0.19407 0.43078 0.03362 +0.26471 0.43015 0.03059 +0.33873 0.42943 0.02748 +0.41518 0.42862 0.02434 +0.49308 0.42775 0.02119 +0.57143 0.42687 0.01807 +0.64923 0.42598 0.01502 +0.72544 0.42512 0.01207 +0.79905 0.42432 0.00925 +0.86903 0.42361 0.00661 +0.93435 0.42301 0.00418 +0.99400 0.42256 0.00200 +1.00000 0.42228 0.00010 +0.00000 0.50474 0.03407 +0.00962 0.50492 0.03151 +0.06612 0.50488 0.02878 +0.12868 0.50465 0.02593 +0.19639 0.50426 0.02298 +0.26829 0.50372 0.01997 +0.34343 0.50307 0.01693 +0.42082 0.50233 0.01389 +0.49945 0.50153 0.01090 +0.57831 0.50069 0.00799 +0.65639 0.49985 0.00519 +0.73264 0.49903 0.00254 +0.80605 0.49826 0.00009 +0.87560 0.49757 0.00000 +0.94027 0.49699 0.00000 +0.99905 0.49654 0.00000 +1.00000 0.49625 0.00000 +0.00000 0.57910 0.02342 +0.01001 0.57929 0.02085 +0.06781 0.57925 0.01817 +0.13159 0.57901 0.01540 +0.20039 0.57859 0.01258 +0.27323 0.57801 0.00975 +0.34912 0.57731 0.00693 +0.42705 0.57651 0.00417 +0.50599 0.57564 0.00150 +0.58492 0.57472 0.00000 +0.66282 0.57379 0.00000 +0.73866 0.57287 0.00000 +0.81142 0.57200 0.00000 +0.88008 0.57119 0.00000 +0.94365 0.57048 0.00000 +1.00000 0.56989 0.00000 +1.00000 0.56945 0.00000 +0.00000 0.65321 0.01299 +0.01290 0.65328 0.01058 +0.07176 0.65311 0.00809 +0.13645 0.65271 0.00557 +0.20600 0.65212 0.00304 +0.27940 0.65137 0.00055 +0.35562 0.65048 0.00000 +0.43365 0.64948 0.00000 +0.51245 0.64840 0.00000 +0.59099 0.64726 0.00000 +0.66823 0.64610 0.00000 +0.74317 0.64494 0.00000 +0.81478 0.64380 0.00000 +0.88208 0.64273 0.00000 +0.94428 0.64178 0.00000 +1.00000 0.64102 0.00000 +1.00000 0.64047 0.00000 +0.00000 0.72543 0.00340 +0.01827 0.72523 0.00130 +0.07788 0.72476 0.00000 +0.14316 0.72407 0.00000 +0.21308 0.72317 0.00000 +0.28661 0.72210 0.00000 +0.36273 0.72087 0.00000 +0.44039 0.71953 0.00000 +0.51856 0.71809 0.00000 +0.59620 0.71659 0.00000 +0.67230 0.71505 0.00000 +0.74609 0.71360 0.00000 +0.81674 0.71227 0.00000 +0.88338 0.71110 0.00000 +0.94516 0.71009 0.00000 +1.00000 0.70928 0.00000 +1.00000 0.70867 0.00000 +0.00000 0.79403 0.00000 +0.02605 0.79341 0.00000 +0.08607 0.79252 0.00000 +0.15154 0.79138 0.00000 +0.22141 0.79003 0.00000 +0.29463 0.78849 0.00000 +0.37017 0.78679 0.00000 +0.44701 0.78500 0.00000 +0.52430 0.78324 0.00000 +0.60113 0.78154 0.00000 +0.67660 0.77994 0.00000 +0.74983 0.77845 0.00000 +0.81994 0.77708 0.00000 +0.88608 0.77587 0.00000 +0.94741 0.77483 0.00000 +1.00000 0.77398 0.00000 +1.00000 0.77334 0.00000 +0.00000 0.85734 0.00000 +0.03605 0.85616 0.00000 +0.09611 0.85470 0.00000 +0.16136 0.85299 0.00000 +0.23078 0.85115 0.00000 +0.30342 0.84928 0.00000 +0.37834 0.84742 0.00000 +0.45459 0.84559 0.00000 +0.53127 0.84381 0.00000 +0.60747 0.84210 0.00000 +0.68231 0.84049 0.00000 +0.75491 0.83898 0.00000 +0.82443 0.83761 0.00000 +0.89002 0.83640 0.00000 +0.95087 0.83535 0.00000 +1.00000 0.83450 0.00000 +1.00000 0.83385 0.00000 +0.00000 0.91376 0.00000 +0.04804 0.91209 0.00000 +0.10782 0.91034 0.00000 +0.17266 0.90852 0.00000 +0.24160 0.90667 0.00000 +0.31367 0.90480 0.00000 +0.38796 0.90295 0.00000 +0.46354 0.90113 0.00000 +0.53952 0.89937 0.00000 +0.61502 0.89768 0.00000 +0.68916 0.89609 0.00000 +0.76109 0.89462 0.00000 +0.82998 0.89329 0.00000 +0.89499 0.89211 0.00000 +0.95531 0.89110 0.00000 +1.00000 0.89028 0.00000 +1.00000 0.88967 0.00000 +0.00829 0.96343 0.00000 +0.06173 0.96177 0.00000 +0.12110 0.96003 0.00000 +0.18541 0.95825 0.00000 +0.25373 0.95643 0.00000 +0.32513 0.95462 0.00000 +0.39869 0.95282 0.00000 +0.47352 0.95106 0.00000 +0.54872 0.94937 0.00000 +0.62345 0.94776 0.00000 +0.69683 0.94624 0.00000 +0.76805 0.94485 0.00000 +0.83626 0.94360 0.00000 +0.90066 0.94251 0.00000 +0.96043 0.94158 0.00000 +1.00000 0.94085 0.00000 +1.00000 0.94032 0.00000 +0.02369 1.00000 0.00000 +0.07669 1.00000 0.00000 +0.13549 1.00000 0.00000 +0.19915 1.00000 0.00000 +0.26675 0.99996 0.00000 +0.33736 0.99825 0.00000 +0.41009 0.99656 0.00000 +0.48408 0.99492 0.00000 +0.55844 0.99335 0.00000 +0.63233 0.99186 0.00000 +0.70492 0.99048 0.00000 +0.77538 0.98922 0.00000 +0.84289 0.98810 0.00000 +0.90664 0.98714 0.00000 +0.96584 0.98635 0.00000 +1.00000 0.98575 0.00000 +1.00000 0.98535 0.00000 +0.00000 0.02828 0.12822 +0.03956 0.02812 0.12830 +0.08831 0.02775 0.12819 +0.14208 0.02717 0.12790 +0.20016 0.02640 0.12744 +0.26183 0.02546 0.12683 +0.32637 0.02435 0.12608 +0.39306 0.02309 0.12520 +0.46117 0.02171 0.12419 +0.52994 0.02021 0.12309 +0.59860 0.01862 0.12190 +0.66635 0.01694 0.12063 +0.73239 0.01521 0.11931 +0.79587 0.01344 0.11796 +0.85594 0.01165 0.11659 +0.91168 0.00987 0.11523 +0.96220 0.00812 0.11389 +0.00000 0.07165 0.12824 +0.03619 0.07128 0.12810 +0.08537 0.07070 0.12774 +0.13975 0.06992 0.12719 +0.19860 0.06895 0.12644 +0.26123 0.06781 0.12552 +0.32688 0.06651 0.12444 +0.39483 0.06507 0.12322 +0.46432 0.06351 0.12187 +0.53456 0.06185 0.12040 +0.60476 0.06009 0.11884 +0.67409 0.05827 0.11720 +0.74171 0.05641 0.11550 +0.80675 0.05452 0.11377 +0.86830 0.05263 0.11203 +0.92543 0.05076 0.11030 +0.97720 0.04894 0.10861 +0.00000 0.12011 0.12698 +0.03261 0.11962 0.12655 +0.08241 0.11893 0.12588 +0.13759 0.11803 0.12500 +0.19741 0.11696 0.12391 +0.26116 0.11572 0.12263 +0.32807 0.11433 0.12119 +0.39739 0.11281 0.11959 +0.46834 0.11117 0.11786 +0.54010 0.10944 0.11601 +0.61186 0.10763 0.11407 +0.68275 0.10576 0.11205 +0.75189 0.10386 0.10999 +0.81838 0.10195 0.10789 +0.88129 0.10006 0.10580 +0.93965 0.09820 0.10372 +0.99246 0.09644 0.10170 +0.00000 0.17352 0.12428 +0.02878 0.17301 0.12350 +0.07937 0.17229 0.12248 +0.13550 0.17138 0.12123 +0.19642 0.17030 0.11977 +0.26140 0.16905 0.11812 +0.32966 0.16766 0.11629 +0.40041 0.16614 0.11431 +0.47285 0.16451 0.11220 +0.54613 0.16280 0.10998 +0.61940 0.16102 0.10767 +0.69178 0.15919 0.10529 +0.76233 0.15734 0.10288 +0.83014 0.15556 0.10046 +0.89420 0.15388 0.09806 +0.95350 0.15235 0.09572 +1.00000 0.15100 0.09346 +0.00000 0.23171 0.12005 +0.02468 0.23127 0.11889 +0.07618 0.23061 0.11750 +0.13336 0.22976 0.11587 +0.19548 0.22874 0.11403 +0.26175 0.22756 0.11200 +0.33139 0.22624 0.10980 +0.40358 0.22480 0.10746 +0.47748 0.22325 0.10499 +0.55223 0.22164 0.10242 +0.62699 0.22002 0.09978 +0.70078 0.21844 0.09711 +0.77263 0.21692 0.09443 +0.84152 0.21550 0.09178 +0.90644 0.21419 0.08919 +0.96635 0.21304 0.08668 +1.00000 0.21207 0.08431 +0.00000 0.29444 0.11427 +0.02031 0.29412 0.11274 +0.07279 0.29358 0.11097 +0.13109 0.29285 0.10898 +0.19442 0.29195 0.10678 +0.26200 0.29089 0.10439 +0.33306 0.28971 0.10186 +0.40681 0.28846 0.09919 +0.48230 0.28716 0.09644 +0.55861 0.28585 0.09361 +0.63475 0.28455 0.09075 +0.70973 0.28328 0.08789 +0.78255 0.28208 0.08506 +0.85218 0.28098 0.08229 +0.91760 0.28000 0.07963 +0.97778 0.27918 0.07710 +1.00000 0.27854 0.07473 +0.00000 0.36129 0.10702 +0.01566 0.36112 0.10514 +0.06917 0.36074 0.10303 +0.12874 0.36019 0.10071 +0.19359 0.35949 0.09820 +0.26285 0.35866 0.09554 +0.33559 0.35774 0.09276 +0.41090 0.35675 0.08988 +0.48781 0.35571 0.08695 +0.56536 0.35465 0.08398 +0.64254 0.35360 0.08102 +0.71835 0.35258 0.07810 +0.79177 0.35163 0.07525 +0.86177 0.35078 0.07251 +0.92732 0.35004 0.06991 +0.98739 0.34947 0.06750 +1.00000 0.34907 0.06530 +0.00000 0.43169 0.09848 +0.01153 0.43171 0.09631 +0.06666 0.43154 0.09394 +0.12790 0.43118 0.09138 +0.19437 0.43068 0.08868 +0.26515 0.43004 0.08585 +0.33931 0.42930 0.08295 +0.41587 0.42848 0.07998 +0.49386 0.42761 0.07700 +0.57228 0.42671 0.07403 +0.65012 0.42582 0.07111 +0.72636 0.42496 0.06827 +0.79997 0.42416 0.06555 +0.86993 0.42345 0.06299 +0.93520 0.42286 0.06063 +0.99479 0.42241 0.05849 +1.00000 0.42214 0.05661 +0.00000 0.50476 0.08898 +0.00970 0.50491 0.08664 +0.06634 0.50485 0.08412 +0.12904 0.50460 0.08146 +0.19687 0.50419 0.07868 +0.26889 0.50364 0.07583 +0.34412 0.50297 0.07293 +0.42158 0.50222 0.07002 +0.50026 0.50140 0.06714 +0.57915 0.50056 0.06432 +0.65723 0.49971 0.06160 +0.73346 0.49888 0.05901 +0.80683 0.49811 0.05658 +0.87631 0.49742 0.05437 +0.94088 0.49684 0.05240 +0.99956 0.49639 0.05070 +1.00000 0.49611 0.04933 +0.00000 0.57912 0.07901 +0.01033 0.57928 0.07662 +0.06826 0.57922 0.07409 +0.13215 0.57895 0.07145 +0.20104 0.57851 0.06875 +0.27395 0.57791 0.06602 +0.34989 0.57719 0.06329 +0.42785 0.57637 0.06060 +0.50680 0.57549 0.05798 +0.58572 0.57456 0.05547 +0.66357 0.57362 0.05311 +0.73934 0.57269 0.05093 +0.81200 0.57180 0.04898 +0.88055 0.57099 0.04728 +0.94398 0.57028 0.04588 +1.00000 0.56969 0.04481 +1.00000 0.56925 0.04411 +0.00000 0.65320 0.06909 +0.01347 0.65323 0.06679 +0.07242 0.65302 0.06440 +0.13719 0.65260 0.06196 +0.20679 0.65199 0.05949 +0.28022 0.65121 0.05704 +0.35646 0.65029 0.05464 +0.43447 0.64927 0.05233 +0.51323 0.64817 0.05014 +0.59170 0.64702 0.04812 +0.66885 0.64584 0.04630 +0.74367 0.64466 0.04472 +0.81514 0.64352 0.04341 +0.88229 0.64244 0.04240 +0.94444 0.64151 0.04158 +1.00000 0.64078 0.04091 +1.00000 0.64025 0.04041 +0.00000 0.72532 0.05981 +0.01907 0.72508 0.05777 +0.07874 0.72458 0.05568 +0.14405 0.72386 0.05358 +0.21398 0.72293 0.05152 +0.28751 0.72182 0.04952 +0.36359 0.72057 0.04762 +0.44119 0.71920 0.04587 +0.51926 0.71774 0.04430 +0.59678 0.71621 0.04294 +0.67278 0.71468 0.04180 +0.74652 0.71325 0.04073 +0.81712 0.71195 0.03976 +0.88371 0.71079 0.03890 +0.94545 0.70981 0.03816 +1.00000 0.70902 0.03757 +1.00000 0.70843 0.03713 +0.00000 0.79378 0.05179 +0.02705 0.79312 0.05017 +0.08710 0.79219 0.04855 +0.15256 0.79101 0.04698 +0.22240 0.78963 0.04549 +0.29557 0.78805 0.04412 +0.37102 0.78632 0.04291 +0.44779 0.78454 0.04179 +0.52503 0.78280 0.04067 +0.60180 0.78113 0.03958 +0.67721 0.77955 0.03854 +0.75038 0.77808 0.03756 +0.82043 0.77674 0.03666 +0.88651 0.77555 0.03587 +0.94779 0.77454 0.03519 +1.00000 0.77371 0.03465 +1.00000 0.77308 0.03427 +0.00000 0.85690 0.04569 +0.03723 0.85568 0.04466 +0.09728 0.85417 0.04369 +0.16248 0.85243 0.04280 +0.23186 0.85061 0.04188 +0.30445 0.84877 0.04089 +0.37931 0.84694 0.03987 +0.45550 0.84513 0.03883 +0.53211 0.84337 0.03780 +0.60824 0.84169 0.03678 +0.68301 0.84009 0.03581 +0.75555 0.83861 0.03489 +0.82500 0.83727 0.03405 +0.89054 0.83608 0.03330 +0.95133 0.83506 0.03266 +1.00000 0.83422 0.03215 +1.00000 0.83360 0.03178 +0.00000 0.91314 0.04210 +0.04937 0.91149 0.04156 +0.10912 0.90975 0.04090 +0.17391 0.90796 0.04014 +0.24279 0.90613 0.03930 +0.31480 0.90429 0.03839 +0.38902 0.90246 0.03744 +0.46453 0.90067 0.03647 +0.54044 0.89893 0.03549 +0.61586 0.89727 0.03453 +0.68992 0.89571 0.03360 +0.76178 0.89426 0.03271 +0.83060 0.89295 0.03190 +0.89555 0.89180 0.03116 +0.95582 0.89081 0.03053 +1.00000 0.89002 0.03001 +1.00000 0.88943 0.02962 +0.00976 0.96281 0.03989 +0.06317 0.96117 0.03943 +0.12248 0.95946 0.03884 +0.18674 0.95770 0.03814 +0.25499 0.95591 0.03736 +0.32631 0.95412 0.03650 +0.39980 0.95235 0.03560 +0.47454 0.95062 0.03467 +0.54966 0.94896 0.03372 +0.62430 0.94737 0.03278 +0.69761 0.94589 0.03186 +0.76875 0.94452 0.03098 +0.83690 0.94330 0.03015 +0.90123 0.94222 0.02940 +0.96095 0.94133 0.02873 +1.00000 0.94062 0.02817 +1.00000 0.94011 0.02772 +0.02523 1.00000 0.03840 +0.07817 1.00000 0.03799 +0.13691 1.00000 0.03744 +0.20050 1.00000 0.03678 +0.26801 0.99947 0.03603 +0.33854 0.99779 0.03520 +0.41119 0.99613 0.03432 +0.48508 0.99452 0.03339 +0.55935 0.99298 0.03244 +0.63316 0.99152 0.03149 +0.70567 0.99017 0.03055 +0.77605 0.98894 0.02963 +0.84348 0.98784 0.02876 +0.90717 0.98690 0.02794 +0.96631 0.98614 0.02720 +1.00000 0.98556 0.02655 +1.00000 0.98519 0.02599 +0.00000 0.02815 0.18293 +0.03913 0.02797 0.18304 +0.08791 0.02756 0.18298 +0.14173 0.02695 0.18276 +0.19987 0.02615 0.18240 +0.26163 0.02517 0.18190 +0.32628 0.02403 0.18128 +0.39309 0.02273 0.18055 +0.46133 0.02131 0.17972 +0.53025 0.01977 0.17880 +0.59906 0.01814 0.17781 +0.66697 0.01643 0.17676 +0.73317 0.01465 0.17568 +0.79681 0.01284 0.17457 +0.85703 0.01102 0.17346 +0.91292 0.00920 0.17236 +0.96357 0.00741 0.17130 +0.00000 0.07145 0.18313 +0.03578 0.07105 0.18309 +0.08502 0.07044 0.18286 +0.13947 0.06963 0.18244 +0.19841 0.06863 0.18186 +0.26114 0.06745 0.18112 +0.32692 0.06612 0.18023 +0.39500 0.06465 0.17922 +0.46463 0.06306 0.17808 +0.53502 0.06135 0.17685 +0.60538 0.05957 0.17554 +0.67487 0.05771 0.17416 +0.74265 0.05581 0.17274 +0.80784 0.05389 0.17129 +0.86953 0.05196 0.16983 +0.92680 0.05006 0.16840 +0.97868 0.04821 0.16700 +0.00000 0.11987 0.18230 +0.03221 0.11935 0.18203 +0.08210 0.11863 0.18154 +0.13736 0.11771 0.18086 +0.19729 0.11661 0.17999 +0.26115 0.11534 0.17894 +0.32820 0.11392 0.17774 +0.39766 0.11236 0.17639 +0.46876 0.11069 0.17492 +0.54068 0.10893 0.17335 +0.61259 0.10708 0.17169 +0.68363 0.10519 0.16996 +0.75293 0.10326 0.16819 +0.81956 0.10132 0.16640 +0.88259 0.09939 0.16461 +0.94106 0.09751 0.16285 +0.99395 0.09576 0.16114 +0.00000 0.17327 0.18022 +0.02839 0.17273 0.17966 +0.07908 0.17199 0.17887 +0.13531 0.17106 0.17787 +0.19635 0.16994 0.17666 +0.26145 0.16867 0.17528 +0.32985 0.16725 0.17373 +0.40075 0.16570 0.17204 +0.47334 0.16404 0.17022 +0.54677 0.16230 0.16829 +0.62019 0.16049 0.16629 +0.69271 0.15863 0.16422 +0.76340 0.15677 0.16212 +0.83133 0.15499 0.16000 +0.89550 0.15332 0.15789 +0.95487 0.15180 0.15582 +1.00000 0.15045 0.15382 +0.00000 0.23148 0.17678 +0.02430 0.23101 0.17589 +0.07590 0.23033 0.17476 +0.13319 0.22946 0.17341 +0.19543 0.22841 0.17186 +0.26183 0.22720 0.17013 +0.33161 0.22586 0.16823 +0.40394 0.22439 0.16619 +0.47799 0.22281 0.16403 +0.55291 0.22119 0.16177 +0.62782 0.21957 0.15943 +0.70175 0.21799 0.15704 +0.77371 0.21647 0.15463 +0.84269 0.21505 0.15223 +0.90767 0.21375 0.14987 +0.96763 0.21261 0.14759 +1.00000 0.21165 0.14542 +0.00000 0.29425 0.17191 +0.01993 0.29390 0.17068 +0.07251 0.29334 0.16921 +0.13092 0.29259 0.16751 +0.19438 0.29166 0.16562 +0.26210 0.29058 0.16355 +0.33334 0.28939 0.16132 +0.40725 0.28813 0.15895 +0.48291 0.28683 0.15646 +0.55935 0.28551 0.15390 +0.63561 0.28420 0.15129 +0.71070 0.28294 0.14866 +0.78359 0.28174 0.14604 +0.85328 0.28065 0.14348 +0.91874 0.27968 0.14099 +0.97892 0.27886 0.13862 +1.00000 0.27823 0.13640 +0.00000 0.36115 0.16567 +0.01526 0.36096 0.16410 +0.06891 0.36056 0.16230 +0.12866 0.35999 0.16027 +0.19369 0.35928 0.15805 +0.26311 0.35844 0.15567 +0.33601 0.35751 0.15314 +0.41146 0.35650 0.15051 +0.48850 0.35546 0.14779 +0.56615 0.35439 0.14504 +0.64342 0.35334 0.14227 +0.71929 0.35232 0.13952 +0.79274 0.35138 0.13683 +0.86276 0.35053 0.13423 +0.92830 0.34980 0.13175 +0.98834 0.34923 0.12943 +1.00000 0.34885 0.12731 +0.00000 0.43161 0.15815 +0.01134 0.43162 0.15626 +0.06663 0.43142 0.15416 +0.12803 0.43105 0.15185 +0.19465 0.43053 0.14939 +0.26557 0.42988 0.14678 +0.33985 0.42912 0.14408 +0.41652 0.42829 0.14130 +0.49460 0.42741 0.13848 +0.57309 0.42651 0.13566 +0.65097 0.42562 0.13287 +0.72723 0.42475 0.13014 +0.80084 0.42396 0.12752 +0.87077 0.42325 0.12503 +0.93599 0.42266 0.12271 +0.99550 0.42222 0.12060 +1.00000 0.42196 0.11873 +0.00000 0.50473 0.14954 +0.00976 0.50486 0.14743 +0.06654 0.50478 0.14512 +0.12937 0.50451 0.14266 +0.19732 0.50407 0.14006 +0.26945 0.50350 0.13737 +0.34477 0.50282 0.13461 +0.42230 0.50205 0.13183 +0.50103 0.50123 0.12905 +0.57994 0.50037 0.12631 +0.65802 0.49952 0.12365 +0.73423 0.49869 0.12110 +0.80754 0.49791 0.11870 +0.87695 0.49722 0.11648 +0.94143 0.49664 0.11448 +0.99999 0.49620 0.11274 +1.00000 0.49593 0.11130 +0.00000 0.57909 0.14027 +0.01064 0.57923 0.13805 +0.06868 0.57914 0.13568 +0.13268 0.57884 0.13318 +0.20166 0.57838 0.13060 +0.27464 0.57776 0.12796 +0.35063 0.57702 0.12531 +0.42861 0.57619 0.12267 +0.50756 0.57529 0.12008 +0.58646 0.57434 0.11759 +0.66427 0.57339 0.11521 +0.73996 0.57246 0.11301 +0.81252 0.57156 0.11100 +0.88095 0.57075 0.10922 +0.94424 0.57003 0.10772 +1.00000 0.56945 0.10653 +1.00000 0.56902 0.10567 +0.00000 0.65313 0.13086 +0.01402 0.65313 0.12867 +0.07305 0.65289 0.12637 +0.13790 0.65244 0.12399 +0.20755 0.65180 0.12157 +0.28101 0.65099 0.11915 +0.35725 0.65006 0.11675 +0.43524 0.64901 0.11442 +0.51395 0.64789 0.11220 +0.59235 0.64672 0.11011 +0.66940 0.64553 0.10821 +0.74410 0.64434 0.10652 +0.81542 0.64319 0.10507 +0.88246 0.64212 0.10389 +0.94457 0.64121 0.10284 +1.00000 0.64050 0.10195 +1.00000 0.63999 0.10122 +0.00000 0.72516 0.12187 +0.01985 0.72488 0.11986 +0.07957 0.72435 0.11779 +0.14492 0.72359 0.11569 +0.21486 0.72263 0.11360 +0.28837 0.72149 0.11155 +0.36441 0.72021 0.10959 +0.44193 0.71882 0.10774 +0.51991 0.71734 0.10605 +0.59731 0.71579 0.10456 +0.67324 0.71427 0.10320 +0.74692 0.71286 0.10191 +0.81746 0.71158 0.10072 +0.88401 0.71045 0.09963 +0.94570 0.70949 0.09866 +1.00000 0.70872 0.09785 +1.00000 0.70815 0.09720 +0.00000 0.79348 0.11390 +0.02804 0.79277 0.11224 +0.08810 0.79180 0.11057 +0.15355 0.79059 0.10891 +0.22336 0.78917 0.10732 +0.29646 0.78756 0.10583 +0.37183 0.78581 0.10446 +0.44855 0.78405 0.10311 +0.52573 0.78234 0.10177 +0.60244 0.78069 0.10045 +0.67779 0.77913 0.09918 +0.75089 0.77768 0.09798 +0.82089 0.77637 0.09686 +0.88692 0.77520 0.09585 +0.94815 0.77421 0.09496 +1.00000 0.77340 0.09421 +1.00000 0.77280 0.09361 +0.00000 0.85641 0.10759 +0.03839 0.85514 0.10645 +0.09841 0.85359 0.10534 +0.16358 0.85184 0.10426 +0.23291 0.85004 0.10311 +0.30545 0.84823 0.10191 +0.38024 0.84641 0.10066 +0.45637 0.84463 0.09940 +0.53291 0.84290 0.09814 +0.60898 0.84123 0.09691 +0.68368 0.83967 0.09571 +0.75615 0.83821 0.09458 +0.82554 0.83689 0.09353 +0.89102 0.83572 0.09257 +0.95176 0.83472 0.09173 +1.00000 0.83391 0.09102 +1.00000 0.83331 0.09046 +0.00000 0.91248 0.10348 +0.05067 0.91085 0.10272 +0.11038 0.90914 0.10184 +0.17513 0.90737 0.10085 +0.24395 0.90556 0.09978 +0.31590 0.90374 0.09865 +0.39004 0.90194 0.09748 +0.46548 0.90017 0.09629 +0.54131 0.89846 0.09510 +0.61666 0.89683 0.09393 +0.69065 0.89529 0.09279 +0.76244 0.89387 0.09171 +0.83119 0.89259 0.09070 +0.89608 0.89146 0.08978 +0.95630 0.89050 0.08896 +1.00000 0.88972 0.08827 +1.00000 0.88916 0.08771 +0.01120 0.96216 0.10052 +0.06457 0.96054 0.09983 +0.12383 0.95885 0.09902 +0.18802 0.95712 0.09810 +0.25621 0.95536 0.09710 +0.32746 0.95359 0.09603 +0.40086 0.95185 0.09492 +0.47552 0.95015 0.09379 +0.55056 0.94851 0.09264 +0.62512 0.94695 0.09151 +0.69835 0.94550 0.09041 +0.76942 0.94416 0.08935 +0.83749 0.94296 0.08835 +0.90176 0.94191 0.08744 +0.96142 0.94104 0.08662 +1.00000 0.94035 0.08591 +1.00000 0.93987 0.08533 +0.02673 1.00000 0.09828 +0.07961 1.00000 0.09765 +0.13828 1.00000 0.09690 +0.20180 1.00000 0.09603 +0.26923 0.99895 0.09508 +0.33967 0.99730 0.09405 +0.41223 0.99567 0.09298 +0.48604 0.99409 0.09187 +0.56022 0.99258 0.09075 +0.63394 0.99115 0.08963 +0.70637 0.98982 0.08853 +0.77667 0.98862 0.08746 +0.84403 0.98755 0.08645 +0.90765 0.98664 0.08551 +0.96673 0.98590 0.08465 +1.00000 0.98534 0.08389 +1.00000 0.98499 0.08325 +0.00000 0.02798 0.24175 +0.03866 0.02777 0.24190 +0.08748 0.02733 0.24191 +0.14135 0.02669 0.24179 +0.19957 0.02585 0.24154 +0.26141 0.02484 0.24119 +0.32617 0.02366 0.24073 +0.39310 0.02233 0.24017 +0.46148 0.02087 0.23954 +0.53054 0.01929 0.23884 +0.59950 0.01762 0.23808 +0.66757 0.01586 0.23728 +0.73393 0.01405 0.23646 +0.79773 0.01220 0.23562 +0.85810 0.01034 0.23479 +0.91414 0.00848 0.23399 +0.96492 0.00666 0.23324 +0.00000 0.07121 0.24220 +0.03535 0.07079 0.24229 +0.08464 0.07014 0.24220 +0.13916 0.06930 0.24195 +0.19820 0.06827 0.24156 +0.26103 0.06706 0.24102 +0.32693 0.06569 0.24035 +0.39515 0.06419 0.23958 +0.46492 0.06256 0.23870 +0.53547 0.06082 0.23773 +0.60598 0.05900 0.23670 +0.67563 0.05711 0.23561 +0.74357 0.05517 0.23448 +0.80891 0.05321 0.23334 +0.87074 0.05125 0.23220 +0.92814 0.04932 0.23109 +0.98013 0.04744 0.23003 +0.00000 0.11958 0.24187 +0.03179 0.11905 0.24180 +0.08175 0.11830 0.24152 +0.13710 0.11735 0.24107 +0.19714 0.11621 0.24044 +0.26112 0.11491 0.23965 +0.32830 0.11346 0.23872 +0.39791 0.11187 0.23766 +0.46916 0.11017 0.23648 +0.54123 0.10837 0.23521 +0.61330 0.10650 0.23386 +0.68449 0.10457 0.23245 +0.75393 0.10261 0.23101 +0.82070 0.10064 0.22955 +0.88386 0.09869 0.22809 +0.94244 0.09679 0.22667 +0.99541 0.09505 0.22528 +0.00000 0.17298 0.24052 +0.02798 0.17242 0.24020 +0.07875 0.17165 0.23968 +0.13508 0.17069 0.23895 +0.19624 0.16955 0.23803 +0.26148 0.16824 0.23695 +0.33001 0.16679 0.23570 +0.40106 0.16521 0.23433 +0.47379 0.16353 0.23283 +0.54738 0.16175 0.23123 +0.62095 0.15992 0.22956 +0.69360 0.15803 0.22783 +0.76444 0.15616 0.22606 +0.83249 0.15438 0.22425 +0.89675 0.15272 0.22244 +0.95620 0.15121 0.22065 +1.00000 0.14988 0.21893 +0.00000 0.23121 0.23796 +0.02389 0.23072 0.23736 +0.07558 0.23001 0.23654 +0.13299 0.22911 0.23550 +0.19535 0.22804 0.23426 +0.26188 0.22680 0.23285 +0.33180 0.22543 0.23129 +0.40428 0.22393 0.22958 +0.47847 0.22233 0.22776 +0.55355 0.22070 0.22582 +0.62861 0.21908 0.22379 +0.70267 0.21750 0.22170 +0.77475 0.21599 0.21956 +0.84382 0.21457 0.21742 +0.90886 0.21328 0.21531 +0.96886 0.21215 0.21326 +1.00000 0.21121 0.21129 +0.00000 0.29402 0.23411 +0.01951 0.29364 0.23320 +0.07219 0.29306 0.23206 +0.13072 0.29228 0.23069 +0.19430 0.29133 0.22914 +0.26217 0.29022 0.22740 +0.33359 0.28902 0.22549 +0.40768 0.28776 0.22342 +0.48349 0.28645 0.22122 +0.56007 0.28513 0.21893 +0.63645 0.28382 0.21657 +0.71163 0.28256 0.21418 +0.78460 0.28137 0.21178 +0.85434 0.28028 0.20942 +0.91982 0.27932 0.20711 +0.98001 0.27851 0.20490 +1.00000 0.27790 0.20282 +0.00000 0.36097 0.22897 +0.01484 0.36076 0.22774 +0.06864 0.36034 0.22626 +0.12857 0.35975 0.22455 +0.19377 0.35902 0.22263 +0.26335 0.35818 0.22053 +0.33640 0.35723 0.21827 +0.41199 0.35622 0.21588 +0.48915 0.35517 0.21340 +0.56691 0.35410 0.21085 +0.64425 0.35304 0.20828 +0.72018 0.35203 0.20570 +0.79367 0.35109 0.20316 +0.86370 0.35024 0.20069 +0.92923 0.34952 0.19832 +0.98924 0.34896 0.19609 +1.00000 0.34859 0.19403 +0.00000 0.43149 0.22253 +0.01114 0.43148 0.22094 +0.06659 0.43127 0.21911 +0.12815 0.43088 0.21707 +0.19491 0.43034 0.21484 +0.26597 0.42968 0.21246 +0.34037 0.42891 0.20996 +0.41715 0.42807 0.20737 +0.49531 0.42718 0.20472 +0.57386 0.42628 0.20204 +0.65178 0.42538 0.19937 +0.72806 0.42451 0.19675 +0.80165 0.42371 0.19420 +0.87155 0.42301 0.19177 +0.93672 0.42243 0.18948 +0.99615 0.42200 0.18738 +1.00000 0.42175 0.18550 +0.00000 0.50465 0.21484 +0.00981 0.50476 0.21297 +0.06673 0.50465 0.21088 +0.12969 0.50437 0.20861 +0.19776 0.50391 0.20619 +0.26999 0.50333 0.20366 +0.34540 0.50263 0.20104 +0.42299 0.50185 0.19837 +0.50176 0.50101 0.19569 +0.58070 0.50015 0.19302 +0.65876 0.49929 0.19040 +0.73494 0.49845 0.18788 +0.80821 0.49768 0.18548 +0.87753 0.49698 0.18324 +0.94191 0.49641 0.18120 +1.00000 0.49597 0.17938 +1.00000 0.49571 0.17784 +0.00000 0.57901 0.20630 +0.01094 0.57912 0.20425 +0.06910 0.57901 0.20202 +0.13319 0.57869 0.19965 +0.20225 0.57820 0.19718 +0.27530 0.57757 0.19463 +0.35134 0.57681 0.19203 +0.42934 0.57596 0.18943 +0.50829 0.57504 0.18687 +0.58716 0.57409 0.18436 +0.66491 0.57313 0.18196 +0.74053 0.57218 0.17970 +0.81299 0.57129 0.17761 +0.88128 0.57047 0.17573 +0.94443 0.56975 0.17409 +1.00000 0.56917 0.17274 +1.00000 0.56875 0.17168 +0.00000 0.65301 0.19737 +0.01455 0.65298 0.19529 +0.07367 0.65271 0.19306 +0.13859 0.65223 0.19074 +0.20829 0.65156 0.18835 +0.28177 0.65073 0.18593 +0.35801 0.64978 0.18352 +0.43598 0.64871 0.18115 +0.51464 0.64757 0.17886 +0.59296 0.64639 0.17669 +0.66991 0.64518 0.17467 +0.74447 0.64399 0.17283 +0.81564 0.64283 0.17123 +0.88261 0.64177 0.16981 +0.94468 0.64088 0.16852 +1.00000 0.64019 0.16739 +1.00000 0.63970 0.16642 +0.00000 0.72494 0.18863 +0.02061 0.72463 0.18664 +0.08038 0.72406 0.18457 +0.14576 0.72327 0.18245 +0.21571 0.72228 0.18031 +0.28920 0.72112 0.17819 +0.36519 0.71981 0.17612 +0.44264 0.71839 0.17415 +0.52052 0.71689 0.17231 +0.59779 0.71533 0.17063 +0.67367 0.71384 0.16904 +0.74729 0.71245 0.16751 +0.81779 0.71119 0.16607 +0.88428 0.71008 0.16474 +0.94593 0.70914 0.16353 +1.00000 0.70839 0.16248 +1.00000 0.70785 0.16159 +0.00000 0.79312 0.18064 +0.02900 0.79238 0.17892 +0.08908 0.79137 0.17716 +0.15452 0.79012 0.17540 +0.22429 0.78866 0.17368 +0.29733 0.78703 0.17203 +0.37262 0.78527 0.17045 +0.44929 0.78353 0.16886 +0.52640 0.78184 0.16727 +0.60305 0.78022 0.16572 +0.67834 0.77868 0.16421 +0.75138 0.77726 0.16277 +0.82132 0.77596 0.16141 +0.88729 0.77482 0.16016 +0.94848 0.77385 0.15904 +1.00000 0.77306 0.15806 +1.00000 0.77248 0.15724 +0.00000 0.85586 0.17404 +0.03953 0.85455 0.17275 +0.09953 0.85296 0.17148 +0.16465 0.85123 0.17016 +0.23394 0.84945 0.16877 +0.30642 0.84765 0.16732 +0.38116 0.84586 0.16584 +0.45722 0.84410 0.16433 +0.53369 0.84239 0.16284 +0.60969 0.84076 0.16137 +0.68432 0.83921 0.15994 +0.75673 0.83778 0.15858 +0.82606 0.83649 0.15730 +0.89148 0.83534 0.15613 +0.95217 0.83437 0.15507 +1.00000 0.83358 0.15416 +1.00000 0.83299 0.15339 +0.00000 0.91179 0.16929 +0.05195 0.91018 0.16829 +0.11162 0.90849 0.16716 +0.17632 0.90674 0.16593 +0.24508 0.90496 0.16463 +0.31696 0.90317 0.16326 +0.39104 0.90140 0.16186 +0.46640 0.89965 0.16043 +0.54216 0.89797 0.15902 +0.61742 0.89636 0.15762 +0.69134 0.89485 0.15627 +0.76306 0.89345 0.15498 +0.83175 0.89219 0.15376 +0.89658 0.89109 0.15264 +0.95674 0.89015 0.15164 +1.00000 0.88940 0.15077 +1.00000 0.88886 0.15004 +0.01262 0.96147 0.16552 +0.06594 0.95988 0.16459 +0.12515 0.95822 0.16354 +0.18928 0.95651 0.16239 +0.25740 0.95478 0.16116 +0.32857 0.95304 0.15987 +0.40189 0.95133 0.15854 +0.47647 0.94965 0.15719 +0.55142 0.94804 0.15583 +0.62590 0.94651 0.15450 +0.69905 0.94508 0.15320 +0.77004 0.94377 0.15196 +0.83805 0.94259 0.15079 +0.90225 0.94157 0.14971 +0.96185 0.94072 0.14873 +1.00000 0.94006 0.14788 +1.00000 0.93960 0.14717 +0.02819 1.00000 0.16248 +0.08102 1.00000 0.16163 +0.13963 1.00000 0.16065 +0.20306 1.00000 0.15956 +0.27041 0.99841 0.15840 +0.34077 0.99678 0.15717 +0.41324 0.99519 0.15589 +0.48695 0.99363 0.15460 +0.56105 0.99215 0.15329 +0.63468 0.99075 0.15200 +0.70702 0.98945 0.15074 +0.77725 0.98827 0.14952 +0.84454 0.98723 0.14837 +0.90809 0.98634 0.14730 +0.96711 0.98563 0.14633 +1.00000 0.98509 0.14547 +1.00000 0.98476 0.14474 +0.00000 0.02778 0.30385 +0.03818 0.02754 0.30407 +0.08703 0.02707 0.30417 +0.14096 0.02639 0.30417 +0.19925 0.02552 0.30407 +0.26118 0.02447 0.30388 +0.32605 0.02325 0.30361 +0.39310 0.02188 0.30326 +0.46161 0.02038 0.30285 +0.53082 0.01877 0.30239 +0.59994 0.01705 0.30189 +0.66817 0.01526 0.30136 +0.73468 0.01341 0.30082 +0.79864 0.01152 0.30029 +0.85916 0.00962 0.29977 +0.91535 0.00773 0.29929 +0.96626 0.00587 0.29887 +0.00000 0.07093 0.30464 +0.03488 0.07048 0.30487 +0.08423 0.06981 0.30496 +0.13883 0.06893 0.30491 +0.19796 0.06787 0.30472 +0.26091 0.06663 0.30442 +0.32693 0.06523 0.30400 +0.39528 0.06368 0.30348 +0.46520 0.06202 0.30288 +0.53590 0.06024 0.30221 +0.60657 0.05839 0.30148 +0.67638 0.05646 0.30070 +0.74447 0.05449 0.29990 +0.80996 0.05250 0.29910 +0.87193 0.05051 0.29830 +0.92946 0.04854 0.29754 +0.98156 0.04663 0.29683 +0.00000 0.11927 0.30490 +0.03134 0.11870 0.30505 +0.08138 0.11792 0.30501 +0.13683 0.11695 0.30481 +0.19697 0.11578 0.30445 +0.26108 0.11445 0.30394 +0.32839 0.11296 0.30331 +0.39814 0.11135 0.30255 +0.46954 0.10961 0.30169 +0.54176 0.10778 0.30075 +0.61398 0.10587 0.29974 +0.68533 0.10391 0.29868 +0.75492 0.10192 0.29758 +0.82182 0.09992 0.29647 +0.88511 0.09794 0.29538 +0.94379 0.09604 0.29430 +0.99683 0.09431 0.29324 +0.00000 0.17265 0.30435 +0.02754 0.17207 0.30432 +0.07840 0.17127 0.30408 +0.13484 0.17028 0.30365 +0.19611 0.16911 0.30305 +0.26148 0.16778 0.30228 +0.33015 0.16630 0.30137 +0.40134 0.16469 0.30033 +0.47423 0.16298 0.29918 +0.54796 0.16117 0.29793 +0.62168 0.15931 0.29662 +0.69448 0.15740 0.29524 +0.76545 0.15553 0.29381 +0.83362 0.15375 0.29233 +0.89797 0.15210 0.29082 +0.95749 0.15060 0.28932 +1.00000 0.14928 0.28787 +0.00000 0.23090 0.30277 +0.02345 0.23038 0.30249 +0.07524 0.22965 0.30199 +0.13276 0.22873 0.30129 +0.19524 0.22763 0.30040 +0.26191 0.22637 0.29933 +0.33196 0.22496 0.29812 +0.40458 0.22344 0.29677 +0.47893 0.22182 0.29530 +0.55418 0.22019 0.29370 +0.62939 0.21856 0.29198 +0.70358 0.21698 0.29019 +0.77575 0.21548 0.28833 +0.84491 0.21407 0.28646 +0.91002 0.21279 0.28459 +0.97005 0.21167 0.28276 +1.00000 0.21074 0.28100 +0.00000 0.29375 0.30002 +0.01906 0.29335 0.29946 +0.07185 0.29274 0.29866 +0.13049 0.29194 0.29766 +0.19420 0.29096 0.29646 +0.26224 0.28984 0.29507 +0.33384 0.28863 0.29348 +0.40808 0.28736 0.29172 +0.48404 0.28605 0.28982 +0.56076 0.28472 0.28780 +0.63725 0.28342 0.28570 +0.71253 0.28216 0.28354 +0.78557 0.28097 0.28136 +0.85535 0.27988 0.27919 +0.92086 0.27893 0.27706 +0.98104 0.27814 0.27500 +1.00000 0.27754 0.27305 +0.00000 0.36075 0.29606 +0.01439 0.36051 0.29519 +0.06837 0.36008 0.29405 +0.12847 0.35948 0.29266 +0.19383 0.35874 0.29104 +0.26358 0.35788 0.28922 +0.33678 0.35693 0.28723 +0.41251 0.35591 0.28509 +0.48979 0.35485 0.28284 +0.56764 0.35378 0.28050 +0.64506 0.35272 0.27812 +0.72105 0.35171 0.27571 +0.79457 0.35077 0.27331 +0.86460 0.34993 0.27096 +0.93011 0.34922 0.26869 +0.99008 0.34867 0.26653 +1.00000 0.34831 0.26453 +0.00000 0.43134 0.29075 +0.01093 0.43131 0.28946 +0.06654 0.43108 0.28791 +0.12825 0.43067 0.28613 +0.19517 0.43012 0.28414 +0.26636 0.42944 0.28199 +0.34087 0.42867 0.27969 +0.41775 0.42782 0.27727 +0.49599 0.42692 0.27478 +0.57460 0.42601 0.27224 +0.65256 0.42510 0.26968 +0.72884 0.42424 0.26715 +0.80243 0.42344 0.26467 +0.87229 0.42274 0.26227 +0.93740 0.42217 0.26001 +0.99675 0.42175 0.25789 +1.00000 0.42151 0.25597 +0.00000 0.50454 0.28399 +0.00985 0.50462 0.28235 +0.06691 0.50450 0.28048 +0.13000 0.50419 0.27840 +0.19819 0.50372 0.27616 +0.27051 0.50312 0.27377 +0.34600 0.50241 0.27128 +0.42366 0.50161 0.26872 +0.50247 0.50077 0.26611 +0.58141 0.49990 0.26350 +0.65947 0.49903 0.26092 +0.73562 0.49819 0.25840 +0.80882 0.49741 0.25598 +0.87806 0.49672 0.25370 +0.94234 0.49615 0.25158 +1.00000 0.49572 0.24967 +1.00000 0.49547 0.24800 +0.00000 0.57890 0.27615 +0.01123 0.57898 0.27427 +0.06950 0.57884 0.27219 +0.13369 0.57850 0.26994 +0.20284 0.57799 0.26756 +0.27595 0.57734 0.26508 +0.35202 0.57656 0.26253 +0.43004 0.57570 0.25996 +0.50898 0.57477 0.25738 +0.58782 0.57380 0.25485 +0.66551 0.57283 0.25240 +0.74105 0.57188 0.25005 +0.81340 0.57098 0.24785 +0.88157 0.57016 0.24584 +0.94456 0.56945 0.24405 +1.00000 0.56886 0.24250 +1.00000 0.56846 0.24120 +0.00000 0.65285 0.26769 +0.01509 0.65279 0.26569 +0.07429 0.65249 0.26353 +0.13926 0.65198 0.26125 +0.20901 0.65129 0.25887 +0.28251 0.65044 0.25644 +0.35875 0.64946 0.25399 +0.43669 0.64837 0.25156 +0.51529 0.64722 0.24918 +0.59352 0.64602 0.24689 +0.67036 0.64480 0.24472 +0.74479 0.64359 0.24272 +0.81582 0.64243 0.24091 +0.88274 0.64140 0.23924 +0.94477 0.64053 0.23769 +1.00000 0.63986 0.23630 +1.00000 0.63940 0.23508 +0.00000 0.72469 0.25914 +0.02137 0.72434 0.25716 +0.08119 0.72374 0.25507 +0.14658 0.72292 0.25290 +0.21653 0.72190 0.25069 +0.29000 0.72071 0.24846 +0.36594 0.71938 0.24627 +0.44332 0.71793 0.24415 +0.52108 0.71641 0.24213 +0.59827 0.71485 0.24022 +0.67409 0.71338 0.23837 +0.74765 0.71201 0.23658 +0.81809 0.71078 0.23489 +0.88454 0.70969 0.23331 +0.94614 0.70878 0.23185 +1.00000 0.70805 0.23055 +1.00000 0.70753 0.22941 +0.00000 0.79272 0.25107 +0.02996 0.79194 0.24927 +0.09004 0.79089 0.24740 +0.15547 0.78961 0.24550 +0.22519 0.78812 0.24362 +0.29816 0.78645 0.24177 +0.37340 0.78471 0.23994 +0.45001 0.78299 0.23810 +0.52706 0.78132 0.23626 +0.60365 0.77972 0.23445 +0.67887 0.77821 0.23268 +0.75185 0.77681 0.23099 +0.82173 0.77554 0.22939 +0.88765 0.77442 0.22790 +0.94879 0.77347 0.22653 +1.00000 0.77271 0.22532 +1.00000 0.77215 0.22427 +0.00000 0.85527 0.24408 +0.04066 0.85391 0.24262 +0.10062 0.85230 0.24113 +0.16571 0.85059 0.23957 +0.23495 0.84883 0.23792 +0.30738 0.84706 0.23621 +0.38205 0.84529 0.23447 +0.45805 0.84356 0.23272 +0.53445 0.84187 0.23097 +0.61038 0.84026 0.22925 +0.68494 0.83874 0.22758 +0.75728 0.83733 0.22599 +0.82655 0.83606 0.22447 +0.89191 0.83494 0.22307 +0.95255 0.83399 0.22180 +1.00000 0.83322 0.22067 +1.00000 0.83266 0.21970 +0.00000 0.91108 0.23860 +0.05321 0.90949 0.23734 +0.11284 0.90783 0.23596 +0.17749 0.90610 0.23448 +0.24619 0.90435 0.23292 +0.31801 0.90258 0.23130 +0.39201 0.90083 0.22965 +0.46730 0.89912 0.22799 +0.54298 0.89746 0.22634 +0.61817 0.89587 0.22471 +0.69201 0.89439 0.22313 +0.76366 0.89302 0.22162 +0.83228 0.89178 0.22020 +0.89705 0.89070 0.21888 +0.95715 0.88979 0.21768 +1.00000 0.88906 0.21663 +1.00000 0.88854 0.21573 +0.01401 0.96077 0.23397 +0.06729 0.95920 0.23279 +0.12644 0.95757 0.23149 +0.19051 0.95589 0.23010 +0.25856 0.95418 0.22863 +0.32965 0.95247 0.22710 +0.40289 0.95078 0.22554 +0.47739 0.94914 0.22397 +0.55226 0.94755 0.22240 +0.62666 0.94605 0.22086 +0.69973 0.94465 0.21937 +0.77064 0.94336 0.21793 +0.83857 0.94221 0.21658 +0.90272 0.94122 0.21534 +0.96226 0.94039 0.21420 +1.00000 0.93975 0.21321 +1.00000 0.93931 0.21236 +0.02963 1.00000 0.23010 +0.08240 1.00000 0.22901 +0.14094 1.00000 0.22779 +0.20430 0.99944 0.22648 +0.27157 0.99785 0.22510 +0.34183 0.99625 0.22366 +0.41421 0.99468 0.22218 +0.48784 0.99316 0.22069 +0.56184 0.99171 0.21920 +0.63539 0.99033 0.21773 +0.70765 0.98906 0.21631 +0.77779 0.98791 0.21494 +0.84501 0.98689 0.21365 +0.90849 0.98603 0.21245 +0.96745 0.98534 0.21137 +1.00000 0.98483 0.21041 +1.00000 0.98452 0.20960 +0.00000 0.02755 0.36845 +0.03767 0.02727 0.36876 +0.08657 0.02677 0.36898 +0.14055 0.02606 0.36912 +0.19892 0.02516 0.36918 +0.26095 0.02407 0.36918 +0.32592 0.02281 0.36911 +0.39310 0.02141 0.36899 +0.46175 0.01987 0.36883 +0.53110 0.01821 0.36863 +0.60037 0.01646 0.36841 +0.66876 0.01463 0.36818 +0.73544 0.01274 0.36795 +0.79955 0.01081 0.36774 +0.86022 0.00887 0.36755 +0.91655 0.00694 0.36742 +0.96758 0.00504 0.36735 +0.00000 0.07063 0.36964 +0.03440 0.07015 0.37005 +0.08381 0.06945 0.37033 +0.13849 0.06854 0.37049 +0.19771 0.06744 0.37054 +0.26077 0.06616 0.37049 +0.32692 0.06473 0.37035 +0.39541 0.06315 0.37012 +0.46548 0.06145 0.36982 +0.53633 0.05964 0.36945 +0.60715 0.05774 0.36905 +0.67712 0.05578 0.36861 +0.74536 0.05378 0.36816 +0.81100 0.05175 0.36770 +0.87311 0.04973 0.36727 +0.93076 0.04773 0.36687 +0.98298 0.04579 0.36653 +0.00000 0.11892 0.37057 +0.03088 0.11833 0.37096 +0.08099 0.11752 0.37118 +0.13653 0.11651 0.37126 +0.19679 0.11532 0.37119 +0.26101 0.11396 0.37099 +0.32846 0.11244 0.37067 +0.39835 0.11079 0.37025 +0.46990 0.10902 0.36973 +0.54228 0.10716 0.36913 +0.61466 0.10522 0.36848 +0.68616 0.10323 0.36778 +0.75589 0.10121 0.36705 +0.82293 0.09918 0.36632 +0.88633 0.09717 0.36559 +0.94511 0.09527 0.36487 +0.99823 0.09355 0.36413 +0.00000 0.17230 0.37091 +0.02708 0.17169 0.37117 +0.07803 0.17087 0.37124 +0.13457 0.16985 0.37114 +0.19597 0.16865 0.37087 +0.26146 0.16729 0.37044 +0.33028 0.16578 0.36988 +0.40161 0.16414 0.36920 +0.47465 0.16239 0.36842 +0.54853 0.16056 0.36754 +0.62239 0.15867 0.36659 +0.69533 0.15674 0.36559 +0.76644 0.15488 0.36450 +0.83472 0.15310 0.36334 +0.89917 0.15146 0.36214 +0.95875 0.14996 0.36093 +1.00000 0.14866 0.35974 +0.00000 0.23057 0.37038 +0.02299 0.23002 0.37043 +0.07488 0.22927 0.37028 +0.13251 0.22832 0.36993 +0.19511 0.22719 0.36940 +0.26191 0.22590 0.36871 +0.33211 0.22447 0.36786 +0.40487 0.22291 0.36689 +0.47938 0.22129 0.36577 +0.55479 0.21965 0.36450 +0.63014 0.21803 0.36311 +0.70446 0.21645 0.36161 +0.77674 0.21495 0.36004 +0.84597 0.21354 0.35842 +0.91114 0.21227 0.35679 +0.97120 0.21117 0.35518 +1.00000 0.21025 0.35362 +0.00000 0.29345 0.36880 +0.01859 0.29303 0.36859 +0.07149 0.29240 0.36817 +0.13024 0.29157 0.36754 +0.19408 0.29056 0.36671 +0.26230 0.28943 0.36566 +0.33407 0.28822 0.36440 +0.40848 0.28693 0.36296 +0.48459 0.28562 0.36135 +0.56144 0.28429 0.35960 +0.63804 0.28299 0.35775 +0.71340 0.28173 0.35583 +0.78651 0.28055 0.35386 +0.85634 0.27947 0.35188 +0.92186 0.27853 0.34991 +0.98204 0.27775 0.34800 +1.00000 0.27717 0.34616 +0.00000 0.36051 0.36607 +0.01394 0.36025 0.36556 +0.06809 0.35980 0.36477 +0.12837 0.35918 0.36370 +0.19390 0.35843 0.36239 +0.26380 0.35756 0.36085 +0.33715 0.35660 0.35913 +0.41301 0.35557 0.35724 +0.49040 0.35451 0.35521 +0.56835 0.35343 0.35307 +0.64585 0.35238 0.35086 +0.72188 0.35137 0.34861 +0.79543 0.35043 0.34635 +0.86546 0.34960 0.34411 +0.93095 0.34890 0.34192 +0.99087 0.34836 0.33982 +1.00000 0.34802 0.33785 +0.00000 0.43116 0.36190 +0.01073 0.43111 0.36091 +0.06650 0.43086 0.35964 +0.12836 0.43044 0.35811 +0.19541 0.42987 0.35637 +0.26673 0.42918 0.35443 +0.34137 0.42839 0.35232 +0.41834 0.42754 0.35008 +0.49666 0.42663 0.34774 +0.57532 0.42572 0.34532 +0.65331 0.42481 0.34286 +0.72960 0.42395 0.34040 +0.80317 0.42315 0.33797 +0.87298 0.42246 0.33560 +0.93803 0.42189 0.33333 +0.99729 0.42148 0.33119 +1.00000 0.42126 0.32921 +0.00000 0.50439 0.35607 +0.00990 0.50446 0.35466 +0.06709 0.50431 0.35299 +0.13031 0.50398 0.35110 +0.19861 0.50350 0.34902 +0.27103 0.50288 0.34678 +0.34660 0.50215 0.34440 +0.42431 0.50135 0.34193 +0.50315 0.50050 0.33939 +0.58211 0.49962 0.33682 +0.66015 0.49874 0.33425 +0.73625 0.49790 0.33172 +0.80939 0.49713 0.32926 +0.87855 0.49644 0.32691 +0.94272 0.49587 0.32470 +1.00000 0.49545 0.32266 +1.00000 0.49520 0.32084 +0.00000 0.57876 0.34891 +0.01153 0.57881 0.34718 +0.06990 0.57865 0.34523 +0.13419 0.57829 0.34309 +0.20341 0.57776 0.34079 +0.27658 0.57708 0.33837 +0.35269 0.57629 0.33585 +0.43073 0.57541 0.33328 +0.50965 0.57446 0.33069 +0.58845 0.57349 0.32811 +0.66608 0.57251 0.32557 +0.74152 0.57156 0.32312 +0.81376 0.57065 0.32079 +0.88180 0.56983 0.31862 +0.94464 0.56912 0.31663 +1.00000 0.56854 0.31487 +1.00000 0.56816 0.31329 +0.00000 0.65265 0.34088 +0.01562 0.65256 0.33895 +0.07490 0.65224 0.33684 +0.13993 0.65170 0.33458 +0.20972 0.65099 0.33219 +0.28324 0.65011 0.32973 +0.35947 0.64911 0.32722 +0.43737 0.64801 0.32470 +0.51591 0.64684 0.32221 +0.59406 0.64562 0.31977 +0.67078 0.64439 0.31743 +0.74507 0.64318 0.31523 +0.81599 0.64202 0.31318 +0.88287 0.64101 0.31124 +0.94486 0.64017 0.30943 +1.00000 0.63952 0.30777 +1.00000 0.63908 0.30628 +0.00000 0.72440 0.33247 +0.02212 0.72402 0.33048 +0.08198 0.72338 0.32834 +0.14740 0.72253 0.32610 +0.21735 0.72148 0.32379 +0.29079 0.72026 0.32144 +0.36667 0.71891 0.31910 +0.44396 0.71744 0.31679 +0.52162 0.71590 0.31456 +0.59873 0.71436 0.31239 +0.67449 0.71291 0.31027 +0.74801 0.71157 0.30822 +0.81839 0.71035 0.30626 +0.88478 0.70929 0.30441 +0.94634 0.70840 0.30270 +1.00000 0.70769 0.30114 +1.00000 0.70719 0.29975 +0.00000 0.79229 0.32424 +0.03091 0.79146 0.32233 +0.09100 0.79038 0.32033 +0.15641 0.78906 0.31826 +0.22608 0.78754 0.31618 +0.29898 0.78585 0.31411 +0.37417 0.78413 0.31201 +0.45072 0.78244 0.30990 +0.52771 0.78079 0.30780 +0.60424 0.77921 0.30572 +0.67940 0.77773 0.30370 +0.75231 0.77635 0.30174 +0.82213 0.77510 0.29989 +0.88800 0.77401 0.29814 +0.94909 0.77308 0.29653 +1.00000 0.77234 0.29508 +1.00000 0.77180 0.29379 +0.00000 0.85464 0.31677 +0.04177 0.85325 0.31511 +0.10171 0.85162 0.31338 +0.16676 0.84993 0.31154 +0.23595 0.84820 0.30963 +0.30833 0.84645 0.30766 +0.38294 0.84471 0.30565 +0.45887 0.84300 0.30364 +0.53520 0.84134 0.30163 +0.61105 0.83975 0.29966 +0.68555 0.83826 0.29774 +0.75782 0.83687 0.29590 +0.82702 0.83562 0.29415 +0.89233 0.83453 0.29251 +0.95291 0.83360 0.29101 +1.00000 0.83285 0.28967 +1.00000 0.83231 0.28849 +0.00085 0.91036 0.31048 +0.05447 0.90879 0.30896 +0.11406 0.90715 0.30731 +0.17865 0.90545 0.30556 +0.24729 0.90372 0.30374 +0.31904 0.90198 0.30187 +0.39297 0.90025 0.29996 +0.46818 0.89856 0.29805 +0.54378 0.89693 0.29616 +0.61890 0.89537 0.29430 +0.69266 0.89391 0.29249 +0.76424 0.89257 0.29076 +0.83279 0.89136 0.28912 +0.89750 0.89030 0.28760 +0.95755 0.88941 0.28621 +1.00000 0.88871 0.28497 +1.00000 0.88821 0.28390 +0.01539 0.96005 0.30496 +0.06863 0.95851 0.30352 +0.12772 0.95690 0.30196 +0.19173 0.95525 0.30032 +0.25970 0.95357 0.29860 +0.33072 0.95189 0.29683 +0.40387 0.95023 0.29504 +0.47828 0.94861 0.29324 +0.55307 0.94705 0.29146 +0.62739 0.94558 0.28971 +0.70038 0.94420 0.28801 +0.77122 0.94294 0.28639 +0.83908 0.94182 0.28487 +0.90316 0.94085 0.28345 +0.96264 0.94004 0.28217 +1.00000 0.93942 0.28103 +1.00000 0.93901 0.28006 +0.03105 1.00000 0.30023 +0.08376 1.00000 0.29889 +0.14223 1.00000 0.29744 +0.20551 0.99884 0.29590 +0.27269 0.99727 0.29429 +0.34287 0.99571 0.29263 +0.41516 0.99417 0.29095 +0.48869 0.99268 0.28926 +0.56261 0.99125 0.28759 +0.63607 0.98991 0.28595 +0.70824 0.98866 0.28436 +0.77830 0.98754 0.28285 +0.84545 0.98655 0.28142 +0.90887 0.98571 0.28011 +0.96776 0.98504 0.27891 +1.00000 0.98455 0.27787 +1.00000 0.98426 0.27698 +0.00000 0.02729 0.43473 +0.03716 0.02699 0.43515 +0.08610 0.02645 0.43551 +0.14014 0.02571 0.43581 +0.19858 0.02477 0.43606 +0.26071 0.02364 0.43627 +0.32579 0.02235 0.43643 +0.39310 0.02090 0.43656 +0.46188 0.01932 0.43666 +0.53138 0.01763 0.43675 +0.60081 0.01584 0.43683 +0.66936 0.01396 0.43691 +0.73619 0.01204 0.43701 +0.80046 0.01007 0.43713 +0.86129 0.00809 0.43730 +0.91775 0.00613 0.43752 +0.96891 0.00419 0.43782 +0.00000 0.07030 0.43640 +0.03391 0.06979 0.43700 +0.08338 0.06906 0.43750 +0.13814 0.06812 0.43790 +0.19746 0.06698 0.43821 +0.26063 0.06567 0.43843 +0.32690 0.06420 0.43857 +0.39553 0.06259 0.43865 +0.46575 0.06085 0.43866 +0.53675 0.05901 0.43863 +0.60773 0.05708 0.43857 +0.67786 0.05508 0.43848 +0.74625 0.05304 0.43839 +0.81204 0.05098 0.43831 +0.87429 0.04892 0.43825 +0.93206 0.04689 0.43823 +0.98438 0.04492 0.43828 +0.00000 0.11856 0.43807 +0.03040 0.11794 0.43872 +0.08059 0.11710 0.43923 +0.13623 0.11606 0.43959 +0.19659 0.11483 0.43984 +0.26094 0.11344 0.43996 +0.32853 0.11189 0.43998 +0.39856 0.11020 0.43990 +0.47026 0.10840 0.43974 +0.54280 0.10651 0.43951 +0.61532 0.10454 0.43922 +0.68697 0.10252 0.43890 +0.75684 0.10046 0.43855 +0.82402 0.09841 0.43820 +0.88754 0.09638 0.43785 +0.94641 0.09450 0.43747 +0.99960 0.09278 0.43707 +0.00000 0.17192 0.43935 +0.02661 0.17129 0.43993 +0.07765 0.17044 0.44033 +0.13430 0.16939 0.44057 +0.19581 0.16816 0.44065 +0.26144 0.16677 0.44058 +0.33039 0.16523 0.44039 +0.40187 0.16356 0.44008 +0.47505 0.16179 0.43967 +0.54908 0.15993 0.43918 +0.62309 0.15801 0.43862 +0.69618 0.15607 0.43798 +0.76742 0.15421 0.43722 +0.83581 0.15244 0.43638 +0.90034 0.15080 0.43549 +0.95999 0.14932 0.43456 +1.00000 0.14803 0.43363 +0.00000 0.23021 0.43993 +0.02252 0.22964 0.44034 +0.07450 0.22886 0.44055 +0.13224 0.22788 0.44057 +0.19497 0.22672 0.44042 +0.26191 0.22541 0.44011 +0.33224 0.22395 0.43964 +0.40514 0.22237 0.43905 +0.47983 0.22074 0.43829 +0.55540 0.21910 0.43735 +0.63089 0.21748 0.43627 +0.70533 0.21590 0.43506 +0.77771 0.21440 0.43377 +0.84702 0.21301 0.43240 +0.91224 0.21175 0.43101 +0.97233 0.21066 0.42960 +1.00000 0.20976 0.42823 +0.00000 0.29313 0.43958 +0.01811 0.29269 0.43975 +0.07111 0.29203 0.43971 +0.12997 0.29117 0.43946 +0.19396 0.29015 0.43900 +0.26236 0.28901 0.43830 +0.33431 0.28778 0.43737 +0.40888 0.28650 0.43623 +0.48513 0.28518 0.43490 +0.56210 0.28385 0.43342 +0.63881 0.28254 0.43182 +0.71426 0.28129 0.43012 +0.78743 0.28011 0.42835 +0.85730 0.27904 0.42654 +0.92284 0.27811 0.42473 +0.98301 0.27735 0.42294 +1.00000 0.27679 0.42122 +0.00000 0.36024 0.43813 +0.01351 0.35996 0.43798 +0.06783 0.35950 0.43753 +0.12827 0.35887 0.43678 +0.19397 0.35810 0.43576 +0.26403 0.35722 0.43451 +0.33753 0.35625 0.43304 +0.41351 0.35522 0.43139 +0.49101 0.35415 0.42957 +0.56905 0.35307 0.42763 +0.64661 0.35202 0.42559 +0.72269 0.35101 0.42348 +0.79626 0.35008 0.42134 +0.86629 0.34926 0.41919 +0.93176 0.34857 0.41707 +0.99163 0.34805 0.41501 +1.00000 0.34772 0.41305 +0.00000 0.43095 0.43509 +0.01055 0.43089 0.43439 +0.06646 0.43062 0.43339 +0.12847 0.43019 0.43212 +0.19567 0.42961 0.43060 +0.26711 0.42890 0.42887 +0.34186 0.42811 0.42694 +0.41892 0.42724 0.42486 +0.49731 0.42633 0.42265 +0.57602 0.42541 0.42034 +0.65404 0.42450 0.41797 +0.73033 0.42364 0.41557 +0.80387 0.42285 0.41317 +0.87364 0.42216 0.41080 +0.93862 0.42160 0.40851 +0.99780 0.42120 0.40631 +1.00000 0.42099 0.40425 +0.00000 0.50423 0.43015 +0.00996 0.50427 0.42896 +0.06728 0.50411 0.42750 +0.13062 0.50376 0.42579 +0.19903 0.50326 0.42386 +0.27154 0.50262 0.42174 +0.34718 0.50189 0.41946 +0.42495 0.50107 0.41706 +0.50382 0.50021 0.41457 +0.58278 0.49932 0.41202 +0.66080 0.49844 0.40944 +0.73686 0.49760 0.40688 +0.80993 0.49683 0.40436 +0.87900 0.49614 0.40191 +0.94305 0.49558 0.39958 +1.00000 0.49517 0.39740 +1.00000 0.49493 0.39540 +0.00000 0.57859 0.42365 +0.01183 0.57862 0.42207 +0.07031 0.57843 0.42023 +0.13469 0.57805 0.41818 +0.20399 0.57750 0.41595 +0.27721 0.57680 0.41356 +0.35335 0.57599 0.41106 +0.43139 0.57510 0.40847 +0.51031 0.57414 0.40583 +0.58906 0.57316 0.40318 +0.66662 0.57217 0.40054 +0.74197 0.57121 0.39796 +0.81409 0.57031 0.39547 +0.88199 0.56949 0.39311 +0.94467 0.56878 0.39090 +1.00000 0.56821 0.38889 +1.00000 0.56786 0.38704 +0.00000 0.65244 0.41600 +0.01616 0.65232 0.41412 +0.07551 0.65196 0.41204 +0.14060 0.65140 0.40978 +0.21042 0.65066 0.40737 +0.28396 0.64976 0.40485 +0.36017 0.64874 0.40226 +0.43803 0.64762 0.39963 +0.51651 0.64644 0.39699 +0.59456 0.64521 0.39439 +0.67117 0.64397 0.39185 +0.74531 0.64275 0.38942 +0.81616 0.64161 0.38710 +0.88299 0.64062 0.38488 +0.94494 0.63980 0.38280 +1.00000 0.63917 0.38087 +1.00000 0.63875 0.37911 +0.00000 0.72408 0.40767 +0.02288 0.72367 0.40564 +0.08278 0.72300 0.40344 +0.14822 0.72212 0.40110 +0.21816 0.72104 0.39867 +0.29157 0.71980 0.39617 +0.36739 0.71842 0.39364 +0.44459 0.71693 0.39113 +0.52214 0.71538 0.38865 +0.59920 0.71386 0.38621 +0.67490 0.71243 0.38382 +0.74836 0.71111 0.38150 +0.81868 0.70992 0.37927 +0.88503 0.70888 0.37715 +0.94654 0.70801 0.37517 +1.00000 0.70732 0.37334 +1.00000 0.70684 0.37170 +0.00000 0.79182 0.39920 +0.03186 0.79096 0.39715 +0.09196 0.78984 0.39499 +0.15734 0.78849 0.39274 +0.22696 0.78694 0.39043 +0.29980 0.78525 0.38810 +0.37494 0.78355 0.38573 +0.45143 0.78188 0.38335 +0.52836 0.78026 0.38097 +0.60482 0.77870 0.37863 +0.67991 0.77724 0.37634 +0.75277 0.77588 0.37412 +0.82253 0.77466 0.37200 +0.88834 0.77359 0.37000 +0.94938 0.77268 0.36814 +1.00000 0.77196 0.36644 +1.00000 0.77144 0.36493 +0.00000 0.85399 0.39117 +0.04289 0.85255 0.38927 +0.10280 0.85094 0.38727 +0.16781 0.84927 0.38516 +0.23695 0.84756 0.38298 +0.30927 0.84584 0.38073 +0.38382 0.84412 0.37846 +0.45968 0.84243 0.37618 +0.53594 0.84080 0.37391 +0.61172 0.83923 0.37168 +0.68615 0.83776 0.36951 +0.75835 0.83641 0.36742 +0.82749 0.83518 0.36543 +0.89274 0.83411 0.36356 +0.95327 0.83320 0.36184 +1.00000 0.83248 0.36028 +1.00000 0.83196 0.35890 +0.00213 0.90962 0.38400 +0.05571 0.90808 0.38220 +0.11526 0.90646 0.38028 +0.17980 0.90479 0.37827 +0.24838 0.90308 0.37618 +0.32006 0.90137 0.37405 +0.39392 0.89967 0.37189 +0.46906 0.89801 0.36973 +0.54458 0.89640 0.36759 +0.61961 0.89487 0.36549 +0.69331 0.89344 0.36345 +0.76481 0.89212 0.36150 +0.83329 0.89093 0.35965 +0.89794 0.88990 0.35793 +0.95793 0.88903 0.35635 +1.00000 0.88835 0.35493 +1.00000 0.88787 0.35370 +0.01676 0.95933 0.37757 +0.06995 0.95782 0.37587 +0.12899 0.95623 0.37405 +0.19293 0.95461 0.37215 +0.26083 0.95295 0.37018 +0.33177 0.95130 0.36818 +0.40484 0.94967 0.36615 +0.47917 0.94808 0.36412 +0.55387 0.94655 0.36212 +0.62810 0.94510 0.36017 +0.70101 0.94375 0.35827 +0.77177 0.94252 0.35647 +0.83957 0.94142 0.35477 +0.90358 0.94047 0.35319 +0.96301 0.93969 0.35175 +1.00000 0.93909 0.35048 +1.00000 0.93870 0.34939 +0.03245 1.00000 0.37197 +0.08510 1.00000 0.37039 +0.14350 0.99976 0.36869 +0.20670 0.99824 0.36692 +0.27380 0.99670 0.36509 +0.34389 0.99516 0.36322 +0.41609 0.99365 0.36133 +0.48953 0.99219 0.35945 +0.56335 0.99079 0.35760 +0.63672 0.98947 0.35579 +0.70881 0.98826 0.35404 +0.77880 0.98716 0.35239 +0.84587 0.98619 0.35083 +0.90922 0.98538 0.34940 +0.96805 0.98473 0.34811 +1.00000 0.98426 0.34698 +1.00000 0.98399 0.34603 +0.00000 0.02702 0.50190 +0.03664 0.02668 0.50245 +0.08562 0.02612 0.50297 +0.13973 0.02534 0.50345 +0.19825 0.02436 0.50390 +0.26047 0.02319 0.50433 +0.32567 0.02186 0.50474 +0.39310 0.02038 0.50514 +0.46203 0.01876 0.50553 +0.53167 0.01703 0.50591 +0.60126 0.01519 0.50630 +0.66996 0.01328 0.50671 +0.73696 0.01131 0.50715 +0.80138 0.00931 0.50762 +0.86236 0.00730 0.50815 +0.91896 0.00529 0.50874 +0.97024 0.00333 0.50942 +0.00000 0.06996 0.50411 +0.03341 0.06942 0.50493 +0.08295 0.06865 0.50566 +0.13779 0.06768 0.50631 +0.19721 0.06651 0.50689 +0.26049 0.06517 0.50740 +0.32689 0.06366 0.50785 +0.39566 0.06201 0.50824 +0.46602 0.06024 0.50859 +0.53718 0.05836 0.50891 +0.60832 0.05639 0.50920 +0.67860 0.05436 0.50947 +0.74715 0.05228 0.50975 +0.81307 0.05019 0.51005 +0.87546 0.04810 0.51037 +0.93335 0.04604 0.51074 +0.98578 0.04404 0.51118 +0.00000 0.11817 0.50658 +0.02992 0.11752 0.50751 +0.08018 0.11666 0.50831 +0.13592 0.11559 0.50899 +0.19640 0.11433 0.50955 +0.26087 0.11290 0.51002 +0.32859 0.11132 0.51038 +0.39877 0.10960 0.51066 +0.47062 0.10777 0.51086 +0.54331 0.10584 0.51101 +0.61599 0.10384 0.51110 +0.68778 0.10179 0.51116 +0.75780 0.09971 0.51121 +0.82510 0.09762 0.51125 +0.88874 0.09559 0.51127 +0.94770 0.09371 0.51122 +1.00000 0.09201 0.51113 +0.00000 0.17153 0.50886 +0.02613 0.17087 0.50977 +0.07726 0.16999 0.51051 +0.13402 0.16892 0.51110 +0.19565 0.16766 0.51154 +0.26141 0.16624 0.51185 +0.33050 0.16467 0.51203 +0.40212 0.16297 0.51211 +0.47545 0.16117 0.51208 +0.54963 0.15928 0.51198 +0.62378 0.15733 0.51181 +0.69702 0.15540 0.51151 +0.76839 0.15354 0.51109 +0.83689 0.15178 0.51056 +0.90151 0.15015 0.50996 +0.96121 0.14868 0.50930 +1.00000 0.14740 0.50862 +0.00000 0.22984 0.51060 +0.02203 0.22924 0.51137 +0.07412 0.22843 0.51195 +0.13197 0.22743 0.51236 +0.19483 0.22625 0.51259 +0.26189 0.22490 0.51266 +0.33236 0.22341 0.51259 +0.40542 0.22182 0.51237 +0.48028 0.22018 0.51195 +0.55600 0.21854 0.51134 +0.63163 0.21692 0.51056 +0.70619 0.21535 0.50964 +0.77867 0.21386 0.50860 +0.84805 0.21247 0.50748 +0.91332 0.21122 0.50630 +0.97343 0.21015 0.50509 +1.00000 0.20927 0.50389 +0.00000 0.29280 0.51149 +0.01762 0.29233 0.51205 +0.07072 0.29164 0.51240 +0.12970 0.29076 0.51254 +0.19386 0.28972 0.51245 +0.26244 0.28857 0.51208 +0.33455 0.28734 0.51146 +0.40927 0.28605 0.51062 +0.48567 0.28473 0.50957 +0.56277 0.28340 0.50835 +0.63958 0.28210 0.50698 +0.71511 0.28084 0.50549 +0.78834 0.27967 0.50390 +0.85824 0.27862 0.50226 +0.92379 0.27770 0.50058 +0.98395 0.27695 0.49891 +1.00000 0.27640 0.49726 +0.00000 0.35995 0.51135 +0.01309 0.35966 0.51155 +0.06758 0.35918 0.51142 +0.12819 0.35854 0.51099 +0.19405 0.35776 0.51026 +0.26427 0.35687 0.50928 +0.33790 0.35590 0.50805 +0.41401 0.35486 0.50662 +0.49162 0.35379 0.50501 +0.56974 0.35271 0.50325 +0.64737 0.35165 0.50136 +0.72349 0.35065 0.49938 +0.79708 0.34972 0.49734 +0.86710 0.34891 0.49526 +0.93254 0.34823 0.49319 +0.99236 0.34772 0.49116 +1.00000 0.34741 0.48919 +0.00000 0.43074 0.50940 +0.01038 0.43065 0.50898 +0.06645 0.43037 0.50825 +0.12860 0.42992 0.50721 +0.19593 0.42933 0.50591 +0.26750 0.42861 0.50437 +0.34235 0.42781 0.50262 +0.41950 0.42693 0.50068 +0.49796 0.42602 0.49859 +0.57672 0.42509 0.49637 +0.65475 0.42419 0.49407 +0.73104 0.42333 0.49170 +0.80456 0.42254 0.48931 +0.87428 0.42186 0.48693 +0.93918 0.42131 0.48459 +0.99827 0.42092 0.48232 +1.00000 0.42073 0.48016 +0.00000 0.50405 0.50533 +0.01004 0.50407 0.50435 +0.06749 0.50389 0.50307 +0.13095 0.50352 0.50152 +0.19946 0.50300 0.49972 +0.27206 0.50235 0.49771 +0.34777 0.50160 0.49552 +0.42558 0.50078 0.49317 +0.50448 0.49991 0.49071 +0.58344 0.49902 0.48816 +0.66144 0.49814 0.48556 +0.73745 0.49729 0.48294 +0.81045 0.49652 0.48033 +0.87941 0.49584 0.47778 +0.94335 0.49528 0.47531 +1.00000 0.49488 0.47295 +1.00000 0.49466 0.47075 +0.00000 0.57840 0.49943 +0.01216 0.57841 0.49797 +0.07074 0.57820 0.49624 +0.13520 0.57779 0.49426 +0.20457 0.57722 0.49207 +0.27784 0.57651 0.48971 +0.35401 0.57569 0.48719 +0.43206 0.57478 0.48457 +0.51095 0.57381 0.48186 +0.58965 0.57282 0.47911 +0.66714 0.57183 0.47636 +0.74239 0.57086 0.47362 +0.81439 0.56996 0.47095 +0.88214 0.56914 0.46837 +0.94466 0.56843 0.46593 +1.00000 0.56788 0.46363 +1.00000 0.56755 0.46151 +0.00000 0.65220 0.49210 +0.01672 0.65205 0.49026 +0.07614 0.65167 0.48818 +0.14128 0.65108 0.48590 +0.21113 0.65032 0.48345 +0.28467 0.64940 0.48085 +0.36087 0.64836 0.47816 +0.43869 0.64723 0.47539 +0.51709 0.64602 0.47259 +0.59505 0.64478 0.46979 +0.67153 0.64354 0.46703 +0.74554 0.64231 0.46434 +0.81634 0.64119 0.46175 +0.88312 0.64023 0.45925 +0.94503 0.63943 0.45690 +1.00000 0.63882 0.45469 +1.00000 0.63842 0.45266 +0.00000 0.72375 0.48378 +0.02366 0.72330 0.48169 +0.08359 0.72260 0.47940 +0.14905 0.72169 0.47695 +0.21897 0.72058 0.47437 +0.29234 0.71931 0.47170 +0.36810 0.71791 0.46897 +0.44520 0.71641 0.46622 +0.52266 0.71485 0.46348 +0.59967 0.71336 0.46076 +0.67531 0.71195 0.45809 +0.74871 0.71066 0.45549 +0.81898 0.70949 0.45299 +0.88527 0.70847 0.45060 +0.94674 0.70762 0.44835 +1.00000 0.70696 0.44627 +1.00000 0.70650 0.44437 +0.00000 0.79134 0.47500 +0.03283 0.79044 0.47280 +0.09292 0.78929 0.47045 +0.15828 0.78790 0.46798 +0.22784 0.78632 0.46543 +0.30063 0.78464 0.46283 +0.37571 0.78297 0.46018 +0.45214 0.78132 0.45752 +0.52901 0.77972 0.45487 +0.60541 0.77819 0.45225 +0.68044 0.77675 0.44969 +0.75323 0.77542 0.44721 +0.82293 0.77422 0.44483 +0.88868 0.77317 0.44258 +0.94967 0.77228 0.44047 +1.00000 0.77159 0.43853 +1.00000 0.77109 0.43678 +0.00000 0.85331 0.46633 +0.04402 0.85185 0.46418 +0.10390 0.85026 0.46189 +0.16887 0.84861 0.45951 +0.23796 0.84693 0.45705 +0.31022 0.84523 0.45453 +0.38470 0.84353 0.45198 +0.46049 0.84187 0.44943 +0.53669 0.84026 0.44690 +0.61239 0.83872 0.44442 +0.68675 0.83727 0.44199 +0.75888 0.83594 0.43966 +0.82796 0.83474 0.43743 +0.89315 0.83369 0.43533 +0.95363 0.83280 0.43339 +1.00000 0.83210 0.43161 +1.00000 0.83160 0.43003 +0.00342 0.90890 0.45825 +0.05697 0.90738 0.45617 +0.11647 0.90578 0.45398 +0.18096 0.90413 0.45170 +0.24947 0.90245 0.44934 +0.32108 0.90076 0.44695 +0.39487 0.89909 0.44453 +0.46992 0.89745 0.44212 +0.54537 0.89587 0.43974 +0.62033 0.89437 0.43741 +0.69394 0.89296 0.43514 +0.76537 0.89166 0.43297 +0.83379 0.89050 0.43092 +0.89837 0.88949 0.42900 +0.95831 0.88865 0.42723 +1.00000 0.88799 0.42564 +1.00000 0.88753 0.42425 +0.01813 0.95861 0.45090 +0.07128 0.95712 0.44893 +0.13026 0.95557 0.44686 +0.19413 0.95397 0.44470 +0.26195 0.95234 0.44249 +0.33281 0.95072 0.44024 +0.40580 0.94912 0.43798 +0.48004 0.94755 0.43573 +0.55466 0.94605 0.43352 +0.62881 0.94463 0.43135 +0.70164 0.94330 0.42927 +0.77232 0.94210 0.42728 +0.84004 0.94102 0.42541 +0.90399 0.94010 0.42368 +0.96336 0.93934 0.42211 +1.00000 0.93876 0.42071 +1.00000 0.93839 0.41951 +0.03385 1.00000 0.44443 +0.08644 1.00000 0.44260 +0.14476 0.99913 0.44067 +0.20789 0.99764 0.43867 +0.27490 0.99613 0.43661 +0.34490 0.99462 0.43453 +0.41700 0.99314 0.43245 +0.49035 0.99171 0.43038 +0.56408 0.99033 0.42835 +0.63737 0.98905 0.42638 +0.70937 0.98786 0.42448 +0.77927 0.98678 0.42269 +0.84627 0.98584 0.42102 +0.90955 0.98505 0.41948 +0.96833 0.98442 0.41810 +1.00000 0.98398 0.41691 +1.00000 0.98372 0.41591 +0.00000 0.02674 0.56913 +0.03613 0.02637 0.56984 +0.08516 0.02577 0.57053 +0.13933 0.02495 0.57122 +0.19793 0.02394 0.57189 +0.26025 0.02274 0.57256 +0.32556 0.02137 0.57324 +0.39312 0.01984 0.57391 +0.46219 0.01819 0.57459 +0.53198 0.01641 0.57529 +0.60172 0.01454 0.57600 +0.67058 0.01259 0.57675 +0.73774 0.01058 0.57753 +0.80232 0.00854 0.57837 +0.86344 0.00649 0.57926 +0.92018 0.00445 0.58023 +0.97159 0.00244 0.58129 +0.00000 0.06961 0.57196 +0.03292 0.06903 0.57300 +0.08252 0.06824 0.57399 +0.13744 0.06723 0.57491 +0.19696 0.06603 0.57577 +0.26036 0.06465 0.57658 +0.32689 0.06311 0.57734 +0.39579 0.06142 0.57807 +0.46630 0.05961 0.57876 +0.53761 0.05769 0.57942 +0.60891 0.05569 0.58008 +0.67935 0.05362 0.58072 +0.74805 0.05151 0.58138 +0.81412 0.04939 0.58206 +0.87664 0.04727 0.58277 +0.93465 0.04518 0.58353 +0.98718 0.04314 0.58436 +0.00000 0.11778 0.57527 +0.02943 0.11710 0.57649 +0.07978 0.11621 0.57760 +0.13561 0.11511 0.57860 +0.19620 0.11382 0.57950 +0.26081 0.11236 0.58031 +0.32866 0.11074 0.58103 +0.39899 0.10899 0.58167 +0.47098 0.10713 0.58225 +0.54382 0.10517 0.58277 +0.61666 0.10313 0.58325 +0.68860 0.10105 0.58370 +0.75876 0.09894 0.58414 +0.82619 0.09683 0.58457 +0.88994 0.09480 0.58493 +0.94899 0.09293 0.58521 +1.00000 0.09125 0.58543 +0.00000 0.17113 0.57860 +0.02565 0.17044 0.57984 +0.07687 0.16953 0.58094 +0.13374 0.16843 0.58188 +0.19549 0.16714 0.58269 +0.26138 0.16569 0.58338 +0.33061 0.16409 0.58394 +0.40238 0.16237 0.58440 +0.47586 0.16054 0.58477 +0.55018 0.15862 0.58506 +0.62448 0.15665 0.58526 +0.69786 0.15472 0.58530 +0.76936 0.15287 0.58519 +0.83796 0.15111 0.58497 +0.90266 0.14950 0.58464 +0.96242 0.14804 0.58424 +1.00000 0.14678 0.58379 +0.00000 0.22945 0.58151 +0.02155 0.22883 0.58266 +0.07374 0.22800 0.58362 +0.13170 0.22697 0.58440 +0.19468 0.22576 0.58502 +0.26188 0.22438 0.58549 +0.33248 0.22287 0.58581 +0.40572 0.22126 0.58595 +0.48074 0.21963 0.58585 +0.55662 0.21798 0.58555 +0.63238 0.21636 0.58506 +0.70705 0.21480 0.58441 +0.77962 0.21331 0.58362 +0.84907 0.21194 0.58273 +0.91439 0.21070 0.58175 +0.97452 0.20964 0.58072 +1.00000 0.20878 0.57967 +0.00000 0.29245 0.58368 +0.01713 0.29196 0.58463 +0.07033 0.29125 0.58537 +0.12943 0.29034 0.58590 +0.19377 0.28929 0.58615 +0.26253 0.28814 0.58610 +0.33481 0.28690 0.58579 +0.40968 0.28560 0.58523 +0.48622 0.28428 0.58444 +0.56343 0.28295 0.58346 +0.64035 0.28165 0.58230 +0.71595 0.28040 0.58100 +0.78924 0.27924 0.57959 +0.85917 0.27819 0.57809 +0.92473 0.27729 0.57653 +0.98487 0.27655 0.57495 +1.00000 0.27603 0.57337 +0.00000 0.35966 0.58483 +0.01270 0.35935 0.58537 +0.06736 0.35886 0.58556 +0.12813 0.35821 0.58541 +0.19415 0.35742 0.58496 +0.26452 0.35652 0.58423 +0.33829 0.35554 0.58324 +0.41452 0.35450 0.58202 +0.49223 0.35342 0.58059 +0.57044 0.35234 0.57899 +0.64813 0.35129 0.57723 +0.72428 0.35029 0.57536 +0.79788 0.34937 0.57340 +0.86790 0.34857 0.57138 +0.93330 0.34790 0.56934 +0.99306 0.34741 0.56731 +1.00000 0.34711 0.56531 +0.00000 0.43052 0.58393 +0.01023 0.43041 0.58378 +0.06645 0.43012 0.58329 +0.12875 0.42965 0.58248 +0.19621 0.42905 0.58138 +0.26790 0.42832 0.58001 +0.34285 0.42750 0.57841 +0.42009 0.42662 0.57660 +0.49861 0.42571 0.57460 +0.57741 0.42478 0.57246 +0.65546 0.42387 0.57020 +0.73174 0.42302 0.56786 +0.80523 0.42224 0.56546 +0.87489 0.42156 0.56304 +0.93972 0.42102 0.56063 +0.99871 0.42065 0.55827 +1.00000 0.42047 0.55599 +0.00000 0.50386 0.58067 +0.01015 0.50386 0.57988 +0.06772 0.50366 0.57876 +0.13129 0.50328 0.57735 +0.19991 0.50274 0.57567 +0.27260 0.50208 0.57375 +0.34837 0.50132 0.57163 +0.42622 0.50049 0.56932 +0.50514 0.49961 0.56686 +0.58410 0.49871 0.56430 +0.66207 0.49783 0.56165 +0.73802 0.49699 0.55895 +0.81094 0.49621 0.55624 +0.87981 0.49554 0.55355 +0.94362 0.49499 0.55091 +1.00000 0.49460 0.54836 +1.00000 0.49439 0.54594 +0.00000 0.57821 0.57532 +0.01250 0.57819 0.57396 +0.07118 0.57796 0.57231 +0.13573 0.57753 0.57039 +0.20517 0.57694 0.56822 +0.27849 0.57621 0.56586 +0.35468 0.57537 0.56331 +0.43272 0.57445 0.56063 +0.51158 0.57348 0.55784 +0.59024 0.57248 0.55497 +0.66765 0.57148 0.55207 +0.74279 0.57051 0.54916 +0.81466 0.56961 0.54629 +0.88226 0.56879 0.54347 +0.94463 0.56809 0.54076 +1.00000 0.56756 0.53819 +1.00000 0.56725 0.53579 +0.00000 0.65196 0.56823 +0.01730 0.65178 0.56641 +0.07679 0.65137 0.56433 +0.14198 0.65076 0.56200 +0.21186 0.64997 0.55948 +0.28540 0.64903 0.55679 +0.36157 0.64797 0.55397 +0.43934 0.64682 0.55104 +0.51767 0.64561 0.54806 +0.59552 0.64436 0.54505 +0.67187 0.64310 0.54204 +0.74578 0.64188 0.53908 +0.81653 0.64079 0.53620 +0.88326 0.63984 0.53344 +0.94513 0.63907 0.53080 +1.00000 0.63848 0.52832 +1.00000 0.63810 0.52602 +0.00000 0.72340 0.55986 +0.02445 0.72292 0.55769 +0.08442 0.72219 0.55530 +0.14988 0.72125 0.55271 +0.21979 0.72012 0.54996 +0.29312 0.71882 0.54709 +0.36880 0.71740 0.54414 +0.44581 0.71588 0.54113 +0.52320 0.71434 0.53811 +0.60015 0.71287 0.53512 +0.67574 0.71148 0.53217 +0.74908 0.71021 0.52930 +0.81929 0.70907 0.52652 +0.88553 0.70807 0.52387 +0.94695 0.70724 0.52136 +1.00000 0.70660 0.51901 +1.00000 0.70616 0.51686 +0.00000 0.79084 0.55070 +0.03381 0.78991 0.54833 +0.09390 0.78872 0.54577 +0.15922 0.78730 0.54306 +0.22873 0.78570 0.54024 +0.30147 0.78404 0.53736 +0.37650 0.78239 0.53444 +0.45287 0.78077 0.53150 +0.52967 0.77919 0.52858 +0.60600 0.77769 0.52569 +0.68097 0.77627 0.52286 +0.75370 0.77496 0.52012 +0.82333 0.77378 0.51748 +0.88904 0.77276 0.51498 +0.94997 0.77189 0.51263 +1.00000 0.77122 0.51045 +1.00000 0.77074 0.50847 +0.00000 0.85262 0.54131 +0.04516 0.85115 0.53889 +0.10501 0.84959 0.53633 +0.16994 0.84796 0.53366 +0.23898 0.84630 0.53093 +0.31117 0.84462 0.52814 +0.38559 0.84295 0.52532 +0.46131 0.84131 0.52251 +0.53743 0.83973 0.51972 +0.61307 0.83821 0.51698 +0.68735 0.83679 0.51430 +0.75942 0.83548 0.51173 +0.82843 0.83431 0.50927 +0.89356 0.83328 0.50695 +0.95398 0.83242 0.50479 +1.00000 0.83174 0.50281 +1.00000 0.83126 0.50103 +0.00471 0.90817 0.53230 +0.05823 0.90668 0.52995 +0.11769 0.90511 0.52749 +0.18212 0.90348 0.52494 +0.25057 0.90183 0.52232 +0.32211 0.90017 0.51967 +0.39582 0.89852 0.51700 +0.47080 0.89691 0.51435 +0.54616 0.89535 0.51172 +0.62104 0.89387 0.50916 +0.69458 0.89249 0.50668 +0.76594 0.89122 0.50430 +0.83428 0.89008 0.50204 +0.89880 0.88910 0.49993 +0.95869 0.88828 0.49799 +1.00000 0.88764 0.49623 +1.00000 0.88719 0.49469 +0.01951 0.95790 0.52404 +0.07261 0.95644 0.52181 +0.13153 0.95491 0.51948 +0.19533 0.95334 0.51708 +0.26308 0.95174 0.51462 +0.33385 0.95014 0.51214 +0.40676 0.94857 0.50965 +0.48091 0.94703 0.50719 +0.55545 0.94556 0.50476 +0.62951 0.94416 0.50241 +0.70226 0.94286 0.50014 +0.77286 0.94168 0.49798 +0.84051 0.94063 0.49595 +0.90439 0.93973 0.49407 +0.96371 0.93900 0.49236 +1.00000 0.93844 0.49085 +1.00000 0.93808 0.48955 +0.03524 1.00000 0.51672 +0.08777 0.99994 0.51464 +0.14602 0.99851 0.51248 +0.20906 0.99705 0.51026 +0.27599 0.99556 0.50799 +0.34590 0.99409 0.50571 +0.41791 0.99264 0.50343 +0.49116 0.99123 0.50118 +0.56480 0.98989 0.49898 +0.63800 0.98863 0.49686 +0.70991 0.98746 0.49482 +0.77974 0.98641 0.49290 +0.84666 0.98550 0.49112 +0.90988 0.98473 0.48949 +0.96859 0.98413 0.48804 +1.00000 0.98370 0.48679 +1.00000 0.98346 0.48575 +0.00000 0.02645 0.63564 +0.03562 0.02605 0.63651 +0.08470 0.02541 0.63740 +0.13894 0.02456 0.63830 +0.19762 0.02351 0.63921 +0.26004 0.02227 0.64014 +0.32547 0.02086 0.64108 +0.39316 0.01930 0.64204 +0.46237 0.01760 0.64302 +0.53231 0.01579 0.64404 +0.60220 0.01388 0.64508 +0.67123 0.01189 0.64617 +0.73854 0.00984 0.64731 +0.80328 0.00776 0.64850 +0.86454 0.00567 0.64977 +0.92141 0.00359 0.65111 +0.97295 0.00156 0.65255 +0.00000 0.06925 0.63912 +0.03243 0.06864 0.64041 +0.08210 0.06781 0.64165 +0.13711 0.06677 0.64285 +0.19673 0.06554 0.64401 +0.26024 0.06412 0.64513 +0.32690 0.06255 0.64622 +0.39595 0.06082 0.64728 +0.46660 0.05898 0.64831 +0.53807 0.05702 0.64933 +0.60952 0.05499 0.65035 +0.68011 0.05288 0.65137 +0.74896 0.05074 0.65240 +0.81518 0.04858 0.65346 +0.87783 0.04643 0.65456 +0.93596 0.04431 0.65571 +0.98859 0.04225 0.65692 +0.00000 0.11738 0.64333 +0.02896 0.11668 0.64485 +0.07939 0.11575 0.64627 +0.13532 0.11462 0.64760 +0.19602 0.11330 0.64884 +0.26075 0.11180 0.64999 +0.32874 0.11016 0.65107 +0.39922 0.10838 0.65208 +0.47136 0.10648 0.65304 +0.54435 0.10449 0.65394 +0.61734 0.10242 0.65480 +0.68943 0.10031 0.65563 +0.75972 0.09817 0.65645 +0.82728 0.09604 0.65725 +0.89114 0.09403 0.65794 +0.95028 0.09217 0.65853 +1.00000 0.09049 0.65904 +0.00000 0.17072 0.64771 +0.02518 0.17001 0.64930 +0.07649 0.16908 0.65075 +0.13347 0.16794 0.65206 +0.19534 0.16663 0.65324 +0.26136 0.16515 0.65430 +0.33073 0.16352 0.65524 +0.40265 0.16176 0.65609 +0.47627 0.15990 0.65684 +0.55074 0.15795 0.65752 +0.62519 0.15598 0.65807 +0.69872 0.15405 0.65843 +0.77034 0.15221 0.65862 +0.83904 0.15046 0.65867 +0.90382 0.14885 0.65860 +0.96363 0.14741 0.65844 +1.00000 0.14617 0.65821 +0.00000 0.22907 0.65182 +0.02107 0.22842 0.65334 +0.07336 0.22756 0.65468 +0.13144 0.22650 0.65585 +0.19454 0.22527 0.65685 +0.26187 0.22387 0.65770 +0.33262 0.22233 0.65840 +0.40603 0.22072 0.65887 +0.48122 0.21907 0.65909 +0.55724 0.21743 0.65908 +0.63314 0.21582 0.65886 +0.70792 0.21425 0.65846 +0.78058 0.21278 0.65790 +0.85010 0.21141 0.65721 +0.91545 0.21019 0.65641 +0.97561 0.20914 0.65554 +1.00000 0.20830 0.65462 +0.00000 0.29211 0.65526 +0.01664 0.29159 0.65660 +0.06995 0.29085 0.65773 +0.12920 0.28993 0.65862 +0.19371 0.28887 0.65919 +0.26264 0.28770 0.65945 +0.33508 0.28646 0.65942 +0.41011 0.28516 0.65912 +0.48678 0.28383 0.65858 +0.56411 0.28251 0.65781 +0.64112 0.28121 0.65685 +0.71680 0.27997 0.65573 +0.79014 0.27881 0.65446 +0.86010 0.27778 0.65309 +0.92565 0.27689 0.65163 +0.98578 0.27617 0.65012 +1.00000 0.27566 0.64858 +0.00000 0.35937 0.65767 +0.01234 0.35905 0.65852 +0.06716 0.35855 0.65901 +0.12810 0.35788 0.65914 +0.19428 0.35708 0.65895 +0.26479 0.35618 0.65845 +0.33870 0.35519 0.65767 +0.41505 0.35414 0.65664 +0.49286 0.35306 0.65537 +0.57114 0.35198 0.65391 +0.64889 0.35093 0.65227 +0.72508 0.34994 0.65049 +0.79868 0.34903 0.64859 +0.86868 0.34823 0.64661 +0.93404 0.34758 0.64457 +0.99375 0.34711 0.64252 +1.00000 0.34683 0.64048 +0.00000 0.43029 0.65775 +0.01012 0.43018 0.65785 +0.06648 0.42986 0.65759 +0.12892 0.42939 0.65698 +0.19651 0.42877 0.65606 +0.26832 0.42803 0.65485 +0.34337 0.42721 0.65338 +0.42069 0.42632 0.65167 +0.49927 0.42540 0.64975 +0.57811 0.42447 0.64767 +0.65617 0.42357 0.64543 +0.73244 0.42271 0.64309 +0.80589 0.42194 0.64066 +0.87550 0.42127 0.63818 +0.94024 0.42075 0.63569 +0.99912 0.42038 0.63321 +1.00000 0.42022 0.63078 +0.00000 0.50367 0.65524 +0.01028 0.50366 0.65462 +0.06798 0.50343 0.65365 +0.13166 0.50304 0.65236 +0.20038 0.50249 0.65078 +0.27315 0.50181 0.64893 +0.34898 0.50104 0.64684 +0.42687 0.50020 0.64455 +0.50581 0.49931 0.64208 +0.58476 0.49841 0.63948 +0.66269 0.49753 0.63676 +0.73859 0.49669 0.63397 +0.81142 0.49592 0.63113 +0.88018 0.49525 0.62829 +0.94387 0.49471 0.62547 +1.00000 0.49433 0.62270 +1.00000 0.49413 0.62003 +0.00000 0.57802 0.65036 +0.01288 0.57798 0.64909 +0.07166 0.57772 0.64750 +0.13629 0.57727 0.64561 +0.20578 0.57666 0.64345 +0.27915 0.57592 0.64107 +0.35536 0.57507 0.63847 +0.43339 0.57413 0.63571 +0.51222 0.57315 0.63281 +0.59082 0.57214 0.62981 +0.66814 0.57114 0.62675 +0.74318 0.57017 0.62364 +0.81492 0.56926 0.62054 +0.88236 0.56845 0.61748 +0.94462 0.56776 0.61449 +1.00000 0.56726 0.61164 +1.00000 0.56697 0.60897 +0.00000 0.65171 0.64346 +0.01791 0.65150 0.64164 +0.07746 0.65107 0.63952 +0.14270 0.65043 0.63714 +0.21260 0.64962 0.63453 +0.28614 0.64866 0.63172 +0.36229 0.64759 0.62875 +0.44000 0.64642 0.62565 +0.51825 0.64519 0.62246 +0.59599 0.64393 0.61921 +0.67220 0.64267 0.61594 +0.74604 0.64147 0.61271 +0.81674 0.64039 0.60956 +0.88343 0.63947 0.60651 +0.94525 0.63872 0.60361 +1.00000 0.63816 0.60086 +1.00000 0.63780 0.59830 +0.00000 0.72305 0.63496 +0.02527 0.72254 0.63270 +0.08527 0.72178 0.63018 +0.15074 0.72081 0.62743 +0.22063 0.71965 0.62450 +0.29390 0.71833 0.62141 +0.36951 0.71689 0.61821 +0.44642 0.71535 0.61493 +0.52377 0.71384 0.61164 +0.60065 0.71239 0.60837 +0.67618 0.71103 0.60515 +0.74946 0.70978 0.60201 +0.81962 0.70866 0.59897 +0.88581 0.70768 0.59605 +0.94718 0.70688 0.59328 +1.00000 0.70626 0.59069 +1.00000 0.70584 0.58828 +0.00000 0.79034 0.62536 +0.03482 0.78937 0.62279 +0.09490 0.78815 0.62000 +0.16018 0.78670 0.61704 +0.22964 0.78509 0.61394 +0.30233 0.78346 0.61079 +0.37730 0.78183 0.60759 +0.45362 0.78023 0.60438 +0.53035 0.77868 0.60119 +0.60662 0.77720 0.59804 +0.68151 0.77580 0.59495 +0.75418 0.77452 0.59195 +0.82375 0.77337 0.58907 +0.88940 0.77236 0.58632 +0.95029 0.77152 0.58373 +1.00000 0.77086 0.58133 +1.00000 0.77041 0.57913 +0.00000 0.85192 0.61519 +0.04633 0.85047 0.61249 +0.10614 0.84893 0.60965 +0.17103 0.84733 0.60672 +0.24001 0.84569 0.60371 +0.31214 0.84403 0.60065 +0.38650 0.84239 0.59758 +0.46215 0.84077 0.59450 +0.53820 0.83921 0.59146 +0.61376 0.83772 0.58847 +0.68797 0.83633 0.58556 +0.75997 0.83504 0.58275 +0.82891 0.83389 0.58006 +0.89398 0.83288 0.57753 +0.95435 0.83204 0.57516 +1.00000 0.83138 0.57299 +1.00000 0.83092 0.57103 +0.00603 0.90747 0.60526 +0.05951 0.90600 0.60264 +0.11892 0.90445 0.59991 +0.18329 0.90285 0.59709 +0.25168 0.90122 0.59422 +0.32315 0.89958 0.59132 +0.39678 0.89796 0.58841 +0.47168 0.89638 0.58551 +0.54696 0.89485 0.58266 +0.62176 0.89340 0.57988 +0.69522 0.89204 0.57718 +0.76651 0.89079 0.57460 +0.83479 0.88968 0.57215 +0.89924 0.88872 0.56986 +0.95907 0.88792 0.56775 +1.00000 0.88730 0.56585 +1.00000 0.88688 0.56416 +0.02090 0.95721 0.59610 +0.07394 0.95577 0.59362 +0.13281 0.95427 0.59104 +0.19654 0.95272 0.58839 +0.26421 0.95116 0.58570 +0.33490 0.94959 0.58299 +0.40772 0.94804 0.58029 +0.48179 0.94653 0.57761 +0.55623 0.94508 0.57499 +0.63021 0.94371 0.57245 +0.70288 0.94244 0.57001 +0.77341 0.94128 0.56769 +0.84099 0.94026 0.56551 +0.90480 0.93938 0.56350 +0.96405 0.93867 0.56167 +1.00000 0.93813 0.56006 +1.00000 0.93779 0.55867 +0.03665 1.00000 0.58795 +0.08911 0.99931 0.58564 +0.14728 0.99791 0.58326 +0.21024 0.99647 0.58081 +0.27708 0.99502 0.57834 +0.34689 0.99357 0.57587 +0.41881 0.99215 0.57341 +0.49197 0.99077 0.57099 +0.56552 0.98946 0.56863 +0.63862 0.98822 0.56636 +0.71045 0.98708 0.56420 +0.78020 0.98606 0.56217 +0.84705 0.98517 0.56029 +0.91020 0.98442 0.55858 +0.96885 0.98384 0.55707 +1.00000 0.98343 0.55577 +1.00000 0.98322 0.55471 +0.00000 0.02616 0.70060 +0.03513 0.02573 0.70166 +0.08426 0.02506 0.70275 +0.13856 0.02417 0.70388 +0.19734 0.02308 0.70503 +0.25986 0.02180 0.70622 +0.32540 0.02036 0.70744 +0.39322 0.01876 0.70870 +0.46257 0.01702 0.70999 +0.53267 0.01516 0.71132 +0.60272 0.01321 0.71270 +0.67190 0.01118 0.71413 +0.73937 0.00910 0.71562 +0.80426 0.00698 0.71717 +0.86567 0.00485 0.71880 +0.92268 0.00274 0.72051 +0.97433 0.00067 0.72232 +0.00000 0.06889 0.70479 +0.03196 0.06826 0.70633 +0.08170 0.06739 0.70784 +0.13679 0.06632 0.70932 +0.19652 0.06505 0.71078 +0.26014 0.06360 0.71221 +0.32693 0.06199 0.71362 +0.39612 0.06023 0.71502 +0.46693 0.05835 0.71640 +0.53855 0.05636 0.71777 +0.61015 0.05428 0.71915 +0.68090 0.05215 0.72054 +0.74990 0.04997 0.72194 +0.81626 0.04778 0.72337 +0.87904 0.04559 0.72485 +0.93729 0.04344 0.72638 +0.99001 0.04137 0.72795 +0.00000 0.11699 0.70990 +0.02849 0.11625 0.71173 +0.07901 0.11530 0.71347 +0.13504 0.11413 0.71513 +0.19586 0.11278 0.71671 +0.26071 0.11126 0.71821 +0.32884 0.10958 0.71965 +0.39946 0.10776 0.72102 +0.47176 0.10583 0.72234 +0.54490 0.10381 0.72361 +0.61803 0.10171 0.72485 +0.69027 0.09957 0.72606 +0.76070 0.09740 0.72726 +0.82839 0.09527 0.72840 +0.89236 0.09326 0.72939 +0.95158 0.09142 0.73026 +1.00000 0.08976 0.73103 +0.00000 0.17032 0.71537 +0.02472 0.16958 0.71730 +0.07613 0.16862 0.71910 +0.13321 0.16746 0.72077 +0.19521 0.16611 0.72231 +0.26136 0.16460 0.72374 +0.33087 0.16294 0.72506 +0.40293 0.16116 0.72628 +0.47669 0.15927 0.72741 +0.55131 0.15730 0.72846 +0.62592 0.15533 0.72932 +0.69959 0.15340 0.72998 +0.77133 0.15156 0.73045 +0.84013 0.14983 0.73076 +0.90498 0.14823 0.73092 +0.96485 0.14681 0.73097 +1.00000 0.14558 0.73093 +0.00000 0.22869 0.72066 +0.02061 0.22802 0.72255 +0.07300 0.22713 0.72426 +0.13119 0.22604 0.72580 +0.19442 0.22478 0.72718 +0.26188 0.22335 0.72841 +0.33278 0.22179 0.72947 +0.40637 0.22018 0.73024 +0.48172 0.21854 0.73075 +0.55789 0.21690 0.73101 +0.63392 0.21528 0.73104 +0.70880 0.21373 0.73086 +0.78155 0.21226 0.73051 +0.85113 0.21091 0.73000 +0.91652 0.20970 0.72936 +0.97669 0.20867 0.72863 +1.00000 0.20785 0.72782 +0.00000 0.29177 0.72535 +0.01617 0.29122 0.72707 +0.06958 0.29046 0.72857 +0.12899 0.28952 0.72980 +0.19369 0.28845 0.73067 +0.26279 0.28728 0.73121 +0.33539 0.28603 0.73144 +0.41057 0.28473 0.73138 +0.48736 0.28340 0.73106 +0.56481 0.28208 0.73049 +0.64191 0.28078 0.72970 +0.71766 0.27955 0.72873 +0.79104 0.27841 0.72759 +0.86102 0.27738 0.72631 +0.92658 0.27651 0.72493 +0.98668 0.27581 0.72347 +1.00000 0.27532 0.72196 +0.00000 0.35909 0.72896 +0.01202 0.35876 0.73010 +0.06701 0.35824 0.73086 +0.12811 0.35756 0.73125 +0.19444 0.35676 0.73129 +0.26509 0.35584 0.73101 +0.33913 0.35485 0.73041 +0.41560 0.35379 0.72954 +0.49350 0.35272 0.72842 +0.57186 0.35164 0.72707 +0.64966 0.35059 0.72553 +0.72588 0.34961 0.72381 +0.79949 0.34870 0.72195 +0.86947 0.34792 0.71999 +0.93478 0.34728 0.71794 +0.99443 0.34682 0.71585 +1.00000 0.34657 0.71374 +0.00000 0.43008 0.72995 +0.01004 0.42995 0.73027 +0.06655 0.42962 0.73021 +0.12913 0.42913 0.72979 +0.19685 0.42850 0.72902 +0.26877 0.42775 0.72794 +0.34392 0.42692 0.72658 +0.42131 0.42603 0.72495 +0.49995 0.42511 0.72310 +0.57882 0.42418 0.72104 +0.65689 0.42328 0.71881 +0.73314 0.42243 0.71644 +0.80655 0.42166 0.71396 +0.87609 0.42100 0.71141 +0.94075 0.42049 0.70881 +0.99953 0.42014 0.70620 +1.00000 0.41999 0.70361 +0.00000 0.50349 0.72810 +0.01046 0.50346 0.72763 +0.06828 0.50322 0.72679 +0.13207 0.50280 0.72560 +0.20088 0.50224 0.72409 +0.27372 0.50155 0.72228 +0.34962 0.50077 0.72022 +0.42754 0.49992 0.71792 +0.50649 0.49903 0.71542 +0.58542 0.49813 0.71276 +0.66332 0.49724 0.70995 +0.73915 0.49640 0.70704 +0.81189 0.49564 0.70406 +0.88054 0.49498 0.70105 +0.94410 0.49445 0.69803 +1.00000 0.49407 0.69503 +1.00000 0.49389 0.69210 +0.00000 0.57783 0.72362 +0.01330 0.57777 0.72242 +0.07217 0.57749 0.72087 +0.13687 0.57702 0.71899 +0.20643 0.57639 0.71682 +0.27983 0.57563 0.71439 +0.35605 0.57477 0.71172 +0.43408 0.57382 0.70887 +0.51287 0.57283 0.70584 +0.59140 0.57182 0.70269 +0.66864 0.57081 0.69944 +0.74357 0.56984 0.69612 +0.81517 0.56893 0.69278 +0.88245 0.56812 0.68945 +0.94464 0.56745 0.68619 +1.00000 0.56697 0.68307 +1.00000 0.56671 0.68013 +0.00000 0.65147 0.71684 +0.01856 0.65123 0.71499 +0.07817 0.65077 0.71282 +0.14345 0.65011 0.71036 +0.21337 0.64928 0.70764 +0.28690 0.64830 0.70469 +0.36302 0.64721 0.70156 +0.44067 0.64603 0.69827 +0.51883 0.64479 0.69486 +0.59646 0.64352 0.69136 +0.67255 0.64225 0.68781 +0.74633 0.64107 0.68431 +0.81698 0.64002 0.68089 +0.88361 0.63913 0.67758 +0.94539 0.63840 0.67442 +1.00000 0.63785 0.67141 +1.00000 0.63752 0.66859 +0.00000 0.72270 0.70815 +0.02613 0.72216 0.70576 +0.08616 0.72137 0.70310 +0.15162 0.72037 0.70018 +0.22149 0.71919 0.69704 +0.29471 0.71785 0.69372 +0.37024 0.71639 0.69026 +0.44707 0.71485 0.68670 +0.52436 0.71336 0.68314 +0.60118 0.71193 0.67961 +0.67665 0.71060 0.67613 +0.74987 0.70937 0.67272 +0.81998 0.70827 0.66943 +0.88611 0.70732 0.66625 +0.94743 0.70653 0.66324 +1.00000 0.70593 0.66040 +1.00000 0.70554 0.65776 +0.00000 0.78984 0.69803 +0.03586 0.78884 0.69525 +0.09592 0.78758 0.69222 +0.16117 0.78610 0.68898 +0.23058 0.78451 0.68562 +0.30322 0.78290 0.68219 +0.37813 0.78130 0.67873 +0.45439 0.77972 0.67526 +0.53106 0.77819 0.67181 +0.60725 0.77673 0.66840 +0.68208 0.77536 0.66506 +0.75468 0.77410 0.66182 +0.82420 0.77297 0.65869 +0.88979 0.77198 0.65572 +0.95063 0.77117 0.65290 +1.00000 0.77053 0.65028 +1.00000 0.77010 0.64788 +0.00000 0.85124 0.68704 +0.04752 0.84981 0.68406 +0.10730 0.84829 0.68096 +0.17214 0.84671 0.67776 +0.24107 0.84510 0.67449 +0.31314 0.84347 0.67118 +0.38742 0.84185 0.66785 +0.46300 0.84026 0.66452 +0.53898 0.83872 0.66124 +0.61447 0.83725 0.65801 +0.68860 0.83588 0.65487 +0.76053 0.83462 0.65184 +0.82941 0.83349 0.64894 +0.89442 0.83251 0.64620 +0.95474 0.83169 0.64364 +1.00000 0.83105 0.64129 +1.00000 0.83061 0.63916 +0.00736 0.90678 0.67621 +0.06081 0.90534 0.67333 +0.12017 0.90381 0.67034 +0.18449 0.90224 0.66727 +0.25281 0.90064 0.66415 +0.32420 0.89903 0.66101 +0.39776 0.89743 0.65786 +0.47258 0.89587 0.65474 +0.54778 0.89437 0.65167 +0.62250 0.89294 0.64868 +0.69588 0.89161 0.64579 +0.76709 0.89039 0.64301 +0.83530 0.88930 0.64039 +0.89969 0.88836 0.63793 +0.95947 0.88758 0.63567 +1.00000 0.88698 0.63362 +1.00000 0.88658 0.63181 +0.02230 0.95654 0.66619 +0.07530 0.95513 0.66346 +0.13410 0.95365 0.66064 +0.19776 0.95213 0.65776 +0.26535 0.95059 0.65485 +0.33596 0.94905 0.65192 +0.40869 0.94753 0.64901 +0.48267 0.94605 0.64615 +0.55703 0.94463 0.64334 +0.63092 0.94329 0.64062 +0.70351 0.94204 0.63802 +0.77396 0.94091 0.63555 +0.84147 0.93991 0.63324 +0.90522 0.93905 0.63111 +0.96441 0.93836 0.62918 +1.00000 0.93784 0.62747 +1.00000 0.93752 0.62602 +0.03806 1.00000 0.65723 +0.09045 0.99870 0.65471 +0.14855 0.99733 0.65211 +0.21143 0.99592 0.64947 +0.27817 0.99450 0.64681 +0.34790 0.99308 0.64415 +0.41972 0.99169 0.64152 +0.49278 0.99034 0.63894 +0.56624 0.98905 0.63645 +0.63925 0.98784 0.63405 +0.71100 0.98673 0.63177 +0.78066 0.98573 0.62964 +0.84743 0.98486 0.62768 +0.91052 0.98414 0.62591 +0.96910 0.98358 0.62434 +1.00000 0.98319 0.62302 +1.00000 0.98299 0.62194 +0.00000 0.02589 0.76321 +0.03466 0.02542 0.76447 +0.08384 0.02471 0.76577 +0.13822 0.02379 0.76713 +0.19708 0.02266 0.76854 +0.25970 0.02135 0.76999 +0.32537 0.01986 0.77149 +0.39332 0.01822 0.77304 +0.46281 0.01644 0.77464 +0.53306 0.01455 0.77629 +0.60327 0.01256 0.77799 +0.67261 0.01049 0.77976 +0.74023 0.00837 0.78159 +0.80528 0.00621 0.78350 +0.86683 0.00405 0.78548 +0.92397 0.00190 0.78755 +0.97574 0.00000 0.78973 +0.00000 0.06854 0.76813 +0.03151 0.06788 0.76993 +0.08132 0.06698 0.77171 +0.13650 0.06587 0.77348 +0.19633 0.06457 0.77524 +0.26007 0.06308 0.77698 +0.32699 0.06143 0.77871 +0.39632 0.05964 0.78044 +0.46728 0.05772 0.78216 +0.53905 0.05570 0.78388 +0.61082 0.05359 0.78561 +0.68171 0.05142 0.78735 +0.75087 0.04921 0.78911 +0.81737 0.04698 0.79091 +0.88028 0.04477 0.79275 +0.93864 0.04259 0.79464 +0.99145 0.04052 0.79654 +0.00000 0.11661 0.77417 +0.02805 0.11584 0.77630 +0.07865 0.11485 0.77835 +0.13479 0.11366 0.78034 +0.19572 0.11227 0.78225 +0.26070 0.11072 0.78410 +0.32897 0.10901 0.78588 +0.39973 0.10716 0.78761 +0.47218 0.10520 0.78929 +0.54547 0.10314 0.79092 +0.61876 0.10102 0.79252 +0.69114 0.09884 0.79410 +0.76170 0.09665 0.79566 +0.82952 0.09452 0.79709 +0.89359 0.09253 0.79836 +0.95289 0.09069 0.79948 +1.00000 0.08905 0.80049 +0.00000 0.16993 0.78069 +0.02428 0.16916 0.78297 +0.07578 0.16817 0.78511 +0.13297 0.16698 0.78713 +0.19510 0.16561 0.78903 +0.26138 0.16407 0.79082 +0.33103 0.16238 0.79250 +0.40323 0.16057 0.79409 +0.47714 0.15865 0.79558 +0.55191 0.15666 0.79697 +0.62668 0.15469 0.79812 +0.70048 0.15278 0.79904 +0.77234 0.15094 0.79976 +0.84124 0.14922 0.80030 +0.90616 0.14764 0.80067 +0.96607 0.14623 0.80091 +1.00000 0.14502 0.80103 +0.00000 0.22832 0.78715 +0.02017 0.22762 0.78940 +0.07266 0.22671 0.79147 +0.13096 0.22560 0.79338 +0.19431 0.22430 0.79512 +0.26190 0.22285 0.79671 +0.33298 0.22128 0.79808 +0.40674 0.21966 0.79914 +0.48225 0.21802 0.79991 +0.55857 0.21638 0.80040 +0.63472 0.21477 0.80065 +0.70971 0.21323 0.80068 +0.78253 0.21177 0.80050 +0.85217 0.21043 0.80015 +0.91760 0.20924 0.79965 +0.97778 0.20823 0.79902 +1.00000 0.20742 0.79830 +0.00000 0.29144 0.79306 +0.01572 0.29087 0.79514 +0.06924 0.29008 0.79700 +0.12883 0.28913 0.79851 +0.19370 0.28806 0.79966 +0.26297 0.28688 0.80046 +0.33573 0.28563 0.80092 +0.41105 0.28432 0.80108 +0.48798 0.28300 0.80094 +0.56553 0.28167 0.80055 +0.64272 0.28039 0.79991 +0.71854 0.27916 0.79906 +0.79196 0.27803 0.79802 +0.86196 0.27702 0.79682 +0.92751 0.27616 0.79549 +0.98759 0.27548 0.79406 +1.00000 0.27501 0.79255 +0.00000 0.35883 0.79777 +0.01175 0.35848 0.79919 +0.06689 0.35795 0.80020 +0.12815 0.35726 0.80081 +0.19464 0.35645 0.80106 +0.26543 0.35553 0.80096 +0.33960 0.35453 0.80053 +0.41618 0.35347 0.79980 +0.49418 0.35239 0.79879 +0.57260 0.35132 0.79754 +0.65045 0.35028 0.79606 +0.72669 0.34930 0.79438 +0.80030 0.34841 0.79255 +0.87025 0.34763 0.79057 +0.93553 0.34701 0.78849 +0.99510 0.34657 0.78634 +1.00000 0.34633 0.78414 +0.00000 0.42988 0.79958 +0.01002 0.42973 0.80011 +0.06667 0.42939 0.80022 +0.12938 0.42889 0.79995 +0.19723 0.42825 0.79932 +0.26925 0.42750 0.79835 +0.34450 0.42666 0.79707 +0.42196 0.42576 0.79550 +0.50065 0.42484 0.79368 +0.57955 0.42391 0.79163 +0.65762 0.42301 0.78939 +0.73385 0.42216 0.78697 +0.80722 0.42140 0.78443 +0.87669 0.42076 0.78178 +0.94125 0.42025 0.77905 +0.99992 0.41992 0.77629 +1.00000 0.41979 0.77352 +0.00000 0.50333 0.79831 +0.01068 0.50327 0.79797 +0.06862 0.50302 0.79723 +0.13251 0.50259 0.79611 +0.20141 0.50201 0.79465 +0.27434 0.50131 0.79287 +0.35028 0.50052 0.79081 +0.42824 0.49966 0.78849 +0.50719 0.49877 0.78594 +0.58610 0.49786 0.78319 +0.66396 0.49698 0.78028 +0.73972 0.49614 0.77724 +0.81237 0.49538 0.77410 +0.88090 0.49473 0.77089 +0.94432 0.49421 0.76766 +1.00000 0.49385 0.76442 +1.00000 0.49368 0.76122 +0.00000 0.57766 0.79416 +0.01376 0.57757 0.79300 +0.07272 0.57727 0.79146 +0.13750 0.57679 0.78957 +0.20711 0.57614 0.78737 +0.28054 0.57537 0.78487 +0.35678 0.57449 0.78212 +0.43479 0.57353 0.77915 +0.51354 0.57253 0.77598 +0.59200 0.57151 0.77266 +0.66915 0.57050 0.76921 +0.74395 0.56953 0.76567 +0.81541 0.56863 0.76208 +0.88254 0.56782 0.75846 +0.94470 0.56718 0.75495 +1.00000 0.56672 0.75158 +1.00000 0.56647 0.74838 +0.00000 0.65123 0.78741 +0.01925 0.65098 0.78552 +0.07892 0.65049 0.78328 +0.14423 0.64981 0.78072 +0.21417 0.64896 0.77787 +0.28769 0.64796 0.77478 +0.36377 0.64685 0.77146 +0.44136 0.64566 0.76796 +0.51942 0.64440 0.76432 +0.59693 0.64312 0.76055 +0.67292 0.64186 0.75674 +0.74665 0.64071 0.75298 +0.81725 0.63968 0.74930 +0.88384 0.63881 0.74574 +0.94557 0.63810 0.74233 +1.00000 0.63758 0.73907 +1.00000 0.63726 0.73601 +0.00000 0.72237 0.77847 +0.02703 0.72179 0.77595 +0.08708 0.72097 0.77312 +0.15254 0.71995 0.77001 +0.22238 0.71874 0.76665 +0.29554 0.71738 0.76309 +0.37098 0.71590 0.75935 +0.44775 0.71438 0.75553 +0.52498 0.71291 0.75172 +0.60175 0.71151 0.74793 +0.67715 0.71019 0.74420 +0.75031 0.70899 0.74054 +0.82036 0.70791 0.73700 +0.88644 0.70698 0.73359 +0.94772 0.70622 0.73034 +1.00000 0.70564 0.72727 +1.00000 0.70526 0.72441 +0.00000 0.78935 0.76779 +0.03694 0.78831 0.76477 +0.09699 0.78702 0.76149 +0.16219 0.78552 0.75798 +0.23156 0.78396 0.75436 +0.30415 0.78237 0.75067 +0.37900 0.78079 0.74696 +0.45519 0.77923 0.74324 +0.53179 0.77773 0.73954 +0.60792 0.77629 0.73589 +0.68268 0.77494 0.73231 +0.75522 0.77371 0.72884 +0.82467 0.77260 0.72549 +0.89020 0.77164 0.72229 +0.95099 0.77084 0.71927 +1.00000 0.77023 0.71644 +1.00000 0.76981 0.71385 +0.00000 0.85059 0.75594 +0.04874 0.84918 0.75271 +0.10849 0.84768 0.74935 +0.17328 0.84613 0.74590 +0.24216 0.84453 0.74238 +0.31416 0.84293 0.73882 +0.38838 0.84133 0.73524 +0.46389 0.83977 0.73169 +0.53979 0.83826 0.72817 +0.61520 0.83682 0.72472 +0.68926 0.83547 0.72137 +0.76112 0.83423 0.71813 +0.82994 0.83312 0.71503 +0.89488 0.83216 0.71210 +0.95515 0.83136 0.70937 +1.00000 0.83075 0.70685 +1.00000 0.83033 0.70456 +0.00873 0.90613 0.74425 +0.06214 0.90471 0.74112 +0.12145 0.90321 0.73789 +0.18571 0.90166 0.73458 +0.25396 0.90008 0.73123 +0.32528 0.89850 0.72786 +0.39876 0.89693 0.72449 +0.47350 0.89539 0.72116 +0.54862 0.89392 0.71789 +0.62325 0.89251 0.71470 +0.69656 0.89121 0.71162 +0.76770 0.89001 0.70868 +0.83584 0.88894 0.70589 +0.90017 0.88802 0.70328 +0.95988 0.88727 0.70088 +1.00000 0.88669 0.69871 +1.00000 0.88631 0.69679 +0.02374 0.95590 0.73342 +0.07668 0.95451 0.73046 +0.13542 0.95307 0.72741 +0.19900 0.95157 0.72431 +0.26651 0.95006 0.72119 +0.33704 0.94855 0.71806 +0.40968 0.94705 0.71496 +0.48357 0.94560 0.71191 +0.55785 0.94421 0.70894 +0.63165 0.94289 0.70607 +0.70415 0.94167 0.70332 +0.77453 0.94056 0.70071 +0.84196 0.93958 0.69828 +0.90564 0.93875 0.69605 +0.96478 0.93808 0.69403 +1.00000 0.93758 0.69225 +1.00000 0.93728 0.69074 +0.03949 0.99941 0.72371 +0.09182 0.99812 0.72097 +0.14984 0.99678 0.71818 +0.21263 0.99540 0.71535 +0.27928 0.99401 0.71251 +0.34891 0.99262 0.70969 +0.42064 0.99125 0.70691 +0.49360 0.98993 0.70419 +0.56697 0.98867 0.70156 +0.63989 0.98749 0.69905 +0.71155 0.98640 0.69668 +0.78113 0.98543 0.69446 +0.84783 0.98458 0.69243 +0.91084 0.98388 0.69061 +0.96937 0.98334 0.68901 +1.00000 0.98297 0.68767 +1.00000 0.98279 0.68660 +0.00000 0.02562 0.82265 +0.03422 0.02512 0.82411 +0.08345 0.02438 0.82563 +0.13790 0.02342 0.82723 +0.19685 0.02225 0.82889 +0.25958 0.02090 0.83061 +0.32537 0.01937 0.83238 +0.39346 0.01769 0.83422 +0.46309 0.01588 0.83612 +0.53349 0.01394 0.83808 +0.60385 0.01191 0.84011 +0.67335 0.00981 0.84220 +0.74114 0.00765 0.84436 +0.80633 0.00545 0.84660 +0.86803 0.00326 0.84893 +0.92530 0.00108 0.85134 +0.97718 0.00000 0.85386 +0.00000 0.06821 0.82832 +0.03108 0.06751 0.83037 +0.08097 0.06658 0.83243 +0.13623 0.06544 0.83448 +0.19617 0.06410 0.83653 +0.26004 0.06258 0.83858 +0.32709 0.06090 0.84062 +0.39656 0.05907 0.84267 +0.46767 0.05711 0.84472 +0.53959 0.05505 0.84677 +0.61151 0.05291 0.84884 +0.68257 0.05071 0.85092 +0.75187 0.04846 0.85303 +0.81850 0.04621 0.85517 +0.88154 0.04396 0.85736 +0.94002 0.04176 0.85959 +0.99291 0.03970 0.86176 +0.00000 0.11624 0.83528 +0.02764 0.11544 0.83770 +0.07832 0.11442 0.84007 +0.13456 0.11320 0.84237 +0.19561 0.11178 0.84460 +0.26072 0.11019 0.84678 +0.32913 0.10845 0.84890 +0.40004 0.10657 0.85097 +0.47263 0.10458 0.85299 +0.54608 0.10249 0.85497 +0.61951 0.10034 0.85691 +0.69203 0.09813 0.85883 +0.76274 0.09592 0.86071 +0.83068 0.09381 0.86240 +0.89484 0.09182 0.86391 +0.95422 0.09000 0.86527 +1.00000 0.08838 0.86648 +0.00000 0.16956 0.84284 +0.02386 0.16876 0.84544 +0.07547 0.16775 0.84792 +0.13277 0.16653 0.85027 +0.19501 0.16512 0.85252 +0.26143 0.16355 0.85465 +0.33122 0.16184 0.85668 +0.40356 0.16000 0.85860 +0.47762 0.15805 0.86044 +0.55255 0.15606 0.86211 +0.62747 0.15409 0.86352 +0.70141 0.15218 0.86468 +0.77338 0.15035 0.86562 +0.84237 0.14864 0.86635 +0.90736 0.14707 0.86691 +0.96731 0.14568 0.86730 +1.00000 0.14450 0.86756 +0.00000 0.22797 0.85042 +0.01975 0.22725 0.85301 +0.07234 0.22631 0.85542 +0.13076 0.22517 0.85767 +0.19423 0.22385 0.85976 +0.26196 0.22237 0.86169 +0.33322 0.22080 0.86333 +0.40715 0.21918 0.86463 +0.48282 0.21754 0.86563 +0.55928 0.21590 0.86634 +0.63555 0.21430 0.86678 +0.71064 0.21276 0.86698 +0.78354 0.21131 0.86695 +0.85323 0.20998 0.86673 +0.91869 0.20881 0.86633 +0.97888 0.20782 0.86579 +1.00000 0.20704 0.86513 +0.00000 0.29113 0.85748 +0.01529 0.29053 0.85991 +0.06895 0.28973 0.86207 +0.12872 0.28877 0.86385 +0.19376 0.28769 0.86524 +0.26319 0.28651 0.86626 +0.33611 0.28525 0.86693 +0.41158 0.28394 0.86727 +0.48863 0.28262 0.86730 +0.56629 0.28130 0.86704 +0.64356 0.28002 0.86653 +0.71944 0.27880 0.86577 +0.79290 0.27768 0.86481 +0.86292 0.27668 0.86367 +0.92846 0.27584 0.86236 +0.98850 0.27518 0.86094 +1.00000 0.27474 0.85941 +0.00000 0.35859 0.86320 +0.01152 0.35823 0.86485 +0.06683 0.35769 0.86608 +0.12825 0.35699 0.86689 +0.19488 0.35617 0.86731 +0.26582 0.35524 0.86737 +0.34011 0.35423 0.86707 +0.41679 0.35318 0.86645 +0.49488 0.35210 0.86554 +0.57337 0.35103 0.86435 +0.65126 0.34999 0.86291 +0.72752 0.34902 0.86126 +0.80113 0.34814 0.85942 +0.87105 0.34738 0.85742 +0.93627 0.34678 0.85529 +0.99578 0.34635 0.85305 +1.00000 0.34614 0.85075 +0.00000 0.42971 0.86573 +0.01004 0.42954 0.86642 +0.06684 0.42919 0.86668 +0.12968 0.42868 0.86654 +0.19765 0.42803 0.86601 +0.26978 0.42726 0.86512 +0.34511 0.42642 0.86390 +0.42265 0.42552 0.86237 +0.50138 0.42459 0.86056 +0.58030 0.42367 0.85850 +0.65837 0.42277 0.85622 +0.73458 0.42193 0.85374 +0.80789 0.42118 0.85111 +0.87729 0.42055 0.84834 +0.94176 0.42006 0.84548 +1.00000 0.41974 0.84256 +1.00000 0.41963 0.83960 +0.00000 0.50318 0.86494 +0.01095 0.50311 0.86469 +0.06901 0.50284 0.86402 +0.13301 0.50240 0.86296 +0.20200 0.50181 0.86153 +0.27499 0.50110 0.85975 +0.35098 0.50030 0.85767 +0.42897 0.49943 0.85530 +0.50792 0.49853 0.85267 +0.58681 0.49763 0.84983 +0.66461 0.49674 0.84680 +0.74030 0.49591 0.84361 +0.81285 0.49516 0.84030 +0.88126 0.49451 0.83689 +0.94454 0.49400 0.83343 +1.00000 0.49366 0.82994 +1.00000 0.49350 0.82647 +0.00000 0.57750 0.86102 +0.01428 0.57739 0.85988 +0.07332 0.57707 0.85833 +0.13817 0.57657 0.85641 +0.20783 0.57591 0.85415 +0.28130 0.57512 0.85158 +0.35754 0.57423 0.84872 +0.43553 0.57327 0.84562 +0.51423 0.57226 0.84229 +0.59262 0.57123 0.83879 +0.66966 0.57022 0.83513 +0.74434 0.56925 0.83136 +0.81565 0.56835 0.82750 +0.88268 0.56756 0.82363 +0.94479 0.56693 0.81986 +1.00000 0.56650 0.81625 +1.00000 0.56628 0.81281 +0.00000 0.65102 0.85424 +0.01999 0.65074 0.85228 +0.07972 0.65023 0.84995 +0.14506 0.64953 0.84727 +0.21501 0.64865 0.84429 +0.28851 0.64764 0.84103 +0.36455 0.64652 0.83752 +0.44207 0.64531 0.83380 +0.52004 0.64404 0.82991 +0.59742 0.64276 0.82588 +0.67334 0.64151 0.82181 +0.74702 0.64038 0.81781 +0.81756 0.63938 0.81389 +0.88410 0.63852 0.81009 +0.94579 0.63784 0.80644 +1.00000 0.63734 0.80296 +1.00000 0.63704 0.79967 +0.00000 0.72205 0.84497 +0.02798 0.72144 0.84230 +0.08804 0.72060 0.83930 +0.15350 0.71955 0.83599 +0.22330 0.71832 0.83240 +0.29640 0.71693 0.82859 +0.37176 0.71544 0.82458 +0.44848 0.71395 0.82052 +0.52565 0.71250 0.81646 +0.60235 0.71112 0.81243 +0.67769 0.70983 0.80846 +0.75079 0.70864 0.80458 +0.82078 0.70759 0.80080 +0.88681 0.70668 0.79717 +0.94804 0.70594 0.79370 +1.00000 0.70538 0.79042 +1.00000 0.70502 0.78736 +0.00000 0.78888 0.83369 +0.03807 0.78780 0.83044 +0.09809 0.78648 0.82689 +0.16325 0.78498 0.82312 +0.23258 0.78344 0.81925 +0.30511 0.78188 0.81533 +0.37990 0.78032 0.81137 +0.45603 0.77879 0.80742 +0.53257 0.77730 0.80349 +0.60862 0.77589 0.79961 +0.68332 0.77457 0.79581 +0.75579 0.77335 0.79212 +0.82518 0.77227 0.78856 +0.89065 0.77133 0.78517 +0.95139 0.77055 0.78195 +1.00000 0.76995 0.77894 +1.00000 0.76956 0.77617 +0.00000 0.84998 0.82099 +0.05001 0.84859 0.81751 +0.10972 0.84711 0.81392 +0.17446 0.84558 0.81023 +0.24328 0.84401 0.80647 +0.31523 0.84243 0.80268 +0.38937 0.84086 0.79888 +0.46480 0.83932 0.79511 +0.54063 0.83783 0.79138 +0.61597 0.83641 0.78773 +0.68996 0.83509 0.78417 +0.76174 0.83387 0.78074 +0.83049 0.83279 0.77747 +0.89538 0.83185 0.77437 +0.95559 0.83107 0.77147 +1.00000 0.83048 0.76880 +1.00000 0.83007 0.76638 +0.01014 0.90551 0.80850 +0.06351 0.90411 0.80513 +0.12277 0.90264 0.80167 +0.18696 0.90111 0.79814 +0.25514 0.89956 0.79457 +0.32639 0.89800 0.79099 +0.39979 0.89646 0.78742 +0.47444 0.89495 0.78389 +0.54948 0.89350 0.78044 +0.62404 0.89212 0.77707 +0.69726 0.89084 0.77383 +0.76833 0.88967 0.77072 +0.83640 0.88862 0.76779 +0.90066 0.88773 0.76505 +0.96032 0.88699 0.76253 +1.00000 0.88643 0.76025 +1.00000 0.88607 0.75824 +0.02520 0.95529 0.79690 +0.07809 0.95394 0.79372 +0.13676 0.95252 0.79047 +0.20027 0.95105 0.78717 +0.26770 0.94956 0.78385 +0.33814 0.94808 0.78055 +0.41070 0.94661 0.77727 +0.48450 0.94519 0.77406 +0.55868 0.94382 0.77093 +0.63240 0.94253 0.76792 +0.70482 0.94133 0.76504 +0.77511 0.94025 0.76232 +0.84247 0.93929 0.75979 +0.90609 0.93848 0.75747 +0.96517 0.93783 0.75537 +1.00000 0.93735 0.75354 +1.00000 0.93707 0.75198 +0.04095 0.99884 0.78649 +0.09320 0.99758 0.78357 +0.15114 0.99627 0.78060 +0.21385 0.99492 0.77760 +0.28041 0.99355 0.77460 +0.34994 0.99219 0.77163 +0.42157 0.99086 0.76871 +0.49444 0.98956 0.76587 +0.56771 0.98833 0.76313 +0.64054 0.98717 0.76052 +0.71211 0.98611 0.75807 +0.78161 0.98516 0.75579 +0.84824 0.98434 0.75370 +0.91118 0.98366 0.75185 +0.96964 0.98313 0.75023 +1.00000 0.98278 0.74889 +1.00000 0.98262 0.74784 +0.00000 0.02538 0.87810 +0.03381 0.02484 0.87976 +0.08310 0.02406 0.88151 +0.13762 0.02307 0.88334 +0.19667 0.02186 0.88525 +0.25951 0.02047 0.88723 +0.32541 0.01891 0.88928 +0.39364 0.01719 0.89140 +0.46342 0.01533 0.89359 +0.53397 0.01336 0.89584 +0.60449 0.01129 0.89817 +0.67415 0.00915 0.90057 +0.74209 0.00695 0.90305 +0.80743 0.00472 0.90561 +0.86927 0.00249 0.90825 +0.92667 0.00027 0.91099 +0.97866 0.00000 0.91383 +0.00000 0.06790 0.88452 +0.03069 0.06717 0.88683 +0.08065 0.06621 0.88915 +0.13601 0.06503 0.89148 +0.19605 0.06366 0.89381 +0.26004 0.06210 0.89615 +0.32723 0.06038 0.89850 +0.39684 0.05852 0.90085 +0.46810 0.05653 0.90321 +0.54018 0.05443 0.90558 +0.61225 0.05226 0.90796 +0.68346 0.05002 0.91037 +0.75291 0.04774 0.91279 +0.81968 0.04545 0.91526 +0.88285 0.04318 0.91776 +0.94143 0.04096 0.92029 +0.99440 0.03892 0.92268 +0.00000 0.11589 0.89238 +0.02725 0.11507 0.89509 +0.07803 0.11402 0.89775 +0.13437 0.11276 0.90035 +0.19554 0.11131 0.90290 +0.26078 0.10969 0.90539 +0.32932 0.10792 0.90782 +0.40038 0.10601 0.91021 +0.47312 0.10398 0.91255 +0.54672 0.10187 0.91485 +0.62030 0.09968 0.91712 +0.69296 0.09745 0.91936 +0.76381 0.09524 0.92149 +0.83187 0.09313 0.92341 +0.89613 0.09116 0.92513 +0.95558 0.08935 0.92668 +1.00000 0.08775 0.92806 +0.00000 0.16921 0.90094 +0.02348 0.16839 0.90385 +0.07518 0.16734 0.90664 +0.13260 0.16609 0.90931 +0.19496 0.16466 0.91188 +0.26151 0.16306 0.91433 +0.33144 0.16132 0.91668 +0.40393 0.15945 0.91893 +0.47813 0.15748 0.92107 +0.55323 0.15548 0.92298 +0.62830 0.15352 0.92461 +0.70237 0.15162 0.92598 +0.77445 0.14980 0.92710 +0.84353 0.14810 0.92800 +0.90858 0.14655 0.92870 +0.96858 0.14518 0.92922 +1.00000 0.14402 0.92959 +0.00000 0.22765 0.90957 +0.01936 0.22689 0.91248 +0.07206 0.22593 0.91522 +0.13059 0.22476 0.91779 +0.19419 0.22341 0.92020 +0.26207 0.22192 0.92241 +0.33351 0.22035 0.92428 +0.40761 0.21873 0.92580 +0.48343 0.21708 0.92699 +0.56003 0.21545 0.92788 +0.63642 0.21386 0.92848 +0.71160 0.21232 0.92881 +0.78458 0.21089 0.92891 +0.85432 0.20958 0.92878 +0.91981 0.20842 0.92847 +0.98000 0.20745 0.92798 +1.00000 0.20670 0.92735 +0.00000 0.29084 0.91771 +0.01489 0.29022 0.92046 +0.06872 0.28940 0.92288 +0.12866 0.28844 0.92488 +0.19388 0.28735 0.92648 +0.26347 0.28616 0.92769 +0.33654 0.28490 0.92853 +0.41215 0.28360 0.92902 +0.48932 0.28228 0.92918 +0.56708 0.28096 0.92904 +0.64444 0.27969 0.92861 +0.72037 0.27848 0.92793 +0.79387 0.27737 0.92702 +0.86389 0.27639 0.92590 +0.92942 0.27556 0.92460 +0.98942 0.27493 0.92316 +1.00000 0.27451 0.92159 +0.00000 0.35838 0.92431 +0.01136 0.35800 0.92616 +0.06683 0.35745 0.92757 +0.12840 0.35675 0.92855 +0.19518 0.35592 0.92911 +0.26626 0.35498 0.92929 +0.34067 0.35398 0.92910 +0.41745 0.35292 0.92857 +0.49562 0.35185 0.92771 +0.57418 0.35078 0.92657 +0.65211 0.34975 0.92515 +0.72838 0.34878 0.92349 +0.80198 0.34791 0.92163 +0.87187 0.34717 0.91958 +0.93704 0.34658 0.91737 +0.99646 0.34618 0.91505 +1.00000 0.34598 0.91263 +0.00000 0.42956 0.92744 +0.01013 0.42938 0.92827 +0.06706 0.42902 0.92865 +0.13004 0.42849 0.92860 +0.19812 0.42783 0.92815 +0.27036 0.42707 0.92732 +0.34578 0.42622 0.92613 +0.42338 0.42531 0.92461 +0.50215 0.42439 0.92278 +0.58109 0.42346 0.92069 +0.65916 0.42257 0.91835 +0.73533 0.42174 0.91580 +0.80859 0.42100 0.91306 +0.87791 0.42038 0.91017 +0.94228 0.41990 0.90716 +1.00000 0.41960 0.90406 +1.00000 0.41951 0.90090 +0.00000 0.50307 0.92703 +0.01129 0.50298 0.92685 +0.06946 0.50269 0.92623 +0.13356 0.50224 0.92519 +0.20263 0.50164 0.92376 +0.27569 0.50092 0.92197 +0.35173 0.50011 0.91984 +0.42973 0.49924 0.91740 +0.50868 0.49834 0.91469 +0.58754 0.49743 0.91174 +0.66529 0.49655 0.90857 +0.74090 0.49572 0.90522 +0.81335 0.49497 0.90173 +0.88163 0.49434 0.89812 +0.94477 0.49384 0.89442 +1.00000 0.49350 0.89068 +1.00000 0.49337 0.88695 +0.00000 0.57738 0.92325 +0.01486 0.57725 0.92211 +0.07398 0.57691 0.92053 +0.13890 0.57639 0.91857 +0.20861 0.57571 0.91623 +0.28209 0.57491 0.91356 +0.35833 0.57401 0.91058 +0.43630 0.57304 0.90733 +0.51495 0.57202 0.90384 +0.59326 0.57099 0.90014 +0.67020 0.56998 0.89627 +0.74475 0.56901 0.89226 +0.81590 0.56811 0.88814 +0.88287 0.56734 0.88403 +0.94494 0.56674 0.88004 +1.00000 0.56633 0.87620 +1.00000 0.56612 0.87254 +0.00000 0.65084 0.91636 +0.02079 0.65053 0.91432 +0.08057 0.65000 0.91189 +0.14594 0.64927 0.90908 +0.21589 0.64838 0.90595 +0.28938 0.64735 0.90251 +0.36537 0.64621 0.89880 +0.44281 0.64499 0.89486 +0.52068 0.64372 0.89072 +0.59794 0.64243 0.88642 +0.67381 0.64121 0.88213 +0.74743 0.64010 0.87790 +0.81792 0.63912 0.87376 +0.88441 0.63828 0.86974 +0.94605 0.63762 0.86588 +1.00000 0.63714 0.86218 +1.00000 0.63686 0.85869 +0.00000 0.72176 0.90673 +0.02898 0.72112 0.90390 +0.08906 0.72025 0.90071 +0.15450 0.71917 0.89719 +0.22426 0.71792 0.89337 +0.29730 0.71652 0.88930 +0.37259 0.71503 0.88504 +0.44925 0.71355 0.88075 +0.52636 0.71213 0.87647 +0.60300 0.71077 0.87222 +0.67828 0.70950 0.86803 +0.75132 0.70834 0.86393 +0.82125 0.70731 0.85995 +0.88722 0.70642 0.85612 +0.94840 0.70570 0.85245 +1.00000 0.70516 0.84898 +1.00000 0.70482 0.84573 +0.00000 0.78843 0.89481 +0.03924 0.78732 0.89131 +0.09924 0.78597 0.88750 +0.16436 0.78449 0.88349 +0.23364 0.78297 0.87940 +0.30612 0.78142 0.87526 +0.38085 0.77989 0.87108 +0.45691 0.77838 0.86691 +0.53338 0.77692 0.86277 +0.60937 0.77553 0.85868 +0.68400 0.77423 0.85469 +0.75640 0.77304 0.85080 +0.82572 0.77197 0.84705 +0.89114 0.77105 0.84348 +0.95183 0.77030 0.84009 +1.00000 0.76972 0.83692 +1.00000 0.76935 0.83399 +0.00000 0.84940 0.88129 +0.05133 0.84804 0.87759 +0.11100 0.84658 0.87377 +0.17569 0.84507 0.86986 +0.24445 0.84353 0.86589 +0.31633 0.84197 0.86189 +0.39040 0.84042 0.85788 +0.46576 0.83891 0.85391 +0.54151 0.83744 0.84999 +0.61677 0.83605 0.84615 +0.69069 0.83475 0.84242 +0.76240 0.83356 0.83882 +0.83108 0.83250 0.83539 +0.89591 0.83158 0.83214 +0.95607 0.83082 0.82910 +1.00000 0.83024 0.82630 +1.00000 0.82986 0.82376 +0.01159 0.90494 0.86805 +0.06492 0.90356 0.86447 +0.12412 0.90211 0.86080 +0.18825 0.90061 0.85707 +0.25637 0.89909 0.85330 +0.32754 0.89755 0.84953 +0.40085 0.89604 0.84578 +0.47543 0.89455 0.84208 +0.55038 0.89313 0.83845 +0.62486 0.89177 0.83493 +0.69800 0.89051 0.83154 +0.76899 0.88937 0.82830 +0.83699 0.88835 0.82524 +0.90119 0.88747 0.82239 +0.96079 0.88675 0.81977 +1.00000 0.88621 0.81740 +1.00000 0.88587 0.81531 +0.02670 0.95473 0.85575 +0.07953 0.95340 0.85238 +0.13814 0.95201 0.84894 +0.20157 0.95057 0.84546 +0.26892 0.94911 0.84197 +0.33927 0.94765 0.83850 +0.41174 0.94621 0.83508 +0.48545 0.94481 0.83172 +0.55954 0.94347 0.82846 +0.63317 0.94221 0.82533 +0.70551 0.94104 0.82234 +0.77573 0.93998 0.81952 +0.84301 0.93904 0.81691 +0.90657 0.93825 0.81452 +0.96558 0.93762 0.81237 +1.00000 0.93716 0.81049 +1.00000 0.93690 0.80891 +0.04243 0.99831 0.84472 +0.09462 0.99708 0.84163 +0.15247 0.99580 0.83849 +0.21509 0.99448 0.83534 +0.28156 0.99314 0.83221 +0.35099 0.99181 0.82911 +0.42253 0.99050 0.82607 +0.49530 0.98923 0.82313 +0.56847 0.98803 0.82030 +0.64121 0.98690 0.81761 +0.71270 0.98586 0.81509 +0.78212 0.98493 0.81276 +0.84866 0.98413 0.81065 +0.91154 0.98347 0.80877 +0.96994 0.98297 0.80716 +1.00000 0.98263 0.80583 +1.00000 0.98248 0.80481 +0.00000 0.02516 0.92873 +0.03344 0.02459 0.93061 +0.08279 0.02378 0.93258 +0.13739 0.02274 0.93464 +0.19653 0.02150 0.93678 +0.25948 0.02007 0.93901 +0.32551 0.01847 0.94132 +0.39387 0.01671 0.94371 +0.46379 0.01481 0.94617 +0.53450 0.01280 0.94870 +0.60518 0.01069 0.95131 +0.67499 0.00851 0.95400 +0.74309 0.00628 0.95677 +0.80858 0.00401 0.95962 +0.87056 0.00174 0.96255 +0.92809 0.00000 0.96558 +0.98020 0.00000 0.96872 +0.00000 0.06762 0.93591 +0.03034 0.06685 0.93846 +0.08037 0.06586 0.94103 +0.13583 0.06465 0.94362 +0.19598 0.06324 0.94622 +0.26009 0.06165 0.94884 +0.32741 0.05989 0.95146 +0.39717 0.05799 0.95410 +0.46857 0.05597 0.95675 +0.54081 0.05384 0.95940 +0.61304 0.05163 0.96208 +0.68440 0.04936 0.96478 +0.75399 0.04705 0.96750 +0.82090 0.04473 0.97025 +0.88419 0.04243 0.97305 +0.94287 0.04021 0.97580 +0.99592 0.03818 0.97839 +0.00000 0.11558 0.94462 +0.02691 0.11472 0.94760 +0.07778 0.11364 0.95054 +0.13422 0.11235 0.95342 +0.19551 0.11087 0.95625 +0.26088 0.10922 0.95903 +0.32956 0.10741 0.96176 +0.40076 0.10547 0.96444 +0.47366 0.10342 0.96707 +0.54741 0.10127 0.96966 +0.62113 0.09906 0.97222 +0.69394 0.09680 0.97474 +0.76492 0.09459 0.97708 +0.83310 0.09250 0.97919 +0.89746 0.09054 0.98108 +0.95698 0.08875 0.98278 +1.00000 0.08717 0.98430 +0.00000 0.16889 0.95411 +0.02314 0.16804 0.95731 +0.07494 0.16697 0.96039 +0.13247 0.16569 0.96336 +0.19496 0.16423 0.96621 +0.26164 0.16260 0.96896 +0.33171 0.16083 0.97160 +0.40434 0.15893 0.97414 +0.47870 0.15695 0.97654 +0.55396 0.15496 0.97864 +0.62918 0.15300 0.98045 +0.70338 0.15110 0.98198 +0.77557 0.14930 0.98325 +0.84473 0.14761 0.98428 +0.90984 0.14608 0.98509 +0.96987 0.14473 0.98570 +1.00000 0.14359 0.98615 +0.00000 0.22735 0.96372 +0.01902 0.22657 0.96692 +0.07182 0.22558 0.96996 +0.13047 0.22439 0.97282 +0.19419 0.22301 0.97552 +0.26225 0.22151 0.97795 +0.33386 0.21994 0.98001 +0.40812 0.21832 0.98170 +0.48410 0.21668 0.98305 +0.56083 0.21505 0.98408 +0.63733 0.21346 0.98480 +0.71261 0.21194 0.98524 +0.78566 0.21052 0.98542 +0.85545 0.20922 0.98537 +0.92095 0.20808 0.98510 +0.98114 0.20713 0.98464 +1.00000 0.20640 0.98402 +0.00000 0.29059 0.97284 +0.01455 0.28995 0.97587 +0.06855 0.28912 0.97849 +0.12867 0.28815 0.98068 +0.19405 0.28706 0.98244 +0.26381 0.28587 0.98380 +0.33703 0.28460 0.98478 +0.41277 0.28330 0.98538 +0.49006 0.28198 0.98564 +0.56792 0.28067 0.98558 +0.64535 0.27940 0.98521 +0.72134 0.27821 0.98457 +0.79487 0.27711 0.98368 +0.86490 0.27615 0.98256 +0.93041 0.27534 0.98125 +0.99037 0.27472 0.97977 +1.00000 0.27433 0.97814 +0.00000 0.35820 0.98016 +0.01127 0.35782 0.98218 +0.06689 0.35726 0.98373 +0.12862 0.35655 0.98484 +0.19555 0.35571 0.98552 +0.26675 0.35477 0.98579 +0.34128 0.35376 0.98567 +0.41817 0.35271 0.98519 +0.49642 0.35163 0.98437 +0.57503 0.35057 0.98323 +0.65299 0.34955 0.98181 +0.72928 0.34859 0.98013 +0.80286 0.34774 0.97822 +0.87272 0.34701 0.97610 +0.93782 0.34644 0.97381 +0.99716 0.34605 0.97137 +1.00000 0.34588 0.96882 +0.00000 0.42946 0.98377 +0.01029 0.42926 0.98470 +0.06736 0.42889 0.98517 +0.13046 0.42835 0.98519 +0.19866 0.42768 0.98478 +0.27100 0.42691 0.98398 +0.34649 0.42606 0.98279 +0.42415 0.42515 0.98126 +0.50297 0.42423 0.97941 +0.58192 0.42330 0.97726 +0.65997 0.42242 0.97484 +0.73611 0.42159 0.97219 +0.80931 0.42086 0.96934 +0.87855 0.42025 0.96631 +0.94281 0.41979 0.96314 +1.00000 0.41951 0.95986 +1.00000 0.41944 0.95649 +0.00000 0.50300 0.98364 +0.01169 0.50289 0.98350 +0.06997 0.50259 0.98290 +0.13417 0.50212 0.98186 +0.20332 0.50150 0.98041 +0.27644 0.50078 0.97857 +0.35252 0.49996 0.97638 +0.43054 0.49909 0.97386 +0.50948 0.49818 0.97105 +0.58831 0.49728 0.96797 +0.66600 0.49640 0.96466 +0.74153 0.49557 0.96114 +0.81387 0.49483 0.95746 +0.88202 0.49421 0.95363 +0.94500 0.49372 0.94971 +1.00000 0.49340 0.94571 +1.00000 0.49329 0.94176 +0.00000 0.57729 0.97991 +0.01550 0.57714 0.97874 +0.07471 0.57678 0.97712 +0.13969 0.57625 0.97508 +0.20944 0.57556 0.97266 +0.28294 0.57474 0.96987 +0.35918 0.57383 0.96677 +0.43711 0.57285 0.96336 +0.51571 0.57183 0.95970 +0.59394 0.57079 0.95580 +0.67076 0.56978 0.95171 +0.74518 0.56881 0.94745 +0.81619 0.56792 0.94308 +0.88311 0.56717 0.93876 +0.94514 0.56659 0.93457 +1.00000 0.56620 0.93053 +1.00000 0.56602 0.92667 +0.00000 0.65069 0.97285 +0.02166 0.65036 0.97071 +0.08148 0.64980 0.96816 +0.14688 0.64906 0.96521 +0.21683 0.64815 0.96191 +0.29029 0.64710 0.95829 +0.36623 0.64594 0.95438 +0.44359 0.64471 0.95021 +0.52135 0.64343 0.94582 +0.59853 0.64215 0.94129 +0.67434 0.64095 0.93679 +0.74790 0.63986 0.93236 +0.81833 0.63890 0.92802 +0.88477 0.63809 0.92381 +0.94637 0.63745 0.91975 +1.00000 0.63699 0.91586 +1.00000 0.63673 0.91219 +0.00000 0.72150 0.96280 +0.03005 0.72083 0.95980 +0.09013 0.71994 0.95642 +0.15556 0.71883 0.95269 +0.22528 0.71756 0.94864 +0.29824 0.71614 0.94430 +0.37347 0.71466 0.93983 +0.45008 0.71321 0.93534 +0.52713 0.71181 0.93086 +0.60371 0.71047 0.92641 +0.67892 0.70923 0.92202 +0.75190 0.70809 0.91774 +0.82177 0.70708 0.91357 +0.88769 0.70621 0.90955 +0.94882 0.70551 0.90571 +1.00000 0.70499 0.90207 +1.00000 0.70467 0.89867 +0.00000 0.78802 0.95023 +0.04048 0.78687 0.94649 +0.10044 0.78550 0.94242 +0.16553 0.78404 0.93821 +0.23476 0.78254 0.93392 +0.30719 0.78102 0.92957 +0.38186 0.77951 0.92520 +0.45785 0.77802 0.92083 +0.53425 0.77659 0.91650 +0.61017 0.77522 0.91223 +0.68472 0.77394 0.90806 +0.75706 0.77277 0.90400 +0.82632 0.77173 0.90009 +0.89168 0.77083 0.89635 +0.95231 0.77010 0.89282 +1.00000 0.76954 0.88950 +1.00000 0.76918 0.88644 +0.00000 0.84888 0.93593 +0.05270 0.84753 0.93203 +0.11233 0.84610 0.92801 +0.17697 0.84462 0.92390 +0.24567 0.84310 0.91974 +0.31748 0.84156 0.91555 +0.39148 0.84004 0.91137 +0.46677 0.83855 0.90722 +0.54244 0.83711 0.90313 +0.61762 0.83574 0.89913 +0.69146 0.83446 0.89524 +0.76310 0.83329 0.89150 +0.83172 0.83225 0.88792 +0.89648 0.83136 0.88455 +0.95659 0.83062 0.88139 +1.00000 0.83006 0.87848 +1.00000 0.82969 0.87584 +0.01309 0.90441 0.92202 +0.06637 0.90306 0.91825 +0.12553 0.90164 0.91440 +0.18959 0.90016 0.91049 +0.25763 0.89866 0.90655 +0.32872 0.89715 0.90261 +0.40196 0.89566 0.89870 +0.47645 0.89420 0.89484 +0.55132 0.89280 0.89108 +0.62571 0.89148 0.88742 +0.69878 0.89024 0.88390 +0.76969 0.88911 0.88055 +0.83762 0.88811 0.87739 +0.90176 0.88726 0.87444 +0.96130 0.88656 0.87174 +1.00000 0.88604 0.86930 +1.00000 0.88571 0.86716 +0.02825 0.95422 0.90910 +0.08102 0.95292 0.90556 +0.13955 0.95155 0.90196 +0.20291 0.95014 0.89832 +0.27018 0.94871 0.89469 +0.34044 0.94728 0.89107 +0.41282 0.94587 0.88752 +0.48644 0.94449 0.88404 +0.56044 0.94318 0.88067 +0.63398 0.94194 0.87744 +0.70623 0.94079 0.87436 +0.77637 0.93975 0.87147 +0.84359 0.93884 0.86879 +0.90707 0.93807 0.86635 +0.96602 0.93746 0.86416 +1.00000 0.93702 0.86227 +1.00000 0.93677 0.86068 +0.04395 0.99784 0.89752 +0.09606 0.99664 0.89429 +0.15384 0.99538 0.89102 +0.21636 0.99409 0.88774 +0.28274 0.99278 0.88448 +0.35207 0.99148 0.88128 +0.42351 0.99020 0.87815 +0.49618 0.98896 0.87512 +0.56926 0.98778 0.87222 +0.64191 0.98667 0.86948 +0.71331 0.98566 0.86691 +0.78264 0.98475 0.86455 +0.84912 0.98397 0.86241 +0.91192 0.98333 0.86054 +0.97026 0.98285 0.85894 +1.00000 0.98253 0.85764 +1.00000 0.98239 0.85667 +0.00000 0.02498 0.97373 +0.03312 0.02437 0.97581 +0.08253 0.02352 0.97799 +0.13721 0.02245 0.98027 +0.19644 0.02117 0.98264 +0.25950 0.01970 0.98511 +0.32566 0.01806 0.98766 +0.39416 0.01626 0.99029 +0.46423 0.01433 0.99300 +0.53509 0.01228 0.99579 +0.60592 0.01013 0.99865 +0.67590 0.00791 1.00000 +0.74415 0.00564 1.00000 +0.80979 0.00334 1.00000 +0.87191 0.00104 1.00000 +0.92956 0.00000 1.00000 +0.98178 0.00000 1.00000 +0.00000 0.06737 0.98162 +0.03003 0.06657 0.98440 +0.08015 0.06554 0.98721 +0.13569 0.06430 0.99005 +0.19596 0.06285 0.99290 +0.26019 0.06123 0.99576 +0.32765 0.05944 0.99864 +0.39755 0.05750 1.00000 +0.46911 0.05545 1.00000 +0.54150 0.05328 1.00000 +0.61388 0.05104 1.00000 +0.68539 0.04874 1.00000 +0.75513 0.04640 1.00000 +0.82218 0.04405 1.00000 +0.88559 0.04172 1.00000 +0.94437 0.03952 1.00000 +0.99749 0.03750 1.00000 +0.00000 0.11530 0.99113 +0.02662 0.11441 0.99437 +0.07757 0.11330 0.99756 +0.13412 0.11198 1.00000 +0.19553 0.11047 1.00000 +0.26103 0.10879 1.00000 +0.32986 0.10695 1.00000 +0.40120 0.10498 1.00000 +0.47425 0.10289 1.00000 +0.54814 0.10072 1.00000 +0.62201 0.09847 1.00000 +0.69497 0.09620 1.00000 +0.76608 0.09400 1.00000 +0.83438 0.09192 1.00000 +0.89883 0.08998 1.00000 +0.95841 0.08821 1.00000 +1.00000 0.08664 1.00000 +0.00000 0.16861 1.00000 +0.02285 0.16773 1.00000 +0.07475 0.16663 1.00000 +0.13239 0.16533 1.00000 +0.19500 0.16384 1.00000 +0.26182 0.16218 1.00000 +0.33202 0.16038 1.00000 +0.40480 0.15846 1.00000 +0.47932 0.15647 1.00000 +0.55475 0.15448 1.00000 +0.63011 0.15253 1.00000 +0.70444 0.15064 1.00000 +0.77673 0.14885 1.00000 +0.84597 0.14718 1.00000 +0.91114 0.14566 1.00000 +0.97120 0.14433 1.00000 +1.00000 0.14322 1.00000 +0.00000 0.22710 1.00000 +0.01872 0.22629 1.00000 +0.07163 0.22527 1.00000 +0.13039 0.22406 1.00000 +0.19424 0.22266 1.00000 +0.26248 0.22115 1.00000 +0.33427 0.21958 1.00000 +0.40870 0.21796 1.00000 +0.48482 0.21632 1.00000 +0.56168 0.21470 1.00000 +0.63829 0.21312 1.00000 +0.71367 0.21161 1.00000 +0.78678 0.21020 1.00000 +0.85661 0.20892 1.00000 +0.92214 0.20780 1.00000 +0.98232 0.20688 1.00000 +1.00000 0.20617 1.00000 +0.00000 0.29038 1.00000 +0.01429 0.28972 1.00000 +0.06845 0.28888 1.00000 +0.12875 0.28791 1.00000 +0.19430 0.28681 1.00000 +0.26422 0.28562 1.00000 +0.33758 0.28435 1.00000 +0.41345 0.28305 1.00000 +0.49086 0.28173 1.00000 +0.56881 0.28043 1.00000 +0.64632 0.27918 1.00000 +0.72236 0.27799 1.00000 +0.79591 0.27691 1.00000 +0.86594 0.27596 1.00000 +0.93143 0.27518 1.00000 +0.99135 0.27458 1.00000 +1.00000 0.27421 1.00000 +0.00000 0.35808 1.00000 +0.01125 0.35768 1.00000 +0.06703 0.35711 1.00000 +0.12891 0.35639 1.00000 +0.19598 0.35555 1.00000 +0.26731 0.35461 1.00000 +0.34195 0.35360 1.00000 +0.41894 0.35254 1.00000 +0.49726 0.35147 1.00000 +0.57593 0.35042 1.00000 +0.65392 0.34940 1.00000 +0.73022 0.34846 1.00000 +0.80378 0.34762 1.00000 +0.87359 0.34690 1.00000 +0.93863 0.34635 1.00000 +0.99789 0.34599 1.00000 +1.00000 0.34584 1.00000 +0.00000 0.42940 1.00000 +0.01052 0.42919 1.00000 +0.06772 0.42880 1.00000 +0.13095 0.42826 1.00000 +0.19926 0.42758 1.00000 +0.27169 0.42680 1.00000 +0.34727 0.42595 1.00000 +0.42499 0.42504 1.00000 +0.50383 0.42412 1.00000 +0.58279 0.42320 1.00000 +0.66083 0.42232 1.00000 +0.73693 0.42150 1.00000 +0.81006 0.42078 1.00000 +0.87921 0.42019 1.00000 +0.94337 0.41974 1.00000 +1.00000 0.41948 1.00000 +1.00000 0.41943 1.00000 +0.00000 0.50296 1.00000 +0.01217 0.50284 1.00000 +0.07056 0.50253 1.00000 +0.13485 0.50204 1.00000 +0.20408 0.50142 1.00000 +0.27726 0.50068 1.00000 +0.35337 0.49986 1.00000 +0.43141 0.49898 1.00000 +0.51034 0.49808 1.00000 +0.58913 0.49717 1.00000 +0.66675 0.49630 1.00000 +0.74218 0.49548 1.00000 +0.81441 0.49475 1.00000 +0.88243 0.49413 1.00000 +0.94525 0.49366 0.99837 +1.00000 0.49336 0.99414 +1.00000 0.49326 0.99001 +0.00000 0.57725 1.00000 +0.01622 0.57708 1.00000 +0.07550 0.57670 1.00000 +0.14054 0.57615 1.00000 +0.21033 0.57544 1.00000 +0.28385 0.57462 1.00000 +0.36008 0.57369 1.00000 +0.43798 0.57271 1.00000 +0.51651 0.57168 1.00000 +0.59465 0.57065 1.00000 +0.67136 0.56963 1.00000 +0.74563 0.56867 0.99603 +0.81654 0.56779 0.99144 +0.88341 0.56706 0.98694 +0.94540 0.56650 0.98257 +1.00000 0.56613 0.97836 +1.00000 0.56597 0.97433 +0.00000 0.65059 1.00000 +0.02259 0.65023 1.00000 +0.08246 0.64965 1.00000 +0.14788 0.64888 1.00000 +0.21783 0.64795 1.00000 +0.29126 0.64689 1.00000 +0.36714 0.64573 1.00000 +0.44442 0.64448 0.99894 +0.52206 0.64319 0.99431 +0.59917 0.64193 0.98959 +0.67493 0.64075 0.98491 +0.74843 0.63969 0.98030 +0.81881 0.63875 0.97578 +0.88520 0.63796 0.97140 +0.94675 0.63734 0.96717 +1.00000 0.63690 0.96313 +1.00000 0.63666 0.95930 +0.00000 0.72128 1.00000 +0.03118 0.72059 1.00000 +0.09127 0.71966 1.00000 +0.15668 0.71854 1.00000 +0.22635 0.71724 0.99728 +0.29924 0.71581 0.99272 +0.37442 0.71436 0.98806 +0.45097 0.71293 0.98339 +0.52795 0.71155 0.97873 +0.60447 0.71023 0.97411 +0.67962 0.70901 0.96956 +0.75254 0.70789 0.96510 +0.82235 0.70690 0.96078 +0.88821 0.70606 0.95660 +0.94929 0.70538 0.95262 +1.00000 0.70488 0.94884 +1.00000 0.70458 0.94529 +0.00000 0.78764 0.99902 +0.04178 0.78646 0.99504 +0.10171 0.78509 0.99077 +0.16676 0.78365 0.98638 +0.23595 0.78217 0.98190 +0.30831 0.78068 0.97738 +0.38292 0.77919 0.97284 +0.45884 0.77773 0.96830 +0.53517 0.77631 0.96381 +0.61102 0.77497 0.95938 +0.68551 0.77371 0.95506 +0.75777 0.77256 0.95085 +0.82697 0.77154 0.94680 +0.89227 0.77067 0.94294 +0.95285 0.76995 0.93927 +1.00000 0.76941 0.93585 +1.00000 0.76907 0.93268 +0.00052 0.84842 0.98403 +0.05413 0.84709 0.97995 +0.11372 0.84568 0.97575 +0.17831 0.84422 0.97148 +0.24694 0.84272 0.96715 +0.31869 0.84121 0.96280 +0.39262 0.83971 0.95846 +0.46782 0.83825 0.95416 +0.54342 0.83683 0.94993 +0.61853 0.83548 0.94579 +0.69229 0.83423 0.94178 +0.76386 0.83308 0.93791 +0.83240 0.83206 0.93423 +0.89711 0.83119 0.93074 +0.95715 0.83047 0.92749 +1.00000 0.82993 0.92450 +1.00000 0.82958 0.92179 +0.01465 0.90394 0.96954 +0.06789 0.90262 0.96560 +0.12698 0.90122 0.96159 +0.19098 0.89977 0.95752 +0.25895 0.89829 0.95344 +0.32996 0.89681 0.94936 +0.40312 0.89534 0.94531 +0.47752 0.89391 0.94133 +0.55231 0.89254 0.93745 +0.62661 0.89123 0.93368 +0.69960 0.89002 0.93007 +0.77043 0.88892 0.92662 +0.83829 0.88794 0.92338 +0.90236 0.88710 0.92037 +0.96185 0.88643 0.91760 +1.00000 0.88593 0.91512 +1.00000 0.88561 0.91294 +0.02984 0.95377 0.95609 +0.08255 0.95250 0.95240 +0.14102 0.95115 0.94866 +0.20430 0.94977 0.94489 +0.27148 0.94837 0.94113 +0.34165 0.94696 0.93741 +0.41394 0.94558 0.93374 +0.48746 0.94423 0.93017 +0.56138 0.94294 0.92671 +0.63483 0.94172 0.92340 +0.70700 0.94060 0.92026 +0.77706 0.93958 0.91731 +0.84420 0.93869 0.91459 +0.90761 0.93794 0.91212 +0.96650 0.93735 0.90992 +1.00000 0.93693 0.90801 +1.00000 0.93669 0.90643 +0.04552 0.99742 0.94405 +0.09755 0.99625 0.94069 +0.15524 0.99502 0.93731 +0.21768 0.99376 0.93393 +0.28395 0.99248 0.93058 +0.35319 0.99120 0.92729 +0.42453 0.98995 0.92409 +0.49710 0.98874 0.92100 +0.57008 0.98758 0.91805 +0.64264 0.98650 0.91526 +0.71395 0.98551 0.91267 +0.78320 0.98463 0.91029 +0.84960 0.98387 0.90816 +0.91234 0.98325 0.90630 +0.97061 0.98278 0.90473 +1.00000 0.98248 0.90347 +1.00000 0.98236 0.90256 diff --git a/src/azioni.ts b/src/azioni.ts index e6bbda1..da66602 100644 --- a/src/azioni.ts +++ b/src/azioni.ts @@ -5,13 +5,16 @@ import { motore } from './motore'; import * as M from './core/montaggio'; import { clipById, end, isVideoClip, newClip, newTrack, nextTrackName, projectEnd, srcTimeAt, TITLE0, trackOf, uid } from './core/progetto'; import { fps, frameToTc, s2f } from './core/timecode'; +import { togliAnimazione } from './core/automazioni'; import { avviso } from './ui/dom'; import { finestraVelocita } from './ui/velocita'; +import { finestraMontaggioTesto } from './ui/montaggioTesto'; import type { Clip, Transition } from './core/tipi'; import { STILI_CONTO, type StileConto } from './render/grafica'; import { applicaPresetTitolo, presetTitolo } from './core/generatori'; import { suonoTitolo } from './core/suoni'; import { ANIMAZIONI, animazione, nuovaAnim } from './core/animazioni'; +import { MODELLI_HTML, modelloHtml, nuovoHtml } from './core/titoliHtml'; import { blocchiDi, durataBlocco, nomeBlocco, nuovoBlocco, posaBlocco, postoBlocco, taglioVicino, tracciaPerBlocco, transizioniSul } from './core/blocchi'; export interface Azione { @@ -30,6 +33,7 @@ const reg = (a: Azione) => azioni.set(a.id, a); * loro tasti, nella ricerca (Ctrl+K), nella guida dei tasti e nei menu */ export const registra = reg; export const esegui = (id: string) => azioni.get(id)?.fn(); +reg({ id: 'montaggioTesto', nome: 'Testo · monta dal parlato…', gruppo: 'Montaggio', fn: () => finestraMontaggioTesto() }); /** stato dei modi della centralina */ export const modi = { @@ -621,7 +625,7 @@ reg({ function opacitaSel(delta: number) { const ids = [...store.sel].filter((id) => { const c = clipById(store.doc, id); return c && isVideoClip(c); }); if (!ids.length) { avviso('Seleziona una clip video', 'info', 1000); return; } - store.edit('Trasparenza', (p) => { for (const c of p.clips) if (ids.includes(c.id)) { c.opacity = Math.max(0, Math.min(1, Math.round((c.opacity + delta) * 20) / 20)); c.opKeys = []; } }); + store.edit('Trasparenza', (p) => { for (const c of p.clips) if (ids.includes(c.id)) { c.opacity = Math.max(0, Math.min(1, Math.round((c.opacity + delta) * 20) / 20)); c.opKeys = []; togliAnimazione(c, 'opacity'); } }); const c = clipById(store.doc, ids[0])!; avviso(`Opacità ${Math.round(c.opacity * 100)}%`, 'tasto', 800); } @@ -637,7 +641,7 @@ reg({ }); // ——— generatori (le macchine della sala) ——— -export function inserisciGeneratore(kind: 'bars' | 'color' | 'countdown' | 'title' | 'nero' | 'anim', f = head(), trackId?: string, opz: { conto?: { stile: StileConto; secondi: number }; titolo?: string; anim?: string } = {}) { +export function inserisciGeneratore(kind: 'bars' | 'color' | 'countdown' | 'title' | 'nero' | 'anim' | 'html', f = head(), trackId?: string, opz: { conto?: { stile: StileConto; secondi: number }; titolo?: string; anim?: string; html?: string } = {}) { const conto = opz.conto ?? { stile: 'pellicola' as StileConto, secondi: 5 }; const p = store.doc; const rr = r(); @@ -673,6 +677,12 @@ export function inserisciGeneratore(kind: 'bars' | 'color' | 'countdown' | 'titl } const c = newClip('title', tid, f, len, { name: an.nome, gen: { anim: nuovaAnim(an.id) } }); pp.clips.push(c); out.push(c.id); + } else if (kind === 'html') { + // un titolo animato HTML: una clip titolo con dentro il modello (testi, colori e tempi si cambiano dalle Proprietà) + const mo = modelloHtml(opz.html ?? 'neon') ?? MODELLI_HTML[0]; + const len = Math.max(1, Math.round(rr * mo.durata)); + const c = newClip('title', tv(len, trackId ?? pp.tracks.find((t) => t.kind === 'video' && !t.lock)?.id ?? null), f, len, { name: mo.nome, gen: { html: nuovoHtml(mo.id) } }); + pp.clips.push(c); out.push(c.id); } else if (kind === 'title') { const len = Math.round(rr * 5 * (opz.titolo ? presetTitolo(opz.titolo)?.volte ?? 1 : 1)); // i titoli stanno sopra: si parte dalla traccia video più alta @@ -719,6 +729,7 @@ reg({ id: 'sottVtt', nome: 'Esporta i sottotitoli in un file .vtt (web)', gruppo reg({ id: 'sottImporta', nome: 'Importa i sottotitoli da un file .srt / .vtt', gruppo: 'Sottotitoli', fn: rapidi((m) => m.importaSottotitoli()) }); reg({ id: 'sottParla', nome: 'Fai parlare i sottotitoli (voce AI)', gruppo: 'Sottotitoli', fn: rapidi((m) => void m.faiParlareSottotitoli()) }); +reg({ id: 'genTitoloHtml', nome: 'Titolo animato HTML (neon, display, terzo inferiore…)', gruppo: 'Generatori', fn: () => inserisciGeneratore('html') }); reg({ id: 'genAnimazione', nome: 'Animazione (sottopancia, testo che si muove…)', gruppo: 'Generatori', tasti: ['Ctrl+Alt+N'], fn: () => inserisciGeneratore('anim') }); export { head as cursore }; diff --git a/src/core/animazioni.ts b/src/core/animazioni.ts index 6bf6c4c..6c8d1f9 100644 --- a/src/core/animazioni.ts +++ b/src/core/animazioni.ts @@ -2,7 +2,7 @@ // e quelle per le cerimonie. Qui ci sono solo i dati (nome, campi da compilare, durata); come si disegnano sta in // src/render/animazioni.ts. Il disegno è un'altra cosa: ogni animazione è una funzione del tempo, senza stato. // Molte nascono dal catalogo di HyperFrames (HeyGen, Apache-2.0, https://github.com/heygen-com/hyperframes): le -// stesse idee di movimento (entrata, tenuta, uscita), ridisegnate per questo programma. Vedi THIRD-PARTY.md. +// stesse idee di movimento (entrata, tenuta, uscita), ridisegnate per questo programma. Vedi TERZE-PARTI.md. import type { AnimSpec } from './tipi'; export type TipoCampo = 'testo' | 'lungo' | 'numero' | 'colore' | 'scelta' | 'spunta'; @@ -108,7 +108,7 @@ export const ANIMAZIONI: Anim[] = [ { id: 'sc-chiusura', nome: 'Chiusura con invito', gruppo: 'social', info: 'grazie, un invito e il pulsante: per finire il video', durata: 6, campi: [T('titolo', 'Titolo', 'Grazie per la visione'), T('sotto', 'Riga sotto', 'Ci vediamo al prossimo video'), T('bottone', 'Pulsante', 'Iscriviti'), C('colore', 'Colore', '#ffd23f'), FONT('montserrat'), DIM] }, { id: 'sc-post', nome: 'Post social', gruppo: 'social', info: 'una scheda stile post con avatar, testo e mi piace', durata: 6, - campi: [T('nome', 'Nome', 'DaProd Video'), T('utente', 'Utente', '@daprod'), L('testo', 'Testo', 'Il montaggio vecchio stile, moderno dentro.'), N('mipiace', 'Mi piace', 12840, 0, 100000000, 1), C('colore', 'Colore', '#1d9bf0'), POS, DIM] }, + campi: [T('nome', 'Nome', 'DaProd Editor Video'), T('utente', 'Utente', '@daprod'), L('testo', 'Testo', 'Il montaggio vecchio stile, moderno dentro.'), N('mipiace', 'Mi piace', 12840, 0, 100000000, 1), C('colore', 'Colore', '#1d9bf0'), POS, DIM] }, { id: 'sc-notifica', nome: 'Notifica del telefono', gruppo: 'social', info: 'un banner che scende dall\'alto come sul telefono', durata: 5, campi: [T('app', 'App', 'Messaggi'), T('titolo', 'Titolo', 'Anna'), T('testo', 'Testo', 'Sei pronto? Tra poco si parte!'), C('colore', 'Colore dell\'icona', '#34c759'), DIM] }, { id: 'sc-chat', nome: 'Chat', gruppo: 'social', info: 'le bolle di una conversazione che arrivano una dopo l\'altra', durata: 7, diff --git a/src/core/automazioni.ts b/src/core/automazioni.ts new file mode 100644 index 0000000..6f2fa92 --- /dev/null +++ b/src/core/automazioni.ts @@ -0,0 +1,320 @@ +// Keyframe su qualunque parametro numerico di una clip o di un effetto. +// Una clip può avere `c.anim`: per ogni parametro (un "percorso" come "opacity", "tf.x", "fx.sat", "fxb.forza", +// "mask..sfuma") una lista di chiavi {f, v, modo}. Chi non ha una linea usa il valore fermo di sempre, quindi i +// progetti vecchi (senza `anim`) restano identici. Le linee elastiche di prima (opKeys, gainKeys) e il movimento +// (tf → via → tfFine) continuano a funzionare: l'animazione, se c'è, ha la precedenza solo su quel parametro. +// Questo modulo è puro e non importa altri moduli (lo usano progetto.ts, blocchi.ts, il compositore e l'audio). +// La struttura (linee per parametro con chiavi a tempo, ricerca della coppia di chiavi, descrittori dei parametri +// per percorso) si ispira ai motori di keyframe di OpenReel Video (MIT): vedi TERZE-PARTI.md. +import type { ChiaveAnim, Clip, MascheraForma, ModoAnim } from './tipi'; + +export const MODI_ANIM: { id: ModoAnim; nome: string; info: string }[] = [ + { id: 'lineare', nome: 'Dritta', info: 'va dritta fino alla chiave dopo' }, + { id: 'morbida', nome: 'Morbida', info: 'parte e arriva piano' }, + { id: 'gradino', nome: 'A gradino', info: 'resta com\'è e salta alla chiave dopo' }, +]; + +/** il valore di una linea al fotogramma locale lf. Prima della prima chiave e dopo l'ultima vale quella; nessuna chiave = base. */ +export function valoreAnim(keys: readonly ChiaveAnim[] | undefined, lf: number, base: number): number { + const n = keys?.length ?? 0; + if (!keys || !n) return base; + if (lf <= keys[0].f) return keys[0].v; + if (lf >= keys[n - 1].f) return keys[n - 1].v; + // ricerca binaria della coppia che racchiude lf + let lo = 0, hi = n - 1; + while (hi - lo > 1) { const m = (lo + hi) >> 1; if (keys[m].f <= lf) lo = m; else hi = m; } + const a = keys[lo], b = keys[hi]; + const modo = a.modo ?? 'lineare'; + if (modo === 'gradino') return a.v; + let t = (lf - a.f) / Math.max(1e-9, b.f - a.f); + if (modo === 'morbida') t = t * t * (3 - 2 * t); + return a.v + (b.v - a.v) * t; +} + +// ——— i parametri: ogni percorso sa leggersi e scriversi sulla clip ——— + +export interface Descrittore { get(c: Clip): number; set(c: Clip, v: number): void } + +const TF: Record = { x: 0, y: 0, scale: 1, rot: 0, cropL: 0, cropR: 0, cropT: 0, cropB: 0, angoli: 0, ombra: 0, sx: 1 }; +const FX: Record = { bright: 0, contrast: 1, sat: 1, hue: 0, temp: 0, vignette: 0, zoom: 0, keyLevel: 0.35, keySoft: 0.1, keyBordo: 0, keySfuma: 0, keyPulisci: 0 }; +const RUOTE: Record = { lift: 0, gamma: 1, gain: 1 }; +const CANALE: Record = { r: 0, g: 1, b: 2 }; +/** i campi numerici di una maschera che si possono animare */ +export const CAMPI_MASCHERA = ['x', 'y', 'w', 'h', 'rot', 'sfuma', 'espandi', 'opacita'] as const; + +const maschera = (c: Clip, id: string): MascheraForma | undefined => c.maschere?.find((m) => m.id === id); + +/** il parametro di un percorso, o null se il percorso non esiste */ +export function descrittore(path: string): Descrittore | null { + if (path === 'opacity') return { get: (c) => c.opacity, set: (c, v) => { c.opacity = v; } }; + if (path === 'gain') return { get: (c) => c.gain, set: (c, v) => { c.gain = v; } }; + if (path === 'pan') return { get: (c) => c.pan, set: (c, v) => { c.pan = v; } }; + const [grp, k, k2, k3] = path.split('.'); + if (grp === 'tf' && Object.hasOwn(TF, k) && !k2) return { get: (c) => (c.tf as unknown as Record)[k] ?? TF[k], set: (c, v) => { (c.tf as unknown as Record)[k] = v; } }; + if (grp === 'fx' && Object.hasOwn(FX, k) && !k2) return { get: (c) => (c.fx as unknown as Record)[k] ?? FX[k], set: (c, v) => { (c.fx as unknown as Record)[k] = v; } }; + if (grp === 'fx' && k === 'colore' && Object.hasOwn(RUOTE, k2) && Object.hasOwn(CANALE, k3)) { + const i = CANALE[k3]; + return { + get: (c) => c.fx.colore?.[k2 as 'lift']?.[i] ?? RUOTE[k2], + set: (c, v) => { + const col = (c.fx.colore ??= {}); + const t = [...(col[k2 as 'lift'] ?? [RUOTE[k2], RUOTE[k2], RUOTE[k2]])] as [number, number, number]; + t[i] = v; + col[k2 as 'lift'] = t; + }, + }; + } + if (path === 'fx.colore.lut') return { get: (c) => c.fx.colore?.lut?.intensita ?? 1, set: (c, v) => { if (c.fx.colore?.lut) c.fx.colore.lut.intensita = v; } }; + if (grp === 'fxb' && k === 'forza' && !k2) return { get: (c) => c.fxb?.forza ?? 1, set: (c, v) => { if (c.fxb) c.fxb.forza = v; } }; + if (grp === 'fxb' && k === 'volume' && !k2) return { get: (c) => c.fxb?.volume ?? 0, set: (c, v) => { if (c.fxb) c.fxb.volume = v; } }; + if (grp === 'fxb' && k === 'parametri' && k2 && !k3) return { get: (c) => c.fxb?.parametri?.[k2] ?? 0, set: (c, v) => { if (c.fxb) (c.fxb.parametri ??= {})[k2] = v; } }; + if (grp === 'mask' && k) { + const id = k; + if ((CAMPI_MASCHERA as readonly string[]).includes(k2) && !k3) { + return { get: (c) => (maschera(c, id) as unknown as Record | undefined)?.[k2] ?? 0, set: (c, v) => { const m = maschera(c, id); if (m) (m as unknown as Record)[k2] = v; } }; + } + // i punti della Bézier: mask..p.x / .y + const mp = /^p(\d+)$/.exec(k2 ?? ''); + if (mp && (k3 === 'x' || k3 === 'y')) { + const i = Number(mp[1]); + return { get: (c) => maschera(c, id)?.punti?.[i]?.[k3] ?? 0, set: (c, v) => { const p = maschera(c, id)?.punti?.[i]; if (p) p[k3] = v; } }; + } + } + return null; +} + +/** il valore fermo (quello che c'è nella clip, senza animazione) di un parametro */ +export function valoreFermo(c: Clip, path: string): number { + return descrittore(path)?.get(c) ?? 0; +} + +const aMano = (c: Clip) => c.anim && Object.keys(c.anim).some((k) => c.anim![k]?.length); + +/** il percorso ha una linea con chiavi? */ +export const haLinea = (c: Clip, path: string) => !!c.anim?.[path]?.length; + +/** il valore di un parametro al fotogramma locale lf: quello animato se c'è la linea, se no quello fermo */ +export function valoreAl(c: Clip, path: string, lf: number): number { + const k = c.anim?.[path]; + const d = descrittore(path); + const base = d ? d.get(c) : 0; + return k?.length ? valoreAnim(k, lf, base) : base; +} + +/** una copia della clip con le parti che i keyframe possono toccare staccate dall'originale (tf, fx, blocco, maschere) */ +export function copiaLeggera(c: Clip): Clip { + const o: Clip = { + ...c, + tf: { ...c.tf }, + fx: { ...c.fx, colore: c.fx.colore ? structuredClone(c.fx.colore) : undefined }, + fxb: c.fxb ? { ...c.fxb, parametri: c.fxb.parametri ? { ...c.fxb.parametri } : undefined } : undefined, + maschere: c.maschere?.map((m) => ({ ...m, punti: m.punti?.map((p) => ({ ...p })) })), + }; + if (!o.fx.colore) delete (o.fx as { colore?: unknown }).colore; + if (!o.fxb) delete (o as { fxb?: unknown }).fxb; + if (!o.maschere) delete (o as { maschere?: unknown }).maschere; + return o; +} + +/** + * La clip com'è al fotogramma locale lf, con tutti i parametri animati sostituiti dal loro valore di adesso. + * Senza animazioni ritorna la clip stessa (nessun costo, nessuna differenza); altrimenti una copia: il progetto + * non si tocca mai durante il disegno. `anim` resta sulla copia (tfAl lo rilegge: dà lo stesso valore). + */ +export function valutaClip(c: Clip, lf: number): Clip { + if (!aMano(c)) return c; + const o = copiaLeggera(c); + for (const path of Object.keys(c.anim!)) { + const keys = c.anim![path]; + if (!keys?.length) continue; + const d = descrittore(path); + if (!d) continue; + const v = valoreAnim(keys, lf, d.get(o)); + if (Number.isFinite(v)) d.set(o, v); + // la linea nuova prende il posto delle vecchie linee elastiche (non si sommano) + if (path === 'opacity') o.opKeys = []; + if (path === 'gain') o.gainKeys = []; + } + return o; +} + +/** i percorsi che hanno almeno una chiave */ +export const percorsiAnimati = (c: Clip) => Object.keys(c.anim ?? {}).filter((k) => c.anim![k]?.length); + +// ——— modificare le linee ——— + +export const indiceChiave = (c: Clip, path: string, lf: number) => c.anim?.[path]?.findIndex((k) => k.f === lf) ?? -1; +export const haChiaveA = (c: Clip, path: string, lf: number) => indiceChiave(c, path, lf) >= 0; + +/** + * Mette (o cambia) una chiave. Se per quel parametro c'era una linea elastica di prima (opacità, volume) la trasforma in + * chiavi dritte equivalenti: da quel momento comanda la nuova linea, e il disegno non cambia. + */ +export function mettiChiave(c: Clip, path: string, lf: number, v: number, modo?: ModoAnim) { + const anim = (c.anim ??= {}); + let linea = anim[path]; + if (!linea) { + linea = []; + if (path === 'opacity' && c.opKeys.length) { linea = c.opKeys.map((k) => ({ f: k.f, v: k.v })); c.opKeys = []; } + if (path === 'gain' && c.gainKeys.length) { linea = c.gainKeys.map((k) => ({ f: k.f, v: k.v })); c.gainKeys = []; } + anim[path] = linea; + } + const i = linea.findIndex((k) => k.f === lf); + if (i >= 0) { linea[i].v = v; if (modo) setModo(linea[i], modo); } + else { + const k: ChiaveAnim = { f: lf, v }; + if (modo && modo !== 'lineare') k.modo = modo; + linea.push(k); + linea.sort((a, b) => a.f - b.f); + } +} + +function setModo(k: ChiaveAnim, modo: ModoAnim) { + if (modo === 'lineare') delete k.modo; else k.modo = modo; +} + +/** cambia il modo con cui si va da quella chiave alla successiva */ +export function impostaModoChiave(c: Clip, path: string, lf: number, modo: ModoAnim) { + const k = c.anim?.[path]?.find((x) => x.f === lf); + if (k) setModo(k, modo); +} + +/** toglie una chiave; se era l'ultima la linea sparisce e il parametro resta dov'era in quel punto (niente salti) */ +export function togliChiave(c: Clip, path: string, lf: number) { + const linea = c.anim?.[path]; + if (!linea) return; + const i = linea.findIndex((k) => k.f === lf); + if (i < 0) return; + const v = linea[i].v; + linea.splice(i, 1); + if (!linea.length) { + delete c.anim![path]; + descrittore(path)?.set(c, v); + if (!Object.keys(c.anim!).length) delete c.anim; + } +} + +/** toglie tutta la linea; il valore fermo diventa quello che c'è al fotogramma lf */ +export function togliLinea(c: Clip, path: string, lf: number) { + if (!c.anim?.[path]) return; + const v = valoreAl(c, path, lf); + delete c.anim[path]; + descrittore(path)?.set(c, v); + if (!Object.keys(c.anim).length) delete c.anim; +} + +/** + * Toglie le linee animate di un parametro (o di tutto un gruppo: "tf" toglie "tf.x", "tf.scale"…). Serve a chi mette un + * valore fisso (Muto, Azzera colore, posizioni pronte…): senza, la linea comanderebbe ancora e il comando non si vedrebbe. + */ +export function togliAnimazione(c: Clip, ...percorsi: string[]) { + if (!c.anim) return; + for (const k of Object.keys(c.anim)) if (percorsi.some((p) => k === p || k.startsWith(p + '.'))) delete c.anim[k]; + if (!Object.keys(c.anim).length) delete c.anim; +} + +/** il fotogramma della chiave prima (dir −1) o dopo (dir +1) di lf, o null */ +export function chiaveVicina(c: Clip, path: string, lf: number, dir: -1 | 1): number | null { + const linea = c.anim?.[path]; + if (!linea) return null; + if (dir > 0) { const k = linea.find((x) => x.f > lf); return k ? k.f : null; } + for (let i = linea.length - 1; i >= 0; i--) if (linea[i].f < lf) return linea[i].f; + return null; +} + +/** tutte le chiavi di tutte le linee (per disegnarle sulla clip): fotogramma locale → quante linee ci sono */ +export function fotogrammiChiave(c: Clip): number[] { + const s = new Set(); + for (const k of Object.keys(c.anim ?? {})) for (const x of c.anim![k]) s.add(x.f); + return [...s].sort((a, b) => a - b); +} + +// ——— quando la clip cambia (taglio, bordi, velocità, frequenza) le chiavi la seguono ——— + +/** dopo il taglio al fotogramma locale lf: a sinistra restano le chiavi prima, a destra quelle dopo (spostate); il valore del taglio sta da tutte e due le parti */ +export function dividiAnim(c: Clip, destra: Clip, lf: number) { + if (!c.anim) return; + const sx: Record = {}, dx: Record = {}; + for (const path of Object.keys(c.anim)) { + const keys = c.anim[path]; + if (!keys.length) continue; + const v = valoreAnim(keys, lf, 0); + // il modo del tratto che contiene il taglio passa alla chiave nuova di destra + let prima: ChiaveAnim | undefined; + for (const k of keys) if (k.f <= lf) prima = k; + const modo = prima?.modo; + sx[path] = keys.filter((k) => k.f < lf).map((k) => ({ ...k })).concat({ f: lf, v }); + const nuova: ChiaveAnim = { f: 0, v }; + if (modo) nuova.modo = modo; + dx[path] = [nuova].concat(keys.filter((k) => k.f > lf).map((k) => ({ ...k, f: k.f - lf }))); + } + c.anim = sx; + destra.anim = dx; +} + +/** una clip che perde d fotogrammi all'inizio (o li guadagna se d < 0): le chiavi restano sullo stesso istante del contenuto */ +export function spostaAnim(c: Clip, d: number) { + if (!c.anim || !d) return; + for (const path of Object.keys(c.anim)) c.anim[path] = c.anim[path].map((k) => ({ ...k, f: k.f - d })); +} + +/** la clip cambia durata di un fattore k (velocità, frequenza di quadro): le chiavi si rimettono in proporzione */ +export function scalaAnim(c: Clip, k: number) { + if (!c.anim || k === 1) return; + for (const path of Object.keys(c.anim)) { + const r: ChiaveAnim[] = []; + for (const x of c.anim[path]) { + const f = Math.round(x.f * k); + const i = r.findIndex((y) => y.f === f); + if (i >= 0) r[i] = { ...x, f }; else r.push({ ...x, f }); + } + c.anim[path] = r.sort((a, b) => a.f - b.f); + } +} + +/** + * Quando si apre un progetto: le animazioni scritte male (chiavi non finite, fuori ordine, doppie) si rimettono a posto, + * le linee vuote o di parametri che non esistono più si tolgono. Senza `anim` non si fa niente (i progetti vecchi restano come sono). + */ +export function pulisciAnim(c: Clip) { + if (c.anim === undefined) { if (c.maschere !== undefined && !Array.isArray(c.maschere)) delete c.maschere; return; } + if (!c.anim || typeof c.anim !== 'object') { delete c.anim; return; } + for (const path of Object.keys(c.anim)) { + const grezza = c.anim[path]; + if (!Array.isArray(grezza) || !descrittore(path)) { delete c.anim[path]; continue; } + const ok = grezza.filter((k) => k && Number.isFinite(k.f) && Number.isFinite(k.v)); + const per = new Map(); + for (const k of ok) { + const n: ChiaveAnim = { f: k.f, v: k.v }; + if (k.modo === 'morbida' || k.modo === 'gradino') n.modo = k.modo; + per.set(k.f, n); // l'ultima scritta vince + } + if (!per.size) delete c.anim[path]; else c.anim[path] = [...per.values()].sort((a, b) => a.f - b.f); + } + if (!Object.keys(c.anim).length) delete c.anim; +} + +/** i fotogrammi dove programmare una linea sull'audio (rampe dritte fra un punto e l'altro): le chiavi, e in mezzo più punti se la curva è morbida; il gradino salta subito prima della chiave dopo */ +export function puntiLinea(keys: readonly ChiaveAnim[] | undefined): number[] { + const out: number[] = []; + if (!keys) return out; + for (let i = 0; i < keys.length; i++) { + out.push(keys[i].f); + if (!i) continue; + const a = keys[i - 1], b = keys[i]; + const modo = a.modo ?? 'lineare'; + if (modo === 'gradino') out.push(b.f - 0.02); + else { + const n = modo === 'morbida' ? 24 : 1; + for (let s = 1; s < n; s++) out.push(a.f + ((b.f - a.f) * s) / n); + } + } + return out; +} + +/** il volume della clip in dB al fotogramma locale lf (linea nuova, se no linea elastica di prima, se no il valore fermo) */ +export function gainDbAl(c: Clip, lf: number, vecchia: (keys: { f: number; v: number }[], lf: number, base: number) => number): number { + const k = c.anim?.gain; + if (k?.length) return valoreAnim(k, lf, c.gain); + return c.gainKeys.length ? vecchia(c.gainKeys, lf, c.gain) : c.gain; +} diff --git a/src/core/blocchi.ts b/src/core/blocchi.ts index b8eae7c..de52e80 100644 --- a/src/core/blocchi.ts +++ b/src/core/blocchi.ts @@ -8,6 +8,7 @@ import type { BloccoFx, Clip, Project, Transition } from './tipi'; import { end, newClip, newTransition, passaPer } from './progetto'; import { oggettoSulQuadro } from './traccia'; +import { valutaClip } from './automazioni'; import { suonoTransizione } from './suoni'; import { fps } from './timecode'; import { nomeModello, tipoDi } from '../render/transizioni'; @@ -93,7 +94,7 @@ type Motore = 'flash' | 'scossa' | 'camera' | 'zoomColpo' | 'battito' | 'zoomLen | 'onda' | 'bolla' | 'vortice' | 'caleido' | 'calore' | 'zoomSfocato' | 'eco' | 'vibra' | 'raggi' | 'bokeh' | 'scintille' | 'anamorfico' | 'duotone' | 'posterizza' | 'solarizza' | 'termico' | 'visore' | 'retino' | 'filmMuto' | 'pizzico' | 'gocce' | 'specchio' | 'quadri' | 'rullo' | 'pesce' | 'neve' | 'pioggia' | 'polvere' | 'coriandoli' - | 'ologramma' | 'prisma' | 'matita' | 'tunnel' | 'nebbia' | 'braci' | 'vetro' | 'noSegnale' | 'irideChiude' | 'irideApre' | 'miniatura' | 'esagoni' | 'scansione' | 'grana' | 'nitido' | 'censura'; + | 'ologramma' | 'prisma' | 'matita' | 'tunnel' | 'nebbia' | 'braci' | 'vetro' | 'noSegnale' | 'irideChiude' | 'irideApre' | 'miniatura' | 'esagoni' | 'scansione' | 'grana' | 'nitido' | 'censura' | 'clicLive'; export interface ParametroFx { chiave: string; nome: string; min: number; max: number; def: number; passo: number } @@ -111,6 +112,7 @@ export interface EffettoTempo { } export const EFFETTI_TEMPO: EffettoTempo[] = [ + { id: 'clicLive', nome: 'Clic animati', info: 'Cerchietti sui clic dei video registrati con i dati del cursore LIVE', durata: 3, gruppo: 'rapidi', motore: 'clicLive', colore: '#ffd54a' }, { id: 'flash', nome: 'Lampo', info: 'un flash bianco: sul taglio o all\'inizio', durata: 0.5, gruppo: 'rapidi', motore: 'flash', colore: '#ffffff' }, { id: 'lampoNero', nome: 'Lampo nero', info: 'un battito di ciglia al nero', durata: 0.4, gruppo: 'rapidi', motore: 'flash', colore: '#000000' }, { id: 'scossa', nome: 'Scossa', info: 'la camera trema per il colpo', durata: 0.5, gruppo: 'rapidi', motore: 'scossa' }, @@ -541,9 +543,12 @@ export function statoEffetti(p: Project, f: number, track?: string): StatoFx | n // il centro comune: la media dei centri degli effetti che ce l'hanno (pesata sulla forza) let px = 0, py = 0, peso = 0; for (const c of blocchiAccesi(p, 'effetto', track)) { + // I clic si disegnano nel layer della ripresa: non cambiano webcam o tracce sotto. + if (c.fxb?.id === 'clicLive') continue; if (f < c.start || f >= end(c)) continue; st ??= neutro(); - applica(st, p, c, f); + // forza e parametri con i keyframe: si valutano per ogni blocco PRIMA dell'inviluppo e della somma + applica(st, p, valutaClip(c, f - c.start), f); const e = effettoTempo(c.fxb!.id); if (e && e.motore !== 'censura' && CENTRATI.has(e.motore) && (c.fxb!.pos || c.fxb!.segue)) { const [x, y] = centroBlocco(c, f, p); diff --git a/src/core/codaExport.ts b/src/core/codaExport.ts new file mode 100644 index 0000000..dfd4d7b --- /dev/null +++ b/src/core/codaExport.ts @@ -0,0 +1,91 @@ +// La coda delle esportazioni, la parte che si può provare senza browser: chi viene dopo, spostare, togliere, +// quanti ne mancano. Chi la fa girare davvero (e la aggancia al Centro attività) è `src/export/coda.ts`. + +export type StatoVoce = 'attesa' | 'lavoro' | 'fatta' | 'errore' | 'annullata'; + +export interface Voce { + id: number; + stato: StatoVoce; + dato: T; + /** l'errore, o il file finito */ + messaggio?: string; +} + +export class Coda { + readonly voci: Voce[] = []; + private seme = 1; + + /** mette in coda (in fondo, o in cima a quelle che aspettano) */ + aggiungi(dato: T, inCima = false): Voce { + const v: Voce = { id: this.seme++, stato: 'attesa', dato }; + if (inCima) { + const i = this.voci.findIndex((x) => x.stato === 'attesa'); + this.voci.splice(i < 0 ? this.voci.length : i, 0, v); + } else this.voci.push(v); + return v; + } + + voce(id: number): Voce | undefined { return this.voci.find((v) => v.id === id); } + + /** quella che sta lavorando adesso */ + inLavoro(): Voce | undefined { return this.voci.find((v) => v.stato === 'lavoro'); } + + /** la prossima a partire: la prima che aspetta, ma solo se nessuna sta lavorando (una dopo l'altra) */ + prossimo(): Voce | undefined { + if (this.inLavoro()) return undefined; + return this.voci.find((v) => v.stato === 'attesa'); + } + + segna(id: number, stato: StatoVoce, messaggio?: string) { + const v = this.voce(id); + if (!v) return; + v.stato = stato; + if (messaggio !== undefined) v.messaggio = messaggio; + } + + /** sposta una voce che aspetta su (-1) o giù (+1) fra quelle che aspettano. Ritorna se si è mossa. */ + sposta(id: number, verso: -1 | 1): boolean { + const v = this.voce(id); + if (!v || v.stato !== 'attesa') return false; + const attese = this.voci.filter((x) => x.stato === 'attesa'); + const k = attese.indexOf(v) + verso; + if (k < 0 || k >= attese.length) return false; + const altra = attese[k]; + const a = this.voci.indexOf(v), b = this.voci.indexOf(altra); + this.voci[a] = altra; + this.voci[b] = v; + return true; + } + + /** toglie una voce che non sta lavorando */ + togli(id: number): boolean { + const i = this.voci.findIndex((v) => v.id === id && v.stato !== 'lavoro'); + if (i < 0) return false; + this.voci.splice(i, 1); + return true; + } + + /** toglie quelle finite (fatte, sbagliate, annullate) */ + pulisciFinite(): number { + const prima = this.voci.length; + for (let i = this.voci.length - 1; i >= 0; i--) if (this.voci[i].stato !== 'attesa' && this.voci[i].stato !== 'lavoro') this.voci.splice(i, 1); + return prima - this.voci.length; + } + + conta(): Record { + const c: Record = { attesa: 0, lavoro: 0, fatta: 0, errore: 0, annullata: 0 }; + for (const v of this.voci) c[v.stato]++; + return c; + } + + /** "1 in lavoro · 2 in coda · 3 finite" */ + riepilogo(): string { + const c = this.conta(); + const pezzi: string[] = []; + if (c.lavoro) pezzi.push('1 in lavoro'); + if (c.attesa) pezzi.push(`${c.attesa} in coda`); + const fin = c.fatta + c.errore + c.annullata; + if (fin) pezzi.push(`${fin} ${fin === 1 ? 'finita' : 'finite'}`); + return pezzi.length ? pezzi.join(' · ') : 'La coda è vuota'; + } +} diff --git a/src/core/coloreAudioProgetto.ts b/src/core/coloreAudioProgetto.ts new file mode 100644 index 0000000..fc37927 --- /dev/null +++ b/src/core/coloreAudioProgetto.ts @@ -0,0 +1,18 @@ +// Migrazione aggiuntiva: i campi vecchi e le loro formule restano intatti. +import type { Project } from './tipi'; +import { configDucking } from './ducking'; + +export function migraColoreAudio(p: Project): void { + p.luts ??= []; + for (const s of [p, ...(p.sequenze ?? [])]) { + for (const t of s.tracks ?? []) if (t.ducking) t.ducking = configDucking(t.ducking); + for (const c of s.clips ?? []) { + if (c.ducking) c.ducking = configDucking(c.ducking); + if (c.duckKeys) { + const m = new Map(); + for (const k of c.duckKeys) if (Number.isFinite(k.f) && Number.isFinite(k.v)) m.set(k.f, Math.max(-60, Math.min(0, k.v))); + c.duckKeys = [...m].map(([f, v]) => ({ f, v })).sort((a, b) => a.f - b.f); + } + } + } +} diff --git a/src/core/ducking.ts b/src/core/ducking.ts new file mode 100644 index 0000000..404680a --- /dev/null +++ b/src/core/ducking.ts @@ -0,0 +1,136 @@ +// Presenza RMS e inviluppi adattati da AudioDucker di OpenReel (MIT): TERZE-PARTI.md. +// È un rilevatore di energia, non riconosce parole o parlato. +import type { Clip, Ducking, Key, Project, RuoloAudio } from './tipi'; +import { dbToGain, fadeAl, keyValue } from './progetto'; +import { gainDbAl } from './automazioni'; +import { f2s } from './timecode'; + +export const DUCKING0: Ducking = { attivo: false, quantita: 12, attacco: .15, rilascio: .6, soglia: -32, isteresi: 4, minimo: .08, hold: .2 }; +export interface IntervalloVoce { da: number; a: number } +export interface FinestraRms extends IntervalloVoce { db: number } +export function configDucking(d?: Partial): Ducking { + const lim = (v: number | undefined, base: number, a: number, b: number) => Number.isFinite(v) ? Math.max(a, Math.min(b, v!)) : base; + return { attivo: d?.attivo === true, quantita: lim(d?.quantita, 12, 0, 60), attacco: lim(d?.attacco, .15, .005, 10), + rilascio: lim(d?.rilascio, .6, .005, 10), soglia: lim(d?.soglia, -32, -90, 0), isteresi: lim(d?.isteresi, 4, 0, 24), + minimo: lim(d?.minimo, .08, 0, 2), hold: lim(d?.hold, .2, 0, 5) }; +} +export const ruoloAudio = (p: Project, c: Clip): RuoloAudio => c.ruoloAudio ?? p.tracks.find((t) => t.id === c.track)?.ruoloAudio ?? 'nessuno'; +export const impostazioneDucking = (p: Project, c: Clip): Ducking => configDucking(c.ducking ?? p.tracks.find((t) => t.id === c.track)?.ducking); +/** La stessa coda letta dal banco quando la clip successiva entra in dissolvenza. */ +export const codaVoce = (p: Project, c: Clip): number => p.clips.find((n) => n.id !== c.id && n.track === c.track && n.start === c.start + c.len && n.trIn)?.trIn?.len ?? 0; +export function vociDucking(p: Project): Clip[] { + const solo = p.tracks.some((t) => t.kind === 'audio' && t.solo); + return p.clips.filter((c) => { + const t = p.tracks.find((t) => t.id === c.track); + return c.kind === 'media' && !!c.media && c.speed > 0 && ruoloAudio(p, c) === 'voce' && t?.kind === 'audio' + && !t.mute && (!solo || t.solo) && dbToGain(t.volume) > 0 && (c.gainKeys.length > 0 || !!c.anim?.gain?.length || dbToGain(c.gain) > 0); + }); +} + +/** Finestre continue da 25 ms: i confini dei pezzi decodificati non cambiano il risultato. + * Si sommano le energie dei canali, senza cancellare il segnale in controfase. */ +export class AnalizzatoreRms { + private somma = 0; + private contati = 0; + private campioni = 0; + private sr = 0; + private da = 0; + private prossimo = 0; + private origine = 0; + private totale = 0; + push(canali: Float32Array[], sr: number, t: number): FinestraRms[] { + if (!canali.length || sr <= 0 || canali.some((c) => c.length !== canali[0].length)) throw new Error('Audio non valido per abbassare la musica'); + const out: FinestraRms[] = []; + if (!this.sr || sr !== this.sr || Math.abs(t - this.prossimo) > 1.5 / sr) { + const f = this.fine(); if (f) out.push(f); + this.origine = t; this.totale = 0; + } + this.sr = sr; + const finestra = Math.max(1, Math.round(sr * .025)); + for (let i = 0; i < canali[0].length; i++) { + if (!this.contati) this.da = this.origine + (this.totale + i) / sr; + for (const ch of canali) { const v = Number.isFinite(ch[i]) ? ch[i] : 0; this.somma += v * v; this.campioni++; } + this.contati++; + if (this.contati === finestra) out.push(this.fine()!); + } + this.totale += canali[0].length; + this.prossimo = this.origine + this.totale / sr; + return out; + } + fine(): FinestraRms | null { + if (!this.contati) return null; + const f = { da: this.da, a: this.da + this.contati / this.sr, db: 10 * Math.log10(Math.max(1e-20, this.somma / this.campioni)) }; + this.contati = this.campioni = this.somma = 0; + return f; + } +} + +/** Porta l'energia letta nella sorgente sulla timeline, con trim, velocità e volume udibile. */ +export function presenzaVoce(p: Project, c: Clip, finestre: FinestraRms[], d: Ducking): IntervalloVoce[] { + const t = p.tracks.find((t) => t.id === c.track)!; + const coda = codaVoce(p, c); + const cs = f2s(c.start, p.rate), durata = f2s(c.len + coda, p.rate), out: IntervalloVoce[] = []; + let inizio: number | null = null, fine = 0; + const chiudi = () => { if (inizio !== null && fine - inizio >= d.minimo - 1e-6) out.push({ da: inizio, a: Math.min(cs + durata, fine + d.hold) }); inizio = null; }; + for (const w of finestre) { + const da = Math.max(0, (w.da - c.srcIn) / c.speed), a = Math.min(durata, (w.a - c.srcIn) / c.speed); + if (a <= da) continue; + const lf = (da + a) / 2 * p.rate.num / p.rate.den; + const gain = gainDbAl(c, lf, keyValue) + t.volume; + let fade = fadeAl(c, lf); + if (c.trIn && lf < c.trIn.len) fade *= lf / c.trIn.len; + if (c.trOut && lf > c.len - c.trOut.len) fade *= (c.len - lf) / c.trOut.len; + if (lf > c.len) fade *= coda > 0 ? Math.max(0, 1 - (lf - c.len) / coda) : 0; + const db = dbToGain(gain) > 0 ? w.db + gain + 20 * Math.log10(Math.max(1e-10, fade)) : -200; + if (inizio !== null && cs + da > fine + .002) chiudi(); + const acceso = db >= d.soglia - (inizio === null ? 0 : d.isteresi); + if (acceso) { inizio ??= cs + da; fine = cs + a; } + else chiudi(); + } + chiudi(); + return out; +} +export function unisciPresenza(v: IntervalloVoce[], distanza = 0): IntervalloVoce[] { + const out: IntervalloVoce[] = []; + for (const r of [...v].filter((x) => x.a > x.da).sort((a, b) => a.da - b.da)) { + const ultimo = out.at(-1); + if (ultimo && r.da <= ultimo.a + distanza) ultimo.a = Math.max(ultimo.a, r.a); + else out.push({ ...r }); + } + return out; +} +/** Unisce anche attacchi/rilasci sovrapposti: la musica non pompa fra due voci vicine. */ +export function generaDuckKeys(p: Project, c: Clip, ranges: IntervalloVoce[], d: Ducking): Key[] { + const fps = p.rate.num / p.rate.den, cs = c.start / fps; + const punti: Key[] = []; + for (const r of unisciPresenza(ranges, d.attacco + d.rilascio)) { + const da = (r.da - cs) * fps, a = (r.a - cs) * fps; + punti.push({ f: da - d.attacco * fps, v: 0 }, { f: da, v: -d.quantita }, { f: a, v: -d.quantita }, { f: a + d.rilascio * fps, v: 0 }); + } + if (!punti.length) return []; + const m = new Map(); + for (const k of punti) m.set(k.f, Math.min(m.get(k.f) ?? 0, k.v)); + const tutti = [...m].map(([f, v]) => ({ f, v })).sort((a, b) => a.f - b.f); + return [{ f: 0, v: keyValue(tutti, 0, 0) }, ...tutti.filter((k) => k.f > 0 && k.f < c.len), { f: c.len, v: keyValue(tutti, c.len, 0) }]; +} + +/** Firma compatta e deterministica: taglio, spostamento, trattamento audio, mute/solo la invalidano. */ +export function firmaDucking(p: Project, c: Clip): string { + const voci = vociDucking(p).map((v) => { + const m = p.media.find((m) => m.id === v.media), t = p.tracks.find((t) => t.id === v.track); + return [v.id, v.media, m?.size, m?.lastModified, m?.path, v.start, v.len, v.srcIn, v.speed, v.nastro, + v.gain, v.gainKeys, ...(v.anim?.gain ? [v.anim.gain] : []), v.fadeIn, v.fadeOut, v.curvaIn, v.curvaOut, v.trIn, v.trOut, codaVoce(p, v), v.afx, t?.volume, t?.pan]; + }).sort((a, b) => String(a[0]).localeCompare(String(b[0]))); + const testo = JSON.stringify([p.rate, p.seqAttiva, c.start, c.len, c.srcIn, c.speed, ruoloAudio(p, c), impostazioneDucking(p, c), voci]); + let a = 2166136261, b = 5381; + for (let i = 0; i < testo.length; i++) { a = Math.imul(a ^ testo.charCodeAt(i), 16777619); b = Math.imul(b, 33) ^ testo.charCodeAt(i); } + return 'duck1:' + (a >>> 0).toString(16) + ':' + (b >>> 0).toString(16); +} +export function duckingValido(p: Project, c: Clip): boolean { + return ruoloAudio(p, c) === 'musica' && impostazioneDucking(p, c).attivo && !!c.duckFirma && c.duckFirma === firmaDucking(p, c); +} +/** Vista di sola lettura per banco, scrub ed export. Mai attenuazioni obsolete o disattivate. */ +export function conDucking(p: Project): Project { + if (!p.clips.some((c) => c.duckKeys?.length)) return p; + return { ...p, clips: p.clips.map((c) => c.duckKeys?.length && !duckingValido(p, c) ? { ...c, duckKeys: undefined } : c) }; +} diff --git a/src/core/esportazione.ts b/src/core/esportazione.ts new file mode 100644 index 0000000..4828cce --- /dev/null +++ b/src/core/esportazione.ts @@ -0,0 +1,239 @@ +// L'esportazione, la parte che si può provare senza browser: i preset pronti, da preset a impostazioni vere +// (misura, fps, codec, bitrate), come il progetto si adatta a un'altra forma (bande o ritaglio), la stima del peso. +// Qui non c'è niente di WebCodecs né di pagina: lo usano `src/export/esporta.ts` (il motore) e `src/ui/esportazione.ts`. + +export type Contenitore = 'mp4' | 'mov' | 'webm' | 'wav'; +export type CodecVideo = 'avc' | 'hevc' | 'vp9' | 'av1' | 'vp8'; +/** bande = l'immagine resta intera e si aggiungono bande nere; ritaglio = riempie il quadro e si taglia ai lati */ +export type Adatta = 'bande' | 'ritaglio'; + +/** i codec che ogni contenitore sa tenere, dal più comune */ +export const CODEC_DI: Record = { + mp4: ['avc', 'hevc', 'vp9', 'av1'], + mov: ['avc', 'hevc'], + webm: ['vp9', 'av1', 'vp8'], + wav: [], +}; + +export const NOME_CODEC: Record = { avc: 'H.264', hevc: 'H.265 (HEVC)', vp9: 'VP9', av1: 'AV1', vp8: 'VP8' }; +export const INFO_CODEC: Record = { + avc: 'va su tutto: telefoni, TV, social', + hevc: 'file più piccolo a parità di qualità, ma non lo apre ogni programma', + vp9: 'ottimo per il web, file piccolo', + av1: 'il più leggero di tutti, ma ci mette di più a prepararlo', + vp8: 'vecchio formato web', +}; +export const NOME_CONTENITORE: Record = { mp4: 'MP4', mov: 'MOV', webm: 'WebM', wav: 'WAV' }; + +/** quanto pesa a parità di qualità un codec rispetto a H.264 (numeri di mestiere, per la stima, non misure) */ +export const EFFICIENZA: Record = { avc: 1, hevc: 0.65, vp9: 0.7, av1: 0.55, vp8: 1.15 }; + +/** Il quadro di uscita di un preset: misura fissa, oppure derivata dal progetto. */ +export type Quadro = + | { tipo: 'fisso'; w: number; h: number } + /** k = quante volte il progetto; lungoMax = il lato lungo non supera questo valore */ + | { tipo: 'progetto'; k?: number; lungoMax?: number }; + +export interface Preset { + id: string; + nome: string; + /** una riga che dice a cosa serve */ + info: string; + formato: Contenitore; + /** i codec che preferisce, nell'ordine (si prende il primo che la macchina sa fare) */ + codec: CodecVideo[]; + quadro: Quadro; + /** i fotogrammi al secondo non salgono oltre questo valore (si saltano fotogrammi interi, mai inventati) */ + fpsMax?: number; + /** 0..100: la posizione del cursore qualità */ + qualita: number; + audioKbps: number; + /** come si adatta se il progetto ha un'altra forma: di partenza */ + adatta: Adatta; + /** si può cambiare tutto a mano */ + libero?: boolean; +} + +export const PRESET: Preset[] = [ + { id: 'yt1080', nome: 'YouTube 1080p', info: 'Full HD, il formato di tutti i giorni', formato: 'mp4', codec: ['avc', 'hevc'], quadro: { tipo: 'fisso', w: 1920, h: 1080 }, fpsMax: 60, qualita: 62, audioKbps: 192, adatta: 'bande' }, + { id: 'yt4k', nome: 'YouTube 4K', info: 'Ultra HD, per schermi grandi', formato: 'mp4', codec: ['avc', 'hevc', 'vp9'], quadro: { tipo: 'fisso', w: 3840, h: 2160 }, fpsMax: 60, qualita: 68, audioKbps: 256, adatta: 'bande' }, + { id: 'verticale', nome: 'Reel · TikTok · Shorts', info: 'Verticale 9:16, per il telefono', formato: 'mp4', codec: ['avc', 'hevc'], quadro: { tipo: 'fisso', w: 1080, h: 1920 }, fpsMax: 30, qualita: 58, audioKbps: 192, adatta: 'bande' }, + { id: 'quadrato', nome: 'Instagram quadrato', info: 'Quadrato 1:1, per i post', formato: 'mp4', codec: ['avc', 'hevc'], quadro: { tipo: 'fisso', w: 1080, h: 1080 }, fpsMax: 30, qualita: 58, audioKbps: 192, adatta: 'bande' }, + { id: 'master', nome: 'Alta qualità (master)', info: 'Come il progetto, per conservare o rifare altri formati', formato: 'mp4', codec: ['avc', 'hevc'], quadro: { tipo: 'progetto' }, qualita: 92, audioKbps: 320, adatta: 'bande' }, + { id: 'whatsapp', nome: 'Leggero per WhatsApp', info: 'Piccolo da mandare in chat', formato: 'mp4', codec: ['avc'], quadro: { tipo: 'progetto', lungoMax: 1280 }, fpsMax: 30, qualita: 22, audioKbps: 96, adatta: 'bande' }, + { id: 'audio', nome: 'Solo audio (WAV)', info: 'Solo il suono, senza compressione', formato: 'wav', codec: [], quadro: { tipo: 'progetto' }, qualita: 100, audioKbps: 0, adatta: 'bande' }, + { id: 'libero', nome: 'Personalizzato', info: 'Scegli tu formato, codec e misura', formato: 'mp4', codec: ['avc', 'hevc', 'vp9', 'av1'], quadro: { tipo: 'progetto' }, qualita: 62, audioKbps: 192, adatta: 'bande', libero: true }, +]; + +export const presetDi = (id: string): Preset => PRESET.find((p) => p.id === id) ?? PRESET[0]; + +/** le misure del «Personalizzato»: l'altezza, con la forma del progetto */ +export const MISURE: { id: string; nome: string; altezza: number | null; k?: number }[] = [ + { id: 'progetto', nome: 'Come il progetto', altezza: null }, + { id: 'meta', nome: 'Metà', altezza: null, k: 0.5 }, + { id: '720', nome: '720p', altezza: 720 }, + { id: '1080', nome: '1080p', altezza: 1080 }, + { id: '2160', nome: '4K', altezza: 2160 }, +]; + +export interface Progetto { w: number; h: number; fps: number } + +const pari = (n: number) => Math.max(2, Math.round(n / 2) * 2); + +/** il quadro di uscita (misure pari, come chiedono i codec) */ +export function quadroDa(pr: Preset, prog: Progetto, misura = 'progetto'): { w: number; h: number } { + if (pr.libero) { + const m = MISURE.find((x) => x.id === misura) ?? MISURE[0]; + if (m.altezza) return { w: pari(prog.w * m.altezza / prog.h), h: pari(m.altezza) }; + const k = m.k ?? 1; + return { w: pari(prog.w * k), h: pari(prog.h * k) }; + } + const q = pr.quadro; + if (q.tipo === 'fisso') return { w: q.w, h: q.h }; + let k = q.k ?? 1; + if (q.lungoMax) k = Math.min(k, q.lungoMax / Math.max(prog.w, prog.h)); + return { w: pari(prog.w * k), h: pari(prog.h * k) }; +} + +/** ogni quanti fotogrammi del progetto se ne tiene uno, per non superare fpsMax (solo rapporti interi: 50→25, 60→30) */ +export function passoFps(fps: number, fpsMax?: number): number { + if (!fpsMax || fps <= fpsMax * 1.05) return 1; + const k = fps / fpsMax; + const n = Math.round(k); + return Math.abs(k - n) < 0.08 && n >= 2 ? n : 1; +} + +/** dove va l'immagine nel quadro di uscita: la tela del compositore è cw×ch e si posa a (dx, dy) sul quadro w×h */ +export interface Geometria { cw: number; ch: number; dx: number; dy: number } + +/** Come si posa un progetto pw×ph su un quadro w×h. Stessa forma → niente da fare (null). */ +export function adattamento(pw: number, ph: number, w: number, h: number, modo: Adatta): Geometria | null { + if (!pw || !ph || simili(pw / ph, w / h)) return null; + const k = modo === 'ritaglio' ? Math.max(w / pw, h / ph) : Math.min(w / pw, h / ph); + const cw = pari(pw * k), ch = pari(ph * k); + return { cw, ch, dx: Math.round((w - cw) / 2), dy: Math.round((h - ch) / 2) }; +} + +/** due forme uguali (a meno di un pixel di arrotondamento) */ +export function simili(a: number, b: number): boolean { return Math.abs(a - b) / b < 0.006; } + +/** "16:9", "9:16", "1:1", "4:3", "21:9"… oppure il numero decimale */ +export function proporzioneTesto(w: number, h: number): string { + const noti: [number, number][] = [[16, 9], [9, 16], [1, 1], [4, 3], [3, 4], [21, 9], [3, 2], [2, 3], [4, 5], [5, 4], [2, 1], [1, 2]]; + for (const [a, b] of noti) if (simili(w / h, a / b)) return `${a}:${b}`; + return (w / h).toFixed(2).replace('.', ',') + ':1'; +} + +/** a parole, cosa succede all'immagine */ +export function testoAdattamento(pw: number, ph: number, w: number, h: number, modo: Adatta): string { + const g = adattamento(pw, ph, w, h, modo); + if (!g) return 'Il progetto ha già questa forma: l\'immagine esce a tutto quadro.'; + const da = proporzioneTesto(pw, ph), a = proporzioneTesto(w, h); + if (modo === 'bande') { + const orizzontale = g.dx > 0 ? 'ai lati' : 'sopra e sotto'; + return `Il progetto è ${da}, l'uscita è ${a}: l'immagine resta intera e si aggiungono bande nere ${orizzontale}.`; + } + const visibile = Math.round((Math.min(w, g.cw) * Math.min(h, g.ch)) / (g.cw * g.ch) * 100); + const tagli = g.dx < 0 ? 'ai lati' : 'sopra e sotto'; + return `Il progetto è ${da}, l'uscita è ${a}: l'immagine riempie il quadro e si taglia ${tagli} (resta il centro, circa il ${visibile}% dell'immagine).`; +} + +/** Tutto quello che il motore deve sapere per esportare un preset. */ +export interface Impostazioni { + formato: Contenitore; + w: number; + h: number; + /** ogni quanti fotogrammi del progetto se ne prende uno */ + passo: number; + fps: number; + codec: CodecVideo | null; + /** bit al secondo del video (0 senza video) */ + bitrate: number; + /** bit al secondo dell'audio (0 per il WAV, che non è compresso) */ + audioBps: number; + adatta: Adatta | null; + geometria: Geometria | null; +} + +export interface Scelte { + preset: string; + /** il codec che vuole l'utente; se la macchina non lo sa fare si prende il primo che c'è */ + codec?: CodecVideo | null; + /** formato (solo «Personalizzato») */ + formato?: Contenitore; + /** 0..100 (di partenza quella del preset) */ + qualita?: number; + adatta?: Adatta; + /** id di MISURE (solo «Personalizzato») */ + misura?: string; +} + +/** I codec fra cui scegliere per questa scelta, nell'ordine di preferenza, fra quelli disponibili. */ +export function codecPossibili(pr: Preset, formato: Contenitore, disponibili: readonly CodecVideo[]): CodecVideo[] { + const del = CODEC_DI[formato]; + const ordine = pr.libero ? del : pr.codec.filter((c) => del.includes(c)); + return ordine.filter((c) => disponibili.includes(c)); +} + +/** il bitrate del video dalla posizione del cursore: bit per pixel da 0,03 a 0,30, meno se il codec è più bravo */ +export function bitrateVideo(w: number, h: number, fps: number, qualita: number, codec: CodecVideo): number { + const q = Math.max(0, Math.min(100, qualita)); + const bpp = 0.03 * Math.pow(10, q / 100); + return Math.round(w * h * fps * bpp * EFFICIENZA[codec] / 1000) * 1000; +} + +/** da preset e scelte a impostazioni vere */ +export function impostazioni(sc: Scelte, prog: Progetto, disponibili: readonly CodecVideo[]): Impostazioni { + const pr = presetDi(sc.preset); + const formato = pr.libero ? sc.formato ?? pr.formato : pr.formato; + if (formato === 'wav') { + return { formato, w: pari(prog.w), h: pari(prog.h), passo: 1, fps: prog.fps, codec: null, bitrate: 0, audioBps: 0, adatta: null, geometria: null }; + } + const { w, h } = quadroDa(pr, prog, sc.misura); + const passo = passoFps(prog.fps, pr.fpsMax); + const fps = prog.fps / passo; + const possibili = codecPossibili(pr, formato, disponibili); + const codec = sc.codec && possibili.includes(sc.codec) ? sc.codec : possibili[0] ?? null; + const adatta = sc.adatta ?? pr.adatta; + const geometria = adattamento(prog.w, prog.h, w, h, adatta); + const q = sc.qualita ?? pr.qualita; + return { + formato, w, h, passo, fps, codec, + bitrate: codec ? bitrateVideo(w, h, fps, q, codec) : 0, + audioBps: pr.audioKbps * 1000, + adatta: geometria ? adatta : null, + geometria, + }; +} + +/** i byte stimati del file (video + audio, più un po' di contenitore) */ +export function pesoStimato(imp: Impostazioni, durataSec: number): number { + if (durataSec <= 0) return 0; + if (imp.formato === 'wav') return Math.round(durataSec * 48000 * 2 * 2 + 44); + return Math.round(((imp.bitrate + imp.audioBps) * durataSec) / 8 * 1.02); +} + +/** "48 MB", "1,2 GB", "820 KB" */ +export function pesoTesto(byte: number): string { + if (byte < 1000) return byte + ' B'; + const num = (x: number, d: number) => x.toFixed(d).replace('.', ',').replace(/,0+$/, ''); + if (byte < 1e6) return Math.round(byte / 1e3) + ' KB'; + if (byte < 1e9) return num(byte / 1e6, byte < 1e7 ? 1 : 0) + ' MB'; + return num(byte / 1e9, 1) + ' GB'; +} + +/** cosa vuol dire quella posizione del cursore qualità, a parole */ +export function descriviQualita(q: number): string { + if (q < 20) return 'Molto leggero: si vede la compressione sui movimenti veloci'; + if (q < 40) return 'Leggero: va bene per mandarlo in chat'; + if (q < 60) return 'Buono: bello sul telefono, file contenuto'; + if (q < 80) return 'Alto: pulito anche sullo schermo grande'; + if (q < 95) return 'Altissimo: da conservare, il file pesa'; + return 'Massimo: quasi senza perdita, file grosso'; +} + +/** il nome del file: nome del progetto pulito + il preset */ +export function nomeFile(progetto: string, pr: Preset, formato: Contenitore): string { + const base = progetto.replace(/[\\/:*?"<>|]/g, '_').trim() || 'montaggio'; + return `${pr.libero ? base : `${base} - ${pr.nome.replace(/[\\/:*?"<>|·]/g, '').replace(/\s+/g, ' ').trim()}`}.${formato}`; +} diff --git a/src/core/generatori.ts b/src/core/generatori.ts index 299d0be..1e73987 100644 --- a/src/core/generatori.ts +++ b/src/core/generatori.ts @@ -36,12 +36,12 @@ export const PRESET_TITOLI: PresetTitolo[] = [ { id: 'zoomCinema', nome: 'Cinema con sottotitolo', gruppo: 'titoli', spec: { style: 'cinema', text: 'La città', sotto: 'un film di DaProd · 2026', size: 96, shadow: true, outline: 'none', ingresso: 'zoom', uscita: 'dissolve' } }, { id: 'dedica', nome: 'Dedica', gruppo: 'titoli', spec: { style: 'citazione', text: 'Per Nonna Maria', sotto: '1938 – sempre con noi', size: 80, outline: 'none', ingresso: 'sale', uscita: 'dissolve' } }, { id: 'capitolo', nome: 'Capitolo', gruppo: 'titoli', spec: { style: 'fisso', text: 'CAPITOLO 2', sotto: 'Il viaggio comincia', size: 110, font: 'Orbitron', spaziatura: 0.12, outline: 'none', shadow: true, ingresso: 'sinistra', uscita: 'destra' } }, - { id: 'notiziario', nome: 'Notiziario', gruppo: 'tv', spec: { style: 'notiziario', text: 'ULTIM\'ORA\nDaProd Video 1.1.2, il big update', size: 46, boxColor: '#d2202a', y: 0.82, align: 'left' } }, + { id: 'notiziario', nome: 'Notiziario', gruppo: 'tv', spec: { style: 'notiziario', text: 'ULTIM\'ORA\nDaProd Editor Video 1.1.2, il big update', size: 46, boxColor: '#d2202a', y: 0.82, align: 'left' } }, { id: 'sottopancia', nome: 'Sottopancia', gruppo: 'tv', spec: { style: 'sottopancia', text: 'Mario Rossi\nregista', size: 56, align: 'left' } }, { id: 'etichetta', nome: 'Etichetta', gruppo: 'tv', spec: { style: 'etichetta', text: 'Nuovo video', size: 50, color: '#1a1206', boxColor: '#ffd54a', outline: 'none', shadow: false, y: 0.16, align: 'left' } }, { id: 'social', nome: 'Social', gruppo: 'tv', spec: { style: 'social', text: 'Seguici per la parte 2 👉', size: 58, color: '#111111', boxColor: '#ffd54a', outline: 'none', shadow: false, y: 0.78 } }, - { id: 'crawl', nome: 'Crawl', gruppo: 'tv', spec: { style: 'crawl', text: 'ULTIM\'ORA · DaProd Video: il montaggio vecchio stile, moderno dentro · ', size: 50, y: 0.9, box: true }, volte: 2 }, - { id: 'rullo', nome: 'Rullo titoli', gruppo: 'tv', spec: { style: 'rullo', text: 'DaProd Video\n\nMontaggio\nDaProd\n\nMusica\nDaProd\n\nGrazie per la visione', size: 64 }, volte: 3 }, + { id: 'crawl', nome: 'Crawl', gruppo: 'tv', spec: { style: 'crawl', text: 'ULTIM\'ORA · DaProd Editor Video: il montaggio vecchio stile, moderno dentro · ', size: 50, y: 0.9, box: true }, volte: 2 }, + { id: 'rullo', nome: 'Rullo titoli', gruppo: 'tv', spec: { style: 'rullo', text: 'DaProd Editor Video\n\nMontaggio\nDaProd\n\nMusica\nDaProd\n\nGrazie per la visione', size: 64 }, volte: 3 }, ]; export const presetTitolo = (id: string) => PRESET_TITOLI.find((x) => x.id === id); @@ -56,12 +56,13 @@ export function applicaPresetTitolo(c: Clip, id: string) { /** * Cosa c'è scritto nel dato del trascinamento di un generatore: - * 'g:title:cinema', 'g:countdown:neon:3', 'g:anim:lt-barra', 'g:bars', 'g:nero', 'g:color' (e i vecchi 'g:title', 'g:countdown'). + * 'g:title:cinema', 'g:countdown:neon:3', 'g:anim:lt-barra', 'g:html:neon', 'g:bars', 'g:nero', 'g:color' (e i vecchi 'g:title', 'g:countdown'). */ -export function leggiGeneratore(dato: string): { kind: 'bars' | 'color' | 'countdown' | 'title' | 'nero' | 'anim'; titolo?: string; anim?: string; conto?: { stile: 'pellicola' | 'moderno' | 'neon' | 'minimal'; secondi: number } } { +export function leggiGeneratore(dato: string): { kind: 'bars' | 'color' | 'countdown' | 'title' | 'nero' | 'anim' | 'html'; titolo?: string; anim?: string; html?: string; conto?: { stile: 'pellicola' | 'moderno' | 'neon' | 'minimal'; secondi: number } } { const [, kind, a, b] = dato.split(':'); if (kind === 'title') return { kind, titolo: a }; if (kind === 'anim') return { kind, anim: a }; + if (kind === 'html') return { kind, html: a }; if (kind === 'countdown') return { kind, conto: { stile: (a as 'pellicola') || 'pellicola', secondi: Number(b) || 5 } }; return { kind: kind as 'bars' | 'color' | 'nero' }; } diff --git a/src/core/maschereForma.ts b/src/core/maschereForma.ts new file mode 100644 index 0000000..4163e2b --- /dev/null +++ b/src/core/maschereForma.ts @@ -0,0 +1,222 @@ +// Le maschere a forma di una clip: rettangolo, ellisse e curva di Bézier, con sfumatura, espansione, inversione, +// più maschere sommate o sottratte in ordine. Tutto è in frazioni della sorgente (0..1, y verso il basso) così la +// maschera segue la clip quando si sposta, si gira e si ritaglia. Questo modulo è puro: dà la "copertura" (0 = si +// toglie, 1 = si vede) su una griglia piccola; il compositore la carica come texture a un canale e la moltiplica +// per la trasparenza della clip (src/render/compositore.ts, passata «forma»). +// L'idea di forme parametriche trasformate in tracciato di Bézier (l'ellisse con la costante 0,5522847498) e di +// maschera con sfumatura viene dal motore di maschere di OpenReel Video (MIT): vedi TERZE-PARTI.md. Il calcolo è +// scritto da zero, in distanza con segno, senza canvas, così si prova da Node. +import type { MascheraForma, PuntoBez } from './tipi'; + +export const MAX_MASCHERE = 8; +/** il lato lungo della griglia della copertura */ +export const LATO_FORMA = 768; + +export function nuovaMaschera(forma: MascheraForma['forma'], id: string, extra: Partial = {}): MascheraForma { + return { + id, forma, x: 0.5, y: 0.5, w: forma === 'bezier' ? 0 : 0.5, h: forma === 'bezier' ? 0 : 0.5, rot: 0, + sfuma: 0, espandi: 0, inverti: false, opacita: 1, op: 'somma', ...(forma === 'bezier' ? { punti: [], morbida: true } : {}), ...extra, + }; +} + +export const nomeForma = (m: MascheraForma) => m.nome || (m.forma === 'rettangolo' ? 'Rettangolo' : m.forma === 'ellisse' ? 'Ellisse' : 'Bézier'); + +/** la griglia della copertura per una sorgente larga quanto il suo rapporto (larghezza / altezza) */ +export function misureForma(aspetto: number, lato = LATO_FORMA): { w: number; h: number } { + const a = Number.isFinite(aspetto) && aspetto > 0.05 ? aspetto : 16 / 9; + return a >= 1 ? { w: lato, h: Math.max(2, Math.round(lato / a)) } : { w: Math.max(2, Math.round(lato * a)), h: lato }; +} + +// ——— la linea della Bézier ——— + +/** la maniglia in uscita del punto i: quella scelta, o (curve morbide) quella che fa passare la curva dolce da un punto all'altro */ +function maniglia(m: MascheraForma, i: number): [number, number] { + const P = m.punti!, p = P[i]; + if (p.hx !== undefined && p.hy !== undefined) return [p.hx, p.hy]; + if (!m.morbida) return [0, 0]; + const a = P[(i - 1 + P.length) % P.length], b = P[(i + 1) % P.length]; + return [(b.x - a.x) / 6, (b.y - a.y) / 6]; +} + +/** la Bézier chiusa come lista di punti (frazioni): i tratti dritti restano due punti, le curve si spezzano in `passi` */ +export function poligonoBezier(m: MascheraForma, passi = 14): [number, number][] { + const P = m.punti ?? []; + const n = P.length; + if (n < 3) return []; + const out: [number, number][] = []; + for (let i = 0; i < n; i++) { + const p0 = P[i], p3 = P[(i + 1) % n]; + const [h0x, h0y] = maniglia(m, i), [h3x, h3y] = maniglia(m, (i + 1) % n); + out.push([p0.x, p0.y]); + if (!h0x && !h0y && !h3x && !h3y) continue; + const x1 = p0.x + h0x, y1 = p0.y + h0y, x2 = p3.x - h3x, y2 = p3.y - h3y; + for (let s = 1; s < passi; s++) { + const t = s / passi, u = 1 - t; + out.push([u * u * u * p0.x + 3 * u * u * t * x1 + 3 * u * t * t * x2 + t * t * t * p3.x, + u * u * u * p0.y + 3 * u * u * t * y1 + 3 * u * t * t * y2 + t * t * t * p3.y]); + } + } + return out; +} + +/** un punto nel sistema della forma (centro e rotazione sua; lx in frazioni di larghezza, ly di altezza) → frazioni della sorgente */ +export function puntoLocale(m: MascheraForma, aspetto: number, lx: number, ly: number): [number, number] { + const co = Math.cos((m.rot * Math.PI) / 180), si = Math.sin((m.rot * Math.PI) / 180); + // in pixel con la proporzione giusta, poi di nuovo in frazioni + const px = lx * aspetto, py = ly; + return [m.x + (co * px - si * py) / aspetto, m.y + (si * px + co * py)]; +} + +/** il contrario: un punto della sorgente (frazioni) nel sistema della forma */ +export function localeDa(m: MascheraForma, aspetto: number, u: number, v: number): [number, number] { + const co = Math.cos((m.rot * Math.PI) / 180), si = Math.sin((m.rot * Math.PI) / 180); + const dx = (u - m.x) * aspetto, dy = v - m.y; + return [(co * dx + si * dy) / aspetto, -si * dx + co * dy]; +} + +/** il contorno da disegnare sul monitor (frazioni della sorgente): rettangolo e ellisse girati, o la Bézier */ +export function contornoMaschera(m: MascheraForma, aspetto: number, passi = 48): [number, number][] { + if (m.forma === 'bezier') return poligonoBezier(m); + const pt = (lx: number, ly: number) => puntoLocale(m, aspetto, lx, ly); + const hw = m.w / 2, hh = m.h / 2; + if (m.forma === 'rettangolo') return [pt(-hw, -hh), pt(hw, -hh), pt(hw, hh), pt(-hw, hh)]; + const out: [number, number][] = []; + for (let i = 0; i < passi; i++) { const a = (i / passi) * Math.PI * 2; out.push(pt(Math.cos(a) * hw, Math.sin(a) * hh)); } + return out; +} + +// ——— la distanza dal bordo (negativa dentro) ——— + +function sdRettEllisse(m: MascheraForma, mw: number, mh: number, out: Float32Array) { + const cx = m.x * mw, cy = m.y * mh, hx = Math.max(0.001, (m.w * mw) / 2), hy = Math.max(0.001, (m.h * mh) / 2); + const r = (m.rot * Math.PI) / 180, co = Math.cos(r), si = Math.sin(r); + const ell = m.forma === 'ellisse'; + for (let j = 0; j < mh; j++) { + const dy = j + 0.5 - cy; + for (let i = 0; i < mw; i++) { + const dx = i + 0.5 - cx; + const lx = co * dx + si * dy, ly = -si * dx + co * dy; + if (ell) { + const k0 = Math.hypot(lx / hx, ly / hy), k1 = Math.hypot(lx / (hx * hx), ly / (hy * hy)); + out[j * mw + i] = k1 > 1e-12 ? (k0 * (k0 - 1)) / k1 : -Math.min(hx, hy); + } else { + const qx = Math.abs(lx) - hx, qy = Math.abs(ly) - hy; + out[j * mw + i] = Math.hypot(Math.max(qx, 0), Math.max(qy, 0)) + Math.min(Math.max(qx, qy), 0); + } + } + } +} + +/** distanza con segno da un poligono, calcolata solo nella fascia vicino al bordo (fuori fascia vale ±(fascia+1)) */ +function sdPoligono(poly: [number, number][], mw: number, mh: number, fascia: number, out: Float32Array) { + const n = poly.length; + const px = poly.map((p) => p[0] * mw), py = poly.map((p) => p[1] * mh); + const dist = new Float32Array(mw * mh).fill(fascia + 1); + const dentro = new Uint8Array(mw * mh); + // dentro/fuori: una riga alla volta, dove i lati incrociano il centro dei pixel (regola pari-dispari) + for (let j = 0; j < mh; j++) { + const y = j + 0.5, xs: number[] = []; + for (let e = 0; e < n; e++) { + const x0 = px[e], y0 = py[e], x1 = px[(e + 1) % n], y1 = py[(e + 1) % n]; + if ((y0 <= y && y1 > y) || (y1 <= y && y0 > y)) xs.push(x0 + ((y - y0) / (y1 - y0)) * (x1 - x0)); + } + xs.sort((a, b) => a - b); + for (let q = 0; q + 1 < xs.length; q += 2) { + const a = Math.max(0, Math.ceil(xs[q] - 0.5)), b = Math.min(mw - 1, Math.ceil(xs[q + 1] - 0.5) - 1); + for (let i = a; i <= b; i++) dentro[j * mw + i] = 1; + } + } + // distanza: ogni lato aggiorna i pixel nella sua scatola allargata della fascia + for (let e = 0; e < n; e++) { + const x0 = px[e], y0 = py[e], x1 = px[(e + 1) % n], y1 = py[(e + 1) % n]; + const ex = x1 - x0, ey = y1 - y0, l2 = ex * ex + ey * ey; + const ia = Math.max(0, Math.floor(Math.min(x0, x1) - fascia)), ib = Math.min(mw - 1, Math.ceil(Math.max(x0, x1) + fascia)); + const ja = Math.max(0, Math.floor(Math.min(y0, y1) - fascia)), jb = Math.min(mh - 1, Math.ceil(Math.max(y0, y1) + fascia)); + for (let j = ja; j <= jb; j++) for (let i = ia; i <= ib; i++) { + const dx = i + 0.5 - x0, dy = j + 0.5 - y0; + const t = l2 > 0 ? Math.max(0, Math.min(1, (dx * ex + dy * ey) / l2)) : 0; + const d = Math.hypot(dx - t * ex, dy - t * ey); + if (d < dist[j * mw + i]) dist[j * mw + i] = d; + } + } + for (let k = 0; k < mw * mh; k++) out[k] = dentro[k] ? -dist[k] : dist[k]; +} + +const molle = (t: number) => { const u = Math.max(0, Math.min(1, t)); return u * u * (3 - 2 * u); }; + +/** la copertura di una sola maschera (0..1): forma → espansione → sfumatura → inversione → quanto conta */ +export function coperturaMaschera(m: MascheraForma, mw: number, mh: number, out: Float32Array) { + const unita = Math.min(mw, mh); + const esp = Math.max(-0.5, Math.min(0.5, m.espandi)) * unita; + const sf = Math.max(0, Math.min(0.5, m.sfuma)) * unita; + const sd = new Float32Array(mw * mh); + if (m.forma === 'bezier') { + const poly = poligonoBezier(m); + if (poly.length < 3) sd.fill(1e6); // senza forma non c'è niente dentro + else sdPoligono(poly, mw, mh, Math.max(2, sf + Math.abs(esp) + 2), sd); + } else sdRettEllisse(m, mw, mh, sd); + const op = Math.max(0, Math.min(1, m.opacita)); + for (let k = 0; k < sd.length; k++) { + const d = sd[k] - esp; + // sotto il pixel: bordo netto con un pixel di sfumatura; sopra: curva dolce a cavallo del bordo + let v = sf < 1 ? Math.max(0, Math.min(1, 0.5 - d)) : molle((sf - d) / (2 * sf)); + if (m.inverti) v = 1 - v; + out[k] = v * op; + } +} + +/** + * La copertura di tutte le maschere accese, in ordine: «somma» aggiunge, «sottrai» toglie. Se la prima è una sottrazione + * si parte da tutto visibile. Ritorna null se non c'è nessuna maschera accesa (= tutto si vede, nessuna passata). + */ +export function coperturaMaschere(maschere: readonly MascheraForma[] | undefined, mw: number, mh: number): Float32Array | null { + const attive = (maschere ?? []).filter((m) => !m.spenta).slice(0, MAX_MASCHERE); + if (!attive.length) return null; + const acc = new Float32Array(mw * mh).fill(attive[0].op === 'sottrai' ? 1 : 0); + const cov = new Float32Array(mw * mh); + for (const m of attive) { + coperturaMaschera(m, mw, mh, cov); + if (m.op === 'sottrai') for (let k = 0; k < acc.length; k++) acc[k] *= 1 - cov[k]; + else for (let k = 0; k < acc.length; k++) acc[k] = acc[k] + cov[k] - acc[k] * cov[k]; + } + return acc; +} + +/** la copertura a un canale da 0 a 255, pronta per la texture */ +export function rasterizzaMaschere(maschere: readonly MascheraForma[] | undefined, aspetto: number, lato = LATO_FORMA): { w: number; h: number; dati: Uint8Array } | null { + const { w, h } = misureForma(aspetto, lato); + const c = coperturaMaschere(maschere, w, h); + if (!c) return null; + const dati = new Uint8Array(w * h); + for (let k = 0; k < dati.length; k++) dati[k] = Math.round(Math.max(0, Math.min(1, c[k])) * 255); + return { w, h, dati }; +} + +/** quanto dell'immagine si vede (0..1): la media della copertura. Serve alle prove */ +export function areaVisibile(c: Float32Array | null): number { + if (!c) return 1; + let s = 0; + for (let k = 0; k < c.length; k++) s += c[k]; + return s / c.length; +} + +/** una firma corta: se non cambia, la texture non si rifà */ +export function firmaMaschere(maschere: readonly MascheraForma[] | undefined, aspetto: number): string { + const a = (maschere ?? []).filter((m) => !m.spenta); + if (!a.length) return ''; + const r = (v: number) => Math.round(v * 10000) / 10000; + return Math.round(aspetto * 1000) + '|' + a.map((m) => [m.forma, r(m.x), r(m.y), r(m.w), r(m.h), r(m.rot), r(m.sfuma), r(m.espandi), m.inverti ? 1 : 0, r(m.opacita), m.op, + m.morbida ? 1 : 0, (m.punti ?? []).map((p: PuntoBez) => [r(p.x), r(p.y), p.hx === undefined ? '' : r(p.hx), p.hy === undefined ? '' : r(p.hy)].join(',')).join(';')].join(':')).join('/'); +} + +/** il punto (frazioni) è dentro la forma? per scegliere la maschera col clic */ +export function dentroMaschera(m: MascheraForma, x: number, y: number, aspetto: number): boolean { + const poly = contornoMaschera(m, aspetto, 64); + if (poly.length < 3) return false; + let dentro = false; + for (let i = 0, j = poly.length - 1; i < poly.length; j = i++) { + const [xi, yi] = poly[i], [xj, yj] = poly[j]; + if ((yi > y) !== (yj > y) && x < ((xj - xi) * (y - yi)) / (yj - yi) + xi) dentro = !dentro; + } + return dentro; +} diff --git a/src/core/montaggio.ts b/src/core/montaggio.ts index a93f72c..984a321 100644 --- a/src/core/montaggio.ts +++ b/src/core/montaggio.ts @@ -5,6 +5,7 @@ import type { Clip, Key, Project, TrackKind, Transition } from './tipi'; import { clipsOn, end, handles, keyValue, mediaOf, newClip, newTrack, nextTrackName, srcTimeAt, tfAl, trackOf, uid, isVideoClip } from './progetto'; import { f2s } from './timecode'; import { blocchiDi, centro } from './blocchi'; +import { dividiAnim, scalaAnim, spostaAnim } from './automazioni'; /** una clip "vera" (occupa posto sulla traccia): i blocchetti FX no, stanno sopra le clip */ export const solida = (c: Clip) => c.kind !== 'fx'; @@ -59,6 +60,8 @@ export function splitClip(p: Project, c: Clip, f: number, newLink?: string): Cli right.link = newLink ?? c.link; [c.opKeys, right.opKeys] = splitKeys(c.opKeys, lf, c.opacity); [c.gainKeys, right.gainKeys] = splitKeys(c.gainKeys, lf, c.gain); + // i keyframe: il valore del taglio sta da tutte e due le parti + dividiAnim(c, right, lf); if (c.tfFine) splitMovimento(c, right, lf); c.len = lf; c.fadeOut = 0; @@ -355,6 +358,7 @@ export function trimClip(p: Project, id: string, edge: 'in' | 'out', d: number, if (!o.ripple) g.start += d; g.opKeys = g.opKeys.map((k) => ({ f: k.f - d, v: k.v })); g.gainKeys = g.gainKeys.map((k) => ({ f: k.f - d, v: k.v })); + spostaAnim(g, d); if (o.ripple) for (const x of p.clips) if (x.track === g.track && x.id !== g.id && (solida(x) ? x.start >= oldEnd : centro(x) >= oldEnd && !alBordo.includes(x)) && !group.includes(x)) x.start -= d; } else { g.len += d; @@ -383,6 +387,7 @@ export function rollEdit(p: Project, leftId: string, rightId: string, d: number) R.srcIn = Math.max(0, R.srcIn + f2s(d, p.rate) * R.speed); R.opKeys = R.opKeys.map((k) => ({ f: k.f - d, v: k.v })); R.gainKeys = R.gainKeys.map((k) => ({ f: k.f - d, v: k.v })); + spostaAnim(R, d); return d; } @@ -601,6 +606,7 @@ export function cambiaVelocita(p: Project, ids: Set, nuova: number, o: O const scala = (keys: Key[]) => keys.map((x) => ({ f: Math.round(x.f * k), v: x.v })); c.opKeys = scala(c.opKeys); c.gainKeys = scala(c.gainKeys); + scalaAnim(c, k); c.fadeIn = c.fadeIn ? Math.max(1, Math.round(c.fadeIn * k)) : 0; c.fadeOut = c.fadeOut ? Math.max(1, Math.round(c.fadeOut * k)) : 0; c.len = nuoveLen.get(c.id)!; diff --git a/src/core/montaggioTesto.ts b/src/core/montaggioTesto.ts new file mode 100644 index 0000000..dbddcf9 --- /dev/null +++ b/src/core/montaggioTesto.ts @@ -0,0 +1,147 @@ +// Dal parlato ai tagli: qui non ci sono finestre, AI o stato dell'editor. I tempi del testo sono nella sorgente; +// quelli del piano sono fotogrammi interi della timeline, con l'estremo finale escluso. +import type { Clip, Project } from './tipi'; +import { end, newTrack } from './progetto'; +import { splitAt, splitClip, withLinked } from './montaggio'; +import { fps } from './timecode'; + +export interface Intervallo { da: number; a: number } +export interface Parola extends Intervallo { testo: string } +export interface ParolaTimeline extends Parola { clip: string } +export interface PianoTagli { intervalli: Intervallo[]; fotogrammi: number; secondi: number } + +/** Non inventiamo tempi dividendo una frase: senza il tempo vero della parola non si può tagliare. */ +export function paroleDaPezzi(pezzi: { da: number; a: number | null; testo: string }[], durata: number): Parola[] { + return pezzi.flatMap((p) => { + const testo = p.testo.trim(); + if (!testo || /\s/.test(testo) || !Number.isFinite(p.da) || p.a === null || !Number.isFinite(p.a)) return []; + const da = Math.max(0, p.da), a = Math.min(durata, p.a); + return a > da ? [{ da, a, testo }] : []; + }).sort((a, b) => a.da - b.da); +} + +/** Le parole ancora presenti in un pezzo di clip, dopo trim, tagli e cambi di velocità. */ +export function paroleInClip(p: Project, c: Clip): ParolaTimeline[] { + if (!c.parlato || c.parlato.media !== c.media || !(c.speed > 0)) return []; + const r = fps(p.rate), fine = c.srcIn + c.len / r * c.speed; + return c.parlato.parole.flatMap((w) => { + const centro = (w.da + w.a) / 2; + if (centro < c.srcIn - 1e-7 || centro >= fine - 1e-7) return []; + const da = Math.max(c.start, Math.round(c.start + (w.da - c.srcIn) / c.speed * r)); + const a = Math.min(end(c), Math.round(c.start + (w.a - c.srcIn) / c.speed * r)); + return a > da ? [{ da, a, testo: w.testo, clip: c.id }] : []; + }); +} + +/** Parole consecutive scelte insieme tolgono anche le pause fra loro, senza prendere la parola vicina. */ +export function intervalliParole(parole: ParolaTimeline[], scelte: ReadonlySet): Intervallo[] { + const out: Intervallo[] = []; + let precedente = -2; + parole.forEach((w, i) => { + if (!scelte.has(i)) return; + const prima = parole[precedente]; + if (i === precedente + 1 && prima?.clip === w.clip) out[out.length - 1].a = Math.max(out[out.length - 1].a, w.a); + else out.push({ da: w.da, a: w.a }); + precedente = i; + }); + return out; +} + +/** Pause indicate da Whisper, comprese testa e coda. Un piccolo respiro resta ai bordi delle parole. */ +export function intervalliSilenzi(parole: Parola[], limiti: Intervallo, soglia: number, margine = 0): Intervallo[] { + if (!parole.length || !Number.isFinite(soglia) || soglia < 0) return []; + const out: Intervallo[] = []; + let da = limiti.da; + for (const w of [...parole].sort((a, b) => a.da - b.da)) { + const a = Math.min(limiti.a, w.da); + if (a - da > soglia && a - da > 2 * margine) out.push({ da: da + margine, a: a - margine }); + da = Math.max(da, Math.min(limiti.a, w.a)); + } + if (limiti.a - da > soglia && limiti.a - da > 2 * margine) out.push({ da: da + margine, a: limiti.a - margine }); + return out; +} + +const chiave = (t: string) => t.toLocaleLowerCase('it').replace(/[^\p{L}\p{N}]/gu, ''); +/** L'elenco contiene parole intere, separate da virgole o a capo. "Allora" si toglie solo se ripetuto. */ +export function intervalliIntercalari(parole: ParolaTimeline[], elenco: string, distanza = 75): Intervallo[] { + const cerca = new Set(elenco.split(/[,;\n]/).map(chiave).filter(Boolean)); + return parole.filter((w, i) => { + const k = chiave(w.testo); + if (!cerca.has(k)) return false; + if (k !== 'allora') return true; + const ripete = (j: number) => parole[j]?.clip === w.clip && chiave(parole[j].testo) === k && w.da - parole[j].a <= distanza; + // Si tiene il primo "allora" e si tolgono quelli subito dopo. + return ripete(i - 1); + }).map(({ da, a }) => ({ da, a })); +} + +/** Unisce sovrapposizioni e intervalli attaccati: l'anteprima conta esattamente quello che si applicherà. */ +export function pianoTagli(intervalli: Intervallo[], p: Project): PianoTagli { + const fine = Math.max(0, ...p.clips.map(end)); + const ordinati = intervalli.filter((x) => Number.isFinite(x.da) && Number.isFinite(x.a)) + .map((x) => ({ da: Math.max(0, Math.round(x.da)), a: Math.min(fine, Math.round(x.a)) })) + .filter((x) => x.a > x.da).sort((a, b) => a.da - b.da); + const uniti: Intervallo[] = []; + for (const x of ordinati) { + const prima = uniti[uniti.length - 1]; + if (prima && x.da <= prima.a) prima.a = Math.max(prima.a, x.a); + else uniti.push({ ...x }); + } + const fotogrammi = uniti.reduce((n, x) => n + x.a - x.da, 0); + return { intervalli: uniti, fotogrammi, secondi: fotogrammi / fps(p.rate) }; +} + +export function tempoDopoTagli(f: number, intervalli: Intervallo[]): number { + return f - intervalli.reduce((n, x) => n + Math.max(0, Math.min(f, x.a) - x.da), 0); +} + +/** Se una traccia bloccata perderebbe il sincronismo si ferma tutto, prima di toccare il progetto. */ +export function controllaTagli(p: Project, piano: PianoTagli): void { + const primo = piano.intervalli[0]?.da; + if (primo === undefined) return; + if (p.clips.some((c) => end(c) > primo && p.tracks.find((t) => t.id === c.track)?.lock)) { + throw new Error('Sblocca le tracce interessate per chiudere i buchi e tenere tutto a sincrono'); + } +} + +/** Chi chiama racchiude tutti i tagli in UN solo store.edit. Restano a sincrono anche FX, segni e sottotitoli. */ +export function applicaTagli(p: Project, piano: PianoTagli): void { + controllaTagli(p, piano); + for (const { da, a } of [...piano.intervalli].reverse()) { + splitAt(p, a); splitAt(p, da); + // I blocchetti si tagliano a loro volta: i loro pezzi non devono finire nel buco appena chiuso. + for (const c of p.clips.slice()) if (c.kind === 'fx') splitClip(p, c, a); + for (const c of p.clips.slice()) if (c.kind === 'fx') splitClip(p, c, da); + p.clips = p.clips.filter((c) => !(c.start >= da && end(c) <= a)); + for (const c of p.clips) if (c.start >= a) c.start -= a - da; + if (p.sottotitoli) p.sottotitoli.righe = p.sottotitoli.righe.flatMap((r) => { + const inizio = tempoDopoTagli(r.da, [{ da, a }]), fine = tempoDopoTagli(r.a, [{ da, a }]); + return fine > inizio ? [{ ...r, da: inizio, a: fine }] : []; + }); + p.markers = p.markers.map((m) => ({ ...m, f: tempoDopoTagli(m.f, [{ da, a }]) })); + if (p.inF !== null) p.inF = tempoDopoTagli(p.inF, [{ da, a }]); + if (p.outF !== null) p.outF = tempoDopoTagli(p.outF, [{ da, a }]); + } +} + +/** L'audio della sola clip, spostato a zero; il video usa la presa diretta legata, o il suo audio incorporato. */ +export function progettoPerTesto(p0: Project, id: string): Project { + const p = structuredClone(p0), c = p.clips.find((x) => x.id === id); + if (!c || c.kind !== 'media' || !c.media) throw new Error('Scegli una clip video o audio'); + const audio = (x: Clip) => p.tracks.find((t) => t.id === x.track)?.kind === 'audio'; + const legate = withLinked(p, [id]); + const candidate = p.clips.filter((x) => legate.has(x.id) && audio(x) && x.start < end(c) && end(x) > c.start); + const presa = audio(c) ? c : candidate.find((x) => x.media === c.media) ?? candidate[0]; + const ascolta = structuredClone(presa ?? c); + if (!presa && !p.media.find((m) => m.id === c.media)?.hasAudio) throw new Error('Questa clip non ha audio da ascoltare'); + const t = newTrack('audio', 'Parlato'); + p.tracks = [t]; + const da = Math.max(c.start, ascolta.start), a = Math.min(end(c), end(ascolta)); + ascolta.srcIn += (da - ascolta.start) / fps(p.rate) * ascolta.speed; + ascolta.start = da - c.start; ascolta.len = a - da; ascolta.track = t.id; + // Si ascolta la voce originale, senza linee di volume o effetti che potrebbero nasconderla. + ascolta.gain = 0; ascolta.gainKeys = []; ascolta.afx = undefined; ascolta.anim = undefined; + ascolta.fadeIn = 0; ascolta.fadeOut = 0; ascolta.duckKeys = undefined; + p.clips = [ascolta]; + return p; +} diff --git a/src/core/progetto.ts b/src/core/progetto.ts index 619831a..6b767c6 100644 --- a/src/core/progetto.ts +++ b/src/core/progetto.ts @@ -1,6 +1,7 @@ // Fabbrica del progetto, delle tracce e delle clip, più le piccole utilità sul modello. import type { Clip, ClipKind, Curva, Master, MediaItem, Project, Rate, Track, TrackKind, Transition, VideoFx, Transform, TitleSpec } from './tipi'; import { f2s } from './timecode'; +import { valoreAnim } from './automazioni'; let seq = 0; export const uid = (p = '') => p + Date.now().toString(36).slice(-5) + (seq++).toString(36) + Math.random().toString(36).slice(2, 6); @@ -59,7 +60,7 @@ export const masterDi = (p: Project): Master => p.master ?? MASTER0; export const autoColore = (p: Project, c: Clip) => c.kind === 'media' && (c.fx.auto ?? masterDi(p).auto); export const TITLE0: TitleSpec = { - text: 'DaProd Video', style: 'fisso', font: 'Rajdhani', size: 90, color: '#ffffff', outline: '#000000', + text: 'DaProd Editor Video', style: 'fisso', font: 'Rajdhani', size: 90, color: '#ffffff', outline: '#000000', shadow: true, box: false, boxColor: '#000000aa', align: 'center', y: 0.5, }; @@ -183,6 +184,20 @@ export function tappeTf(c: Clip): { t: number; tf: Transform }[] { /** la posizione della clip al fotogramma locale lf: ferma (tf) o in movimento verso tfFine, passando per le tappe di mezzo */ export function tfAl(c: Clip, lf: number): Transform { + const base = tfMovimento(c, lf); + if (!c.anim) return base; + // i campi con i keyframe prendono il posto di quelli fermi o in movimento (gli altri restano com'erano) + let o: Transform | null = null; + for (const k of CAMPI_TF) { + const linea = c.anim['tf.' + k]; + if (!linea?.length) continue; + o ??= { ...base }; + (o as unknown as Record)[k] = valoreAnim(linea, lf, (base as unknown as Record)[k] ?? PARTENZA_TF[k] ?? 0); + } + return o ?? base; +} + +function tfMovimento(c: Clip, lf: number): Transform { if (!c.tfFine) return c.tf; const x = Math.max(0, Math.min(1, lf / Math.max(1, c.len - 1))); const tappe = tappeTf(c); @@ -205,7 +220,8 @@ export function fadeAl(c: Clip, lf: number): number { /** opacità di una clip al fotogramma f (clip × linea elastica × dissolvenze) */ export function clipOpacity(c: Clip, f: number): number { const lf = f - c.start; - let o = c.opKeys.length ? keyValue(c.opKeys, lf, c.opacity) : c.opacity; + const anim = c.anim?.opacity; + let o = anim?.length ? valoreAnim(anim, lf, c.opacity) : c.opKeys.length ? keyValue(c.opKeys, lf, c.opacity) : c.opacity; o *= fadeAl(c, lf); return Math.max(0, Math.min(1, o)); } diff --git a/src/core/store.ts b/src/core/store.ts index 14c3bf7..50976ba 100644 --- a/src/core/store.ts +++ b/src/core/store.ts @@ -4,7 +4,7 @@ import type { Clip, MediaItem, Project, Sequenza } from './tipi'; import { newProject, progettoAperto } from './progetto'; import { FORMATI } from './tipi'; -type Snap = Pick & { label: string }; +type Snap = Pick & { label: string }; export type StoreEvent = 'doc' | 'sel' | 'head' | 'view' | 'status'; @@ -53,7 +53,7 @@ class Store { private snap(label: string): Snap { const d = this.doc; - return structuredClone({ tracks: d.tracks, clips: d.clips, markers: d.markers, inF: d.inF, outF: d.outF, media: d.media, w: d.w, h: d.h, rate: d.rate, drop: d.drop, name: d.name, master: d.master, sottotitoli: d.sottotitoli, sequenze: d.sequenze, seqAttiva: d.seqAttiva, cartelle: d.cartelle, label }); + return structuredClone({ luts: d.luts, tracks: d.tracks, clips: d.clips, markers: d.markers, inF: d.inF, outF: d.outF, media: d.media, w: d.w, h: d.h, rate: d.rate, drop: d.drop, name: d.name, master: d.master, sottotitoli: d.sottotitoli, sequenze: d.sequenze, seqAttiva: d.seqAttiva, cartelle: d.cartelle, label }); } private restore(s: Snap) { diff --git a/src/core/tipi.ts b/src/core/tipi.ts index 6056a51..2851a35 100644 --- a/src/core/tipi.ts +++ b/src/core/tipi.ts @@ -5,10 +5,36 @@ export type Rate = { num: number; den: number }; +/** Colore SDR: nessuna conversione log implicita. Tutti i campi assenti sono neutri. */ +export interface PuntoColore { id: string; x: number; y: number } +export type CanaleCurva = 'master' | 'red' | 'green' | 'blue' | 'luma'; +export interface ColoreAvanzato { + lift?: [number, number, number]; + gamma?: [number, number, number]; + gain?: [number, number, number]; + curve?: Partial>; + lut?: { id: string; /** 0..1 */ intensita: number }; +} +/** Una sola copia nel progetto, anche nei pacchetti .dap/.daprod. Mai texture o typed array nel JSON. */ +export interface RisorsaLut { + id: string; hash: string; nome: string; n: number; + domainMin: [number, number, number]; domainMax: [number, number, number]; dati: number[]; +} +export type RuoloAudio = 'nessuno' | 'voce' | 'musica'; +export interface Ducking { + attivo: boolean; + /** riduzione positiva in dB */ quantita: number; + /** tempi in secondi di timeline */ attacco: number; rilascio: number; + /** soglia RMS in dBFS, non riconoscimento del parlato */ soglia: number; + isteresi: number; minimo: number; hold: number; +} + /** fx = la vecchia corsia FX a parte (1.0.4): all'apertura i suoi blocchi passano sulle tracce video e lei sparisce */ export type TrackKind = 'video' | 'audio' | 'fx'; export interface Track { + ruoloAudio?: RuoloAudio; + ducking?: Ducking; id: string; kind: TrackKind; name: string; @@ -31,6 +57,40 @@ export type ClipKind = 'media' | 'color' | 'bars' | 'tone' | 'countdown' | 'titl /** Un punto della linea elastica (rubber band): f = fotogrammi dall'inizio della clip. */ export interface Key { f: number; v: number } +/** Come si passa da una chiave alla successiva: dritta, morbida (parte e arriva piano) o a gradino (resta fino alla prossima). */ +export type ModoAnim = 'lineare' | 'morbida' | 'gradino'; +/** Un keyframe di un parametro numerico: f = fotogrammi dall'inizio della clip, modo = come si arriva alla chiave dopo. */ +export interface ChiaveAnim { f: number; v: number; modo?: ModoAnim } +/** Le linee animate di una clip: il percorso del parametro ("opacity", "tf.x", "fx.sat", "fxb.forza", "mask..sfuma"…) + * con le sue chiavi in ordine di tempo. Chi non c'è usa il valore fermo di sempre (src/core/automazioni.ts). */ +export type Animazioni = Record; + +/** Un punto della maschera a Bézier: x e y in frazioni della sorgente (0..1 dall'angolo in alto a sinistra); hx e hy = la + * maniglia in uscita (relativa al punto, quella in entrata è opposta). Senza maniglie il punto è uno spigolo. */ +export interface PuntoBez { x: number; y: number; hx?: number; hy?: number } +/** Una maschera a forma sulla clip (src/core/maschereForma.ts). Tutto in frazioni della sorgente, così segue la clip. */ +export interface MascheraForma { + id: string; + forma: 'rettangolo' | 'ellisse' | 'bezier'; + nome?: string; + /** rettangolo ed ellisse: centro, larghezza e altezza intere (frazioni), rotazione in gradi */ + x: number; y: number; w: number; h: number; rot: number; + /** Bézier: i punti in ordine (la forma si chiude da sola); morbida = le curve passano dolci da un punto all'altro */ + punti?: PuntoBez[]; + morbida?: boolean; + /** sfumatura del bordo, frazione del lato corto (0..0.5) */ + sfuma: number; + /** allarga (+) o restringe (−) la forma, frazione del lato corto (−0.5..0.5) */ + espandi: number; + inverti: boolean; + /** quanto conta la maschera 0..1 */ + opacita: number; + /** somma = aggiunge a quello che si vede · sottrai = toglie */ + op: 'somma' | 'sottrai'; + /** spenta = c'è ma non conta */ + spenta?: boolean; +} + /** mix = dissolvenza · wipe = tendina SMPTE · dip = passaggio a colore · dve = effetto digitale */ export type TransitionType = 'mix' | 'wipe' | 'dip' | 'dve'; @@ -71,6 +131,8 @@ export interface SuonoClip { } export interface BloccoFx { + /** LIVE: i clic di questo media, disegnati sulla ripresa prima del suo movimento. */ + cursoreMedia?: string; tipo: 'effetto' | 'transizione'; /** effetto: il suo nome nel catalogo (src/core/blocchi.ts) · transizione: 'mix', 'dip', 'wipe:119', 'dve:301'… */ id: string; @@ -151,6 +213,7 @@ export interface Ritaglio { } export interface VideoFx { + colore?: ColoreAvanzato; /** livello del nero / luminosità -1..1 */ bright: number; /** guadagno / contrasto 0..2 */ @@ -278,7 +341,15 @@ export interface AnimSpec { v: Record; } +/** un titolo animato HTML (src/core/titoliHtml.ts): quale modello e i valori dei suoi campi (testi, colori, tempi) */ +export interface HtmlSpec { + id: string; + v: Record; +} + export interface GenSpec { + /** un titolo animato fatto di HTML e CSS, disegnato fotogramma per fotogramma (la clip è un titolo) */ + html?: HtmlSpec; /** un'animazione pronta: sottopancia, testo che si muove, grafico, fondo, effetto da cerimonia… (la clip è un titolo) */ anim?: AnimSpec; color?: string; @@ -304,6 +375,14 @@ export interface GenSpec { export interface Curva { k: number; s?: boolean } export interface Clip { + /** Parlato per il montaggio dal testo: secondi della sorgente, così i tagli e la velocità non lo spostano. */ + parlato?: { id: string; media: string; da: number; a: number; parole: { da: number; a: number; testo: string }[] }; + /** la scelta della clip prevale su quella della traccia */ + ruoloAudio?: RuoloAudio; + ducking?: Ducking; + /** attenuazione in dB, separata dalla linea elastica manuale */ + duckKeys?: Key[]; + duckFirma?: string; id: string; track: string; kind: ClipKind; @@ -337,6 +416,10 @@ export interface Clip { segue?: string; /** lo sfondo tolto dall'AI (maschere in src/media/maschere.ts) */ ritaglio?: Ritaglio; + /** keyframe su qualunque parametro numerico (src/core/automazioni.ts): chi ha una linea qui la usa al posto del valore fermo */ + anim?: Animazioni; + /** le maschere a forma (rettangolo, ellisse, Bézier), sommate o sottratte in ordine (src/core/maschereForma.ts) */ + maschere?: MascheraForma[]; /** la ripresa si tiene ferma sull'oggetto tracciato (stabilizza) */ stabilizza?: boolean; fx: VideoFx; @@ -364,6 +447,8 @@ export interface Clip { export type MediaType = 'video' | 'audio' | 'image'; export interface MediaItem { + /** Opzionale: i progetti vecchi restano identici. Incorporato anche nel .daprod, senza file da ricollegare. */ + cursoreLive?: import('./zoomCursore').DatiCursore; id: string; name: string; type: MediaType; @@ -435,6 +520,7 @@ export type LookFinale = 'nessuno' | 'cinema' | 'caldo' | 'freddo' | 'vivace' | /** i ritocchi finali: valgono per tutto il montaggio, nei monitor e nell'export */ export interface Master { + colore?: ColoreAvanzato; /** colore automatico su tutte le riprese (livelli e bilanciamento del bianco) */ auto: boolean; /** forza del colore automatico 0..1 */ @@ -463,6 +549,7 @@ export interface Master { } export interface Project { + luts?: RisorsaLut[]; format: 'daprod-video'; v: 1; name: string; diff --git a/src/core/titoliHtml.ts b/src/core/titoliHtml.ts new file mode 100644 index 0000000..411f988 --- /dev/null +++ b/src/core/titoliHtml.ts @@ -0,0 +1,799 @@ +// I titoli animati HTML: titoli e grafiche fatte con HTML e CSS (stile «vecchio, moderno dentro») che girano dentro l'app. +// Qui sta la parte pura, senza browser: il catalogo dei modelli (campi, durata), lo stato dell'animazione a ogni istante +// (funzione del solo tempo: dato t esce sempre la stessa cosa), la costruzione del fotogramma come testo HTML e la chiave +// con cui si ricorda un fotogramma già disegnato. Il disegno vero (HTML → immagine → tela) sta in src/render/titoliHtml.ts. +// L'idea di scrivere i titoli in HTML e di guidarli col tempo fotogramma per fotogramma, così monitor ed esportazione sono +// identici, viene da HyperFrames (HeyGen, Apache-2.0, https://github.com/heygen-com/hyperframes). Vedi TERZE-PARTI.md. +import type { HtmlSpec, Project } from './tipi'; +import type { CampoAnim } from './animazioni'; +import { E, caso, clamp01, lerp } from '../render/anim/base'; + +// ——— i caratteri: solo quelli già nel programma (@fontsource, DSEG7), tutti con licenza OFL ——— +export interface FontHtml { famiglia: string; peso: number; ripiego: string } +export const FONT_HTML: Record = { + 'dseg7': { famiglia: 'DSEG7', peso: 700, ripiego: 'monospace' }, + 'orbitron-700': { famiglia: 'Orbitron', peso: 700, ripiego: 'sans-serif' }, + 'orbitron-900': { famiglia: 'Orbitron', peso: 900, ripiego: 'sans-serif' }, + 'rajdhani-500': { famiglia: 'Rajdhani', peso: 500, ripiego: 'sans-serif' }, + 'rajdhani-700': { famiglia: 'Rajdhani', peso: 700, ripiego: 'sans-serif' }, + 'montserrat-500': { famiglia: 'Montserrat', peso: 500, ripiego: 'sans-serif' }, + 'montserrat-700': { famiglia: 'Montserrat', peso: 700, ripiego: 'sans-serif' }, + 'montserrat-900': { famiglia: 'Montserrat', peso: 900, ripiego: 'sans-serif' }, + 'oswald-500': { famiglia: 'Oswald', peso: 500, ripiego: 'sans-serif' }, + 'oswald-700': { famiglia: 'Oswald', peso: 700, ripiego: 'sans-serif' }, + 'bebas-400': { famiglia: 'Bebas Neue', peso: 400, ripiego: 'sans-serif' }, + 'archivo-400': { famiglia: 'Archivo Black', peso: 400, ripiego: 'sans-serif' }, + 'mono-700': { famiglia: 'Space Mono', peso: 700, ripiego: 'monospace' }, + 'playfair-400': { famiglia: 'Playfair Display', peso: 400, ripiego: 'serif' }, + 'playfair-700': { famiglia: 'Playfair Display', peso: 700, ripiego: 'serif' }, +}; + +/** i caratteri a scelta nel pannello: chiave del campo → i pezzi di font da incorporare */ +const SCELTE_FONT: Record = { + orbitron: { nome: 'Orbitron (digitale)', pezzi: ['orbitron-700', 'orbitron-900'], peso: 700, famiglia: 'Orbitron' }, + rajdhani: { nome: 'Rajdhani (tecnico)', pezzi: ['rajdhani-500', 'rajdhani-700'], peso: 700, famiglia: 'Rajdhani' }, + montserrat: { nome: 'Montserrat (pulito)', pezzi: ['montserrat-500', 'montserrat-700', 'montserrat-900'], peso: 700, famiglia: 'Montserrat' }, + oswald: { nome: 'Oswald (stretto)', pezzi: ['oswald-500', 'oswald-700'], peso: 700, famiglia: 'Oswald' }, + bebas: { nome: 'Bebas Neue (titoli)', pezzi: ['bebas-400'], peso: 400, famiglia: 'Bebas Neue' }, + archivo: { nome: 'Archivo Black (pesante)', pezzi: ['archivo-400'], peso: 400, famiglia: 'Archivo Black' }, + playfair: { nome: 'Playfair (elegante)', pezzi: ['playfair-400', 'playfair-700'], peso: 700, famiglia: 'Playfair Display' }, + mono: { nome: 'Space Mono (macchina)', pezzi: ['mono-700'], peso: 700, famiglia: 'Space Mono' }, +}; +const fontScelta = (chiave: string) => SCELTE_FONT[chiave] ?? SCELTE_FONT.orbitron; + +// ——— i campi ——— +export type ValoreHtml = string | number | boolean; +export type ValoriHtml = Record; +const T = (id: string, nome: string, def: string): CampoAnim => ({ id, nome, tipo: 'testo', def }); +const L = (id: string, nome: string, def: string): CampoAnim => ({ id, nome, tipo: 'lungo', def }); +const N = (id: string, nome: string, def: number, min: number, max: number, step = 1): CampoAnim => ({ id, nome, tipo: 'numero', def, min, max, step }); +const C = (id: string, nome: string, def: string): CampoAnim => ({ id, nome, tipo: 'colore', def }); +const S = (id: string, nome: string, def: string, scelte: [string, string][]): CampoAnim => ({ id, nome, tipo: 'scelta', def, scelte }); +const FONT = (def: string, ammessi: string[] = Object.keys(SCELTE_FONT)): CampoAnim => S('font', 'Carattere', def, ammessi.map((k) => [k, SCELTE_FONT[k].nome] as [string, string])); +/** entrata, uscita e grandezza: ce li hanno tutti i modelli */ +const TEMPI = (ent = 0.7, usc = 0.5): CampoAnim[] => [N('ent', 'Entrata (secondi)', ent, 0.1, 4, 0.1), N('usc', 'Uscita (secondi)', usc, 0.1, 4, 0.1)]; +const DIM: CampoAnim = N('dim', 'Grandezza', 100, 50, 200, 5); + +export type GruppoHtml = 'vecchio' | 'tv' | 'social' | 'cinema' | 'parole' | 'indicare' | 'docu'; +export const GRUPPI_HTML: { id: GruppoHtml; nome: string }[] = [ + { id: 'vecchio', nome: 'Vecchio stile' }, + { id: 'tv', nome: 'TV e notizie' }, + { id: 'social', nome: 'Social e logo' }, + { id: 'cinema', nome: 'Cinema e capitoli' }, + { id: 'parole', nome: 'Parole e citazioni' }, + { id: 'indicare', nome: 'Indicare e confrontare' }, + { id: 'docu', nome: 'Documentario e interviste' }, +]; + +/** lo stato dell'animazione a un istante: numeri, tutti calcolati dal solo tempo */ +export type StatoHtml = Record; + +export interface ModelloHtml { + id: string; + nome: string; + gruppo: GruppoHtml; + info: string; + /** durata di partenza in secondi */ + durata: number; + campi: CampoAnim[]; + /** i pezzi di carattere da incorporare per questi valori */ + font: (v: ValoriHtml) => string[]; + /** i numeri in più del modello (oltre a quelli comuni): funzione del solo tempo */ + stato?: (t: number, d: number, v: ValoriHtml, s: StatoHtml) => StatoHtml; + /** il contenuto, scritto come testo HTML con dentro i numeri dello stato */ + html: (v: ValoriHtml, s: StatoHtml) => string; + /** il CSS del modello (si legge `var(--in)`, `var(--out)`, `var(--t)`…) */ + css: string; + /** la scritta da mostrare se il sistema non sa disegnare l'HTML (ripiego semplice) */ + righe: (v: ValoriHtml) => string[]; +} + +// ——— attrezzi ——— +const arrotonda = (x: number) => Math.round(x * 10000) / 10000; +const num = (x: number) => String(arrotonda(Number.isFinite(x) ? x : 0)); +const esc = (s: string) => s.replace(/[\u0000-\u0008\u000b\u000c\u000e-\u001f\ufffe\uffff]/g, '').replace(/&/g, '&').replace(//g, '>').replace(/"/g, '"').replace(/'/g, '''); +/** testo su più righe (a capo →
) */ +const righeHtml = (s: string) => s.split(/\r?\n/).map(esc).join('
'); +/** un colore sicuro per il CSS: solo #rrggbb (se no il valore di riserva) */ +export const coloreSicuro = (c: unknown, def: string) => (typeof c === 'string' && /^#[0-9a-f]{6}$/i.test(c) ? c : def); +const testo = (v: ValoriHtml, k: string, def = '') => (typeof v[k] === 'string' ? (v[k] as string) : def); +const numero = (v: ValoriHtml, k: string, def: number) => { const n = Number(v[k]); return Number.isFinite(n) ? n : def; }; +const scelto = (v: ValoriHtml, k: string, ammessi: string[], def: string) => (typeof v[k] === 'string' && ammessi.includes(v[k] as string) ? (v[k] as string) : def); +const col = (v: ValoriHtml, k: string, def: string) => coloreSicuro(v[k], def); +const fam = (v: ValoriHtml, def = 'orbitron') => fontScelta(scelto(v, 'font', Object.keys(SCELTE_FONT), def)); +const nomeFont = (v: ValoriHtml, def = 'orbitron') => `'${fam(v, def).famiglia}'`; +const s2 = (x: number) => String(Math.floor(x)).padStart(2, '0'); +/** 0 → 1 fra i secondi a e b (con la curva e) */ +const fra = (t: number, a: number, b: number, e: (x: number) => number = E.p3out) => e(clamp01((t - a) / Math.max(1e-6, b - a))); + +// ——— la freccia che indica un punto: geometria (in pixel del palco, con il punto indicato come origine) ——— +const LATI_FRECCIA: Record = { 'alto-sinistra': [-1, -1], 'alto-destra': [1, -1], 'basso-sinistra': [-1, 1], 'basso-destra': [1, 1] }; +interface Punto2 { x: number; y: number } +/** la freccia parte da sotto (o sopra) la scritta, scende dritta e poi entra di lato nel segno; la punta guarda il centro */ +function geometriaFreccia(lato: string, R: number, forma: string): { S: Punto2; C: Punto2; F: Punto2; E: Punto2; angolo: number; dy: number } { + const [dx, dy] = LATI_FRECCIA[lato] ?? LATI_FRECCIA['alto-sinistra']; + const S = { x: dx * (0.9 * R + 300), y: dy * (0.6 * R + 170) }; + const dist = forma === 'rettangolo' ? 1.3 * R + 12 : forma === 'evidenziatore' ? 1.5 * R + 12 : forma === 'nessuna' ? 30 : R + 12; + const E = { x: dx * dist, y: 0 }; + const angolo = dx < 0 ? 0 : Math.PI; + // la riga si ferma un po' prima della punta, se no la punta sembrerebbe tozza + return { S, C: { x: S.x, y: 0 }, F: { x: E.x - Math.cos(angolo) * 30, y: 0 }, E, angolo, dy }; +} +/** lunghezza di una curva quadratica (somma di 16 pezzetti dritti): serve per disegnarla piano piano */ +function lunghezzaCurva(a: Punto2, c: Punto2, b: Punto2): number { + let L = 0, p = a; + for (let i = 1; i <= 16; i++) { + const t = i / 16, u = 1 - t; + const q = { x: u * u * a.x + 2 * u * t * c.x + t * t * b.x, y: u * u * a.y + 2 * u * t * c.y + t * t * b.y }; + L += Math.hypot(q.x - p.x, q.y - p.y); p = q; + } + return L; +} + +// ——— il catalogo ——— +export const MODELLI_HTML: ModelloHtml[] = [ + // ————————————————————————— vecchio stile ————————————————————————— + { + id: 'display7', nome: 'Display a sette segmenti', gruppo: 'vecchio', info: 'un contatore a segmenti rossi che sale, con il vetro e la cornice di metallo', durata: 5, + campi: [N('da', 'Parte da', 0, 0, 99999999, 1), N('a', 'Arriva a', 1250, 0, 99999999, 1), N('cifre', 'Cifre', 4, 2, 8, 1), T('etichetta', 'Etichetta', 'GIRI AL MINUTO'), C('colore', 'Colore dei segmenti', '#ff4d6d'), ...TEMPI(0.7, 0.5), DIM], + font: () => ['dseg7', 'rajdhani-700'], + stato: (t, d, v, s) => { + const fine = Math.max(0.5, d - s.usc - 0.2), da = numero(v, 'da', 0), a = numero(v, 'a', 0); + const k = fra(t, s.ent * 0.6, fine, E.p3io); + // i segmenti si accendono con uno sfarfallio che dura quanto l'entrata + const luce = t >= s.ent ? 1 : t < s.ent * 0.25 ? 0.15 : caso(Math.floor(t * 30), 3) < t / s.ent ? 1 : 0.35; + return { valore: Math.round(lerp(da, a, k)), luce }; + }, + html: (v, s) => { + const n = Math.max(2, Math.min(8, Math.round(numero(v, 'cifre', 4)))); + const val = String(Math.max(0, Math.min(10 ** n - 1, Math.round(s.valore)))).padStart(n, '0'); + return `
${'8'.repeat(n)}${val}
+
${esc(testo(v, 'etichetta', ''))}
`; + }, + css: `.d7{position:absolute;left:50%;top:50%;transform:translate(-50%,-50%) scale(calc(var(--dim)*(0.9 + 0.1*var(--in))));opacity:calc(var(--in)*var(--out));padding:34px 46px 24px;border-radius:26px;background:linear-gradient(160deg,#4b4757,#1b1a22 45%,#0e0d13);border:2px solid #6f6b7d;box-shadow:0 30px 70px rgba(0,0,0,.65),inset 0 2px 0 rgba(255,255,255,.18),inset 0 -3px 0 rgba(0,0,0,.6)} +.d7-vetro{position:relative;padding:20px 34px;border-radius:12px;background:#07060b;border:3px solid #000;box-shadow:inset 0 0 40px rgba(0,0,0,.9),0 1px 0 rgba(255,255,255,.12);font-family:'DSEG7',monospace;font-size:190px;line-height:1;letter-spacing:6px;white-space:nowrap} +.d7-spento{color:var(--c);opacity:.09} +.d7-acceso{position:absolute;left:34px;top:20px;color:var(--c);text-shadow:0 0 14px var(--c),0 0 40px var(--c)} +.d7-et{margin-top:18px;display:flex;align-items:center;gap:14px;font-family:'Rajdhani',sans-serif;font-weight:700;font-size:34px;letter-spacing:6px;color:#a19db0;text-transform:uppercase} +.d7-et i{width:16px;height:16px;border-radius:50%;background:var(--c);box-shadow:0 0 12px var(--c)}`, + righe: (v) => [String(numero(v, 'a', 0)), testo(v, 'etichetta')], + }, + { + id: 'neon', nome: 'Scritta al neon', gruppo: 'vecchio', info: 'il tubo di vetro si accende a scatti, con l\'alone di luce intorno', durata: 5, + campi: [L('testo', 'Scritta', 'APERTO'), C('colore', 'Colore', '#ff3df2'), FONT('orbitron', ['orbitron', 'bebas', 'archivo', 'montserrat', 'mono']), ...TEMPI(1.2, 0.5), DIM], + font: (v) => fam(v).pezzi, + stato: (t, _d, _v, s) => { + // accensione a scatti: all'inizio il tubo balbetta, poi resta acceso; un ultimo guizzo a metà tenuta + const x = clamp01(t / s.ent); + let luce = t >= s.ent ? 1 : x < 0.12 ? 0 : caso(Math.floor(t * 28), 11) < x * 1.15 ? 1 : 0.12; + if (t > s.ent + 1.4 && t < s.ent + 1.55) luce = caso(Math.floor(t * 40), 5) < 0.5 ? 0.45 : 1; + return { luce }; + }, + html: (v, s) => `
${righeHtml(testo(v, 'testo', ''))}
${righeHtml(testo(v, 'testo', ''))}
`, + css: `.nn{position:absolute;left:50%;top:50%;transform:translate(-50%,-50%) scale(var(--dim));text-align:center;font-weight:${'${P}'};font-size:170px;line-height:1.15;letter-spacing:8px;text-transform:uppercase;white-space:nowrap;opacity:var(--out)} +.nn-tubo{color:#2a2433;-webkit-text-stroke:2px #4b4757} +.nn-luce{position:absolute;left:0;top:0;width:100%;color:#fff;opacity:var(--lit);text-shadow:0 0 6px var(--c),0 0 18px var(--c),0 0 42px var(--c),0 0 90px var(--c),0 0 160px var(--c)}`, + righe: (v) => testo(v, 'testo').split(/\r?\n/), + }, + { + id: 'rec', nome: 'Mirino videocamera REC', gruppo: 'vecchio', info: 'REC che lampeggia, tempo a sette segmenti, batteria e gli angoli del mirino', durata: 8, + campi: [T('data', 'Data', '12 GIU 2026'), N('inizio', 'Il tempo parte da (secondi)', 0, 0, 86399, 1), C('colore', 'Colore del REC', '#ff4d6d'), ...TEMPI(0.4, 0.4)], + font: () => ['dseg7', 'rajdhani-700'], + stato: (t, _d, v) => { const tot = Math.floor(t + numero(v, 'inizio', 0)); return { sec: tot, lampo: Math.floor(t * 2) % 2 === 0 ? 1 : 0.1 }; }, + html: (v, s) => { + const tot = Math.floor(s.sec); + const tc = `${s2(tot / 3600)}:${s2((tot % 3600) / 60)}:${s2(tot % 60)}`; + return `
+
REC${esc(testo(v, 'data', ''))}
+
88:88:88${tc}
`; + }, + css: `.rc{position:absolute;inset:60px;opacity:calc(var(--in)*var(--out));font-family:'Rajdhani',sans-serif;color:#fff} +.rc>i{position:absolute;width:90px;height:90px;border:0 solid #fff} +.rc .a1{left:0;top:0;border-left-width:6px;border-top-width:6px}.rc .a2{right:0;top:0;border-right-width:6px;border-top-width:6px} +.rc .a3{left:0;bottom:0;border-left-width:6px;border-bottom-width:6px}.rc .a4{right:0;bottom:0;border-right-width:6px;border-bottom-width:6px} +.rc-su{position:absolute;left:50px;top:44px;display:flex;align-items:center;gap:20px;font-weight:700;font-size:58px;letter-spacing:4px;text-shadow:0 2px 6px rgba(0,0,0,.8)} +.rc-pt{width:38px;height:38px;border-radius:50%;background:var(--c);box-shadow:0 0 16px var(--c)} +.rc-su em{font-style:normal;font-size:42px;margin-left:30px;color:#dcd8e6} +.rc-gi{position:absolute;left:50px;right:50px;bottom:40px;display:flex;justify-content:space-between;align-items:flex-end} +.rc-tc{position:relative;font-family:'DSEG7',monospace;font-size:78px;color:#fff;text-shadow:0 0 8px rgba(255,255,255,.55);letter-spacing:3px} +.rc-tc u{position:absolute;left:0;top:0;text-decoration:none;color:#fff;opacity:.08} +.rc-bat{display:flex;gap:6px;padding:8px;border:5px solid #fff;border-radius:8px;position:relative} +.rc-bat i{width:26px;height:44px;background:#fff} +.rc-bat:after{content:'';position:absolute;right:-16px;top:18px;width:10px;height:26px;background:#fff;border-radius:0 4px 4px 0}`, + righe: (v) => ['REC', testo(v, 'data')], + }, + { + id: 'vu', nome: 'Vumetro a lancetta', gruppo: 'vecchio', info: 'il quadrante di una vecchia centralina, con la lancetta che balla a tempo', durata: 6, + campi: [T('etichetta', 'Etichetta', 'LIVELLO'), N('livello', 'Quanto balla', 70, 10, 100, 5), C('colore', 'Colore della lancetta', '#ff4d6d'), C('carta', 'Colore del quadrante', '#f1e7c4'), ...TEMPI(0.6, 0.5), DIM], + font: () => ['rajdhani-700'], + stato: (t, _d, v, s) => { + // la lancetta: somma di onde che non si ripetono mai uguali; all'inizio sale da zero con un po' di rimbalzo + const liv = numero(v, 'livello', 70) / 100; + const onda = 0.5 + 0.28 * Math.sin(t * 5.1) + 0.16 * Math.sin(t * 11.3 + 1.7) + 0.08 * Math.sin(t * 23.9 + 0.4); + const sale = fra(t, 0, s.ent + 0.4, E.back(2.4)); + return { ago: clamp01(Math.max(0, onda) * liv * sale + 0.02) }; + }, + html: (v, s) => { + const gradi = -50 + 100 * s.ago; + let tacche = ''; + for (let i = 0; i <= 20; i++) { + const a = ((-50 + i * 5) * Math.PI) / 180, lungo = i % 5 === 0 ? 26 : 14, r1 = 250, r2 = r1 - lungo; + const rosso = i >= 15; + tacche += ``; + } + return `
+ + +${tacche}VU +${esc(testo(v, 'etichetta', '').toUpperCase())} + +
`; + }, + css: `.vu{position:absolute;left:50%;top:50%;transform:translate(-50%,-50%) scale(calc(var(--dim)*1.25*(0.92 + 0.08*var(--in))));opacity:calc(var(--in)*var(--out));filter:drop-shadow(0 24px 40px rgba(0,0,0,.6))}.vu svg{display:block}`, + righe: (v) => ['VU', testo(v, 'etichetta')], + }, + + // ————————————————————————— TV e notizie ————————————————————————— + { + id: 'terzo', nome: 'Terzo inferiore · nome e ruolo', gruppo: 'tv', info: 'la barra scorre e svela il nome e sotto il ruolo', durata: 5, + campi: [T('nome', 'Nome', 'Mario Rossi'), T('ruolo', 'Ruolo', 'Regista'), C('colore', 'Colore della barra', '#ffd54a'), S('lato', 'Dove sta', 'sinistra', [['sinistra', 'A sinistra'], ['destra', 'A destra']]), FONT('rajdhani', ['rajdhani', 'montserrat', 'oswald', 'orbitron']), ...TEMPI(0.8, 0.5), DIM], + font: (v) => fam(v, 'rajdhani').pezzi, + stato: (t, d, _v, s) => ({ nome: fra(t, 0.15, 0.15 + s.ent), ruolo: fra(t, 0.4, 0.4 + s.ent), barra: fra(t, 0, s.ent * 0.8, E.p4out) }), + html: (v, s) => { + const destra = scelto(v, 'lato', ['sinistra', 'destra'], 'sinistra') === 'destra'; + return `
${esc(testo(v, 'nome', ''))}
${esc(testo(v, 'ruolo', ''))}
`; + }, + css: `.tz{position:absolute;left:110px;bottom:150px;display:flex;align-items:stretch;gap:26px;transform:scale(var(--dim));transform-origin:0 100%;opacity:var(--out)} +.tz.dx{left:auto;right:110px;flex-direction:row-reverse;transform-origin:100% 100%;text-align:right} +.tz-barra{width:14px;background:var(--c);box-shadow:0 0 22px var(--c);transform:scaleY(var(--b));transform-origin:50% 100%} +.tz-testi{padding:14px 40px 16px 8px;background:linear-gradient(90deg,rgba(9,8,13,.86),rgba(9,8,13,.0));clip-path:inset(0 calc((1 - var(--b))*100%) 0 0)} +.tz.dx .tz-testi{padding:14px 8px 16px 40px;background:linear-gradient(270deg,rgba(9,8,13,.86),rgba(9,8,13,.0));clip-path:inset(0 0 0 calc((1 - var(--b))*100%))} +.tz-nome{font-weight:700;font-size:84px;line-height:1.05;letter-spacing:2px;color:#fff;text-transform:uppercase;overflow:hidden} +.tz-nome span{display:block;transform:translateY(calc((1 - var(--n))*100%));opacity:var(--n)} +.tz-ruolo{font-weight:500;font-size:46px;letter-spacing:6px;color:var(--c);text-transform:uppercase;overflow:hidden} +.tz-ruolo span{display:block;transform:translateY(calc((1 - var(--r))*100%));opacity:var(--r)}`, + righe: (v) => [testo(v, 'nome'), testo(v, 'ruolo')], + }, + { + id: 'notizie', nome: 'Sottopancia notizie', gruppo: 'tv', info: 'la targhetta rossa «ultim\'ora», la fascia col titolo e la sigla del canale', durata: 6, + campi: [T('etichetta', 'Targhetta', 'ULTIM\'ORA'), L('titolo', 'Titolo', 'DaProd Editor Video: il montaggio vecchio stile, moderno dentro'), T('sigla', 'Sigla del canale', 'DAPROD NEWS'), C('colore', 'Colore della targhetta', '#d2202a'), ...TEMPI(0.7, 0.5), DIM], + font: () => ['oswald-500', 'oswald-700', 'rajdhani-700'], + stato: (t, _d, _v, s) => ({ fascia: fra(t, 0, s.ent, E.p4out), testo: fra(t, 0.3, 0.3 + s.ent), targa: fra(t, 0.1, 0.1 + s.ent * 0.8, E.back(1.6)) }), + html: (v, s) => `
${esc(testo(v, 'etichetta', ''))}
${righeHtml(testo(v, 'titolo', ''))}
${esc(testo(v, 'sigla', ''))}
`, + css: `.nt{position:absolute;left:0;right:0;bottom:90px;transform:scale(var(--dim));transform-origin:50% 100%;opacity:var(--out)} +.nt-targa{display:inline-block;margin-left:90px;padding:6px 34px;background:var(--c);color:#fff;font-family:'Oswald',sans-serif;font-weight:700;font-size:44px;letter-spacing:5px;transform:translateY(calc((1 - var(--g))*60px));opacity:var(--g)} +.nt-fascia{display:flex;align-items:center;justify-content:space-between;gap:40px;padding:20px 90px;background:linear-gradient(180deg,#f5f3fa,#d8d4e2);transform:translateX(calc((1 - var(--f))*-100%))} +.nt-titolo{font-family:'Oswald',sans-serif;font-weight:500;font-size:60px;line-height:1.1;color:#14131a;overflow:hidden} +.nt-titolo span{display:block;opacity:var(--x);transform:translateY(calc((1 - var(--x))*40px))} +.nt-sigla{flex:none;font-family:'Rajdhani',sans-serif;font-weight:700;font-size:36px;letter-spacing:5px;color:var(--c)}`, + righe: (v) => [testo(v, 'etichetta'), testo(v, 'titolo')], + }, + { + id: 'ticker', nome: 'Ticker scorrevole', gruppo: 'tv', info: 'la fascia in basso con la sigla fissa e il testo che scorre da destra a sinistra', durata: 10, + campi: [T('sigla', 'Sigla', 'DAPROD'), L('testo', 'Testo che scorre', 'Il montaggio vecchio stile, moderno dentro /// Tutto resta sul tuo computer /// Niente account, niente chiavi'), N('velocita', 'Velocità (pixel al secondo)', 220, 60, 700, 10), C('colore', 'Colore della sigla', '#ffd54a'), S('posto', 'Dove sta', 'basso', [['basso', 'In basso'], ['alto', 'In alto']]), ...TEMPI(0.5, 0.4)], + font: () => ['rajdhani-500', 'rajdhani-700', 'oswald-500'], + stato: (t, _d, v) => ({ x: t * numero(v, 'velocita', 220) }), + html: (v, s) => { + const uno = testo(v, 'testo', '').replace(/\s*\r?\n\s*/g, ' /// '); + // il testo si ripete abbastanza da riempire tutto il tempo (stima della larghezza: 28 pixel a lettera) + const larghezza = Math.max(1, uno.length * 28 + 200); + const volte = Math.max(1, Math.min(40, Math.ceil((s.xMax + 2200) / larghezza))); + const alto = scelto(v, 'posto', ['basso', 'alto'], 'basso') === 'alto'; + return `
${esc(testo(v, 'sigla', ''))}
${(esc(uno) + '').repeat(volte)}
`; + }, + css: `.tk{position:absolute;left:0;right:0;bottom:0;height:120px;display:flex;background:#0d0c12;border-top:4px solid var(--c);transform:translateY(calc((1 - var(--in))*130px));opacity:var(--out);font-family:'Rajdhani',sans-serif} +.tk.su{bottom:auto;top:0;border-top:0;border-bottom:4px solid var(--c);transform:translateY(calc((1 - var(--in))*-130px))} +.tk-sigla{flex:none;display:flex;align-items:center;padding:0 54px;background:var(--c);color:#14131a;font-weight:700;font-size:56px;letter-spacing:6px;z-index:2;box-shadow:8px 0 24px rgba(0,0,0,.5)} +.tk-corsa{position:relative;flex:1;overflow:hidden} +.tk-nastro{position:absolute;left:100%;top:0;height:100%;display:flex;align-items:center;white-space:pre;font-weight:500;font-size:54px;color:#ebe7f4;letter-spacing:2px} +.tk-nastro i{display:inline-block;width:200px}`, + righe: (v) => [testo(v, 'sigla'), testo(v, 'testo')], + }, + { + id: 'conto', nome: 'Conto alla rovescia', gruppo: 'tv', info: 'un numero grande per volta, l\'anello che si svuota e la scritta finale', durata: 6, + campi: [N('da', 'Parte da', 5, 2, 30, 1), T('finale', 'Scritta alla fine', 'VIA!'), C('colore', 'Colore', '#ffd54a'), S('stile', 'Numeri', 'led', [['led', 'A segmenti'], ['pieno', 'Pieni (Orbitron)']]), ...TEMPI(0.3, 0.4)], + font: (v) => (scelto(v, 'stile', ['led', 'pieno'], 'led') === 'led' ? ['dseg7', 'orbitron-900'] : ['orbitron-900']), + stato: (t, _d, v) => { + const da = Math.max(2, Math.round(numero(v, 'da', 5))); + const sec = Math.floor(t + 1e-9); + const n = da - sec; + const f = t - sec; // dove siamo dentro il secondo + return { n, f, anello: n >= 1 ? 1 - f : 0, colpo: n >= 1 ? E.p3out(clamp01(f / 0.35)) : E.back(2)(clamp01((t - da) / 0.5)) }; + }, + html: (v, s) => { + const led = scelto(v, 'stile', ['led', 'pieno'], 'led') === 'led'; + const fine = s.n < 1; + const circonferenza = 2 * Math.PI * 330; + return `
+
${fine ? esc(testo(v, 'finale', 'VIA!')) : String(Math.max(1, s.n))}
`; + }, + css: `.cn{position:absolute;left:50%;top:50%;width:720px;height:720px;margin:-360px 0 0 -360px;transform:scale(calc(var(--dim,1)*(0.9 + 0.1*var(--in))));opacity:calc(var(--in)*var(--out))} +.cn-anello{position:absolute;left:0;top:0} +.cn-num{position:absolute;left:50%;top:50%;font-family:'Orbitron',sans-serif;font-weight:900;font-size:360px;line-height:1;color:var(--c);text-shadow:0 0 30px var(--c)} +.cn-num.led{font-family:'DSEG7',monospace;font-weight:700;font-size:330px} +.cn-num.fine{font-family:'Orbitron',sans-serif;font-weight:900;font-size:190px;white-space:nowrap}`, + righe: (v) => [String(numero(v, 'da', 5)), testo(v, 'finale')], + }, + + // ————————————————————————— social e logo ————————————————————————— + { + id: 'iscriviti', nome: 'Iscriviti e mi piace', gruppo: 'social', info: 'il pulsante si preme, diventa «iscritto» e la campanella suona; il pollice sale', durata: 6, + campi: [T('nome', 'Nome del canale', 'DaProd'), T('etichetta', 'Pulsante', 'ISCRIVITI'), T('dopo', 'Pulsante dopo il clic', 'ISCRITTO'), N('clic', 'Secondo del clic', 1.8, 0.5, 8, 0.1), C('colore', 'Colore del pulsante', '#ff2d4a'), ...TEMPI(0.7, 0.5), DIM], + font: () => ['rajdhani-700', 'montserrat-700'], + stato: (t, _d, v, s) => { + const clic = numero(v, 'clic', 1.8); + const premuto = t >= clic ? 1 : 0; + const giu = t < clic || t > clic + 0.25 ? 0 : 1 - Math.abs((t - clic) / 0.125 - 1); + // la campanella dondola dopo il clic con un'oscillazione che si smorza + const dopo = Math.max(0, t - clic - 0.15); + const campana = premuto ? Math.sin(dopo * 22) * 24 * Math.exp(-dopo * 2.2) : 0; + return { premuto, giu, campana, pollice: fra(t, clic + 0.6, clic + 1.3, E.back(2)) }; + }, + html: (v, s) => { + const nome = testo(v, 'nome', ''); + const si = s.premuto > 0; + return `
${esc(nome.trim().charAt(0).toUpperCase() || 'D')}
${esc(nome)}
+
${esc(si ? testo(v, 'dopo', '') : testo(v, 'etichetta', ''))}
+ +
`; + }, + css: `.is{position:absolute;left:50%;top:50%;transform:translate(-50%,-50%) scale(calc(var(--dim)*(0.85 + 0.15*var(--in))));display:flex;align-items:center;gap:30px;padding:26px 40px;border-radius:90px;background:rgba(22,17,36,.82);border:2px solid rgba(255,255,255,.22);box-shadow:0 24px 60px rgba(0,0,0,.55);opacity:calc(var(--in)*var(--out));font-family:'Rajdhani',sans-serif} +.is-av{width:104px;height:104px;border-radius:50%;background:linear-gradient(135deg,#ffd54a,#ff3df2);color:#14131a;display:flex;align-items:center;justify-content:center;font-weight:700;font-size:64px} +.is-nome{font-weight:700;font-size:70px;color:#fff;letter-spacing:2px} +.is-btn{padding:16px 46px;border-radius:14px;background:var(--c);color:#fff;font-weight:700;font-size:54px;letter-spacing:4px;box-shadow:0 6px 0 rgba(0,0,0,.35)} +.is-btn.si{background:#4b4757;color:#ebe7f4} +.is-camp,.is-poll{flex:none;transform-origin:50% 12%}`, + righe: (v) => [testo(v, 'nome'), testo(v, 'etichetta')], + }, + { + id: 'logo', nome: 'Logo che entra', gruppo: 'social', info: 'il marchio gira ed entra con un rimbalzo, un riflesso lo attraversa e il nome si apre sotto', durata: 5, + campi: [T('sigla', 'Sigla nel marchio', 'DaP'), T('nome', 'Nome sotto', 'DaProd Editor Video'), C('colore', 'Colore', '#ffd54a'), C('colore2', 'Secondo colore', '#ff3df2'), ...TEMPI(0.9, 0.5), DIM], + font: () => ['orbitron-900', 'rajdhani-700'], + stato: (t, _d, _v, s) => ({ gira: fra(t, 0, s.ent + 0.3, E.back(1.8)), brilla: fra(t, s.ent * 0.8, s.ent * 0.8 + 0.9, E.p2io), nome: fra(t, s.ent * 0.6, s.ent * 0.6 + 0.8) }), + html: (v, s) => `
${esc(testo(v, 'sigla', ''))}
${esc(testo(v, 'nome', ''))}
`, + css: `.lg{position:absolute;left:50%;top:50%;transform:translate(-50%,-50%) scale(var(--dim));display:flex;flex-direction:column;align-items:center;gap:36px;opacity:var(--out)} +.lg-marchio{position:relative;overflow:hidden;width:330px;height:330px;border-radius:74px;background:linear-gradient(135deg,var(--c),var(--c2));display:flex;align-items:center;justify-content:center;transform:rotate(calc((1 - var(--g))*-200deg)) scale(var(--g));opacity:calc(var(--g)*3);box-shadow:0 0 70px var(--c2),inset 0 3px 0 rgba(255,255,255,.4),inset 0 -6px 0 rgba(0,0,0,.25)} +.lg-marchio span{font-family:'Orbitron',sans-serif;font-weight:900;font-size:150px;color:#14131a;letter-spacing:-4px} +.lg-marchio i{position:absolute;top:-20%;bottom:-20%;width:90px;left:calc(-30% + var(--sh)*150%);background:linear-gradient(90deg,rgba(255,255,255,0),rgba(255,255,255,.75),rgba(255,255,255,0));transform:skewX(-20deg)} +.lg-nome{font-family:'Rajdhani',sans-serif;font-weight:700;font-size:88px;letter-spacing:calc(var(--nm)*16px);color:#fff;text-transform:uppercase;opacity:var(--nm);white-space:nowrap}`, + righe: (v) => [testo(v, 'sigla'), testo(v, 'nome')], + }, + + // ————————————————————————— cinema e capitoli ————————————————————————— + { + id: 'cinema', nome: 'Titolo cinema', gruppo: 'cinema', info: 'le lettere si aprono piano, due filetti si allungano e sotto compare la riga piccola', durata: 6, + campi: [T('titolo', 'Titolo', 'LA CITTÀ'), T('sotto', 'Riga sotto', 'un film di DaProd · 2026'), C('colore', 'Colore', '#ffffff'), C('filetto', 'Colore dei filetti', '#ffd54a'), FONT('playfair', ['playfair', 'bebas', 'oswald', 'montserrat']), ...TEMPI(1.4, 0.7), DIM], + font: (v) => [...fam(v, 'playfair').pezzi, 'rajdhani-500'], + stato: (t, _d, _v, s) => ({ apre: fra(t, 0, s.ent + 0.6, E.p3out), filetto: fra(t, 0.2, s.ent + 0.2, E.p4out), sotto: fra(t, s.ent * 0.7, s.ent * 0.7 + 0.8) }), + html: (v, s) => `
${esc(testo(v, 'titolo', ''))}
${esc(testo(v, 'sotto', ''))}
`, + css: `.ci{position:absolute;left:50%;top:50%;transform:translate(-50%,-50%) scale(var(--dim));display:flex;flex-direction:column;align-items:center;gap:30px;opacity:var(--out);text-align:center} +.ci-titolo{font-weight:${'${P}'};font-size:190px;line-height:1;color:var(--c);white-space:nowrap;letter-spacing:calc((1 - var(--ap))*0.9em + 0.12em);opacity:var(--ap);text-shadow:0 6px 40px rgba(0,0,0,.6)} +.ci-f{display:block;height:3px;width:calc(var(--fl)*980px);background:linear-gradient(90deg,transparent,var(--c2),transparent)} +.ci-sotto{font-family:'Rajdhani',sans-serif;font-weight:500;font-size:50px;letter-spacing:12px;color:#dcd8e6;text-transform:uppercase;opacity:var(--sb);transform:translateY(calc((1 - var(--sb))*20px))}`, + righe: (v) => [testo(v, 'titolo'), testo(v, 'sotto')], + }, + { + id: 'capitolo', nome: 'Cartello capitolo', gruppo: 'cinema', info: 'una fascia scura con il numero grande, la parola «capitolo» e il titolo che scorre', durata: 5, + campi: [T('parola', 'Parola', 'CAPITOLO'), T('numero', 'Numero', '02'), T('titolo', 'Titolo', 'Il viaggio comincia'), C('colore', 'Colore', '#ffd54a'), FONT('orbitron', ['orbitron', 'bebas', 'oswald', 'montserrat']), ...TEMPI(0.9, 0.6)], + font: (v) => [...fam(v).pezzi, 'rajdhani-500'], + stato: (t, _d, _v, s) => ({ fascia: fra(t, 0, s.ent * 0.8, E.p4out), numero: fra(t, s.ent * 0.3, s.ent * 0.3 + 0.7, E.back(1.6)), titolo: fra(t, s.ent * 0.6, s.ent * 0.6 + 0.7) }), + html: (v, s) => `
${esc(testo(v, 'numero', ''))}
${esc(testo(v, 'parola', ''))}
${esc(testo(v, 'titolo', ''))}
`, + css: `.cp{position:absolute;left:0;right:0;top:50%;height:360px;margin-top:-180px;opacity:var(--out)} +.cp-fascia{position:absolute;inset:0;display:flex;align-items:center;gap:70px;padding:0 160px;background:linear-gradient(90deg,rgba(9,8,13,.92),rgba(9,8,13,.78));border-top:4px solid var(--c);border-bottom:4px solid var(--c);clip-path:inset(calc((1 - var(--fa))*50%) 0 calc((1 - var(--fa))*50%) 0)} +.cp-num{font-weight:${'${P}'};font-size:250px;line-height:1;color:transparent;-webkit-text-stroke:5px var(--c);transform:scale(calc(0.6 + 0.4*var(--nu)));opacity:var(--nu)} +.cp-par{font-family:'Rajdhani',sans-serif;font-weight:500;font-size:48px;letter-spacing:14px;color:var(--c);text-transform:uppercase;opacity:var(--ti)} +.cp-tit{overflow:hidden;font-weight:${'${P}'};font-size:100px;line-height:1.15;color:#fff;white-space:nowrap} +.cp-tit span{display:block;transform:translateX(calc((1 - var(--ti))*-120px));opacity:var(--ti)}`, + righe: (v) => [testo(v, 'parola') + ' ' + testo(v, 'numero'), testo(v, 'titolo')], + }, + + // ————————————————————————— parole e citazioni ————————————————————————— + { + id: 'citazione', nome: 'Citazione con virgolette', gruppo: 'parole', info: 'le virgolette grandi entrano con un rimbalzo, la frase si apre e sotto compare chi l\'ha detta', durata: 7, + campi: [L('testo', 'Frase', 'Il montaggio vecchio stile, moderno dentro.'), T('autore', 'Chi l\'ha detta', 'Cammo'), C('colore', 'Colore delle virgolette', '#ffd54a'), FONT('playfair', ['playfair', 'montserrat', 'oswald', 'rajdhani', 'bebas']), ...TEMPI(1, 0.6), DIM], + font: (v) => [...fam(v, 'playfair').pezzi, 'rajdhani-700'], + stato: (t, _d, _v, s) => ({ virgolette: fra(t, 0, s.ent * 0.8, E.back(1.8)), frase: fra(t, s.ent * 0.3, s.ent * 1.3), filetto: fra(t, s.ent * 0.7, s.ent * 0.7 + 0.7, E.p4out), autore: fra(t, s.ent * 0.9, s.ent * 0.9 + 0.7) }), + html: (v, s) => { + const a = testo(v, 'autore', '').trim(); + return `
“
${righeHtml(testo(v, 'testo', ''))}
${a ? `
${esc(a)}
` : ''}
`; + }, + css: `.qt{position:absolute;left:50%;top:50%;width:1300px;transform:translate(-50%,-50%) scale(var(--dim));text-align:center;opacity:var(--out)} +.qt-v{height:150px;font-weight:${'${P}'};font-size:300px;line-height:1;color:var(--c);opacity:var(--vq);transform:scale(calc(0.5 + 0.5*var(--vq)));text-shadow:0 0 50px rgba(0,0,0,.5)} +.qt-testo{font-weight:${'${P}'};font-size:84px;line-height:1.25;color:#fff;opacity:var(--tx);transform:translateY(calc((1 - var(--tx))*40px));text-shadow:0 4px 30px rgba(0,0,0,.6)} +.qt-f{display:block;margin:44px auto 22px;height:4px;width:calc(var(--fl)*220px);background:var(--c)} +.qt-autore{font-family:'Rajdhani',sans-serif;font-weight:700;font-size:44px;letter-spacing:8px;color:var(--c);text-transform:uppercase;opacity:var(--au)}`, + righe: (v) => [testo(v, 'testo'), testo(v, 'autore')], + }, + { + id: 'karaoke', nome: 'Sottotitolo karaoke', gruppo: 'parole', info: 'la frase in basso, parola per parola: ogni parola si colora mentre arriva il suo momento', durata: 6, + campi: [L('testo', 'Frase', 'Il montaggio vecchio stile, moderno dentro'), N('velocita', 'Parole al secondo', 2.5, 0.5, 8, 0.5), C('colore', 'Colore della parola', '#ffd54a'), S('fascia', 'Fascia dietro', 'scura', [['scura', 'Scura'], ['nessuna', 'Nessuna']]), FONT('montserrat', ['montserrat', 'rajdhani', 'oswald', 'orbitron', 'bebas', 'archivo']), ...TEMPI(0.4, 0.4), DIM], + font: (v) => fam(v, 'montserrat').pezzi, + stato: (t, _d, v, s) => ({ pos: Math.max(0, t - s.ent * 0.5) * numero(v, 'velocita', 2.5) }), + html: (v, s) => { + const parole = testo(v, 'testo', '').split(/\s+/).filter(Boolean).slice(0, 60); + const fascia = scelto(v, 'fascia', ['scura', 'nessuna'], 'scura') === 'scura'; + const w = parole.map((p, i) => { const k = clamp01(s.pos - i), e = esc(p); return `${e}${e}`; }).join(' '); + return `
${w}
`; + }, + css: `.ka{position:absolute;left:50%;bottom:140px;width:1500px;transform:translateX(-50%) scale(var(--dim));transform-origin:50% 100%;text-align:center;opacity:calc(var(--in)*var(--out))} +.ka-riga{display:inline-block;max-width:1400px;padding:20px 48px 26px;border-radius:28px;font-weight:${'${P}'};font-size:78px;line-height:1.3;letter-spacing:1px} +.ka.f .ka-riga{background:rgba(9,8,13,.8);box-shadow:0 18px 50px rgba(0,0,0,.5)} +.kw{position:relative;display:inline-block;transform:scale(calc(1 + 0.12*var(--a)))} +.kw u{text-decoration:none;color:#fff;opacity:calc(0.6*(1 - var(--k)) + 0.01);text-shadow:0 3px 14px rgba(0,0,0,.7)} +.kw b{position:absolute;left:0;top:0;font-weight:inherit;color:var(--c);white-space:nowrap;clip-path:inset(-20% calc((1 - var(--k))*100%) -20% 0);text-shadow:0 0 18px var(--c)}`, + righe: (v) => [testo(v, 'testo')], + }, + { + id: 'macchina', nome: 'Macchina da scrivere', gruppo: 'parole', info: 'le lettere arrivano una per volta, col cursore che lampeggia in fondo', durata: 7, + campi: [L('testo', 'Testo', 'Un vecchio banco.\nUna tecnologia nuova.\nTutto sul tuo computer.'), N('velocita', 'Lettere al secondo', 16, 4, 60, 1), C('colore', 'Colore del cursore', '#ffd54a'), S('fascia', 'Fondo', 'scuro', [['scuro', 'Fascia scura'], ['nessuno', 'Solo il testo']]), FONT('mono', ['mono', 'rajdhani', 'orbitron', 'montserrat']), ...TEMPI(0.4, 0.5), DIM], + font: (v) => fam(v, 'mono').pezzi, + stato: (t, _d, v, s) => { + const tot = Array.from(testo(v, 'testo', '')).length; + const car = Math.min(tot, Math.floor(Math.max(0, t - s.ent * 0.5) * numero(v, 'velocita', 16))); + // mentre scrive il cursore resta acceso; prima e dopo lampeggia + return { car, luce: car > 0 && car < tot ? 1 : Math.floor(t * 2.2) % 2 === 0 ? 1 : 0 }; + }, + html: (v, s) => { + const lett = Array.from(testo(v, 'testo', '')), car = Math.round(s.car); + const fascia = scelto(v, 'fascia', ['scuro', 'nessuno'], 'scuro') === 'scuro'; + // il resto del testo c'è già ma è invisibile: così la fascia non cambia misura mentre si scrive + return `
${righeHtml(lett.slice(0, car).join(''))}${righeHtml(lett.slice(car).join(''))}
`; + }, + css: `.mc{position:absolute;left:50%;top:50%;width:1300px;transform:translate(-50%,-50%) scale(var(--dim));opacity:calc(var(--in)*var(--out))} +.mc-testo{padding:50px 60px;border-radius:22px;background:rgba(9,8,13,.84);border:2px solid rgba(255,255,255,.16);box-shadow:0 26px 70px rgba(0,0,0,.55);font-weight:${'${P}'};font-size:64px;line-height:1.4;color:#ebe7f4;letter-spacing:1px} +.mc.nu .mc-testo{background:none;border-color:transparent;box-shadow:none;text-shadow:0 4px 22px rgba(0,0,0,.8)} +.mc-cur{position:relative;display:inline-block;width:0;height:1em;vertical-align:text-bottom} +.mc-cur u{position:absolute;left:4px;top:0.08em;width:0.52em;height:1em;background:var(--c);box-shadow:0 0 16px var(--c)} +.mc-resto{opacity:0}`, + righe: (v) => testo(v, 'testo').split(/\r?\n/), + }, + + // ————————————————————————— social e logo (altri) ————————————————————————— + { + id: 'didascalia', nome: 'Didascalia social con @ e icone', gruppo: 'social', info: 'il post come sui social: nome, @utente, testo e sotto il cuore, i commenti e le condivisioni che salgono', durata: 6, + campi: [T('nome', 'Nome', 'DaProd'), T('handle', 'Nome utente', '@daprod'), L('testo', 'Didascalia', 'Montaggio vecchio stile, moderno dentro. Provalo oggi! #daprod #video'), N('mipiace', 'Mi piace', 12400, 0, 99999999, 100), N('commenti', 'Commenti', 386, 0, 99999999, 1), N('condivisioni', 'Condivisioni', 1250, 0, 99999999, 10), C('colore', 'Colore del cuore', '#ff2d4a'), ...TEMPI(0.7, 0.5), DIM], + font: () => ['rajdhani-500', 'rajdhani-700'], + stato: (t, _d, _v, s) => ({ carta: fra(t, 0, s.ent), frase: fra(t, s.ent * 0.4, s.ent * 0.4 + 0.8), conta: fra(t, s.ent * 0.6, s.ent * 0.6 + 1.6), cuore: fra(t, s.ent + 0.9, s.ent + 1.4, E.back(3)) }), + html: (v, s) => { + const nome = testo(v, 'nome', ''); + const premuto = s.cuore > 0, grigio = '#a19db0'; + const miglia = (n: number) => String(Math.round(n)).replace(/\B(?=(\d{3})+(?!\d))/g, '.'); + const compatto = (n: number) => (n >= 1e6 ? `${(n / 1e6).toFixed(1).replace('.', ',')} M` : n >= 1e4 ? `${(n / 1e3).toFixed(1).replace('.', ',')} K` : miglia(n)); + const cifra = (k: string, def: number) => compatto(Math.round(Math.max(0, numero(v, k, def)) * s.conta)); + const ico = (d: string, colore: string, extra = '') => ``; + return `
${esc(nome.trim().charAt(0).toUpperCase() || 'D')}
${esc(nome)}
${esc(testo(v, 'handle', ''))}
+
${righeHtml(testo(v, 'testo', ''))}
+
${ico('M32 56C10 40 4 26 12 16 19 8 29 12 32 20 35 12 45 8 52 16 60 26 54 40 32 56z', premuto ? col(v, 'colore', '#ff2d4a') : grigio, `style="transform:scale(${num(premuto ? Math.max(0.2, s.cuore) : 1)})"`)}${cifra('mipiace', 12400)}
${ico('M8 10h48v32H30L18 54V42H8z', grigio)}${cifra('commenti', 386)}
${ico('M36 8l22 20-22 20V36C18 36 10 44 6 56c0-18 8-32 30-34z', grigio)}${cifra('condivisioni', 1250)}
`; + }, + css: `.sc{position:absolute;left:110px;bottom:110px;width:960px;transform:scale(calc(var(--dim)*(0.92 + 0.08*var(--cd))));transform-origin:0 100%;opacity:calc(var(--cd)*var(--out));padding:34px 40px 30px;border-radius:30px;background:rgba(22,17,36,.88);border:2px solid rgba(255,255,255,.2);box-shadow:0 26px 70px rgba(0,0,0,.55);font-family:'Rajdhani',sans-serif} +.sc-testa{display:flex;align-items:center;gap:22px} +.sc-av{flex:none;width:92px;height:92px;border-radius:50%;background:linear-gradient(135deg,#ffd54a,#ff3df2);color:#14131a;display:flex;align-items:center;justify-content:center;font-weight:700;font-size:56px} +.sc-id{flex:1} +.sc-nome{display:flex;align-items:center;gap:12px;font-weight:700;font-size:48px;line-height:1.1;color:#fff} +.sc-h{font-weight:500;font-size:36px;letter-spacing:1px;color:#a19db0} +.sc-testo{margin-top:24px;font-weight:600;font-size:46px;line-height:1.25;color:#ebe7f4;opacity:var(--tx);transform:translateY(calc((1 - var(--tx))*24px))} +.sc-giu{margin-top:28px;display:flex;align-items:center;gap:56px;font-weight:700;font-size:42px;color:#dcd8e6} +.sc-giu div{display:flex;align-items:center;gap:14px}`, + righe: (v) => [testo(v, 'nome') + ' ' + testo(v, 'handle'), testo(v, 'testo')], + }, + { + id: 'finale', nome: 'Schermo di fine · iscriviti e due video', gruppo: 'social', info: 'il fondo si scurisce, due riquadri scivolano ai lati per i prossimi video e sotto il canale con il pulsante per iscriversi', durata: 10, + campi: [T('titolo', 'Titolo', 'GUARDA ANCHE'), T('canale', 'Nome del canale', 'DaProd'), T('pulsante', 'Pulsante', 'ISCRIVITI'), T('video1', 'Primo video', 'Ultimo video'), T('video2', 'Secondo video', 'Il più visto'), C('colore', 'Colore del pulsante', '#ff2d4a'), N('fondo', 'Quanto scurisce il fondo (%)', 55, 0, 90, 5), ...TEMPI(0.8, 0.6), DIM], + font: () => ['rajdhani-700'], + stato: (t, _d, _v, s) => ({ titolo: fra(t, s.ent * 0.2, s.ent * 0.2 + 0.6), uno: fra(t, s.ent * 0.3, s.ent * 0.3 + 0.8, E.p4out), due: fra(t, s.ent * 0.5, s.ent * 0.5 + 0.8, E.p4out), canale: fra(t, s.ent * 0.9, s.ent * 0.9 + 0.7, E.back(1.8)) }), + html: (v, s) => { + const gioca = ''; + const nome = testo(v, 'canale', ''); + return `
${esc(testo(v, 'titolo', ''))}
+
${gioca}
${esc(testo(v, 'video1', ''))}
${gioca}
${esc(testo(v, 'video2', ''))}
+
${esc(nome.trim().charAt(0).toUpperCase() || 'D')}
${esc(nome)}
${esc(testo(v, 'pulsante', ''))}
`; + }, + css: `.fn{position:absolute;left:0;top:0;width:100%;height:100%;opacity:var(--out);font-family:'Rajdhani',sans-serif} +.fn-velo{position:absolute;left:0;top:0;width:100%;height:100%;background:rgba(9,8,13,var(--vl));opacity:var(--in)} +.fn-corpo{position:absolute;left:50%;top:50%;width:1360px;transform:translate(-50%,-50%) scale(var(--dim));display:flex;flex-direction:column;align-items:center;gap:46px} +.fn-tit{font-weight:700;font-size:64px;letter-spacing:16px;color:#fff;opacity:var(--t1);transform:translateY(calc((1 - var(--t1))*-30px));text-shadow:0 4px 24px rgba(0,0,0,.7)} +.fn-video{display:flex;gap:80px} +.fn-v{width:600px;opacity:var(--vv);transform:translateX(calc(var(--lx)*(1 - var(--vv))*160px))} +.fn-sch{height:338px;border-radius:22px;background:linear-gradient(135deg,rgba(255,255,255,.16),rgba(255,255,255,.04));border:3px solid rgba(255,255,255,.4);box-shadow:0 24px 60px rgba(0,0,0,.5);display:flex;align-items:center;justify-content:center} +.fn-v b{display:block;margin-top:18px;font-weight:700;font-size:44px;letter-spacing:3px;color:#ebe7f4;text-align:center} +.fn-canale{display:flex;align-items:center;gap:30px;padding:22px 34px;border-radius:90px;background:rgba(22,17,36,.88);border:2px solid rgba(255,255,255,.22);opacity:var(--cn);transform:scale(calc(0.8 + 0.2*var(--cn)))} +.fn-av{width:96px;height:96px;border-radius:50%;background:linear-gradient(135deg,#ffd54a,#ff3df2);color:#14131a;display:flex;align-items:center;justify-content:center;font-weight:700;font-size:60px} +.fn-nome{font-weight:700;font-size:60px;letter-spacing:2px;color:#fff} +.fn-btn{padding:14px 44px;border-radius:14px;background:var(--c);color:#fff;font-weight:700;font-size:48px;letter-spacing:4px;box-shadow:0 6px 0 rgba(0,0,0,.35)}`, + righe: (v) => [testo(v, 'titolo'), testo(v, 'canale') + ' · ' + testo(v, 'pulsante')], + }, + + // ————————————————————————— indicare e confrontare ————————————————————————— + { + id: 'freccia', nome: 'Freccia e evidenziatore', gruppo: 'indicare', info: 'una freccia disegnata a mano indica un punto del quadro, con un segno attorno (cerchio, rettangolo o pennarello) e la scritta', durata: 5, + campi: [T('etichetta', 'Scritta', 'GUARDA QUI'), N('x', 'Punta a: da sinistra (%)', 62, 5, 95, 1), N('y', 'Punta a: dall\'alto (%)', 45, 5, 95, 1), S('lato', 'La scritta sta', 'alto-sinistra', [['alto-sinistra', 'In alto a sinistra'], ['alto-destra', 'In alto a destra'], ['basso-sinistra', 'In basso a sinistra'], ['basso-destra', 'In basso a destra']]), S('forma', 'Attorno al punto', 'cerchio', [['cerchio', 'Cerchio'], ['rettangolo', 'Rettangolo'], ['evidenziatore', 'Evidenziatore'], ['nessuna', 'Niente']]), N('raggio', 'Grandezza del segno', 110, 40, 300, 5), C('colore', 'Colore', '#ffd54a'), FONT('rajdhani', ['rajdhani', 'oswald', 'montserrat', 'orbitron', 'bebas']), ...TEMPI(0.7, 0.4)], + font: (v) => fam(v, 'rajdhani').pezzi, + stato: (t, _d, _v, s) => ({ segno: fra(t, 0, s.ent * 0.7), freccia: fra(t, s.ent * 0.3, s.ent * 0.3 + 0.8, E.p3io), scritta: fra(t, s.ent * 0.6, s.ent * 0.6 + 0.6, E.back(1.8)) }), + html: (v, s) => { + const R = Math.max(40, Math.min(300, numero(v, 'raggio', 110))); + const forma = scelto(v, 'forma', ['cerchio', 'rettangolo', 'evidenziatore', 'nessuna'], 'cerchio'); + const g = geometriaFreccia(scelto(v, 'lato', Object.keys(LATI_FRECCIA), 'alto-sinistra'), R, forma); + const c = col(v, 'colore', '#ffd54a'); + let segno = ''; + if (forma === 'cerchio') { + const L = 2 * Math.PI * R; + segno = ``; + } else if (forma === 'rettangolo') { + const w = 2.6 * R, h = 1.6 * R, rx = 14, L = 2 * (w + h) - (8 - 2 * Math.PI) * rx; + segno = ``; + } else if (forma === 'evidenziatore') segno = ``; + const L = lunghezzaCurva(g.S, g.C, g.F) * 1.01; + const testa = clamp01((s.freccia - 0.85) / 0.15); + const et = esc(testo(v, 'etichetta', '')); + const targhetta = et ? `
${et}
` : ''; + return `
${segno}${targhetta}
`; + }, + css: `.fr{position:absolute;left:0;top:0;width:100%;height:100%;opacity:var(--out);filter:drop-shadow(0 6px 14px rgba(0,0,0,.55))} +.fr-p{position:absolute;width:0;height:0} +.fr-et{position:absolute;white-space:nowrap;padding:10px 32px;border-radius:14px;background:rgba(9,8,13,.9);border:3px solid var(--c);color:var(--c);font-weight:${'${P}'};font-size:60px;letter-spacing:4px;text-transform:uppercase}`, + righe: (v) => [testo(v, 'etichetta')], + }, + { + id: 'primadopo', nome: 'Prima e dopo diviso', gruppo: 'indicare', info: 'un divisore scorre sul quadro: il «prima» si scurisce a sinistra, il «dopo» resta chiaro a destra', durata: 6, + campi: [T('prima', 'Scritta a sinistra', 'PRIMA'), T('dopo', 'Scritta a destra', 'DOPO'), N('da', 'Il divisore parte da (%)', 20, 0, 100, 1), N('a', 'Arriva a (%)', 80, 0, 100, 1), N('velo', 'Quanto scurisce il «prima» (%)', 45, 0, 90, 5), C('colore', 'Colore del divisore', '#ffd54a'), FONT('rajdhani', ['rajdhani', 'oswald', 'montserrat', 'orbitron', 'bebas']), ...TEMPI(0.6, 0.5)], + font: (v) => fam(v, 'rajdhani').pezzi, + stato: (t, d, v, s) => ({ pos: lerp(numero(v, 'da', 20), numero(v, 'a', 80), fra(t, s.ent * 0.5, Math.max(s.ent * 0.5 + 0.2, d - s.usc - 0.1), E.p2io)), etichette: fra(t, s.ent * 0.3, s.ent * 0.3 + 0.6) }), + html: (v, s) => { + const x = Math.max(0, Math.min(100, s.pos)); + return `
${esc(testo(v, 'prima', ''))}${esc(testo(v, 'dopo', ''))}
`; + }, + css: `.pd{position:absolute;left:0;top:0;width:100%;height:100%;opacity:var(--out)} +.pd-velo{position:absolute;left:0;top:0;height:100%;width:var(--x);background:rgba(9,8,13,var(--vl));opacity:var(--in)} +.pd-linea{position:absolute;top:0;height:100%;left:var(--x);width:6px;margin-left:-3px;background:var(--c);box-shadow:0 0 22px var(--c);transform:scaleY(var(--in));transform-origin:50% 50%} +.pd-man{position:absolute;left:var(--x);top:50%;width:104px;height:104px;margin:-52px 0 0 -52px;border-radius:50%;background:var(--c);display:flex;align-items:center;justify-content:center;box-shadow:0 8px 30px rgba(0,0,0,.6);transform:scale(var(--in))} +.pd-et{position:absolute;top:70px;padding:8px 34px;border-radius:40px;font-weight:${'${P}'};font-size:54px;letter-spacing:8px;text-transform:uppercase;opacity:var(--et);box-shadow:0 8px 24px rgba(0,0,0,.5)} +.pd-et.sx{left:70px;background:rgba(9,8,13,.9);color:#fff} +.pd-et.dx{right:70px;background:var(--c);color:#14131a}`, + righe: (v) => [testo(v, 'prima') + ' / ' + testo(v, 'dopo')], + }, + { + id: 'prezzo', nome: 'Prezzo e offerta', gruppo: 'indicare', info: 'il cartellino cade, il prezzo vecchio si barra, quello nuovo salta fuori e il bollino dello sconto gira', durata: 6, + campi: [T('etichetta', 'Scritta sopra', 'OFFERTA'), T('vecchio', 'Prezzo di prima', '99,00'), T('prezzo', 'Prezzo adesso', '69,00'), T('valuta', 'Valuta', '€'), T('sconto', 'Sconto', '-30%'), C('colore', 'Colore', '#ff2d4a'), FONT('montserrat', ['montserrat', 'archivo', 'oswald', 'bebas', 'orbitron']), ...TEMPI(0.8, 0.5), DIM], + font: (v) => fam(v, 'montserrat').pezzi, + stato: (t, _d, _v, s) => ({ cartello: fra(t, 0, s.ent, E.back(1.5)), vecchio: fra(t, s.ent * 0.5, s.ent * 0.5 + 0.5), barra: fra(t, s.ent * 0.5 + 0.5, s.ent * 0.5 + 0.9), nuovo: fra(t, s.ent * 0.5 + 0.7, s.ent * 0.5 + 1.3, E.back(2.4)), bollino: fra(t, s.ent * 0.5 + 1, s.ent * 0.5 + 1.7, E.back(2.6)) }), + html: (v, s) => { + let punte = ''; + for (let i = 0; i < 24; i++) { const a = (i / 24) * 2 * Math.PI, r = i % 2 === 0 ? 104 : 88; punte += `${num(110 + Math.sin(a) * r)},${num(110 - Math.cos(a) * r)} `; } + const valuta = esc(testo(v, 'valuta', '')); + const sconto = esc(testo(v, 'sconto', '')); + return `
${esc(testo(v, 'etichetta', ''))}
${valuta} ${esc(testo(v, 'vecchio', ''))}
${valuta}${esc(testo(v, 'prezzo', ''))}
${sconto ? `
${sconto}
` : ''}
`; + }, + css: `.pz{position:absolute;left:50%;top:50%;width:900px;height:760px;margin:-380px 0 0 -450px;transform:scale(var(--dim));opacity:var(--out)} +.pz-card{position:absolute;left:0;right:90px;top:70px;padding-bottom:46px;text-align:center;border-radius:36px;background:linear-gradient(160deg,#2a2433,#14131a);border:3px solid rgba(255,255,255,.25);box-shadow:0 40px 90px rgba(0,0,0,.65);transform:translateY(calc((1 - var(--cd))*-420px)) rotate(calc((1 - var(--cd))*-8deg));opacity:calc(var(--cd)*3)} +.pz-et{padding:18px 0;border-radius:33px 33px 0 0;background:var(--c);color:#fff;font-weight:${'${P}'};font-size:64px;letter-spacing:12px;text-transform:uppercase} +.pz-vecchio{position:relative;display:inline-block;margin-top:34px;font-weight:${'${P}'};font-size:84px;color:#a19db0;opacity:var(--vc)} +.pz-vecchio i{position:absolute;left:-8%;right:-8%;top:52%;height:9px;border-radius:5px;background:var(--c);transform:rotate(-6deg) scaleX(var(--br));transform-origin:0 50%} +.pz-prezzo{margin-top:8px;font-weight:${'${P}'};font-size:260px;line-height:1;color:#fff;opacity:var(--pr);transform:scale(calc(0.5 + 0.5*var(--pr)));text-shadow:0 0 50px var(--c)} +.pz-prezzo small{font-size:110px;vertical-align:top;margin-right:10px;color:var(--c)} +.pz-sticker{position:absolute;right:0;top:0;width:230px;height:230px;display:flex;align-items:center;justify-content:center;transform:rotate(calc(14deg + (1 - var(--st))*-200deg)) scale(var(--st));opacity:calc(var(--st)*3)} +.pz-sticker svg{position:absolute;left:0;top:0} +.pz-sticker b{position:relative;font-weight:${'${P}'};font-size:62px;color:#14131a}`, + righe: (v) => [testo(v, 'etichetta'), testo(v, 'valuta') + ' ' + testo(v, 'prezzo')], + }, + + // ————————————————————————— documentario e interviste ————————————————————————— + { + id: 'luogo', nome: 'Cartello luogo e data', gruppo: 'docu', info: 'lo stile dei documentari: il segnaposto, il luogo a lettere grandi, la data e le coordinate che si scrivono', durata: 5, + campi: [T('luogo', 'Luogo', 'ROMA, ITALIA'), T('data', 'Data', '12 GIUGNO 2026'), T('coordinate', 'Riga piccola (coordinate o altro)', '41.9028° N · 12.4964° E'), C('colore', 'Colore', '#ffd54a'), S('lato', 'Dove sta', 'sinistra', [['sinistra', 'In basso a sinistra'], ['destra', 'In basso a destra']]), FONT('rajdhani', ['rajdhani', 'oswald', 'montserrat', 'orbitron', 'bebas']), ...TEMPI(0.9, 0.6), DIM], + font: (v) => [...fam(v, 'rajdhani').pezzi, 'rajdhani-700', 'mono-700'], + stato: (t, _d, _v, s) => ({ linea: fra(t, 0, s.ent * 0.6, E.p4out), luogo: fra(t, s.ent * 0.3, s.ent * 1.1), data: fra(t, s.ent * 0.6, s.ent * 1.4), coord: fra(t, s.ent * 0.9, s.ent * 0.9 + 0.7), pin: fra(t, 0.1, 0.8, E.rimbalzo) }), + html: (v, s) => { + const destra = scelto(v, 'lato', ['sinistra', 'destra'], 'sinistra') === 'destra'; + const coord = testo(v, 'coordinate', '').trim(); + return `
${esc(testo(v, 'luogo', ''))}
${esc(testo(v, 'data', ''))}
${coord ? `
${esc(coord)}
` : ''}
`; + }, + css: `.lu{position:absolute;left:110px;bottom:130px;display:flex;align-items:stretch;gap:28px;transform:scale(var(--dim));transform-origin:0 100%;opacity:var(--out)} +.lu.dx{left:auto;right:110px;flex-direction:row-reverse;transform-origin:100% 100%;text-align:right} +.lu-linea{width:8px;background:var(--c);box-shadow:0 0 18px var(--c);transform:scaleY(var(--li));transform-origin:50% 100%} +.lu-testi{display:flex;flex-direction:column;gap:8px} +.lu.dx .lu-testi{align-items:flex-end} +.lu-luogo{display:flex;align-items:center;gap:16px;font-weight:${'${P}'};font-size:78px;line-height:1.05;letter-spacing:6px;color:#fff;text-transform:uppercase;text-shadow:0 4px 24px rgba(0,0,0,.7);clip-path:inset(0 calc((1 - var(--lg))*100%) 0 0)} +.lu.dx .lu-luogo{flex-direction:row-reverse;clip-path:inset(0 0 0 calc((1 - var(--lg))*100%))} +.lu-data{font-family:'Rajdhani',sans-serif;font-weight:700;font-size:44px;letter-spacing:8px;color:var(--c);text-transform:uppercase;text-shadow:0 3px 16px rgba(0,0,0,.7);clip-path:inset(0 calc((1 - var(--da))*100%) 0 0)} +.lu.dx .lu-data{clip-path:inset(0 0 0 calc((1 - var(--da))*100%))} +.lu-coord{font-family:'Space Mono',monospace;font-weight:700;font-size:30px;letter-spacing:2px;color:#dcd8e6;text-shadow:0 3px 14px rgba(0,0,0,.8);opacity:var(--co)}`, + righe: (v) => [testo(v, 'luogo'), testo(v, 'data')], + }, + { + id: 'intervista', nome: 'Intervista · nome e domanda', gruppo: 'docu', info: 'la targhetta col nome e il ruolo di chi parla e, sotto, la domanda su una fascia chiara', durata: 7, + campi: [T('nome', 'Nome', 'Anna Verdi'), T('ruolo', 'Ruolo', 'Direttrice del museo'), L('domanda', 'Domanda', 'Come è cominciata tutta la storia?'), T('sigla', 'Targhetta sopra', 'INTERVISTA'), C('colore', 'Colore', '#35e8ff'), FONT('oswald', ['oswald', 'rajdhani', 'montserrat', 'orbitron', 'bebas']), ...TEMPI(0.8, 0.5), DIM], + font: (v) => [...fam(v, 'oswald').pezzi, 'rajdhani-500', 'rajdhani-700'], + stato: (t, _d, _v, s) => ({ sigla: fra(t, 0, s.ent * 0.7, E.back(1.6)), nome: fra(t, s.ent * 0.2, s.ent, E.p4out), domanda: fra(t, s.ent * 0.6, s.ent * 1.5, E.p4out) }), + html: (v, s) => { + const sigla = testo(v, 'sigla', '').trim(), ruolo = testo(v, 'ruolo', '').trim(), dom = testo(v, 'domanda', '').trim(); + return `
${sigla ? `
${esc(sigla)}
` : ''}
${esc(testo(v, 'nome', ''))}${ruolo ? `${esc(ruolo)}` : ''}
${dom ? `
“${righeHtml(dom)}”
` : ''}
`; + }, + css: `.iv{position:absolute;left:110px;bottom:120px;width:1100px;transform:scale(var(--dim));transform-origin:0 100%;opacity:var(--out)} +.iv-sigla{display:inline-block;padding:6px 26px;background:var(--c);color:#14131a;font-family:'Rajdhani',sans-serif;font-weight:700;font-size:34px;letter-spacing:8px;opacity:var(--sg);transform:translateY(calc((1 - var(--sg))*40px))} +.iv-nome{display:flex;align-items:baseline;gap:26px;padding:16px 36px;background:rgba(9,8,13,.9);border-left:10px solid var(--c);clip-path:inset(0 calc((1 - var(--cr))*100%) 0 0)} +.iv-nome b{font-weight:${'${P}'};font-size:64px;letter-spacing:2px;color:#fff;text-transform:uppercase} +.iv-nome em{font-style:normal;font-family:'Rajdhani',sans-serif;font-weight:500;font-size:40px;letter-spacing:3px;color:var(--c)} +.iv-dom{padding:22px 36px 26px;background:rgba(245,243,250,.94);color:#14131a;font-family:'Rajdhani',sans-serif;font-weight:700;font-size:52px;line-height:1.2;clip-path:inset(0 calc((1 - var(--dm))*100%) 0 0)}`, + righe: (v) => [testo(v, 'nome') + ' · ' + testo(v, 'ruolo'), testo(v, 'domanda')], + }, + { + id: 'coda', nome: 'Titoli di coda che scorrono', gruppo: 'docu', info: 'i nomi salgono dal basso e escono in alto per tutta la durata: ruolo a sinistra, nome a destra (scrivi «Ruolo | Nome», una riga per volta)', durata: 12, + campi: [L('testo', 'Righe (Ruolo | Nome; senza | è un titolo)', 'Un film di DaProd\n\nRegia | Mario Rossi\nMontaggio | Anna Verdi\nMusiche | Luca Bianchi\nFotografia | Sara Neri\n\nGrazie a tutti'), C('colore', 'Colore dei ruoli', '#ffd54a'), N('fondo', 'Quanto scurisce il fondo (%)', 70, 0, 100, 5), FONT('oswald', ['oswald', 'rajdhani', 'montserrat', 'orbitron', 'playfair']), ...TEMPI(0.8, 0.8), DIM], + font: (v) => [...fam(v, 'oswald').pezzi, 'rajdhani-500'], + html: (v, s) => { + const righe = testo(v, 'testo', '').split(/\r?\n/).slice(0, 60).map((r) => { + const i = r.indexOf('|'); + if (i >= 0) return `
${esc(r.slice(0, i).trim())}
${esc(r.slice(i + 1).trim())}
`; + return r.trim() ? `
${esc(r.trim())}
` : '
'; + }).join(''); + return `
${righe}
`; + }, + css: `.cd{position:absolute;left:0;top:0;width:100%;height:100%;opacity:var(--out)} +.cd-bg{position:absolute;left:0;top:0;width:100%;height:100%;background:var(--bg);opacity:var(--in)} +.cd-vetro{position:absolute;left:0;top:0;width:100%;height:100%;-webkit-mask-image:linear-gradient(180deg,transparent 0,#000 12%,#000 88%,transparent 100%);mask-image:linear-gradient(180deg,transparent 0,#000 12%,#000 88%,transparent 100%)} +.cd-rotolo{position:absolute;left:0;right:0;top:calc(100% - var(--k)*100%);transform:translateY(calc(-1*var(--k)*100%)) scale(var(--dim));transform-origin:50% 0;padding:0 160px;text-align:center} +.cd-riga{display:flex;justify-content:center;align-items:baseline;gap:44px;min-height:88px;font-size:50px;line-height:1.5} +.cd-ruolo{flex:1;text-align:right;font-family:'Rajdhani',sans-serif;font-weight:500;font-size:42px;letter-spacing:4px;color:var(--c);text-transform:uppercase} +.cd-nome{flex:1;text-align:left;font-weight:${'${P}'};letter-spacing:2px;color:#fff} +.cd-tit{padding:10px 0;font-weight:${'${P}'};font-size:76px;letter-spacing:8px;color:#fff;text-transform:uppercase} +.cd-vuota{height:70px}`, + righe: (v) => testo(v, 'testo').split(/\r?\n/).map((r) => r.replace('|', ' ')), + }, + { + id: 'capitoli', nome: 'Barra di avanzamento capitoli', gruppo: 'docu', info: 'una barra divisa in capitoli che si riempie col tempo, con il nome di quello che stai guardando acceso', durata: 10, + campi: [L('capitoli', 'Capitoli (uno per riga)', 'Introduzione\nIl viaggio\nIl risultato\nConclusione'), C('colore', 'Colore', '#ffd54a'), S('posto', 'Dove sta', 'basso', [['basso', 'In basso'], ['alto', 'In alto']]), FONT('rajdhani', ['rajdhani', 'oswald', 'montserrat', 'orbitron', 'bebas']), ...TEMPI(0.6, 0.5), DIM], + font: (v) => fam(v, 'rajdhani').pezzi, + stato: (t, d, _v, s) => ({ avanza: clamp01((t - s.ent * 0.5) / Math.max(0.2, d - s.ent * 0.5 - s.usc * 0.5)) }), + html: (v, s) => { + const nomi = testo(v, 'capitoli', '').split(/\r?\n/).map((x) => x.trim()).filter(Boolean).slice(0, 8); + if (!nomi.length) nomi.push(''); + const n = nomi.length, attivo = Math.min(n - 1, Math.floor(s.avanza * n)); + const alto = scelto(v, 'posto', ['basso', 'alto'], 'basso') === 'alto'; + const seg = nomi.map((nome, i) => { + const f = clamp01(s.avanza * n - i); + const o = i === attivo ? 1 : i < attivo ? 0.8 : 0.5; + return `
${s2(i + 1)} ${esc(nome)}
`; + }).join(''); + return `
${seg}
`; + }, + css: `.ch{position:absolute;left:110px;right:110px;bottom:90px;padding:26px 34px 22px;border-radius:24px;background:rgba(9,8,13,.74);transform:scale(var(--dim));transform-origin:50% 100%;opacity:calc(var(--in)*var(--out))} +.ch.su{bottom:auto;top:90px;transform-origin:50% 0} +.ch-seg{display:flex;gap:16px} +.ch-c{flex:1;min-width:0} +.ch-barra{height:14px;border-radius:7px;background:rgba(255,255,255,.22);overflow:hidden} +.ch-barra i{display:block;width:100%;height:100%;background:var(--c);box-shadow:0 0 14px var(--c);transform:scaleX(var(--f));transform-origin:0 50%} +.ch-nome{margin-top:14px;font-weight:${'${P}'};font-size:38px;letter-spacing:2px;color:#fff;opacity:var(--o);white-space:nowrap;overflow:hidden;text-overflow:ellipsis} +.ch-nome b{color:var(--c)} +.ch-c.att .ch-nome{color:var(--c)}`, + righe: (v) => testo(v, 'capitoli').split(/\r?\n/), + }, +]; + +export const modelloHtml = (id: string) => MODELLI_HTML.find((m) => m.id === id); +export const modelliDi = (g: GruppoHtml) => MODELLI_HTML.filter((m) => m.gruppo === g); + +// ——— i valori ——— +export const valoriHtmlDiPartenza = (m: ModelloHtml): ValoriHtml => Object.fromEntries(m.campi.map((c) => [c.id, c.def])); + +/** una specifica nuova (con i valori di partenza) */ +export function nuovoHtml(id: string, v: ValoriHtml = {}): HtmlSpec { + const m = modelloHtml(id) ?? MODELLI_HTML[0]; + return { id: m.id, v: { ...valoriHtmlDiPartenza(m), ...v } }; +} + +/** i valori completi di una specifica: quelli mancanti o storti si prendono dai valori di partenza (i progetti vecchi reggono) */ +export function valoriHtmlDi(spec: HtmlSpec): ValoriHtml { + const m = modelloHtml(spec.id); + const base = m ? valoriHtmlDiPartenza(m) : {}; + const v: ValoriHtml = { ...base }; + const dato = spec.v && typeof spec.v === 'object' ? spec.v : {}; + for (const c of m?.campi ?? []) { + const x = dato[c.id]; + if (x === undefined || x === null) continue; + if (c.tipo === 'numero') { const n = Number(x); if (Number.isFinite(n)) v[c.id] = Math.max(c.min ?? -Infinity, Math.min(c.max ?? Infinity, n)); } + else if (c.tipo === 'colore') v[c.id] = coloreSicuro(x, String(c.def)); + else if (c.tipo === 'scelta') v[c.id] = (c.scelte ?? []).some(([k]) => k === x) ? String(x) : c.def; + else if (c.tipo === 'spunta') v[c.id] = !!x; + else v[c.id] = String(x).slice(0, c.tipo === 'lungo' ? 600 : 200); + } + return v; +} + +/** + * Migrazione all'apertura di un progetto: i titoli HTML con campi mancanti, fuori misura o di un tipo sbagliato tornano + * a valori buoni. Chi non ha titoli HTML (tutti i progetti vecchi) non viene toccato. Si può fare più volte: il risultato è lo stesso. + */ +export function migraTitoliHtml(p: Project): void { + for (const s of [p, ...(p.sequenze ?? [])]) { + for (const c of s.clips ?? []) { + const h = c.gen?.html; + if (!h) continue; + if (!modelloHtml(h.id)) { if (!h.v || typeof h.v !== 'object') h.v = {}; continue; } + h.v = valoriHtmlDi(h); + } + } +} + +// ——— il tempo ——— +/** i numeri comuni a tutti i modelli: entrata, uscita, quanto si è andati avanti. Solo dal tempo. */ +export function statoComune(t: number, d: number, v: ValoriHtml): StatoHtml { + d = Math.max(0.1, d); + t = Math.max(0, Math.min(d, t)); + let ent = Math.max(0.05, numero(v, 'ent', 0.7)), usc = Math.max(0.05, numero(v, 'usc', 0.5)); + // se la clip è più corta di entrata + uscita si riducono insieme + if (ent + usc > d) { const k = d / (ent + usc); ent *= k; usc *= k; } + const dentro = E.p3out(clamp01(t / ent)); + const fuori = 1 - E.p2in(clamp01((t - (d - usc)) / usc)); + return { t, d, ent, usc, in: dentro, out: fuori, p: clamp01(t / d), dim: Math.max(0.1, numero(v, 'dim', 100) / 100) }; +} + +/** lo stato completo di un titolo HTML al tempo t (secondi dall'inizio della clip), clip lunga d secondi */ +export function statoHtml(spec: HtmlSpec, t: number, d: number): StatoHtml { + const m = modelloHtml(spec.id); + const v = valoriHtmlDi(spec); + const s = statoComune(t, d, v); + if (!m?.stato) return s; + const extra = m.stato(s.t, s.d, v, s); + // lo scorrimento del ticker ha bisogno di sapere fin dove arriverà alla fine della clip + if (spec.id === 'ticker') extra.xMax = s.d * numero(v, 'velocita', 220); + return { ...s, ...extra }; +} + +// ——— il fotogramma ——— +/** la misura del palcoscenico virtuale (alto 1080, largo quanto il formato, almeno 1500) e la scala fino ai pixel veri */ +export function palco(W: number, H: number): { sw: number; sh: number; k: number } { + let sw = (1080 * W) / H, sh = 1080; + if (sw < 1500) { sw = 1500; sh = (1500 * H) / W; } + return { sw: arrotonda(sw), sh: arrotonda(sh), k: arrotonda(W / sw) }; +} + +/** impronta del testo (FNV-1a a 32 bit): serve per riconoscere due fotogrammi uguali */ +export function impronta(s: string): string { + let h = 0x811c9dc5; + for (let i = 0; i < s.length; i++) { h ^= s.charCodeAt(i); h = Math.imul(h, 0x01000193); } + return (h >>> 0).toString(36) + '.' + s.length.toString(36); +} + +export interface FotogrammaHtml { + /** l'HTML del fotogramma (un div che riempie la tela) */ + corpo: string; + /** il CSS del modello (uguale per tutti i fotogrammi dello stesso modello e dello stesso carattere) */ + css: string; + /** i pezzi di carattere da incorporare */ + font: string[]; + /** due fotogrammi con la stessa chiave sono lo stesso disegno (in pausa tra entrata e uscita se ne fa uno solo) */ + chiave: string; +} + +/** Costruisce il fotogramma al tempo t. Niente browser, niente caso vero: stesso (spec, W, H, t, d) → stesso risultato. */ +export function costruisciHtml(spec: HtmlSpec, W: number, H: number, t: number, d: number): FotogrammaHtml { + const m = modelloHtml(spec.id); + const v = valoriHtmlDi(spec); + const s = statoHtml(spec, t, d); + const { sw, sh, k } = palco(W, H); + const f = m ? fam(v, m.campi.find((c) => c.id === 'font')?.def as string | undefined) : fontScelta('orbitron'); + const col1 = col(v, 'colore', '#ffd54a'); + const col2 = col(v, 'colore2', col(v, 'filetto', '#ff3df2')); + // --t (secondi), --d (durata) e --p (0..1) li scrive solo chi li usa nel suo CSS: se no ogni fotogramma sarebbe diverso + // anche quando l'immagine è ferma (tenuta fra entrata e uscita) e la cache non potrebbe riusarlo + const cssModello = m ? m.css : ''; + const tempo = (nome: string, valore: number) => (cssModello.includes(`var(--${nome})`) ? `--${nome}:${num(valore)};` : ''); + const vars = `${tempo('t', s.t)}${tempo('d', s.d)}${tempo('p', s.p)}--in:${num(s.in)};--out:${num(s.out)};--dim:${num(s.dim)};--c:${col1};--c2:${col2};--font:${m ? nomeFont(v, m.campi.find((c) => c.id === 'font')?.def as string | undefined) : "'Orbitron'"}`; + const dentro = m ? m.html(v, s) : ''; + const corpo = `
${dentro}
`; + const css = cssModello.replace(/\$\{P\}/g, String(f.peso)); + const pezzi = m ? [...new Set(m.font(v))] : []; + return { corpo, css, font: pezzi, chiave: `${spec.id}|${W}x${H}|${impronta(corpo)}` }; +} + +/** la scritta per chi non può avere l'HTML (ripiego): le righe di testo del modello */ +export function righeDi(spec: HtmlSpec): string[] { + const m = modelloHtml(spec.id); + return m ? m.righe(valoriHtmlDi(spec)).filter((x) => x.trim()) : []; +} + +/** il CSS comune a tutti i modelli */ +export const CSS_BASE = `.dp,.dp *{box-sizing:border-box;margin:0;padding:0}.dp{font-family:var(--font),sans-serif;color:#fff;-webkit-font-smoothing:antialiased}`; + +/** la firma di una specifica (cambia quando cambi un testo o un colore) */ +export const firmaHtml = (spec: HtmlSpec) => spec.id + JSON.stringify(spec.v); diff --git a/src/core/zoomCursore.ts b/src/core/zoomCursore.ts new file mode 100644 index 0000000..fa9bfe3 --- /dev/null +++ b/src/core/zoomCursore.ts @@ -0,0 +1,127 @@ +// Cursore LIVE, nello spirito di OpenScreen (MIT, vedi TERZE-PARTI.md). +// La geometria del focus è adattata da videoPlayback/zoomTransform.ts all'origine centrale di DaProd. +// Il movimento viene scritto una volta nelle tappe normali: seek, monitor ed export fanno lo stesso conto. +import type { Clip, MediaItem, Project, Transform } from './tipi'; +import { newClip } from './progetto'; + +export interface SchermoCursore { id: string; left: number; top: number; width: number; height: number } +export interface CampioneCursore { tMs: number; cx: number; cy: number; visible: boolean; clicks: number } +export interface ClicCursore { tMs: number; cx: number; cy: number; button: number } +export interface SegmentoCursore { daMs: number; durataMs: number } +export interface DatiCursore { + v: 1; + schermo: SchermoCursore; + durataMs: number; + video?: { nome: string; size: number }; + segmenti: SegmentoCursore[]; + campioni: CampioneCursore[]; + clic: ClicCursore[]; +} +/** Segmenti nell'orologio del campionatore, e dove sono finiti nel video cucito. */ +export interface TaglioCursore { da: number; fine: number; videoMs: number; durataMs: number } + +export function rimappaCursore(raw: CampioneCursore[], schermo: SchermoCursore, tagli: TaglioCursore[], durataMs: number): DatiCursore { + const campioni: CampioneCursore[] = [], clic: ClicCursore[] = []; + let i = 0; + for (const g of tagli) { + while (i < raw.length && raw[i].tMs < g.da) i++; + while (i < raw.length && raw[i].tMs < g.fine) { + const s = raw[i++], tMs = g.videoMs + s.tMs - g.da; + if (!Number.isFinite(tMs) || tMs < 0 || tMs >= Math.min(durataMs, g.videoMs + g.durataMs)) continue; + const visible = s.visible && Number.isFinite(s.cx) && Number.isFinite(s.cy) && s.cx >= 0 && s.cx < 1 && s.cy >= 0 && s.cy < 1; + const punto = { ...s, tMs, cx: Number.isFinite(s.cx) ? s.cx : 0, cy: Number.isFinite(s.cy) ? s.cy : 0, visible, clicks: visible ? s.clicks & 7 : 0 }; + campioni.push(punto); + for (let b = 0; b < 3; b++) if (punto.clicks & (1 << b)) clic.push({ tMs, cx: s.cx, cy: s.cy, button: b }); + } + } + return { v: 1, schermo, durataMs, segmenti: tagli.map((g) => ({ daMs: g.videoMs, durataMs: g.durataMs })), campioni, clic }; +} + +const clamp = (v: number, a: number, b: number) => Math.max(a, Math.min(b, v)); + +/** Focus in coordinate sorgente, dopo il fit nel progetto. Limita la camera ai bordi dell'immagine. */ +export function trasformazioneFocus(base: Transform, cx: number, cy: number, z: number, w: number, h: number): Transform { + const dx = clamp(-z * (cx - 0.5) * w, -(z - 1) * w / 2, (z - 1) * w / 2); + const dy = clamp(-z * (cy - 0.5) * h, -(z - 1) * h / 2, (z - 1) * h / 2); + const a = base.rot * Math.PI / 180, x = dx * base.scale * (base.sx ?? 1), y = dy * base.scale; + return { ...base, scale: base.scale * z, x: base.x + Math.cos(a) * x - Math.sin(a) * y, y: base.y + Math.sin(a) * x + Math.cos(a) * y }; +} + +/** Clic vicini nel tempo fanno una sola visita; la camera torna al quadro intero fra due visite distanti. */ +export function regioniZoom(clic: ClicCursore[], durataMs: number) { + const regioni: { da: number; fine: number; clic: ClicCursore[] }[] = []; + for (const c of clic) { + if (!Number.isFinite(c.tMs) || c.tMs < 0 || c.tMs >= durataMs) continue; + const da = Math.max(0, c.tMs - 500), fine = Math.min(durataMs, c.tMs + 1700); + const prima = regioni.at(-1); + if (prima && da <= prima.fine) { prima.fine = fine; prima.clic.push(c); } + else regioni.push({ da, fine, clic: [c] }); + } + return regioni; +} + +/** Interpolazione nella sorgente, senza inventare posizioni attraverso un tratto non visibile. */ +export function puntoCursoreAl(campioni: CampioneCursore[], tMs: number): [number, number] | null { + let lo = 0, hi = campioni.length; + while (lo < hi) { const m = (lo + hi) >>> 1; if (campioni[m].tMs <= tMs) lo = m + 1; else hi = m; } + const a = campioni[lo - 1], b = campioni[lo]; + if (!a?.visible || tMs - a.tMs > 150) return null; + if (!b?.visible || b.tMs - a.tMs > 150) return [a.cx, a.cy]; + const k = clamp((tMs - a.tMs) / Math.max(0.001, b.tMs - a.tMs), 0, 1); + return [a.cx + (b.cx - a.cx) * k, a.cy + (b.cy - a.cy) * k]; +} + +/** Solo sulla clip appena creata da LIVE: non riscrive movimenti già lavorati a mano. */ +export function applicaZoomCursore(p: Project, c: Clip, m: MediaItem): boolean { + const dati = m.cursoreLive; + if (!dati || dati.v !== 1 || c.tfFine || c.via?.length || c.len < 3 || m.width <= 0 || m.height <= 0 || c.speed <= 0) return false; + const r = p.rate.num / p.rate.den, durata = (c.len - 1) * 1000 / r; + const ingresso = (c.srcIn - (m.t0 || 0)) * 1000; + const clic = dati.clic.map((s) => ({ ...s, tMs: (s.tMs - ingresso) / c.speed })); + const regioni = regioniZoom(clic, durata); + if (!regioni.length) return false; + const fit = Math.min(p.w / m.width, p.h / m.height), base = { ...c.tf }; + const tappe: { t: number; tf: Transform }[] = [{ t: 0, tf: base }]; + for (const g of regioni) { + // Entrata e uscita hanno due tappe uguali ai lati: passaPer dà la S senza stato di playback. + const entrata = Math.min(g.fine, g.da + 500), uscita = Math.max(entrata, g.fine - 550); + tappe.push({ t: g.da / durata, tf: { ...base } }); + let x = g.clic[0].cx, y = g.clic[0].cy; + // Bake deterministico a 5 Hz nel tempo del contenuto, poi passaPer raccorda le tappe con la S. + // Il filtro usa sempre lo stesso passo, indipendente dai seek e dai fotogrammi del monitor. + for (let ms = entrata; ms < uscita; ms += 200) { + const q = puntoCursoreAl(dati.campioni, ingresso + ms * c.speed); + if (q) { const k = 1 - Math.exp(-200 / 280); x += (q[0] - x) * k; y += (q[1] - y) * k; } + const tf = trasformazioneFocus(base, x, y, 1.65, m.width * fit, m.height * fit); + const prima = tappe.at(-1)!; + if (ms === entrata || Math.hypot(tf.x - prima.tf.x, tf.y - prima.tf.y) >= 3) tappe.push({ t: ms / durata, tf }); + } + tappe.push({ t: uscita / durata, tf: trasformazioneFocus(base, x, y, 1.65, m.width * fit, m.height * fit) }); + tappe.push({ t: g.fine / durata, tf: { ...base } }); + } + tappe.push({ t: 1, tf: { ...base } }); + // Se un clic è sul primo/ultimo fotogramma, gli estremi restano comunque a quadro intero. + const uniche = new Map(); + for (const t of tappe) uniche.set(clamp(t.t, 0, 1), t.tf); + uniche.set(0, base); uniche.set(1, { ...base }); + const ordine = [...uniche].sort((a, b) => a[0] - b[0]); + c.tf = ordine[0][1]; c.tfFine = ordine.at(-1)![1]; + c.via = ordine.slice(1, -1).map(([t, tf]) => ({ t, tf })); + return true; +} + +/** Un blocco normale: eliminabile e accorciabile, sulla traccia dello schermo; non muove webcam e sfondo. */ +export function bloccoClicLive(c: Clip): Clip { + // Il legame è quello dei blocchi (blocchiDi), non il gruppo audio/video: cancellare il blocco lascia la ripresa. + return newClip('fx', c.track, c.start, c.len, { name: 'Clic animati', + fxb: { tipo: 'effetto', id: 'clicLive', forza: 1, colore: '#ffd54a', audio: false, cursoreMedia: c.media } }); +} + +/** Il tempo è quello della sorgente: trim, slip e velocità usano i clic del fotogramma che si sta mostrando. */ +export function clicAlTempo(dati: DatiCursore, tMs: number): ClicCursore[] { + let lo = 0, hi = dati.clic.length; + while (lo < hi) { const m = (lo + hi) >>> 1; if (dati.clic[m].tMs <= tMs - 550) lo = m + 1; else hi = m; } + const clic: ClicCursore[] = []; + for (let i = lo; i < dati.clic.length && dati.clic[i].tMs <= tMs; i++) clic.push(dati.clic[i]); + return clic.slice(-8); +} diff --git a/src/demo.ts b/src/demo.ts index 9eab77f..29ea2ba 100644 --- a/src/demo.ts +++ b/src/demo.ts @@ -194,7 +194,7 @@ export async function montaggioDimostrativo() { pp.clips.push(cv, ca); at += L; }); - const titolo = newClip('title', v2.id, Math.round(r * 0.5), Math.round(r * 4), { name: 'Titolo', gen: { title: { ...TITLE0, text: 'DaProd Video', font: 'Orbitron', size: 110, color: '#ffd54a' } } }); + const titolo = newClip('title', v2.id, Math.round(r * 0.5), Math.round(r * 4), { name: 'Titolo', gen: { title: { ...TITLE0, text: 'DaProd Editor Video', font: 'Orbitron', size: 110, color: '#ffd54a' } } }); titolo.fadeIn = Math.round(r / 2); titolo.fadeOut = Math.round(r / 2); const sotto = newClip('title', v2.id, L + Math.round(r * 1.5), Math.round(r * 3.5), { name: 'Sottopancia', gen: { title: { ...TITLE0, style: 'sottopancia', text: 'Napoli di notte\nripresa dimostrativa', size: 52, align: 'left' } } }); sotto.fadeIn = 6; sotto.fadeOut = 6; diff --git a/src/effetti.ts b/src/effetti.ts index 27e73c6..de1fdda 100644 --- a/src/effetti.ts +++ b/src/effetti.ts @@ -2,6 +2,7 @@ // Li usano il tasto "fx" in fondo alle clip, la sezione Effetti del contenitore (anche trascinandoli su una // clip) e le proprietà. Ogni effetto sa dire se è acceso e sa accendersi o spegnersi. import type { Clip, Look, Project } from './core/tipi'; +import { togliAnimazione } from './core/automazioni'; import { autoColore, dbToGain, gainToDb, isVideoClip, masterDi, newTransition } from './core/progetto'; import { fps } from './core/timecode'; import { mediaRT, PEAKS_PER_SEC } from './media/libreria'; @@ -99,6 +100,7 @@ export const EFFETTI_AUDIO: Effetto[] = [ c.afx = { ...c.afx, norm: c.gain }; c.gain = g; c.gainKeys = []; + togliAnimazione(c, 'gain'); }, }, { diff --git a/src/export/coda.ts b/src/export/coda.ts new file mode 100644 index 0000000..2caaaa7 --- /dev/null +++ b/src/export/coda.ts @@ -0,0 +1,126 @@ +// La coda delle esportazioni che lavora davvero: una dopo l'altra, con avanzamento, tempo rimasto e annulla. +// Ogni esportazione che parte ha anche la sua riga nel Centro attività (categoria «esporta»): lì si vede e si ferma +// come ogni altro lavoro, senza toccare il suo popup. L'ordine e le regole stanno in `src/core/codaExport.ts`. +import { Coda, type Voce } from '../core/codaExport'; +import { Stima } from '../core/stima'; +import type { Project } from '../core/tipi'; +import { nuova, progettoAttuale } from '../media/attivita'; +import { invoke, isTauri } from '../platform'; +import { esporta, type Opzioni } from './esporta'; + +export interface LavoroExport { + /** come si chiama nel Centro attività e nella lista */ + titolo: string; + presetNome: string; + /** "1920×1080 · 30 fps · MP4 H.264 · circa 48 MB" */ + riassunto: string; + /** "Tutto il montaggio" o "Da 00:00:10:00 a 00:00:30:00" */ + tratto: string; + /** il progetto com'era quando si è messo in coda: l'uscita è quella che si è vista */ + progetto: Project; + opzioni: Omit; + /** chiedere dove salvare (solo se la coda era libera: se no va in Video/DaProd Video) */ + chiedi: boolean; + /** il numero del progetto aperto quando si è messo in coda */ + generazione: number; + // ——— come sta andando ——— + k: number; + dettaglio: string; + restante: number | null; + percorso?: string; + file?: string; + annulla: boolean; +} + +export const coda = new Coda(); +const ascoltatori = new Set<() => void>(); +export const quandoCoda = (fn: () => void) => { ascoltatori.add(fn); return () => { ascoltatori.delete(fn); }; }; +const avvisa = () => { for (const f of ascoltatori) f(); }; +const finitori = new Set<(v: Voce) => void>(); +/** chiamata quando una esportazione finisce (bene, male o annullata) */ +export const quandoFinita = (fn: (v: Voce) => void) => { finitori.add(fn); return () => { finitori.delete(fn); }; }; + +export type NuovoLavoro = Omit; + +/** Mette un'esportazione in coda. Se la coda è libera parte subito (e chiede dove salvare, se `chiedi`). */ +export function accoda(l: NuovoLavoro, chiedi: boolean): Voce { + const libera = !coda.voci.some((v) => v.stato === 'attesa' || v.stato === 'lavoro'); + const v = coda.aggiungi({ ...l, k: 0, dettaglio: 'in coda', restante: null, annulla: false, generazione: progettoAttuale(), chiedi: chiedi && libera }); + avvisa(); + void pompa(); + return v; +} + +/** ferma quella che lavora, o toglie dalla coda quella che aspetta */ +export function annullaVoce(id: number) { + const v = coda.voce(id); + if (!v) return; + if (v.stato === 'attesa') { coda.segna(id, 'annullata', 'tolta dalla coda'); avvisa(); } + else if (v.stato === 'lavoro') { v.dato.annulla = true; v.dato.dettaglio = 'annullo…'; avvisa(); } +} + +export function spostaVoce(id: number, verso: -1 | 1) { if (coda.sposta(id, verso)) avvisa(); } +export function togliVoce(id: number) { if (coda.togli(id)) avvisa(); } +export function pulisciFinite() { if (coda.pulisciFinite()) avvisa(); } + +/** apre la cartella dove sta il file (solo nell'app) */ +export async function mostraNellaCartella(percorso: string) { + if (isTauri) await invoke('mostra_nella_cartella', { path: percorso }).catch(() => {}); +} + +let corre = false; + +async function pompa() { + if (corre) return; + corre = true; + try { + for (let v = coda.prossimo(); v; v = coda.prossimo()) await esegui(v); + } finally { corre = false; } +} + +async function esegui(v: Voce) { + const d = v.dato; + coda.segna(v.id, 'lavoro'); + d.dettaglio = 'comincio…'; + avvisa(); + if (d.generazione !== progettoAttuale()) { + coda.segna(v.id, 'errore', 'Hai cambiato progetto: rimettila in coda dal progetto giusto'); + d.dettaglio = 'progetto cambiato'; + avvisa(); + return; + } + const stima = new Stima(); + const lav = nuova({ titolo: d.titolo, categoria: 'esporta', alAnnulla: () => { d.annulla = true; } }); + try { + const file = await esporta(d.progetto, { + ...d.opzioni, + automatica: !d.chiedi, + alPercorso: (p) => { d.percorso = p; }, + }, (a) => { + // il video e l'audio avanzano insieme; la chiusura del file è l'ultimo pezzetto + const k = a.fase === 'chiusura' ? 0.99 : Math.min(0.98, a.totale ? (a.fatti / a.totale) * 0.98 : 0); + stima.registra(k); + d.k = k; + d.restante = stima.restante(); + d.dettaglio = a.fase === 'video' ? `${Math.round(k * 100)}%${a.fpsResa > 0 ? ` · ${a.fpsResa.toFixed(0)} fps` : ''}` : a.fase === 'audio' ? 'audio…' : 'chiudo il file…'; + lav.imposta(k, d.dettaglio); + avvisa(); + }, () => d.annulla); + if (file) { + d.k = 1; d.file = file; d.restante = 0; d.dettaglio = 'fatta'; + coda.segna(v.id, 'fatta', file); + lav.fine(file); + } else { + coda.segna(v.id, 'annullata', d.annulla ? 'annullata' : 'non hai scelto dove salvare'); + d.dettaglio = 'annullata'; + lav.annullata(); + } + } catch (e) { + const msg = e instanceof Error ? e.message : String(e); + coda.segna(v.id, 'errore', msg); + d.dettaglio = 'non riuscita'; + lav.errore(msg); + } + avvisa(); + for (const f of finitori) f(v); +} diff --git a/src/export/codec.ts b/src/export/codec.ts new file mode 100644 index 0000000..5f995f8 --- /dev/null +++ b/src/export/codec.ts @@ -0,0 +1,50 @@ +// Quali codec video questa macchina sa davvero codificare, e se lo fa con la scheda video o col processore. +// Si chiede a WebCodecs (`VideoEncoder.isConfigSupported`); Mediabunny poi usa lo stesso controllo per scegliere. +import { canEncodeVideo } from 'mediabunny'; +import { CODEC_DI, type CodecVideo, type Contenitore } from '../core/esportazione'; + +/** le stringhe dei codec per WebCodecs: livelli alti, perché devono bastare anche per il 4K a 60 fps */ +const STRINGA: Record = { + avc: 'avc1.640034', + hevc: 'hvc1.1.6.L153.B0', + vp9: 'vp09.00.51.08', + av1: 'av01.0.13M.08', + vp8: 'vp8', +}; + +export interface StatoCodec { + codec: CodecVideo; + /** la macchina lo sa codificare a questa misura */ + disponibile: boolean; + /** lo fa la scheda video (o il chip del computer) */ + scheda: boolean; +} + +async function provaConfig(codec: CodecVideo, w: number, h: number, fps: number, hw: 'prefer-hardware' | 'prefer-software'): Promise { + if (typeof VideoEncoder === 'undefined') return false; + try { + const r = await VideoEncoder.isConfigSupported({ codec: STRINGA[codec], width: w, height: h, bitrate: 8_000_000, framerate: fps, hardwareAcceleration: hw }); + return !!r.supported; + } catch { return false; } +} + +const memoria = new Map(); + +/** lo stato di un codec a una certa misura (ricordato: la prova costa qualche decina di millisecondi) */ +export async function statoCodec(codec: CodecVideo, w: number, h: number, fps: number): Promise { + const chiave = `${codec}|${w}x${h}|${Math.round(fps)}`; + const gia = memoria.get(chiave); + if (gia) return gia; + const scheda = await provaConfig(codec, w, h, fps, 'prefer-hardware'); + // disponibile = lo sa fare Mediabunny (è lui che codificherà davvero), con la scheda o col processore + let disponibile = scheda || await provaConfig(codec, w, h, fps, 'prefer-software'); + if (!disponibile) disponibile = await canEncodeVideo(codec, { width: w, height: h }).catch(() => false); + const st = { codec, disponibile, scheda: scheda && disponibile }; + memoria.set(chiave, st); + return st; +} + +/** i codec del contenitore con il loro stato, nell'ordine di CODEC_DI */ +export async function statiCodec(formato: Contenitore, w: number, h: number, fps: number): Promise { + return Promise.all(CODEC_DI[formato].map((c) => statoCodec(c, w, h, fps))); +} diff --git a/src/export/edl.ts b/src/export/edl.ts index 77bb99b..b194310 100644 --- a/src/export/edl.ts +++ b/src/export/edl.ts @@ -50,6 +50,7 @@ export function creaEdl(p: Project): string { } if (c.kind === 'media' && m) righe.push(`* FROM CLIP NAME: ${m.name}`); else if (c.kind === 'title' && c.gen?.anim) righe.push(`* ANIMAZIONE: ${c.name.slice(0, 60)}`); + else if (c.kind === 'title' && c.gen?.html) righe.push(`* TITOLO HTML: ${c.name.slice(0, 60)}`); else if (c.kind === 'title') righe.push(`* TITOLO: ${(c.gen?.title?.text ?? '').replace(/\n/g, ' / ').slice(0, 60)}`); if (c.opacity < 1 && canale.startsWith('V')) righe.push(`* OPACITY: ${Math.round(c.opacity * 100)}%`); righe.push(''); diff --git a/src/export/esporta.ts b/src/export/esporta.ts index 31e0b9f..8a10da6 100644 --- a/src/export/esporta.ts +++ b/src/export/esporta.ts @@ -12,10 +12,12 @@ import { f2s, fps } from '../core/timecode'; import { mixaggio } from '../media/audio'; import { mediaRT } from '../media/libreria'; import { caricaFontAnimazioni } from '../render/font'; +import { preparaStrati } from '../render/titoliHtml'; import { Compositore } from '../render/compositore'; import { pianoVideo, type Sorgente } from '../render/piano'; import { dialogoSalva, invoke, isTauri, nomeDaPercorso, scarica, type FileScelto } from '../platform'; import type { Fotogramma } from '../media/fotogrammi'; +import type { Geometria } from '../core/esportazione'; export type Formato = 'mp4' | 'mov' | 'webm' | 'wav'; export type Qualita = 'bassa' | 'media' | 'alta' | 'altissima'; @@ -30,6 +32,19 @@ export interface Opzioni { /** un file per il programma stesso (Rendi clip unica): nell'app va nella cartella Video/DaProd Video senza chiedere, * nel browser resta in memoria; arriva a `file` quando è finito */ interna?: { file: (f: FileScelto) => void }; + /** il codec che si vorrebbe (se questo sistema non lo sa fare si prende il primo che c'è) */ + codec?: VideoCodec; + /** bit al secondo del video e dell'audio; se mancano vale `qualita` */ + bitrate?: number; + audioBps?: number; + /** ogni quanti fotogrammi del progetto se ne tiene uno (2 = 60 fps → 30 fps); di partenza 1 */ + passo?: number; + /** l'uscita ha un'altra forma del progetto: la tela del compositore è `cw`×`ch` e si posa a (dx, dy) sul quadro `w`×`h` */ + geometria?: Geometria | null; + /** senza dialogo: nell'app va in Video/DaProd Video, nel browser si scarica (serve alla coda, che lavora da sola) */ + automatica?: boolean; + /** a file finito, dove sta (solo nell'app) */ + alPercorso?: (percorso: string) => void; } export interface Avanzamento { fatti: number; totale: number; fase: string; fpsResa: number } @@ -44,9 +59,10 @@ const QUALITA: Record = { let aacPronto: Promise | null = null; /** sceglie i codec che questo sistema sa davvero codificare */ -export async function scegliCodec(formato: Formato, w: number, h: number): Promise<{ v: VideoCodec | null; a: AudioCodec | null }> { +export async function scegliCodec(formato: Formato, w: number, h: number, preferito?: VideoCodec): Promise<{ v: VideoCodec | null; a: AudioCodec | null }> { if (formato === 'wav') return { v: null, a: 'pcm-s16' }; const vc: VideoCodec[] = formato === 'webm' ? ['vp9', 'av1', 'vp8'] : formato === 'mov' ? ['avc', 'hevc'] : ['avc', 'hevc', 'vp9', 'av1']; + if (preferito && vc.includes(preferito)) vc.unshift(preferito); const ac: AudioCodec[] = formato === 'webm' ? ['opus', 'vorbis'] : ['aac', 'opus', 'mp3']; const v = await getFirstEncodableVideoCodec(vc, { width: w, height: h }); let a = await getFirstEncodableAudioCodec(ac, { numberOfChannels: 2, sampleRate: 48000 }); @@ -62,7 +78,7 @@ export async function scegliCodec(formato: Formato, w: number, h: number): Promi } /** una scrittura su disco che accetta pezzi in qualunque posizione (per l'MP4 che torna indietro a sistemare le intestazioni) */ -interface Destinazione { target: BufferTarget | StreamTarget; chiudi: () => Promise; annulla: () => Promise } +interface Destinazione { target: BufferTarget | StreamTarget; chiudi: () => Promise; annulla: () => Promise; /** il percorso sul disco (solo nell'app) */ percorso?: string } async function destinazione(nome: string, mime: string, estensione: string): Promise { if (isTauri) { @@ -78,6 +94,7 @@ async function destinazione(nome: string, mime: string, estensione: string): Pro target: new StreamTarget(ws, { chunked: true, chunkSize: 4 * 1024 * 1024 }), chiudi: async () => { await invoke('export_chiudi', { id }); return nomeDaPercorso(path); }, annulla: async () => { await invoke('export_chiudi', { id }).catch(() => {}); }, + percorso: path, }; } const w = window as unknown as { showSaveFilePicker?: (o: object) => Promise }; @@ -128,6 +145,29 @@ async function destinazioneInterna(nome: string, mime: string, consegna: (f: Fil }; } +/** la destinazione senza domande, per la coda: nell'app il file va in Video/DaProd Video (mai sovrascritto), nel browser si scarica */ +async function destinazioneAutomatica(nome: string, mime: string): Promise { + if (isTauri) { + const path = await invoke('registrazione_percorso', { name: nome }); + const id = await invoke('export_apri', { path }); + const ws = new WritableStream({ + write: async (chunk) => { await invoke('export_scrivi', chunk.data, { headers: { 'x-id': String(id), 'x-pos': String(chunk.position) } }); }, + }); + return { + target: new StreamTarget(ws, { chunked: true, chunkSize: 4 * 1024 * 1024 }), + chiudi: async () => { await invoke('export_chiudi', { id }); return nomeDaPercorso(path); }, + annulla: async () => { await invoke('export_chiudi', { id }).catch(() => {}); }, + percorso: path, + }; + } + const target = new BufferTarget(); + return { + target, + chiudi: async () => { scarica(new Blob([target.buffer!], { type: mime }), nome); return nome; }, + annulla: async () => {}, + }; +} + /** legge i fotogrammi esatti per l'export: un lettore in avanti per ogni clip */ export class Lettori { private l = new Map; cur: VideoSample | null; next: VideoSample | null; fine: boolean; usato: number }>(); @@ -194,26 +234,32 @@ export async function esporta(p0: Project, o: Opzioni, avanza: (a: Avanzamento) const b = o.soloInOut && p.outF !== null ? p.outF : projectEnd(p); if (b <= a) throw new Error('Il montaggio è vuoto'); const w = Math.round(o.w / 2) * 2, h = Math.round(o.h / 2) * 2; - const { v, a: ac } = await scegliCodec(o.formato, w, h); + const { v, a: ac } = await scegliCodec(o.formato, w, h, o.codec); if (o.formato !== 'wav' && !v) throw new Error(`Questo sistema non sa codificare video in ${o.formato.toUpperCase()}. Prova WebM o MP4.`); const mime = o.formato === 'webm' ? 'video/webm' : o.formato === 'mov' ? 'video/quicktime' : o.formato === 'wav' ? 'audio/wav' : 'video/mp4'; - const dest = o.interna ? await destinazioneInterna(o.nome, mime, o.interna.file) : await destinazione(o.nome, mime, o.formato); + const dest = o.interna ? await destinazioneInterna(o.nome, mime, o.interna.file) : o.automatica ? await destinazioneAutomatica(o.nome, mime) : await destinazione(o.nome, mime, o.formato); if (!dest) return null; const format = o.formato === 'webm' ? new WebMOutputFormat() : o.formato === 'mov' ? new MovOutputFormat() : o.formato === 'wav' ? new WavOutputFormat() : new Mp4OutputFormat({ fastStart: dest.target instanceof BufferTarget ? 'in-memory' : false }); const out = new Output({ format, target: dest.target }); let canvas: OffscreenCanvas | null = null, comp: Compositore | null = null, vsrc: CanvasSource | null = null; + // se l'uscita ha un'altra forma del progetto: il compositore disegna a misura del progetto (cw×ch) e un secondo quadro + // (w×h) lo accoglie con le bande nere o tagliato ai lati; è quel quadro che va al codificatore + const geo = o.geometria ?? null; + let quadro: OffscreenCanvas | null = null, ctx2d: OffscreenCanvasRenderingContext2D | null = null; + const passo = Math.max(1, Math.round(o.passo ?? 1)); if (o.formato !== 'wav' && v) { - canvas = new OffscreenCanvas(w, h); + canvas = new OffscreenCanvas(geo ? geo.cw : w, geo ? geo.ch : h); comp = new Compositore(canvas, true); - vsrc = new CanvasSource(canvas, { codec: v, bitrate: QUALITA[o.qualita], keyFrameInterval: 2, latencyMode: 'quality' } as ConstructorParameters[1]); - out.addVideoTrack(vsrc, { frameRate: r }); + if (geo) { quadro = new OffscreenCanvas(w, h); ctx2d = quadro.getContext('2d'); } + vsrc = new CanvasSource(quadro ?? canvas, { codec: v, bitrate: o.bitrate ?? QUALITA[o.qualita], keyFrameInterval: 2, latencyMode: 'quality' } as ConstructorParameters[1]); + out.addVideoTrack(vsrc, { frameRate: r / passo }); } let asrc: AudioBufferSource | null = null; if (ac) { - asrc = new AudioBufferSource({ codec: ac, bitrate: o.formato === 'wav' ? undefined : QUALITA[o.qualita] } as ConstructorParameters[0]); + asrc = new AudioBufferSource({ codec: ac, bitrate: o.formato === 'wav' ? undefined : o.audioBps || QUALITA[o.qualita] } as ConstructorParameters[0]); out.addAudioTrack(asrc); } - out.setMetadataTags({ title: p.name, comment: 'Montato con DaProd Video' }); + out.setMetadataTags({ title: p.name, comment: 'Montato con DaProd Editor Video' }); const lettori = new Lettori(); const t0 = performance.now(); try { @@ -233,20 +279,28 @@ export async function esporta(p0: Project, o: Opzioni, avanza: (a: Avanzamento) if (comp && vsrc) { // il compositore dell'export è a piena risoluzione; il progetto può essere di un'altra misura const pp: Project = { ...p, w: p.w, h: p.h }; - for (let f = a; f < b; f++) { + for (let f = a; f < b; f += passo) { if (annullato()) throw new Error('annullato'); + const giro = Math.floor((f - a) / passo); const tSec = f2s(f, p.rate); while (pezzi && audioFino < tSec + 2 && audioFino !== Infinity) await altroAudio(); const strati = pianoVideo(pp, f); const presi = new Map(); for (const s of strati) { for (const src of [s.b, s.a]) { - if (src && src.clip.kind === 'media') presi.set(src, await lettori.prendi(src.clip, src.t, f)); + if (src && src.clip.kind === 'media') presi.set(src, await lettori.prendi(src.clip, src.t, giro)); } } + await preparaStrati(pp, strati, canvas!.width); comp.render(pp, strati, false, f, (s) => presi.get(s) ?? null, (s) => lettori.dopo(s.clip)); - await vsrc.add((f - a) / r, 1 / r); - lettori.pulisci(f); + if (ctx2d && quadro && geo) { + // subito dopo il disegno: il quadro nero e l'immagine al suo posto + ctx2d.fillStyle = '#000'; + ctx2d.fillRect(0, 0, quadro.width, quadro.height); + ctx2d.drawImage(canvas!, geo.dx, geo.dy, geo.cw, geo.ch); + } + await vsrc.add((f - a) / r, Math.min(passo, b - f) / r); + lettori.pulisci(giro); if ((f - a) % 5 === 0) avanza({ fatti: f - a, totale, fase: 'video', fpsResa: (f - a) / ((performance.now() - t0) / 1000) }); } } @@ -258,7 +312,9 @@ export async function esporta(p0: Project, o: Opzioni, avanza: (a: Avanzamento) await out.finalize(); lettori.tutto(); comp?.distruggi(); - return await dest.chiudi(); + const nomeFinale = await dest.chiudi(); + if (dest.percorso) o.alPercorso?.(dest.percorso); + return nomeFinale; } catch (e) { lettori.tutto(); comp?.distruggi(); @@ -283,6 +339,7 @@ export async function fotogrammaPng(p: Project, f: number): Promise { const strati = pianoVideo(p, f); const presi = new Map(); for (const s of strati) for (const src of [s.b, s.a]) if (src && src.clip.kind === 'media') presi.set(src, await lettori.prendi(src.clip, src.t, 0)); + await preparaStrati(p, strati, canvas.width); comp.render(p, strati, false, f, (s) => presi.get(s) ?? null, (s) => lettori.dopo(s.clip)); return await canvas.convertToBlob({ type: 'image/png' }); } finally { diff --git a/src/main.ts b/src/main.ts index 607475a..bfe8b17 100644 --- a/src/main.ts +++ b/src/main.ts @@ -26,6 +26,8 @@ import '@fontsource/great-vibes/latin-400.css'; import '@fontsource/caveat/latin-700.css'; import './stile/editor.css'; import './stile/flussi.css'; +import './stile/guscio.css'; +import './stile/titoliHtml.css'; import { avvia } from './ui/app'; import { h } from './ui/dom'; import { isTauri } from './platform'; @@ -36,7 +38,7 @@ const radice = document.getElementById('app')!; let banco: ReturnType | null = null; function nonSupportato(): string | null { - if (typeof VideoDecoder === 'undefined' || typeof VideoEncoder === 'undefined') return 'Questo browser non ha WebCodecs, il motore video di DaProd Video.'; + if (typeof VideoDecoder === 'undefined' || typeof VideoEncoder === 'undefined') return 'Questo browser non ha WebCodecs, il motore video di DaProd Editor Video.'; const c = document.createElement('canvas'); if (!c.getContext('webgl2')) return 'Questo browser non ha WebGL2 (serve per mixare i livelli video).'; return null; @@ -59,10 +61,12 @@ if (problema) { banco = avvia(radice); // i caratteri delle animazioni arrivano in silenzio: quando ci sono, il monitor ridisegna void caricaFontAnimazioni().then(() => import('./motore').then((m) => m.motore.ridisegna())); + // i titoli animati HTML si disegnano a parte: quando arriva un fotogramma nuovo il monitor ridisegna + void Promise.all([import('./render/titoliHtml'), import('./motore')]).then(([h, m]) => h.quandoPronto(() => m.motore.ridisegna())); setTimeout(() => { avvio.classList.add('via'); setTimeout(() => avvio.remove(), 500); }, isTauri ? 500 : 900); } -// agganci per le prove automatiche (test/prove.mjs) e per chi curiosa dalla console +// Agganci per lo sviluppo e le prove automatiche (test/prove.mjs). import * as M from './core/montaggio'; import * as TC from './core/timecode'; import * as P from './core/progetto'; @@ -131,6 +135,7 @@ import * as PX from './media/proxy'; import * as CU from './ui/clipUnica'; import * as SR from './ui/sottotitoliRapidi'; import * as CL from './media/clear'; -(window as unknown as Record).__dpvTest = { M, TC, P, esporta, creaEdl, motore, guadagnoClip, pianoVideo, Z, statoDecoder, ripresaDiProva, ripresaVfrDiProva, branoVbrDiProva, NZ, TD, PR, importaFile, apriFile, PK, proxyStato: (id: string) => mediaRT(id)?.proxyStato, mediaRT, B, S, SU, V, AG, LV, SQ, SOT, FE, G, mixaggio, PV, TR, TK, ST, Compositore, NM, DP, WV, LAV, SF, MK, RT, CP, USF, AN, RA, fontAnim, MT, MP, EX, QL, RI, AT, CH, SM, DG, EA, HW, FT, FL, ui: () => banco }; -// l'audio con l'AI (togliere il rumore, separare voce e base): per le prove -Object.assign((window as unknown as { __dpvTest: object }).__dpvTest, { AA, AAM, AAS, AAR, AAC, PX, CU, SR, CL, LB, MH }); +// Playwright usa il build di produzione e naviga senza parametri: webdriver tiene compatibili anche foto e banchi di prova. +if (import.meta.env.DEV || navigator.webdriver) { + (window as unknown as Record).__dpvTest = { M, TC, P, esporta, creaEdl, motore, guadagnoClip, pianoVideo, Z, statoDecoder, ripresaDiProva, ripresaVfrDiProva, branoVbrDiProva, NZ, TD, PR, importaFile, apriFile, PK, proxyStato: (id: string) => mediaRT(id)?.proxyStato, mediaRT, B, S, SU, V, AG, LV, SQ, SOT, FE, G, mixaggio, PV, TR, TK, ST, Compositore, NM, DP, WV, LAV, SF, MK, RT, CP, USF, AN, RA, fontAnim, MT, MP, EX, QL, RI, AT, CH, SM, DG, EA, HW, FT, FL, ui: () => banco, AA, AAM, AAS, AAR, AAC, PX, CU, SR, CL, LB, MH }; +} diff --git a/src/media/audio.ts b/src/media/audio.ts index 1f52fea..ab08624 100644 --- a/src/media/audio.ts +++ b/src/media/audio.ts @@ -2,12 +2,14 @@ // incroci; il tono di riferimento. Lo stesso grafo serve la riproduzione e l'export (OfflineAudioContext). import { AudioBufferSink } from 'mediabunny'; import type { Clip, Project } from '../core/tipi'; +import { gainDbAl, puntiLinea, valoreAnim } from '../core/automazioni'; import { dbToGain, end, fadeAl, keyValue, masterDi, mediaOf, newTransition } from '../core/progetto'; import { transizioniAttive } from '../core/blocchi'; import { f2s } from '../core/timecode'; import { mediaRT } from './libreria'; import { bufferSuono, suoniFx } from './suoni'; import { Stiratore } from './stira'; +import { conDucking } from '../core/ducking'; const SUONA = new Set(['media', 'tone', 'beep']); @@ -18,7 +20,7 @@ const SUONA = new Set(['media', 'tone', 'beep']); */ export function conIncroci(p: Project): Project { const trs = transizioniAttive(p); - if (!trs.length) return p; + if (!trs.length) return conDucking(p); const audio = new Set(p.tracks.filter((t) => t.kind === 'audio').map((t) => t.id)); const nuovi = new Map(); for (const x of trs) { @@ -30,7 +32,7 @@ export function conIncroci(p: Project): Project { nuovi.set(c.id, { ...c, trIn: newTransition('mix', Math.min(L, c.len)) }); } } - return nuovi.size ? { ...p, clips: p.clips.map((c) => nuovi.get(c.id) ?? c) } : p; + return conDucking(nuovi.size ? { ...p, clips: p.clips.map((c) => nuovi.get(c.id) ?? c) } : p); } /** la clip audio attaccata dopo c con transizione in testa (allunga c per l'incrocio) */ @@ -45,8 +47,8 @@ function codaIncrocio(p: Project, c: Clip): number { * rampa lineare verso quel punto abbassava piano piano tutta la clip: il "fade out automatico" che non si voleva. */ export function guadagnoClip(c: Clip, lf: number, coda: number): number { - const db = c.gainKeys.length ? keyValue(c.gainKeys, lf, c.gain) : c.gain; - let g = dbToGain(db); + const db = gainDbAl(c, lf, keyValue); + let g = dbToGain(db + keyValue(c.duckKeys ?? [], lf, 0)); // le dissolvenze con la loro forma (dritta, morbida, analogica, veloce, a S): la stessa del disegno g *= fadeAl(c, lf); if (c.trIn && lf < c.trIn.len) g *= Math.max(0, lf / c.trIn.len); @@ -57,7 +59,7 @@ export function guadagnoClip(c: Clip, lf: number, coda: number): number { } /** punti dell'inviluppo (fotogrammi locali) dove il guadagno cambia pendenza */ -function puntiInviluppo(c: Clip, coda: number): number[] { +export function puntiInviluppo(c: Clip, coda: number): number[] { const s = new Set([0, c.len, c.len + coda]); const add = (a: number, b: number, n = 6) => { for (let i = 0; i <= n; i++) s.add(a + ((b - a) * i) / n); }; // le dissolvenze curve hanno bisogno di più punti (fra un punto e l'altro la rampa è dritta) @@ -67,10 +69,16 @@ function puntiInviluppo(c: Clip, coda: number): number[] { if (c.trIn) add(0, c.trIn.len); if (c.trOut) add(c.len - c.trOut.len, c.len); if (coda) add(c.len, c.len + coda); + // i keyframe del volume: le chiavi e i punti in mezzo (curve morbide, gradini) + for (const f of puntiLinea(c.anim?.gain)) s.add(f); for (let i = 0; i < c.gainKeys.length; i++) { s.add(c.gainKeys[i].f); if (i) add(c.gainKeys[i - 1].f, c.gainKeys[i].f); } + for (let i = 0; i < (c.duckKeys?.length ?? 0); i++) { + s.add(c.duckKeys![i].f); + if (i) add(c.duckKeys![i - 1].f, c.duckKeys![i].f, 24); + } return [...s].filter((x) => x >= 0 && x <= c.len + coda).sort((a, b) => a - b); } @@ -102,7 +110,7 @@ function suonaTono(ctx: BaseAudioContext, c: Clip, uscita: AudioNode, inizio: nu } /** programma l'inviluppo su un GainNode: t0 = tempo del contesto in cui la timeline è a startSec */ -function applicaInviluppo(g: GainNode, p: Project, c: Clip, coda: number, t0: number, startSec: number, now: number) { +export function applicaInviluppo(g: GainNode, p: Project, c: Clip, coda: number, t0: number, startSec: number, now: number) { const r = p.rate; const toCtx = (lf: number) => t0 + f2s(c.start + lf, r) - startSec; const pts = puntiInviluppo(c, coda); @@ -116,6 +124,22 @@ function applicaInviluppo(g: GainNode, p: Project, c: Clip, coda: number, t0: nu } } +/** il panorama con i keyframe: rampe fra le chiavi (senza animazione resta il valore fermo, programmato dal chiamante) */ +export function applicaPanorama(pn: StereoPannerNode, p: Project, c: Clip, t0: number, startSec: number, now: number) { + const k = c.anim?.pan; + if (!k?.length) return; + const toCtx = (lf: number) => t0 + f2s(c.start + lf, p.rate) - startSec; + const lfNow = ((now - t0 + startSec) * p.rate.num) / p.rate.den - c.start; + const lim = (v: number) => Math.max(-1, Math.min(1, v)); + pn.pan.cancelScheduledValues(0); + pn.pan.setValueAtTime(lim(valoreAnim(k, Math.max(0, lfNow), c.pan)), Math.max(now, toCtx(0))); + for (const lf of puntiLinea(k)) { + const when = toCtx(lf); + if (when <= now) continue; + pn.pan.linearRampToValueAtTime(lim(valoreAnim(k, lf, c.pan)), when); + } +} + /** * Gli effetti audio della clip come catena di filtri: si inserisce fra le sorgenti e il guadagno della voce. * Ritorna il nodo in cui far entrare l'audio (o il guadagno stesso se non ci sono effetti). @@ -421,6 +445,7 @@ class Banco { gain.connect(pan); pan.connect(this.bus(c.track).gain); applicaInviluppo(gain, p, c, coda, this.t0, this.startSec, now); + applicaPanorama(pan, p, c, this.t0, this.startSec, now); const v: Voce = { clip: c, gain, pan, nodes: [], until: now, finita: false, pumping: false, ingresso: catenaEffetti(ctx, c, gain) }; this.voci.set(c.id, v); if (c.kind === 'tone' || c.kind === 'beep') { @@ -695,6 +720,7 @@ export async function* mixaggio(p0: Project, fromSec: number, toSec: number): As pn.pan.value = c.pan; g.connect(pn).connect(tb); applicaInviluppo(g, p, c, coda, 0, a0, 0); + applicaPanorama(pn, p, c, 0, a0, 0); const ingresso = catenaEffetti(ctx, c, g); if (c.kind === 'tone' || c.kind === 'beep') { suonaTono(ctx, c, ingresso, cs - a0, Math.max(0, cs - a0), Math.max(0.001, Math.min(b, ce) - a0)); diff --git a/src/media/audioAI.ts b/src/media/audioAI.ts index ab963c9..958e2ec 100644 --- a/src/media/audioAI.ts +++ b/src/media/audioAI.ts @@ -8,6 +8,7 @@ // si ferma con ✕, aspetta se il montaggio sta suonando) e gira in un Worker. Tutto sul computer di chi monta. import { AudioBufferSink } from 'mediabunny'; import type { Clip, ForzaRumore, MediaItem, Project } from '../core/tipi'; +import { togliAnimazione } from '../core/automazioni'; import { newClip, newTrack, trackOf, uid } from '../core/progetto'; import { f2s } from '../core/timecode'; import { store } from '../core/store'; @@ -604,7 +605,7 @@ export async function separaVoceBase(clipId: string, opz: OpzioniSepara = {}): P p.tracks.push(tr); const c = newClip('media', tr.id, x.start, x.len, { media: m.id, name: `${n === 'voce' ? 'Voce' : 'Base'}: ${x.name}`, srcIn: s0.srcIn - t.da, speed: x.speed, nastro: x.nastro, label: x.label, - gain: x.gain, gainKeys: structuredClone(x.gainKeys), pan: x.pan, fadeIn: x.fadeIn, fadeOut: x.fadeOut, curvaIn: x.curvaIn, curvaOut: x.curvaOut, + gain: x.gain, gainKeys: structuredClone(x.gainKeys), anim: x.anim?.gain ? { gain: structuredClone(x.anim.gain) } : undefined, pan: x.pan, fadeIn: x.fadeIn, fadeOut: x.fadeOut, curvaIn: x.curvaIn, curvaOut: x.curvaOut, afx: { separata: { ruolo: n, con: [x.id] } }, }); p.clips.push(c); @@ -616,6 +617,7 @@ export async function separaVoceBase(clipId: string, opz: OpzioniSepara = {}): P c.afx = { ...c.afx, separata: { ruolo: 'originale', con: ids, gain: c.gain } }; c.gain = -60; c.gainKeys = []; + togliAnimazione(c, 'gain'); } for (const c of nuoveClip) c.afx!.separata!.con = [x.id, ...ids.filter((i) => i !== c.id)]; return ids; diff --git a/src/media/cursoreLive.ts b/src/media/cursoreLive.ts new file mode 100644 index 0000000..6e1df03 --- /dev/null +++ b/src/media/cursoreLive.ts @@ -0,0 +1,41 @@ +// Ponte LIVE/Windows. Nel browser non raccogliamo eventi DOM: non descrivono il desktop registrato. +import { invoke, isAndroid, isMac, isTauri } from '../platform'; +import { rimappaCursore, type CampioneCursore, type SchermoCursore, type TaglioCursore } from '../core/zoomCursore'; + +export const cursoreDisponibile = isTauri && !isAndroid && !isMac && /Windows/i.test(navigator.userAgent); +export const schermiCursore = () => cursoreDisponibile ? invoke('cursore_schermi') : Promise.resolve([]); + +export class CursoreLive { + private tagli: { da: number; fine: number }[] = []; + private aperto: { da: number; fine: number } | null = null; + private constructor(private id: number, private origine: number, readonly schermo: SchermoCursore) {} + + static async avvia(schermo: SchermoCursore) { + const a = performance.now(); + const r = await invoke<{ id: number; trascorsiMs: number }>('cursore_avvia', { schermo: schermo.id }); + // Handshake: il nativo consegna il tempo già trascorso dal primo campione. La metà del viaggio + // di ritorno resta una stima, da collaudare contro i fotogrammi reali (nessuna precisione promessa). + const fine = performance.now(); + return new CursoreLive(r.id, fine - r.trascorsiMs - Math.min(8, (fine - a) / 2), schermo); + } + + pezzo(t0: number) { + this.aperto = { da: t0 - this.origine, fine: Infinity }; + this.tagli.push(this.aperto); + } + + pausa(t: number) { if (this.aperto) this.aperto.fine = t - this.origine; this.aperto = null; } + + async ferma() { + this.pausa(performance.now()); + const testo = await invoke('cursore_ferma', { id: this.id }); + const raw = testo.trim() ? testo.trim().split('\n').map((s) => JSON.parse(s) as CampioneCursore) : []; + return { perVideo: (parti: { indice: number; daMs: number; durataMs: number }[], durataMs: number) => { + const tagli: TaglioCursore[] = parti.flatMap((p) => { + const g = this.tagli[p.indice]; + return g ? [{ da: g.da, fine: g.fine, videoMs: p.daMs, durataMs: p.durataMs }] : []; + }); + return rimappaCursore(raw, this.schermo, tagli, durataMs); + } }; + } +} diff --git a/src/media/doppiaggio.ts b/src/media/doppiaggio.ts index b620a3a..e9d686a 100644 --- a/src/media/doppiaggio.ts +++ b/src/media/doppiaggio.ts @@ -3,6 +3,7 @@ // lingua se i sottotitoli sono tradotti. Ogni frase va al suo posto: se la voce è più lunga dello spazio che ha, si // accelera un po' (col tono giusto, src/media/stira.ts); poi l'audio intero diventa un file e va su una traccia sua. import type { Clip, Project, Sottotitolo } from '../core/tipi'; +import { togliAnimazione } from '../core/automazioni'; import { end, newClip, newTrack, nextTrackName, uid } from '../core/progetto'; import { f2s, fps } from '../core/timecode'; import { sottotitoliDi } from '../core/sottotitoli'; @@ -178,7 +179,7 @@ export function posaVoce(p: Project, mediaId: string, duratasec: number, silenzi if (!usati.has(t.id) || t.id === tr.id) continue; const soloDialoghi = p.clips.filter((c) => c.track === t.id && c.kind !== 'fx').every((c) => dialoghi.some((d) => d.id === c.id)); if (soloDialoghi) t.mute = true; - else for (const c of dialoghi) if (c.track === t.id) { c.gain = -40; c.gainKeys = []; } + else for (const c of dialoghi) if (c.track === t.id) { c.gain = -40; c.gainKeys = []; togliAnimazione(c, 'gain'); } } } return nuovi; diff --git a/src/media/ducking.ts b/src/media/ducking.ts new file mode 100644 index 0000000..0e52b46 --- /dev/null +++ b/src/media/ducking.ts @@ -0,0 +1,57 @@ +// Lettura a pezzi e analisi in worker: resta in memoria solo l'energia, mai una registrazione intera. +import { AudioBufferSink } from 'mediabunny'; +import type { Clip, Key, Project } from '../core/tipi'; +import { conIncroci } from './audio'; +import { f2s } from '../core/timecode'; +import { codaVoce, firmaDucking, generaDuckKeys, impostazioneDucking, presenzaVoce, ruoloAudio, vociDucking, type FinestraRms } from '../core/ducking'; +import { mediaRT } from './libreria'; + +async function analizza(p: Project, c: Clip, segnale?: AbortSignal): Promise { + const rt = c.media ? mediaRT(c.media) : undefined; + if (!rt?.a || !rt.aDecodable) throw new Error(`L'audio di «${c.name}» non è disponibile`); + const w = new Worker(new URL('./ducking.worker.ts', import.meta.url), { type: 'module' }); + let rifiuta: ((e: Error) => void) | undefined; + const annullato = () => { rifiuta?.(new Error('Analisi fermata')); w.terminate(); }; + segnale?.addEventListener('abort', annullato); + const invia = (d: { canali?: Float32Array[]; sr: number; t: number; fine?: boolean }) => new Promise((resolve, reject) => { + if (segnale?.aborted) { reject(new Error('Analisi fermata')); return; } + rifiuta = reject; + w.onmessage = (e) => { rifiuta = undefined; if (e.data.errore) reject(new Error(e.data.errore)); else resolve(e.data.finestre); }; + w.onerror = () => reject(new Error('Il lavoro in secondo piano per abbassare la musica non è partito')); + w.postMessage(d, d.canali?.map((c) => c.buffer as ArrayBuffer) ?? []); + }); + const da = c.srcIn, a = da + f2s(c.len + codaVoce(p, c), p.rate) * c.speed; + const iter = new AudioBufferSink(rt.a).buffers(da, a); + const out: FinestraRms[] = []; + try { + for await (const { buffer, timestamp } of iter) { + if (segnale?.aborted) throw new Error('Analisi fermata'); + const sr = buffer.sampleRate; + const inizio = Math.max(0, Math.ceil((da - timestamp) * sr)), fine = Math.min(buffer.length, Math.ceil((a - timestamp) * sr)); + if (fine <= inizio) continue; + const canali = Array.from({ length: buffer.numberOfChannels }, (_, i) => buffer.getChannelData(i).slice(inizio, fine)); + out.push(...await invia({ canali, sr, t: timestamp + inizio / sr })); + if (out.length > 2_000_000) throw new Error('Voce troppo lunga: dividila in parti prima di analizzarla'); + } + out.push(...await invia({ sr: 0, t: 0, fine: true })); + return out; + } finally { void iter.return?.().catch(() => {}); segnale?.removeEventListener('abort', annullato); w.terminate(); } +} + +export interface RisultatoDucking { id: string; firma: string; keys: Key[] } +/** Il chiamante applica tutti i risultati in una sola store.edit, dopo aver ricontrollato le firme. */ +export async function preparaDucking(p0: Project, ids?: string[], segnale?: AbortSignal, progresso?: (testo: string) => void): Promise { + const p = conIncroci(structuredClone(p0)); + const musiche = p.clips.filter((c) => ruoloAudio(p, c) === 'musica' && impostazioneDucking(p, c).attivo && (!ids || ids.includes(c.id))); + if (!musiche.length) throw new Error('Segna la musica e accendi «Abbassa sotto la voce»'); + const voci = vociDucking(p), letture = new Map(); + if (!voci.length) throw new Error('Segna almeno una clip o una traccia audio come voce e lasciala in ascolto'); + for (const [i, c] of voci.entries()) { progresso?.(`Analizzo la voce ${i + 1}/${voci.length}: ${c.name}`); letture.set(c.id, await analizza(p, c, segnale)); } + return musiche.map((c) => { + const d = impostazioneDucking(p, c); + const ranges = voci.flatMap((v) => presenzaVoce(p, v, letture.get(v.id)!, d)); + return { id: c.id, firma: firmaDucking(p, c), keys: generaDuckKeys(p, c, ranges, d) }; + }); +} +// Si verifica sullo stesso progetto con gli incroci derivati, anche nel monitor e nell'export. +export const firmaDuckingAttuale = (p: Project, c: Clip) => firmaDucking(conIncroci(p), c); diff --git a/src/media/ducking.worker.ts b/src/media/ducking.worker.ts new file mode 100644 index 0000000..8cca7b1 --- /dev/null +++ b/src/media/ducking.worker.ts @@ -0,0 +1,11 @@ +// Analisi locale, nessun modello o servizio da scaricare. +import { AnalizzatoreRms } from '../core/ducking'; +let rms = new AnalizzatoreRms(); +self.onmessage = (e: MessageEvent<{ canali?: Float32Array[]; sr: number; t: number; fine?: boolean }>) => { + try { + const d = e.data; + const finestre = d.fine ? [rms.fine()].filter((v) => v !== null) : rms.push(d.canali!, d.sr, d.t); + if (d.fine) rms = new AnalizzatoreRms(); + self.postMessage({ finestre }); + } catch (e) { self.postMessage({ errore: e instanceof Error ? e.message : String(e) }); } +}; diff --git a/src/media/idoneitaAI.ts b/src/media/idoneitaAI.ts new file mode 100644 index 0000000..6107ab4 --- /dev/null +++ b/src/media/idoneitaAI.ts @@ -0,0 +1,22 @@ +// Un'indicazione prudente per scegliere un modello: la prova WebGPU verifica la scheda, non misura il modello. +// WebGPU non comunica la VRAM libera: senza una prova reale non promettiamo una velocità precisa. +import type { Hardware } from './hardware'; + +export interface RequisitiAI { processore?: boolean; ramGB: number; thread: number } +export function idoneitaAI(m: RequisitiAI, h: Hardware | null, usaScheda: boolean): { dove: string; testo: string; ok: boolean | null } { + if (!h) return { dove: m.processore || !usaScheda ? 'Processore' : 'Scheda video o processore', testo: 'Sto riconoscendo questa macchina…', ok: null }; + const s = h.schede[h.scelta]; + const gpu = !m.processore && usaScheda && h.gpuApi && s?.prova === 'si' && !s.guasta && !s.software; + const pocaRam = h.ram !== null && h.ram < m.ramGB; + if (gpu) return { + dove: 'Scheda video (WebGPU), processore se non riesce', ok: pocaRam ? false : null, + testo: pocaRam ? `Poca memoria di sistema: consigliati almeno ${m.ramGB} GB.` + : 'Scheda adatta: prova WebGPU superata. Velocità del modello da provare; VRAM libera non rilevabile.', + }; + const lento = pocaRam || h.cpu < m.thread; + return { + dove: 'Processore', ok: lento ? false : null, + testo: lento ? `Può essere lento su questa macchina: consigliati ${m.thread} thread e almeno ${m.ramGB} GB di memoria.` + : `Processore adatto sulla carta (${h.cpu} thread).${h.ram === null ? ' Memoria non rilevata.' : ''} Velocità da provare${m.processore ? '.' : ': sulla scheda video sarebbe più rapido.'}`, + }; +} diff --git a/src/media/libreria.ts b/src/media/libreria.ts index 3827474..120a097 100644 --- a/src/media/libreria.ts +++ b/src/media/libreria.ts @@ -1,8 +1,8 @@ // Il contenitore (bin): i file importati, aperti con Mediabunny (WebCodecs) e tenuti vivi finché servono. // Dalla 1.5.8 l'import e la riapertura leggono i metadati (contenitore, tracce, durata, dimensioni, codec) e il file è // subito usabile dall'originale. Dalla 1.6.0 locandina, colore automatico e forma d'onda ripartono da soli (sono -// leggeri e si leggono dalla memoria delle misure, cache.ts, se già fatti); la copia leggera e il controllo della -// velocità li prepara l'utente con proponiPreparazione() (pulsanti nel Centro attività). +// leggeri e si leggono dalla memoria delle misure, cache.ts, se già fatti). All'import le copie leggere dei video +// pesanti partono in fondo alla coda; il controllo della velocità resta a richiesta nel Centro attività. // Le miniature della timeline restano «a richiesta»: si leggono solo i fotogrammi delle clip che si vedono. import { ALL_FORMATS, AudioBufferSink, BlobSource, CanvasSink, Input, StreamSource, @@ -11,7 +11,7 @@ import { import type { MediaItem, Project } from '../core/tipi'; import { autoColore, uid } from '../core/progetto'; import { invoke, isTauri, type FileScelto } from '../platform'; -import { proponiProxy, proxyEsistente, modoProxy, type Proxy } from './proxy'; +import { copieLeggereAutomatiche, proponiProxy, proxyEsistente, modoProxy, ripresaPesante, type Proxy } from './proxy'; import { attivitaDaAvviare, avviaRiga, annullaChiave, daAvviare, giaInCorso, proponi, rigaAttivita, type Attivita, type Lavoro, type Proposto } from './attivita'; import { chiaveMedia, comprimiPicchi, espandiPicchi, leggiCache, scriviCache } from './cache'; @@ -170,11 +170,10 @@ let preparazioneAutomatica = true; export const impostaPreparazioneAutomatica = (on: boolean) => { preparazioneAutomatica = on; }; /** - * All'import e alla riapertura: si usa SOLO quello che c'è già (memoria delle misure, copia leggera sul disco o tornata - * da un .dap). Niente decodifica, niente code, niente righe nel Centro attività. Vale anche con le preferenze vecchie - * («Copie leggere: sempre», dpv-normalizza): da sole non fanno più partire niente. + * Si legge quello che c'è già e si preparano le cose leggere in fondo. Solo per i nuovi import, se richiesto nelle + * impostazioni, si preparano anche i proxy dei video pesanti. Alla riapertura le copie nuove non partono. */ -async function leggiPreparato(item: MediaItem, r: MediaRT) { +async function leggiPreparato(item: MediaItem, r: MediaRT, nuovoImport = false) { const chiave = chiaveMedia(item); if (r.v && r.vDecodable) await locandinaSalvata(r, chiave); void (async () => { @@ -194,11 +193,22 @@ async function leggiPreparato(item: MediaItem, r: MediaRT) { } avvisaPrep(r.id); // le cose leggere (locandina, colore, forma d'onda) partono da sole, a turno nella corsia leggera: si vedono nel Centro attività. - // La copia leggera e il controllo della velocità restano a richiesta (pulsanti nel Centro attività). if (preparazioneAutomatica && rt.get(r.id) === r) for (const cosa of ['locandina', 'colore', 'picchi'] as const) proponiPreparazione(item, cosa, { avvia: true }); + if (nuovoImport) void preparaProxyAutomatico(item, r); })(); } +/** Nessuna attesa nell'import: i metadati si controllano in fondo, poi il proxy va dietro ai lavori chiesti a mano. */ +async function preparaProxyAutomatico(item: MediaItem, r: MediaRT) { + const valido = () => copieLeggereAutomatiche() && modoProxy() !== 'mai' && rt.get(r.id) === r && r.stato === 'ok' && !r.proxy; + if (!valido()) return; + try { + if (!(await ripresaPesante(item, r)) || !valido()) return; + const p = proponiProxy(item, r, () => sorgente(r), { avvia: true, forza: true, priorita: () => -1000 + prioritaDi(item.id)() }); + if (p) { avvisaPrep(item.id); void p.esito.then(() => avvisaPrep(item.id)); } + } catch { /* metadati non leggibili: resta disponibile «Prepara copia leggera» */ } +} + // ——— le preparazioni manuali ——— /** quello che si può preparare per un file, a mano (tasto destro, Proprietà, «tutti i file del contenitore») */ export type Preparazione = 'locandina' | 'colore' | 'picchi' | 'proxy' | 'velocita'; @@ -234,7 +244,7 @@ const chiavePrep = (cosa: Preparazione, id: string) => (cosa === 'proxy' ? 'prox /** * Prepara un lavoro per un file: nasce «da avviare» (riga nel Centro attività, parte con Avvia) o, con avvia:true, parte * subito. null = non serve o non si può (già fatta, già in giro, file senza video/audio, Copie leggere = Mai…). - * Mai chiamata dal programma da solo: solo da un gesto dell'utente. + * Locandina, colore e picchi si preparano anche in automatico. */ export function proponiPreparazione(m: MediaItem | string, cosa: Preparazione, o: OpzioniPreparazione = {}): Proposto | null { const item = typeof m === 'string' ? cercaMedia(m) : m; @@ -334,7 +344,7 @@ export function statoPreparazione(id: string, cosa: Preparazione): StatoPreparaz case 'picchi': return !(r.a && r.aDecodable) ? 'non-serve' : r.peaks && r.peaksDone >= r.peaks.length ? 'fatta' : r.erroriPrep?.picchi ? 'errore' : 'non-fatta'; case 'proxy': if (r.proxy || r.proxyStato === 'pronto') return 'fatta'; - if (!video || modoProxy() === 'mai' || (item && (item.type !== 'video' || item.duration < 2))) return 'non-serve'; + if (!video || modoProxy() === 'mai' || (item && (item.type !== 'video' || item.duration <= 0))) return 'non-serve'; if (r.proxyStato === 'no') return 'non-serve'; if (r.proxyStato === 'errore') return 'errore'; return 'non-fatta'; @@ -448,8 +458,8 @@ export async function importa(sel: FileScelto, opz: { soloDescrizione?: boolean } r.stato = 'ok'; if (opz.soloDescrizione) { input.dispose(); rt.delete(id); return { item: base, rt: r }; } - // solo letture (memoria delle misure, copia leggera già sul disco): nessun lavoro parte da solo - await leggiPreparato(base, r); + // L'import non aspetta le preparazioni di fondo né la copia leggera. + await leggiPreparato(base, r, true); return { item: base, rt: r }; } catch (e) { rt.get(id)?.input?.dispose(); diff --git a/src/media/modelliAI.ts b/src/media/modelliAI.ts index 0288302..97e1314 100644 --- a/src/media/modelliAI.ts +++ b/src/media/modelliAI.ts @@ -11,19 +11,22 @@ import { MODELLO_SEPARAZIONE, installaRumore, installaSeparazione, modelloRumore import { modelloInCache } from './modelliAudio'; import { modelliScaricati, togliRepoModello } from './diagnosiAI'; import { dimenticaModello, modelliPronti, segnaModelloPronto } from './modelliPronti'; +import type { RequisitiAI } from './idoneitaAI'; export type Gruppo = 'Togli lo sfondo e segui' | 'Sottotitoli' | 'Traduzione' | 'Audio'; export type StatoModello = 'pronto' | 'parziale' | 'da-scaricare'; export type Avanzamento = (fase: string, k: number) => void; -export interface ModelloHub { +export interface ModelloHub extends RequisitiAI { id: string; gruppo: Gruppo; nome: string; info: string; + /** a cosa serve, in una riga (indipendente dalla variante e dal computer) */ + uso: string; /** quanto pesa, circa, se si sa */ mb?: number; - /** quelli che «Controlla e ripara tutto» scarica (gli altri si scelgono a mano) */ + /** suggerimento per la scelta: nessun modello viene selezionato o scaricato da solo */ consigliato: boolean; /** dove cercare i suoi file nella cache (più indirizzi: ogni funzione prova i ricambi) */ repos: string[]; @@ -46,7 +49,7 @@ export function modelliHub(): ModelloHub[] { // per togliere lo sfondo c'è un modo solo, SAM 3 (gli altri restano dentro per i progetti vecchi e come ricambio, ma non si scelgono) for (const m of MODELLI_RITAGLIO.filter((x) => x.id === 'sam3')) { out.push({ - id: m.id, gruppo: 'Togli lo sfondo e segui', nome: m.nome, info: m.info, mb: m.id === 'sam3' ? 300 : undefined, consigliato: consigliati.has(m.id), repos: m.repo, + id: m.id, gruppo: 'Togli lo sfondo e segui', nome: m.nome, info: m.info, uso: 'Ritaglia gli oggetti scelti con i clic e li segue nella ripresa.', ramGB: 8, thread: 8, mb: 300, consigliato: consigliati.has(m.id), repos: m.repo, async scarica(avanza) { const r = repoDa(await caricaModelloRitaglio(m, avanza)); if (!r || r === m.repo[0]) { ricorda(m.id, r || m.repo[0]); return; } @@ -60,13 +63,13 @@ export function modelliHub(): ModelloHub[] { } for (const w of MODELLI) { out.push({ - id: 'whisper-' + w.id.split('-').pop(), gruppo: 'Sottotitoli', nome: `Whisper ${w.nome}`, info: w.info, mb: w.mb, consigliato: w.id.endsWith('base'), repos: [w.id], + id: 'whisper-' + w.id.split('-').pop(), gruppo: 'Sottotitoli', nome: `Whisper ${w.nome}`, info: w.info, uso: 'Ascolta il parlato e scrive i sottotitoli con i tempi.', ramGB: w.mb > 500 ? 8 : 4, thread: w.mb > 500 ? 8 : 4, mb: w.mb, consigliato: w.id.endsWith('base'), repos: [w.id], async scarica(avanza) { await caricaModelloVoce(w.id, avanza); ricorda('whisper-' + w.id.split('-').pop(), w.id); }, async togli() { await togliRepoModello(w.id); dimentica('whisper-' + w.id.split('-').pop()); }, }); } out.push({ - id: 'nllb', gruppo: 'Traduzione', nome: 'NLLB-200 di Meta', info: 'traduce i sottotitoli in nove lingue', mb: 600, consigliato: false, repos: MODELLI_TRADUZIONE, + id: 'nllb', gruppo: 'Traduzione', nome: 'NLLB-200 di Meta', info: 'traduce i sottotitoli in nove lingue', uso: 'Traduce il testo dei sottotitoli in un’altra lingua.', processore: true, ramGB: 8, thread: 4, mb: 600, consigliato: false, repos: MODELLI_TRADUZIONE, async scarica(avanza) { await caricaTraduttore(avanza); const b = await modelliScaricati(); @@ -76,12 +79,12 @@ export function modelliHub(): ModelloHub[] { }); const rumore = modelloRumoreScelto(); out.push({ - id: 'rumore', gruppo: 'Audio', nome: 'MossFormer2 · togli i rumori', info: 'il filtro per le voci (ClearerVoice): sulla scheda video pulisce 15 s in meno di un secondo', mb: Math.round(rumore.peso / 1048576), consigliato: true, repos: [rumore.repo], file: rumore.url, + id: 'rumore', gruppo: 'Audio', nome: 'MossFormer2 · togli i rumori', info: 'il filtro per le voci (ClearerVoice)', uso: 'Toglie il rumore di fondo dai dialoghi e lascia la voce.', ramGB: 4, thread: 8, mb: Math.round(rumore.peso / 1048576), consigliato: true, repos: [rumore.repo], file: rumore.url, async scarica(avanza) { await installaRumore((a, t) => avanza(`${(a / 1048576).toFixed(0)} di ${((t || rumore.peso) / 1048576).toFixed(0)} MB`, t ? a / t : 0)); }, async togli() { await togliModelloRumore(); }, }); out.push({ - id: 'separa', gruppo: 'Audio', nome: 'Demucs · voce e base', info: 'separa il cantato dalla musica e isola le voci', mb: Math.round(MODELLO_SEPARAZIONE.peso / 1048576), consigliato: true, repos: [MODELLO_SEPARAZIONE.repo], file: MODELLO_SEPARAZIONE.url, + id: 'separa', gruppo: 'Audio', nome: 'Demucs · voce e base', info: 'separa il cantato dalla musica e isola le voci', uso: 'Divide la canzone in voce e base su due tracce.', ramGB: 8, thread: 8, mb: Math.round(MODELLO_SEPARAZIONE.peso / 1048576), consigliato: true, repos: [MODELLO_SEPARAZIONE.repo], file: MODELLO_SEPARAZIONE.url, async scarica(avanza) { await installaSeparazione((a, t) => avanza(`${(a / 1048576).toFixed(0)} di ${((t || MODELLO_SEPARAZIONE.peso) / 1048576).toFixed(0)} MB`, t ? a / t : 0)); }, async togli() { await togliSeparazione(); }, }); diff --git a/src/media/proxy.ts b/src/media/proxy.ts index 749e374..416ea82 100644 --- a/src/media/proxy.ts +++ b/src/media/proxy.ts @@ -1,9 +1,8 @@ // Le copie leggere (proxy): copie delle riprese pesanti (al massimo 960 pixel di lato, un fotogramma chiave ogni mezzo // secondo). I monitor leggono quelle e vanno lisci anche con i file dei telefoni e dei generatori (4K, HEVC, fotogrammi // chiave ogni 10 secondi); l'export legge sempre gli originali. Si conservano nel disco privato del browser/app (OPFS). -// Dalla 1.5.8 NON si fanno più da sole: né all'import, né quando la ripresa entra in timeline, né alla riapertura. -// Se una copia c'è già (sul disco o dentro un .dap) si legge e si usa subito; se no la fa l'utente con «Prepara copia -// leggera» (una riga da avviare nel Centro attività). Mentre il montaggio suona il lavoro si sospende (pausa vera). +// All'import dei video pesanti partono da sole, se la preferenza è accesa. Alla riapertura si usano solo quelle già +// pronte. Resta «Prepara copia leggera» nel Centro attività. Mentre il montaggio suona il lavoro si sospende (pausa vera). import { ALL_FORMATS, BlobSource, BufferSource, BufferTarget, Conversion, EncodedPacketSink, Input, Mp4OutputFormat, Output, QUALITY_MEDIUM, WebMOutputFormat, getFirstEncodableVideoCodec, type Source, @@ -18,16 +17,25 @@ const LATO = 960; const CARTELLA = 'proxy-1'; /** - * La preferenza di prima (Vista → Copie leggere). Dalla 1.5.8 non fa partire più niente da sola: + * La preferenza di prima (Vista → Copie leggere), conservata anche per i progetti vecchi: * · 'mai' il monitor legge sempre gli originali (le copie già fatte non si usano) e «Prepara copia leggera» non si offre; * · 'sempre' «Prepara copia leggera» si offre per tutti i video, anche quelli leggeri; - * · 'auto' si offre solo per le riprese pesanti (grandi, HEVC/AV1, fotogrammi chiave radi). + * · 'auto' si offre solo per le riprese pesanti. + * L'avvio all'import ha una preferenza separata e riguarda sempre solo i video pesanti. * Il valore salvato in localStorage si legge e non si cancella. */ export type ModoProxy = 'auto' | 'sempre' | 'mai'; const leggiModo = (): ModoProxy => { try { const v = localStorage.getItem('dpv-proxy'); return v === 'sempre' || v === 'mai' ? v : 'auto'; } catch { return 'auto'; } }; let modo: ModoProxy = leggiModo(); export const modoProxy = () => modo; +const CHIAVE_AUTO = 'dpv-proxy-automatiche'; +let automatiche = (() => { try { return localStorage.getItem(CHIAVE_AUTO) !== 'no'; } catch { return true; } })(); +export const copieLeggereAutomatiche = () => automatiche; +export function impostaCopieLeggereAutomatiche(on: boolean) { + automatiche = on; + try { localStorage.setItem(CHIAVE_AUTO, on ? 'si' : 'no'); } catch { /* vale per questa sessione */ } + avvisa(); +} export function impostaModoProxy(m: ModoProxy) { modo = m; try { localStorage.setItem('dpv-proxy', m); } catch { /* niente memoria: vale per questa volta */ } @@ -66,16 +74,48 @@ async function distanzaChiavi(r: MediaRT, durata: number): Promise { } catch { return 0; } } -/** serve un proxy? Riprese grandi, fotogrammi chiave radi o codec faticosi; mai per i file brevi (solo letture di metadati) */ +/** Soglie prudenti: Full HD anche verticale, almeno 10 bit, oltre 35 Mbit/s o chiavi distanti più di 2 secondi. */ +export const SOGLIE_PROXY = Object.freeze({ latoLungo: 1920, latoCorto: 1080, bit: 10, bitrate: 35_000_000, distanzaChiavi: 2 }); +export interface DatiProxy { codec?: string; bit?: number; bitrate?: number; distanzaChiavi?: number } + +/** La profondità dichiarata nella stringa WebCodecs (il nome generico «vp9» non basta). */ +export function bitVideo(codec: string): number { + const profondita = /^(?:vp09\.\d+\.\d+|av01\.\d\.\d+[mh])\.(\d+)/i.exec(codec); + if (profondita) return Number(profondita[1]); + if (/^avc[13]\.(6e|7a|f4)/i.test(codec)) return 10; + return 0; +} + +/** Solo metadati: non cambia il progetto e non decodifica fotogrammi. */ +export function videoPesante(m: Pick, d: DatiProxy = {}): boolean { + if (m.type !== 'video') return false; + const codec = d.codec || m.vcodec; + return Math.max(m.width, m.height) > SOGLIE_PROXY.latoLungo || Math.min(m.width, m.height) > SOGLIE_PROXY.latoCorto + || (d.bit ?? bitVideo(codec)) >= SOGLIE_PROXY.bit + || /hev|hvc|av01|av1|prores|ap4[hcxs]|apch|apcn|apcs|apco|aprh|aprn/i.test(codec) + || (d.bitrate ?? 0) > SOGLIE_PROXY.bitrate || (d.distanzaChiavi ?? 0) > SOGLIE_PROXY.distanzaChiavi; +} + +/** serve un proxy? Solo letture di metadati; «sempre» vale per le richieste manuali. */ export async function serveProxy(m: MediaItem, r: MediaRT): Promise { - if (modo === 'mai' || m.type !== 'video' || !r.v || !r.vDecodable || m.duration < 2) return false; + if (modo === 'mai' || m.type !== 'video' || !r.v || !r.vDecodable || m.duration <= 0) return false; if (modo === 'sempre') return true; - if (m.width * m.height > 1280 * 720 * 1.05) return true; - if (/hev|hvc|hevc|av01|av1/i.test(m.vcodec)) return true; - return (await distanzaChiavi(r, m.duration)) > 1.1; + return ripresaPesante(m, r); } const serve = serveProxy; +/** Anche con la vecchia preferenza «sempre», l'automatismo sceglie solo le riprese pesanti. */ +export async function ripresaPesante(m: MediaItem, r: MediaRT): Promise { + if (m.type !== 'video' || !r.v || !r.vDecodable || m.duration <= 0) return false; + if (videoPesante(m)) return true; + const [config, bitrate] = await Promise.all([ + r.v.getDecoderConfig().catch(() => null), r.v.getAverageBitrate().catch(() => null), + ]); + const d = { codec: config?.codec, bitrate: bitrate ?? (m.size > 0 ? m.size * 8 / m.duration : 0) }; + if (videoPesante(m, d)) return true; + return videoPesante(m, { ...d, distanzaChiavi: await distanzaChiavi(r, m.duration) }); +} + async function apriProxy(fonte: Blob | ArrayBuffer): Promise { const input = new Input({ source: fonte instanceof Blob ? new BlobSource(fonte) : new BufferSource(fonte), formats: ALL_FORMATS }); const v = await input.getPrimaryVideoTrack(); @@ -129,7 +169,7 @@ export interface OpzioniProxy { /** * «Prepara copia leggera» per una ripresa. Ritorna la riga (da avviare, o già avviata con avvia:true) o null se non si - * offre (non è un video decodificabile, Copie leggere = Mai, c'è già o è già in giro). Non fa partire niente da sola. + * offre (non è un video decodificabile, Copie leggere = Mai, c'è già o è già in giro). * fonte = una lettura nuova del file originale (il proxy lo legge per conto suo, senza disturbare il monitor). * Pausa vera (pauseSignal di Mediabunny): riparte dallo stesso fotogramma. Annulla: la copia a metà si butta * (sul disco si scrive solo a lavoro finito). @@ -150,6 +190,7 @@ export function proponiProxy(m: MediaItem, r: MediaRT, fonte: () => Source, o: O if (r.proxy) return true; if (!r.input) return false; if (await proxyEsistente(m, r)) return true; + if (!l.valido || !r.input) return false; if (!o.forza && !(await serve(m, r))) { r.proxyStato = 'no'; avvisa(); l.imposta(1, `${m.name} · non serve (file già leggero)`); return false; } r.proxyStato = 'lavoro'; r.proxyProg = 0; diff --git a/src/media/ritaglio.ts b/src/media/ritaglio.ts index ed377e8..f853bdb 100644 --- a/src/media/ritaglio.ts +++ b/src/media/ritaglio.ts @@ -20,6 +20,7 @@ import { baseLocaleAI } from './libreriaAI'; import { messaggioScheda, schedaGuasta } from './hardware'; import { chiaveHFSalvata } from './libreriaAI'; import { modelliPronti, segnaModelloPronto } from './modelliPronti'; +import { registraVram, segnaUsoAI } from './vram'; export interface ModelloRitaglio { id: string; @@ -78,6 +79,8 @@ let worker: Worker | null = null; let seq = 0; const attese = new Map void; no: (e: Error) => void }>(); let caricamento: { ok: (d: string) => void; no: (e: Error) => void; stato: (fase: string, prog: number) => void; dacache: boolean; chiave: string; slot: Slot } | null = null; +let promessaCaricamento: Promise | null = null; +let chiaveCaricamento = ''; const scaricati = new Map(); function lavoratore(): Worker { @@ -142,24 +145,42 @@ function segnaInUso(chiave: string, trovato: ModelloRitaglio | undefined, repo: let ultimoCarico: { m: ModelloRitaglio; stato: (fase: string, prog: number) => void } | null = null; let ultimoTraccia: { m: ModelloRitaglio; stato: (fase: string, prog: number) => void } | null = null; +// la scheda video si libera quando il modello non serve (src/media/vram.ts): il worker si chiude, il modello torna dalla cache +registraVram('sfondo', { + libera: () => { + if (!worker) return false; + worker.terminate(); + worker = null; inUso = null; inUsoTraccia = null; caricamento = null; + return true; + }, + occupato: () => attese.size > 0 || caricamento !== null, +}); + function caricaNelWorker(m: ModelloRitaglio, stato: (fase: string, prog: number) => void, senzaScheda = false, slot: Slot = 'p'): Promise { + segnaUsoAI(); const chiave = m.id + '|' + m.repo.join(','); + const richiesta = chiave + '|' + slot + '|' + senzaScheda; + // Un solo caricamento alla volta: richieste uguali aspettano insieme, modelli diversi si caricano dopo. + if (promessaCaricamento) return chiaveCaricamento === richiesta ? promessaCaricamento : promessaCaricamento.then(() => caricaNelWorker(m, stato, senzaScheda, slot)); // lo stesso modello è già dentro il worker: non si rimanda niente (a ogni clic si ricaricava e si rileggeva tutto il modello) if (!senzaScheda && worker) { if (slot === 'p' && inUso?.chiave === chiave) return Promise.resolve(inUso.testo); if (slot === 'traccia' && inUsoTraccia?.chiave === chiave) return Promise.resolve(inUsoTraccia.testo); } - return new Promise((ok, no) => { + chiaveCaricamento = richiesta; + promessaCaricamento = new Promise((ok, no) => { scaricati.clear(); caricamento = { ok, no, stato, dacache: !!modelliPronti()[m.id], chiave, slot }; const hw = messaggioScheda(); const usa = senzaScheda ? { ...hw, scheda: false, finta: false } : hw; lavoratore().postMessage({ tipo: 'carica', famiglia: m.famiglia, repo: m.repo, base: baseLocaleAI(), scheda: usa.scheda, hw: usa, chiaveHF: chiaveHFSalvata(), slot }); - }); + }).finally(() => { promessaCaricamento = null; caricamento = null; }); + return promessaCaricamento; } /** un fotogramma al worker */ function inviaMaschera(px: Pixel, o?: OpzMaschera): Promise { + segnaUsoAI(); return new Promise((ok, no) => { const id = ++seq; attese.set(id, { ok, no }); diff --git a/src/media/traduci.ts b/src/media/traduci.ts index 33a28bf..a4a2be5 100644 --- a/src/media/traduci.ts +++ b/src/media/traduci.ts @@ -6,6 +6,7 @@ import { spiegaErroreAI, testoErrore } from './erroriAI'; import { baseLocaleAI } from './libreriaAI'; import { segnaModelloPronto } from './modelliPronti'; +import { registraVram, segnaUsoAI } from './vram'; /** il modello della traduzione (e quello di riserva), come li prova il worker */ export const MODELLI_TRADUZIONE = ['Xenova/nllb-200-distilled-600M', 'onnx-community/nllb-200-distilled-600M-ONNX']; @@ -37,6 +38,7 @@ let worker: Worker | null = null; let seq = 0; const attese = new Map void; no: (e: Error) => void }>(); let caricamento: { ok: () => void; no: (e: Error) => void; stato: (fase: string, prog: number) => void } | null = null; +let promessaCaricamento: Promise | null = null; const scaricati = new Map(); function lavoratore(): Worker { @@ -69,13 +71,30 @@ function lavoratore(): Worker { return worker; } +// la memoria si libera quando la traduzione non serve (src/media/vram.ts) +registraVram('traduzione', { + libera: () => { + if (!worker) return false; + worker.terminate(); + worker = null; + return true; + }, + occupato: () => attese.size > 0 || caricamento !== null, +}); + const nllb: Traduttore = { - carica: (stato) => new Promise((ok, no) => { - scaricati.clear(); - caricamento = { ok, no, stato }; - lavoratore().postMessage({ tipo: 'carica', base: baseLocaleAI() }); - }), + carica: (stato) => { + segnaUsoAI(); + if (promessaCaricamento) return promessaCaricamento; + promessaCaricamento = new Promise((ok, no) => { + scaricati.clear(); + caricamento = { ok, no, stato }; + lavoratore().postMessage({ tipo: 'carica', base: baseLocaleAI() }); + }).finally(() => { promessaCaricamento = null; caricamento = null; }); + return promessaCaricamento; + }, traduci: (testi, da, a) => new Promise((ok, no) => { + segnaUsoAI(); const id = ++seq; attese.set(id, { ok, no }); lavoratore().postMessage({ tipo: 'traduci', id, testi, da: codiceNllb(da), a: codiceNllb(a) }); diff --git a/src/media/voce.ts b/src/media/voce.ts index 6e4defb..caeb4c2 100644 --- a/src/media/voce.ts +++ b/src/media/voce.ts @@ -4,7 +4,8 @@ // · Nemotron 3.5 di NVIDIA (src/media/nemo.ts, nell'app): multilingua, va su scheda NVIDIA, Mac e anche su CPU; // · Whisper (src/media/voce.worker.ts, anche nel browser), e dall'italiano anche la traduzione in inglese. // Tutto sul computer di chi monta: l'audio non va da nessuna parte. -import type { Project, Sottotitolo } from '../core/tipi'; +import type { Clip, Project, Sottotitolo } from '../core/tipi'; +import { paroleDaPezzi, progettoPerTesto, type Parola } from '../core/montaggioTesto'; import { end, projectEnd, uid } from '../core/progetto'; import { f2s, fps } from '../core/timecode'; import { sistemaRighe } from '../core/sottotitoli'; @@ -14,6 +15,7 @@ import { spiegaErroreAI } from './erroriAI'; import { baseLocaleAI } from './libreriaAI'; import { messaggioScheda, schedaGuasta } from './hardware'; import { segnaModelloPronto } from './modelliPronti'; +import { registraVram, segnaUsoAI } from './vram'; export interface Modello { id: string; nome: string; info: string; mb: number } @@ -39,7 +41,7 @@ export interface Pezzo { da: number; a: number | null; testo: string } /** chi trascrive un pezzo d'audio (16 kHz mono): di solito il worker con Whisper; le prove ne mettono uno finto */ export type Trascrittore = { carica: (modello: string, stato: (fase: string, prog: number) => void) => Promise; - trascrivi: (audio: Float32Array, lingua: string, traduci: boolean) => Promise; + trascrivi: (audio: Float32Array, lingua: string, traduci: boolean, parole?: boolean) => Promise; }; const SR = 16000; @@ -49,6 +51,8 @@ let worker: Worker | null = null; let seq = 0; const attese = new Map void; no: (e: Error) => void }>(); let caricamento: { ok: (d: string) => void; no: (e: Error) => void; stato: (fase: string, prog: number) => void } | null = null; +let promessaCaricamento: Promise | null = null; +let chiaveCaricamento = ''; const scaricati = new Map(); function lavoratore(): Worker { @@ -91,20 +95,37 @@ let avvisoVoce: ((msg: string) => void) | null = null; /** l'ultimo modello caricato (per ricaricarlo se bisogna ripartire) */ let ultimoModello: { modello: string; stato: (fase: string, prog: number) => void } | null = null; +// la scheda video si libera quando il modello non serve (src/media/vram.ts) +registraVram('voce', { + libera: () => { + if (!worker) return false; + worker.terminate(); + worker = null; + return true; + }, + occupato: () => attese.size > 0 || caricamento !== null, +}); + function caricaNelWorker(modello: string, stato: (fase: string, prog: number) => void, senzaScheda = false): Promise { - return new Promise((ok, no) => { + segnaUsoAI(); + const chiave = modello + '|' + senzaScheda; + if (promessaCaricamento) return chiaveCaricamento === chiave ? promessaCaricamento : promessaCaricamento.then(() => caricaNelWorker(modello, stato, senzaScheda)); + chiaveCaricamento = chiave; + promessaCaricamento = new Promise((ok, no) => { scaricati.clear(); caricamento = { ok, no, stato }; const hw = messaggioScheda(); const usa = senzaScheda ? { ...hw, scheda: false, finta: false } : hw; lavoratore().postMessage({ tipo: 'carica', modello, base: baseLocaleAI(), scheda: usa.scheda, hw: usa }); - }); + }).finally(() => { promessaCaricamento = null; caricamento = null; }); + return promessaCaricamento; } /** un pezzo di un minuto non deve mai metterci più di così: se il worker non risponde (scheda video appesa) si rifà */ export const ATTESA_PEZZO_MS = { valore: 10 * 60 * 1000 }; -function trascriviNelWorker(audio: Float32Array, lingua?: string, traduci?: boolean): Promise { +function trascriviNelWorker(audio: Float32Array, lingua?: string, traduci?: boolean, parole = false): Promise { + segnaUsoAI(); return new Promise((ok, no) => { const id = ++seq; const orologio = setTimeout(() => { @@ -115,17 +136,17 @@ function trascriviNelWorker(audio: Float32Array, lingua?: string, traduci?: bool no(err); }, ATTESA_PEZZO_MS.valore); attese.set(id, { ok: (p) => { clearTimeout(orologio); ok(p); }, no: (e) => { clearTimeout(orologio); no(e); } }); - lavoratore().postMessage({ tipo: 'trascrivi', id, audio, lingua, traduci }, [audio.buffer]); + lavoratore().postMessage({ tipo: 'trascrivi', id, audio, lingua, traduci, parole }, [audio.buffer]); }); } const whisper: Trascrittore = { carica: (modello, stato) => { ultimoModello = { modello, stato }; return caricaNelWorker(modello, stato).then((d) => { segnaModelloPronto('whisper-' + modello.split('-').pop(), modello); return d; }); }, - trascrivi: async (audio, lingua, traduci) => { + trascrivi: async (audio, lingua, traduci, parole) => { // l'audio passa al worker (e da lì sparisce): se serve rifare il pezzo se ne tiene una copia const copia = audio.slice(); try { - return await trascriviNelWorker(audio, lingua, traduci); + return await trascriviNelWorker(audio, lingua, traduci, parole); } catch (e) { if (!(e as { schedaGuasta?: boolean }).schedaGuasta || !ultimoModello) throw e; // la scheda video ha sbagliato: il worker si butta e si riparte da uno nuovo sul processore, con lo stesso pezzo @@ -135,7 +156,7 @@ const whisper: Trascrittore = { caricamento = null; attese.clear(); await caricaNelWorker(ultimoModello.modello, ultimoModello.stato, true); - return trascriviNelWorker(copia, lingua, traduci); + return trascriviNelWorker(copia, lingua, traduci, parole); } }, }; @@ -146,6 +167,37 @@ export const caricaModelloVoce = (modello: string, stato: (fase: string, prog: n /** per le prove: un trascrittore finto (null = torna Whisper) */ export const impostaTrascrittore = (t: Trascrittore | null) => { trascrittore = t ?? whisper; }; +/** Lo stesso Whisper dei sottotitoli, con i tempi veri per parola e senza traduzione o filtro delle ripetizioni. */ +export async function paroleWhisper(audio: Float32Array, o: OpzioniVoce, stato: (fase: string, prog: number) => void, segnale?: AbortSignal): Promise { + const fermo = () => { if (segnale?.aborted) throw new Error('fermato'); }; + fermo(); + await trascrittore.carica(o.modello || MODELLI[1].id, (fase, k) => stato(fase, k * 0.3)); + fermo(); + const tagli = puntiDiTaglio(audio), out: Parola[] = []; + for (let k = 0; k < tagli.length - 1; k++) { + fermo(); + const da = tagli[k], a = tagli[k + 1]; + stato(`Ascolto le parole: ${Math.round(da)} di ${Math.round(audio.length / SR)} secondi`, 0.3 + 0.7 * k / (tagli.length - 1)); + const pezzi = await trascrittore.trascrivi(audio.slice(Math.floor(da * SR), Math.floor(a * SR)), o.lingua, false, true); + fermo(); + for (const w of paroleDaPezzi(pezzi, a - da)) out.push({ ...w, da: w.da + da, a: w.a + da }); + } + stato('Fatto', 1); + return out; +} + +/** I secondi restituiti da Whisper tornano nella sorgente della clip, anche se è tagliata o accelerata. */ +export async function testoDellaClip(p: Project, id: string, o: OpzioniVoce, stato: (fase: string, prog: number) => void, segnale?: AbortSignal): Promise> { + const c = p.clips.find((x) => x.id === id); + if (!c?.media) throw new Error('Scegli una clip video o audio'); + stato('Preparo l\'audio della clip…', 0); + const audio = await audioPerVoce(progettoPerTesto(p, id), (k) => stato('Preparo l\'audio della clip…', k * 0.1)); + const parole = await paroleWhisper(audio, o, (fase, k) => stato(fase, 0.1 + 0.9 * k), segnale); + if (!parole.length) throw new Error('Non ho trovato parole con tempi precisi. Prova un altro modello Whisper'); + return { id: uid('parlato'), media: c.media, da: c.srcIn, a: c.srcIn + f2s(c.len, p.rate) * c.speed, + parole: parole.map((w) => ({ ...w, da: c.srcIn + w.da * c.speed, a: c.srcIn + w.a * c.speed })) }; +} + /** ferma tutto (il pulsante "Ferma"): il worker si chiude e il modello si ricarica la prossima volta */ export function fermaVoce() { worker?.terminate(); diff --git a/src/media/voce.worker.ts b/src/media/voce.worker.ts index 691c117..1b7b3fe 100644 --- a/src/media/voce.worker.ts +++ b/src/media/voce.worker.ts @@ -35,13 +35,13 @@ async function carica(modello: string, conScheda = true) { const LINGUE: Record = { it: 'italian', en: 'english', es: 'spanish', fr: 'french', de: 'german', pt: 'portuguese' }; -async function trascrivi(audio: Float32Array, lingua?: string, traduci?: boolean) { +async function trascrivi(audio: Float32Array, lingua?: string, traduci?: boolean, parole = false) { if (!asr) throw new Error('modello non caricato'); const opz = { // "auto": Whisper riconosce da solo la lingua ...(lingua && lingua !== 'auto' ? { language: LINGUE[lingua] ?? 'italian' } : {}), task: traduci ? 'translate' : 'transcribe', - chunk_length_s: 30, stride_length_s: 5, return_timestamps: true, + chunk_length_s: 30, stride_length_s: 5, return_timestamps: parole ? 'word' : true, }; try { return await asr(audio, opz); @@ -57,13 +57,13 @@ async function trascrivi(audio: Float32Array, lingua?: string, traduci?: boolean class SchedaGuasta extends Error {} self.onmessage = async (e: MessageEvent) => { - const m = e.data as { tipo: string; id?: number; modello?: string; audio?: Float32Array; lingua?: string; traduci?: boolean; base?: string; scheda?: boolean; hw?: ImpostazioneScheda }; + const m = e.data as { tipo: string; id?: number; modello?: string; audio?: Float32Array; lingua?: string; traduci?: boolean; parole?: boolean; base?: string; scheda?: boolean; hw?: ImpostazioneScheda }; try { if (m.base !== undefined) base = m.base; if (m.hw) usaImpostazioneScheda(m.hw); if (m.tipo === 'carica') await carica(m.modello!, m.scheda !== false); else if (m.tipo === 'trascrivi') { - const out = await trascrivi(m.audio!, m.lingua, m.traduci); + const out = await trascrivi(m.audio!, m.lingua, m.traduci, m.parole); const pezzi = (out.chunks?.length ? out.chunks : [{ timestamp: [0, null] as [number, number | null], text: out.text }]) .map((c) => ({ da: c.timestamp[0], a: c.timestamp[1], testo: c.text })); manda({ tipo: 'testo', id: m.id, pezzi }); diff --git a/src/media/vram.ts b/src/media/vram.ts new file mode 100644 index 0000000..7f48c73 --- /dev/null +++ b/src/media/vram.ts @@ -0,0 +1,42 @@ +// La memoria della scheda video (VRAM). I modelli AI restano caricati nei loro worker dopo il lavoro (SAM 3 + SAM 2.1 circa 1 GB, Whisper +// circa mezzo giro in più): senza un limite la scheda resta piena finché il programma è aperto, e si porta via la memoria a giochi, render +// e altri programmi. Qui ogni modello che sta in un worker si iscrive con due cose: come si scarica e se sta lavorando adesso. Se per +// un po' (di partenza 90 s) nessuno lo usa, o se si preme «Libera la memoria della scheda video», i worker si chiudono e la memoria torna +// libera; la volta dopo il modello si ricarica dalla cache del computer (secondi, senza rete). Il filtro dei rumori e la separazione +// voce/base non servono: il loro worker si chiude già alla fine di ogni lavoro. +interface Voce { libera: () => boolean; occupato: () => boolean } +const voci = new Map(); +let ultimo = 0; +let giro = 0; +const scadenza = 90_000; +let daLiberare = false; + +/** un modello da scaricare dalla scheda: `libera` chiude il suo worker (true se c'era qualcosa da chiudere), `occupato` dice se sta lavorando */ +export function registraVram(nome: string, v: Voce) { voci.set(nome, v); } + +/** qualcuno ha appena usato un modello: il conto dei secondi riparte */ +export function segnaUsoAI() { + ultimo = Date.now(); + if (giro || typeof window === 'undefined') return; + giro = window.setInterval(controlla, 15_000); +} + +function controlla() { + if (daLiberare) { liberaVram(); return; } + if (Date.now() - ultimo < scadenza) return; + if ([...voci.values()].some((v) => v.occupato())) { ultimo = Date.now(); return; } + liberaVram(); +} + +/** scarica dalla scheda video tutti i modelli che non stanno lavorando: torna quanti worker ha chiuso */ +export function liberaVram(): number { + let n = 0; + daLiberare = false; + for (const v of voci.values()) { + if (v.occupato()) { daLiberare = true; continue; } + try { if (v.libera()) n++; } catch { daLiberare = true; /* si riprova al prossimo controllo */ } + } + // Quelli occupati si scaricano al prossimo controllo, appena hanno finito. + if (!daLiberare && giro) { clearInterval(giro); giro = 0; } + return n; +} diff --git a/src/nome.ts b/src/nome.ts new file mode 100644 index 0000000..8e42b0c --- /dev/null +++ b/src/nome.ts @@ -0,0 +1,3 @@ +// Il nome del programma, in un posto solo: la barra in alto («DaP» + questo nome) e il titolo della finestra lo leggono da qui. +// Scelto da Cammo il 29/10/2026: «DaProd Editor Video». Il productName di Tauri resta «DaProd Video» per non spostare installazione e aggiornamenti. +export const NOME_PROGRAMMA = 'Editor Video'; diff --git a/src/pacchetto.ts b/src/pacchetto.ts index e2e6feb..543b594 100644 --- a/src/pacchetto.ts +++ b/src/pacchetto.ts @@ -1,7 +1,7 @@ // Il pacchetto .daprod: il progetto e tutti i suoi file in un file solo, da portare su un altro computer e // riaprire identico. È uno zip vero (si apre anche con 7-Zip o con Esplora risorse): dentro ci sono // progetto.json, i media in media/ e un LEGGIMI. I file sono messi dentro così come sono ("stored", senza -// comprimere: i video lo sono già), così DaProd Video li legge direttamente da dentro lo zip, senza scompattare. +// comprimere: i video lo sono già), così DaProd Editor Video li legge direttamente da dentro lo zip, senza scompattare. // Zip64 quando serve (file o pacchetti oltre i 4 GB). import type { MediaItem, Project } from './core/tipi'; import { store } from './core/store'; @@ -162,10 +162,10 @@ export async function pianoPacchetto(soloUsati: boolean): Promise { return { voci, mancano, byte: voci.reduce((s, x) => s + x.f.len, 0) }; } -const LEGGIMI = `DaProd Video · pacchetto del progetto +const LEGGIMI = `DaProd Editor Video · pacchetto del progetto -Questo file è un progetto di DaProd Video con dentro tutti i suoi file: aprilo con -DaProd Video (File → Apri, o doppio clic) e ritrovi il montaggio identico, anche su +Questo file è un progetto di DaProd Editor Video con dentro tutti i suoi file: aprilo con +DaProd Editor Video (File → Apri, o doppio clic) e ritrovi il montaggio identico, anche su un altro computer. Non serve scompattarlo. Dentro: progetto.json (il montaggio) e la cartella media/ (i video, le musiche, le immagini). @@ -286,7 +286,7 @@ export async function scriviPacchetto(nomeFile: string, piano: Piano, soloUsati: const w = window as unknown as { showSaveFilePicker?: (o: object) => Promise }; if (w.showSaveFilePicker) { try { - const hh = await w.showSaveFilePicker({ suggestedName: nomeFile, types: [{ description: 'Progetto DaProd Video', accept: { 'application/zip': ['.daprod'] } }] }); + const hh = await w.showSaveFilePicker({ suggestedName: nomeFile, types: [{ description: 'Progetto DaProd Editor Video', accept: { 'application/zip': ['.daprod'] } }] }); const ws = await (hh as unknown as { createWritable: () => Promise }).createWritable(); await tutto.stream().pipeTo(ws); return nomeFile; @@ -405,7 +405,7 @@ export async function leggiPacchetto(s: Sorgente): Promise<{ testo: string; voci const voci = await indicePacchetto(s); const pj = voci.get('progetto.json'); if (!pj) throw new Error('nel pacchetto manca progetto.json'); - if (!pj.stored) throw new Error('progetto.json compresso: questo pacchetto non l\'ha fatto DaProd Video'); + if (!pj.stored) throw new Error('progetto.json compresso: questo pacchetto non l\'ha fatto DaProd Editor Video'); const testo = new TextDecoder().decode(await leggi(s, pj.off, pj.off + pj.len)); return { testo, voci }; } @@ -481,11 +481,11 @@ export async function pianoDap(vecchie: Map | null, proxy: Ma return { cose, tenute, mancano, nomi, byte: cose.reduce((s, x) => s + x.len, 0) }; } -const LEGGIMI_DAP = `DaProd Video · progetto completo (.dap) +const LEGGIMI_DAP = `DaProd Editor Video · progetto completo (.dap) -Questo file è un progetto di DaProd Video con dentro TUTTO: il montaggio (progetto.json), +Questo file è un progetto di DaProd Editor Video con dentro TUTTO: il montaggio (progetto.json), tutti i file (media/: video, musiche, immagini, registrazioni, audio lavorato) e le copie -leggere per il monitor (proxy/). Aprilo con DaProd Video (File → Apri, o doppio clic), +leggere per il monitor (proxy/). Aprilo con DaProd Editor Video (File → Apri, o doppio clic), anche su un altro computer: ritrovi tutto identico. Non serve scompattarlo. https://github.com/cammo22/DaProdVideo `; @@ -614,7 +614,7 @@ export async function scriviDapBrowser(nomeFile: string, piano: PianoDap, avanza const w = window as unknown as { showSaveFilePicker?: (o: object) => Promise }; if (w.showSaveFilePicker) { try { - const hh = await w.showSaveFilePicker({ suggestedName: nomeFile, types: [{ description: 'Progetto DaProd Video', accept: { 'application/zip': ['.dap'] } }] }); + const hh = await w.showSaveFilePicker({ suggestedName: nomeFile, types: [{ description: 'Progetto DaProd Editor Video', accept: { 'application/zip': ['.dap'] } }] }); const ws = await (hh as unknown as { createWritable: () => Promise }).createWritable(); await tutto.stream().pipeTo(ws); return nomeFile; diff --git a/src/progetti.ts b/src/progetti.ts index dccbd40..ed4dfe2 100644 --- a/src/progetti.ts +++ b/src/progetti.ts @@ -1,3 +1,4 @@ +import { migraColoreAudio } from './core/coloreAudioProgetto'; // Progetti: nuovo, apri, salva, autosalvataggio, importazione dei file e ricollegamento dei media. // Nell'app (Tauri) i media si ritrovano dal percorso; nel browser dalle "maniglie" dei file che Chrome // permette di ricordare (basta un clic per ridare il permesso). @@ -6,6 +7,8 @@ import type { MediaItem, Project } from './core/tipi'; import { FORMATI } from './core/tipi'; import { ALTEZZA, MASTER0, newProject } from './core/progetto'; import { migraBlocchi } from './core/blocchi'; +import { pulisciAnim } from './core/automazioni'; +import { migraTitoliHtml } from './core/titoliHtml'; import { apri as apriMedia, chiudi as chiudiMedia, importa, impostaCercaMedia, impostaControlloVelocita, mediaRT, usoDiMedia, type MediaRT, type OpzioniPreparazione } from './media/libreria'; import { cambiaProgetto, inSovraccarico, nuova, proponi, type Lavoro, type Proposto } from './media/attivita'; import { dimenticaMedia } from './media/fotogrammi'; @@ -33,17 +36,19 @@ function db(): Promise { r.onerror = () => ko(r.error); }); } -async function idb(store: 'kv' | 'maniglie' | 'file', op: 'get' | 'put' | 'delete', key: string, val?: unknown): Promise { +async function idb(store: 'kv' | 'maniglie' | 'file', op: 'get' | 'put' | 'delete', key: string, val?: unknown, propagaErrore = false): Promise { try { const d = await db(); return await new Promise((ok, ko) => { const tx = d.transaction(store, op === 'get' ? 'readonly' : 'readwrite'); const s = tx.objectStore(store); const r = op === 'get' ? s.get(key) : op === 'put' ? s.put(val, key) : s.delete(key); - r.onsuccess = () => ok(r.result as T); - r.onerror = () => ko(r.error); + // La richiesta può riuscire e la transazione fallire dopo (per esempio se manca spazio). + tx.oncomplete = () => ok(r.result as T); + tx.onabort = () => ko(tx.error ?? r.error); + tx.onerror = () => ko(tx.error ?? r.error); }); - } catch { return undefined; } + } catch (e) { if (propagaErrore) throw e; return undefined; } } /** tutte le chiavi di un deposito (per fare pulizia) */ @@ -395,6 +400,7 @@ export async function salva(come = false) { /** la revisione del documento già scritta dall'autosalvataggio (-1 = niente ancora) */ let autosalvata = -1; +let avvisatoAutosalvataggio = false; export async function autosalva() { if (!store.dirty && store.doc.saved) return; @@ -404,25 +410,35 @@ export async function autosalva() { const testo = serializza(); try { if (isTauri) await invoke('autosalva', { text: testo }); - else await idb('kv', 'put', 'autosalvataggio', testo); + else await idb('kv', 'put', 'autosalvataggio', testo, true); autosalvata = rev; - } catch { /* spazio pieno o permessi: si riprova al prossimo giro */ } + } catch { + // La revisione resta da salvare: si riprova al prossimo giro, senza avvisi a raffica. + if (!avvisatoAutosalvataggio) { + avvisatoAutosalvataggio = true; + avviso('Non riesco a salvare la copia automatica: controlla lo spazio e i permessi. Per tenere il lavoro usa Salva come…', 'errore', 7000); + } + } } function valida(o: unknown): Project | null { const p = o as Project; if (!p || p.format !== 'daprod-video' || !Array.isArray(p.tracks) || !Array.isArray(p.clips)) return null; for (const m of p.media) { m.t0 ??= 0; m.markIn ??= null; m.markOut ??= null; } - for (const c of p.clips) { c.opKeys ??= []; c.gainKeys ??= []; c.speed ??= 1; } + for (const c of p.clips) { c.opKeys ??= []; c.gainKeys ??= []; c.speed ??= 1; pulisciAnim(c); } // le versioni di prima: tracce audio basse e niente ritocchi finali for (const t of p.tracks) { if (t.kind === 'audio' && t.height === 46) t.height = ALTEZZA.audio; if (t.kind === 'video' && t.height === 58) t.height = ALTEZZA.video; } + // le clip delle altre timeline: i keyframe (se ci sono) si rimettono in ordine come nella principale + for (const s of p.sequenze ?? []) for (const c of s.clips ?? []) pulisciAnim(c); p.master = { ...MASTER0, ...(p.master ?? {}) }; // dalla 1.0.5: gli FX stanno sulle tracce video (la corsia a parte della 1.0.4 sparisce), e le transizioni delle // clip video diventano blocchetti migraBlocchi(p); + migraColoreAudio(p); + migraTitoliHtml(p); return p; } @@ -430,7 +446,7 @@ function valida(o: unknown): Project | null { export async function apri() { if (store.dirty && store.doc.clips.length && !(await conferma('Apri progetto', 'Il montaggio attuale ha modifiche. Aprire un altro progetto?', 'Apri', 'Annulla'))) return; if (isTauri) { - const [path] = await dialogoApri({ multiple: false, title: 'Progetto DaProd Video', estensioni: ['dap', 'daprod', 'dpv', 'json'], mime: [] }); + const [path] = await dialogoApri({ multiple: false, title: 'Progetto DaProd Editor Video', estensioni: ['dap', 'daprod', 'dpv', 'json'], mime: [] }); if (path) await apriFile({ path }); return; } @@ -449,7 +465,7 @@ export async function apriFile(s: Sorgente) { const testo = s.file ? await s.file.text() : await invoke('progetto_leggi', { path: s.path }); p = valida(JSON.parse(testo)); } catch { p = null; } - if (!p) { avviso('Questo file non è un progetto DaProd Video', 'errore'); return; } + if (!p) { avviso('Questo file non è un progetto DaProd Editor Video', 'errore'); return; } percorsoProgetto = s.path ?? null; await carica(p); registraRecente(p, s.path, s.path ? undefined : JSON.stringify(p)); @@ -467,7 +483,7 @@ async function apriPacchetto(s: Sorgente, dap = false) { try { const { testo, voci } = await leggiPacchetto(s); const p = valida(JSON.parse(testo)); - if (!p) throw new Error('dentro non c\'è un progetto DaProd Video'); + if (!p) throw new Error('dentro non c\'è un progetto DaProd Editor Video'); for (const m of p.media) { const v = m.pacchetto ? voci.get(m.pacchetto) : undefined; if (!v) continue; @@ -529,7 +545,7 @@ export async function salvaPacchetto() { }; solo.addEventListener('change', () => void misura()); d.corpo.append( - h('p', null, 'Il progetto e tutti i suoi file (video, musiche, immagini) in un file solo. Portalo su un altro computer e aprilo con DaProd Video: ritrovi il montaggio identico. È uno zip: i file dentro restano uguali (niente perdita di qualità) e si aprono direttamente da lì.'), + h('p', null, 'Il progetto e tutti i suoi file (video, musiche, immagini) in un file solo. Portalo su un altro computer e aprilo con DaProd Editor Video: ritrovi il montaggio identico. È uno zip: i file dentro restano uguali (niente perdita di qualità) e si aprono direttamente da lì.'), h('p', null, quanti, ' · ', peso), h('label', { class: 'riga-spunta' }, solo, ' Solo i file usati nel montaggio (il contenitore si alleggerisce)'), mancano); diff --git a/src/render/anim/social.ts b/src/render/anim/social.ts index c3b3a6a..226cc99 100644 --- a/src/render/anim/social.ts +++ b/src/render/anim/social.ts @@ -146,7 +146,7 @@ function chiusura(q: Q) { function post(q: Q) { const { c } = q; const s = gr(q), colore = col(q, 'colore', '#1d9bf0'); - const nome = tx(q, 'nome', 'DaProd Video'), utente = tx(q, 'utente', '@daprod'), testo = tx(q, 'testo', ''); + const nome = tx(q, 'nome', 'DaProd Editor Video'), utente = tx(q, 'utente', '@daprod'), testo = tx(q, 'testo', ''); const W = 940 * s, pad = 40 * s; const fT = `500 ${40 * s}px "Montserrat", sans-serif`; const rr = righe(c, testo, fT, W - pad * 2); diff --git a/src/render/colore.ts b/src/render/colore.ts index df40088..b4cb1ea 100644 --- a/src/render/colore.ts +++ b/src/render/colore.ts @@ -1,11 +1,14 @@ // Il colore finale: i look della pagina Finale e i ritocchi globali, tradotti in pochi numeri // (lift, gamma, gain, saturazione, contrasto, viraggio di ombre e luci, vignetta, grana). // Lo stesso calcolo serve i monitor e l'export, come tutto il resto. -import type { LookFinale, Master } from '../core/tipi'; +import type { ColoreAvanzato, LookFinale, Master } from '../core/tipi'; +import { curveNeutre } from './curve'; export type V3 = [number, number, number]; export interface Grade { + curve?: ColoreAvanzato['curve']; + lut?: ColoreAvanzato['lut']; lift: V3; gamma: V3; gain: V3; @@ -65,12 +68,24 @@ export function gradeDi(m: Master): Grade { g.gain = [g.gain[0] * (1 + t * 0.12), g.gain[1] * (1 - ti * 0.08), g.gain[2] * (1 - t * 0.14)]; g.vignette = Math.max(g.vignette, m.vignette); g.grain = Math.max(g.grain, m.grain * 0.12); - return g; + return conColore(g, m.colore); } +/** I ritocchi manuali si sommano al look senza cambiarne la formula storica. */ +export function conColore(g: Grade, c?: ColoreAvanzato): Grade { + return { ...g, + lift: g.lift.map((v, i) => v + (c?.lift?.[i] ?? 0)) as V3, + gamma: g.gamma.map((v, i) => Math.max(0.1, v * (c?.gamma?.[i] ?? 1))) as V3, + gain: g.gain.map((v, i) => v * (c?.gain?.[i] ?? 1)) as V3, + curve: c?.curve, lut: c?.lut, + }; +} +export const gradeClip = (c?: ColoreAvanzato): Grade => conColore(GRADE0, c); + /** il colore finale non cambia niente? (così non si spreca un passaggio) */ export function gradeNeutro(g: Grade): boolean { const eq = (a: V3, b: V3) => Math.abs(a[0] - b[0]) + Math.abs(a[1] - b[1]) + Math.abs(a[2] - b[2]) < 1e-4; return eq(g.lift, GRADE0.lift) && eq(g.gamma, GRADE0.gamma) && eq(g.gain, GRADE0.gain) && Math.abs(g.sat - 1) < 1e-4 - && Math.abs(g.contrast - 1) < 1e-4 && eq(g.shadow, GRADE0.shadow) && eq(g.high, GRADE0.high) && g.vignette < 1e-4 && g.grain < 1e-4; + && Math.abs(g.contrast - 1) < 1e-4 && eq(g.shadow, GRADE0.shadow) && eq(g.high, GRADE0.high) && g.vignette < 1e-4 && g.grain < 1e-4 + && curveNeutre(g.curve) && !(g.lut && g.lut.intensita > 0); } diff --git a/src/render/coloreGpu.ts b/src/render/coloreGpu.ts new file mode 100644 index 0000000..b80cf8b --- /dev/null +++ b/src/render/coloreGpu.ts @@ -0,0 +1,125 @@ +// Risorse colore condivise fra anteprima ed export. Algoritmi LUT/curve: TERZE-PARTI.md (MIT OpenReel). +import type { Project, RisorsaLut } from '../core/tipi'; +import type { Grade } from './colore'; +import { CAMPIONI_CURVA, curveNeutre, tabellaCurve } from './curve'; +import { validaLut } from './lut'; + +export const UNIFORM_COLORE = ['u_caLift', 'u_caGamma', 'u_caGain', 'u_caManuale', 'u_caCurve', 'u_caLut', 'u_caCurveOn', 'u_caIntensity', 'u_caSize', 'u_caMin', 'u_caMax']; +export const GLSL_COLORE = ` +uniform vec3 u_caLift, u_caGamma, u_caGain; +uniform bool u_caManuale, u_caCurveOn; +uniform sampler2D u_caCurve; +uniform highp sampler3D u_caLut; +uniform float u_caIntensity, u_caSize; +uniform vec3 u_caMin, u_caMax; +float curva(float x, float r) { + return texture(u_caCurve, vec2((clamp(x, 0.0, 1.0) * ${CAMPIONI_CURVA - 1}.0 + 0.5) / ${CAMPIONI_CURVA}.0, (r + 0.5) / 5.0)).r; +} +vec3 coloreAvanzato(vec3 rgb) { + if (u_caManuale) { + rgb = rgb * u_caGain + u_caLift * (1.0 - rgb); + rgb = pow(max(rgb, 0.0), 1.0 / max(u_caGamma, vec3(0.1))); + } + if (u_caCurveOn) { + rgb = vec3(curva(rgb.r, 0.0), curva(rgb.g, 0.0), curva(rgb.b, 0.0)); + rgb = vec3(curva(rgb.r, 1.0), curva(rgb.g, 2.0), curva(rgb.b, 3.0)); + float y = dot(rgb, vec3(0.2126, 0.7152, 0.0722)); + float nuovo = curva(y, 4.0); + rgb = y > 0.00001 ? rgb * (nuovo / y) : vec3(nuovo); + } + if (u_caIntensity > 0.0) { + vec3 p = clamp((rgb - u_caMin) / (u_caMax - u_caMin), 0.0, 1.0); + vec3 uvw = (p * (u_caSize - 1.0) + 0.5) / u_caSize; + rgb = mix(rgb, texture(u_caLut, uvw).rgb, u_caIntensity); + } + return rgb; +}`; + +type Tex = { tex: WebGLTexture; target: number }; +export class ColoreGpu { + private cache = new Map(); + private usate = new Set(); + /** Avvisi consultabili dall'host del pannello, oltre alla console. */ + readonly avvisi = new Set(); + constructor(private gl: WebGL2RenderingContext) {} + inizia() { this.usate.clear(); } + finisce() { + for (const [k, t] of this.cache) if (!this.usate.has(k)) { this.gl.deleteTexture(t.tex); this.cache.delete(k); } + } + distruggi() { for (const t of this.cache.values()) this.gl.deleteTexture(t.tex); this.cache.clear(); } + + private texture(k: string, target: number, w: number, h: number, d: number, data: Float32Array): WebGLTexture { + this.usate.add(k); + const gia = this.cache.get(k); + if (gia) return gia.tex; + const gl = this.gl, tex = gl.createTexture(); + if (!tex) throw new Error('Memoria video esaurita per il colore'); + const binding = gl.getParameter(target === gl.TEXTURE_3D ? gl.TEXTURE_BINDING_3D : gl.TEXTURE_BINDING_2D); + const flip = gl.getParameter(gl.UNPACK_FLIP_Y_WEBGL), pre = gl.getParameter(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL); + try { + gl.bindTexture(target, tex); + gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, false); + gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, false); + for (const p of [gl.TEXTURE_MIN_FILTER, gl.TEXTURE_MAG_FILTER]) gl.texParameteri(target, p, gl.LINEAR); + for (const p of [gl.TEXTURE_WRAP_S, gl.TEXTURE_WRAP_T, ...(d ? [gl.TEXTURE_WRAP_R] : [])]) gl.texParameteri(target, p, gl.CLAMP_TO_EDGE); + if (d) gl.texImage3D(target, 0, gl.RGBA16F, w, h, d, 0, gl.RGBA, gl.FLOAT, data); + else gl.texImage2D(target, 0, gl.RGBA16F, w, h, 0, gl.RGBA, gl.FLOAT, data); + if (gl.getError() !== gl.NO_ERROR) { + const msg = 'Colore: questa scheda usa LUT/curve a 8 bit; valori fuori 0–1 e precisione ridotti'; + if (!this.avvisi.has(msg)) { this.avvisi.add(msg); console.warn(msg); } + const bytes = Uint8Array.from(data, (v) => Math.round(Math.max(0, Math.min(1, v)) * 255)); + if (d) gl.texImage3D(target, 0, gl.RGBA8, w, h, d, 0, gl.RGBA, gl.UNSIGNED_BYTE, bytes); + else gl.texImage2D(target, 0, gl.RGBA8, w, h, 0, gl.RGBA, gl.UNSIGNED_BYTE, bytes); + if (gl.getError() !== gl.NO_ERROR) throw new Error('La scheda video non riesce a caricare il colore'); + } + this.cache.set(k, { tex, target }); + return tex; + } catch (e) { gl.deleteTexture(tex); throw e; } + finally { gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, flip); gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, pre); gl.bindTexture(target, binding); } + } + + imposta(p: Project, g: Grade, u: Record, manuale: boolean) { + const gl = this.gl, active = gl.getParameter(gl.ACTIVE_TEXTURE); + const l = g.lut?.intensita ? p.luts?.find((l) => l.id === g.lut!.id) : undefined; + if (g.lut && g.lut.intensita > 0 && !l) { + const msg = 'LUT mancante: ricarica il file .cube dal pannello Colore avanzato'; + if (!this.avvisi.has(msg)) { this.avvisi.add(msg); console.warn(msg); } + } + gl.uniform1i(u.u_caManuale, manuale ? 1 : 0); + gl.uniform3f(u.u_caLift, ...g.lift); gl.uniform3f(u.u_caGamma, ...g.gamma); gl.uniform3f(u.u_caGain, ...g.gain); + gl.uniform1i(u.u_caCurve, 4); gl.uniform1i(u.u_caLut, 5); + const curveOn = !curveNeutre(g.curve); + gl.uniform1i(u.u_caCurveOn, curveOn ? 1 : 0); + try { + // Anche i sampler spenti hanno texture complete e unità distinte da sorgente/matte. + gl.activeTexture(gl.TEXTURE4); + const ck = 'curve:' + (curveOn ? JSON.stringify(g.curve) : 'identita'); + gl.bindTexture(gl.TEXTURE_2D, this.texture(ck, gl.TEXTURE_2D, CAMPIONI_CURVA, 5, 0, tabellaConCache(curveOn ? g.curve : undefined, ck))); + gl.activeTexture(gl.TEXTURE5); + const lut = l ?? LUT_IDENTITA; + const k = 'lut:' + lut.hash; + let tex = this.cache.get(k)?.tex; + if (tex) this.usate.add(k); + else { + if (!validaLut(lut) || lut.n > gl.getParameter(gl.MAX_3D_TEXTURE_SIZE)) throw new Error('LUT non valida o troppo grande per questa scheda video'); + const rgba = new Float32Array(lut.n ** 3 * 4); + for (let i = 0; i < lut.n ** 3; i++) { + rgba[i * 4] = lut.dati[i * 3]; rgba[i * 4 + 1] = lut.dati[i * 3 + 1]; rgba[i * 4 + 2] = lut.dati[i * 3 + 2]; rgba[i * 4 + 3] = 1; + } + tex = this.texture(k, gl.TEXTURE_3D, lut.n, lut.n, lut.n, rgba); + } + gl.bindTexture(gl.TEXTURE_3D, tex); + gl.uniform1f(u.u_caIntensity, l ? Math.max(0, Math.min(1, g.lut!.intensita)) : 0); + gl.uniform1f(u.u_caSize, lut.n); gl.uniform3f(u.u_caMin, ...lut.domainMin); gl.uniform3f(u.u_caMax, ...lut.domainMax); + } finally { gl.activeTexture(active); } + } +} +// La tabella CPU si costruisce solo quando cambiano i punti; cache limitata anche durante l'editing. +const tabelle = new Map(); +function tabellaConCache(curve: Grade['curve'], k: string) { + let t = tabelle.get(k); + if (!t) { t = tabellaCurve(curve); if (tabelle.size >= 16) tabelle.delete(tabelle.keys().next().value!); tabelle.set(k, t); } + return t; +} +const LUT_IDENTITA: RisorsaLut = { id: '', hash: 'identita', nome: 'Identità', n: 2, domainMin: [0, 0, 0], domainMax: [1, 1, 1], + dati: [0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1] }; diff --git a/src/render/compositore.ts b/src/render/compositore.ts index 812a107..ac79f97 100644 --- a/src/render/compositore.ts +++ b/src/render/compositore.ts @@ -1,6 +1,6 @@ // Il mixer video in WebGL2. Ogni strato si disegna nel suo buffer (trasformazioni, proc amp, chiave, look), // poi si combina sull'uscita con la transizione e la trasparenza. Stesso codice per i monitor e per l'export. -import type { Project, Transition } from '../core/tipi'; +import type { Clip, Project, Transition } from '../core/tipi'; import type { Strato, Sorgente } from './piano'; import type { VideoSample } from 'mediabunny'; import { fotogramma, type Fotogramma } from '../media/fotogrammi'; @@ -11,16 +11,20 @@ export type Fornitore = (s: Sorgente) => Fotogramma | null; import { autoColore, masterDi, mediaOf, tfAl } from '../core/progetto'; import { spostaTraccia } from '../core/traccia'; import { mediaRT } from '../media/libreria'; -import { gradeDi, gradeNeutro } from './colore'; +import { gradeClip, gradeDi, gradeNeutro } from './colore'; +import { ColoreGpu, GLSL_COLORE, UNIFORM_COLORE } from './coloreGpu'; import { CAMPI_FX, MAX_CENSURE, statoEffetti, type StatoFx } from '../core/blocchi'; import { fxEffettivo } from '../core/effettiClip'; +import { firmaMaschere, rasterizzaMaschere } from '../core/maschereForma'; import { coloriChiave, SPILL0 } from '../core/sfondo'; import { maschereAl } from '../media/maschere'; import { disegnaSovr, firmaSovr } from './sovrimpressione'; import { nuovaTela } from './grafica'; import { disegnaCountdown, motoTitolo, specAlTempo, telaTitolo } from './grafica'; import { disegnaAnimazione, firmaAnim } from './animazioni'; +import { fotogrammaHtml, misuraResa } from './titoliHtml'; import { TITLE0 } from '../core/progetto'; +import { anelliClic, DISEGNA_CLIC, UNIFORM_CLIC } from './cursore'; const VS_LAYER = `#version 300 es in vec2 a_pos; @@ -42,6 +46,7 @@ void main() { const FS_LAYER = `#version 300 es precision highp float; +${UNIFORM_CLIC} in vec2 v_uv; uniform sampler2D u_tex; uniform int u_src; // 0 texture, 1 barre SMPTE, 2 barre EBU, 3 colore pieno @@ -63,6 +68,8 @@ uniform float u_keySfuma; // sfuma il bordo uniform float u_keyPulisci; // toglie puntini e buchi uniform sampler2D u_matte, u_matte2; // le maschere dell'AI (prima e dopo l'istante) e quanto verso la seconda uniform float u_matteK; +uniform sampler2D u_forma; // le maschere a forma della clip (rettangolo, ellisse, Bézier): copertura 0..1 in un canale solo +uniform bool u_formaOn; uniform int u_vista; // 0 normale, 1 si vede la maschera, 2 il soggetto sugli scacchi, 3 il contorno di quello che resta uniform bool u_mirror; uniform float u_temp, u_vignette; @@ -77,6 +84,7 @@ uniform vec2 u_boxPx; // quanti pixel del progetto fa la sorgente intera uniform float u_round, u_feather; out vec4 o; +${GLSL_COLORE} vec2 orient(vec2 uv) { if (u_orient == 90) return vec2(uv.y, 1.0 - uv.x); if (u_orient == 180) return vec2(1.0 - uv.x, 1.0 - uv.y); @@ -199,6 +207,7 @@ void main() { vec2 iq = vec2(ch * I - sh * Q, sh * I + ch * Q) * u_sat; rgb = vec3(Y + 0.956 * iq.x + 0.621 * iq.y, Y - 0.272 * iq.x - 0.647 * iq.y, Y - 1.106 * iq.x + 1.703 * iq.y); if (u_temp != 0.0) rgb *= vec3(1.0 + u_temp * 0.18, 1.0 + u_temp * 0.02, 1.0 - u_temp * 0.2); + rgb = coloreAvanzato(rgb); if (u_vignette > 0.0) { vec2 dv = v_uv - 0.5; rgb *= 1.0 - u_vignette * smoothstep(0.15, 0.6, dot(dv, dv) * 2.2); } rgb = clamp(rgb, 0.0, 1.0); // chiave @@ -228,7 +237,10 @@ void main() { float k = smoothstep(soglia - mor, soglia + mor, m); aChiave = u_keyInv ? 1.0 - k : k; } + ${DISEGNA_CLIC} a *= aChiave; + // la passata con le maschere a forma: si moltiplica per la copertura (nessuna maschera = niente passata) + if (u_formaOn) a *= texture(u_forma, uv0).r; // angoli tondi (e l'ombra, che è lo stesso rettangolo sfumato): distanza dal rettangolo arrotondato, in pixel if (u_round > 0.0 || u_feather > 0.0) { vec2 lo = u_box.xy * u_boxPx, hi = (vec2(1.0) - u_box.zw) * u_boxPx; @@ -270,6 +282,7 @@ in vec2 v_uv; uniform sampler2D u_src; uniform vec3 u_lift, u_gamma, u_gain, u_shadow, u_high; uniform float u_sat, u_contrast, u_vignette, u_grain, u_time, u_split; +${GLSL_COLORE} out vec4 o; float hash(vec2 p) { return fract(sin(dot(p, vec2(12.9898, 78.233))) * 43758.5453); } void main() { @@ -282,6 +295,7 @@ void main() { float y = dot(r, vec3(0.2126, 0.7152, 0.0722)); r = mix(vec3(y), r, u_sat); r += u_shadow * (1.0 - smoothstep(0.0, 0.55, y)) + u_high * smoothstep(0.45, 1.0, y); + r = coloreAvanzato(r); vec2 d = v_uv - 0.5; r *= 1.0 - u_vignette * smoothstep(0.12, 0.62, dot(d, d) * 2.0); if (u_grain > 0.0) r += (hash(v_uv * vec2(1280.0, 720.0) + fract(u_time * 7.13)) - 0.5) * u_grain; @@ -1534,6 +1548,7 @@ function hex(c: string): [number, number, number] { export class Compositore { gl: WebGL2RenderingContext; + readonly coloreGpu: ColoreGpu; private pLayer: WebGLProgram; private pComb: WebGLProgram; private pMaster: WebGLProgram; @@ -1565,16 +1580,18 @@ export class Compositore { const gl = canvas.getContext('webgl2', { alpha: false, antialias: false, premultipliedAlpha: true, preserveDrawingBuffer: preserve, desynchronized: false, powerPreference: 'high-performance' }) as WebGL2RenderingContext | null; if (!gl) throw new Error('WebGL2 non disponibile'); this.gl = gl; + this.coloreGpu = new ColoreGpu(gl); this.pLayer = this.prog(VS_LAYER, FS_LAYER); this.pComb = this.prog(VS_FULL, FS_COMBINE); this.pMaster = this.prog(VS_FULL, FS_MASTER); this.pFx = this.prog(VS_FULL, FS_FX); for (const n of ['u_src', 'u_res', 'u_off', 'u_zoom', 'u_rot', 'u_blur', 'u_pixel', 'u_rgb', 'u_glitch', 'u_seme', 'u_desat', 'u_invert', 'u_flash', 'u_fade', 'u_luce', 'u_lucePh', 'u_bande', 'u_vhs', 'u_time', 'u_flashCol', 'u_fadeCol', 'u_bagliore', 'u_flare', 'u_flarePh', 'u_arco', 'u_arcoPh', 'u_espo', 'u_neon', 'u_onda', 'u_bolla', 'u_vortice', 'u_caleido', 'u_calore', 'u_zblur', 'u_centro', 'u_sole', 'u_tinta', 'u_semeGrana', 'u_numCensure', 'u_censure', 'u_morbidoCensure', ...CAMPI_FX.map((k) => 'u_' + k)]) this.uF[n] = gl.getUniformLocation(this.pFx, n); - for (const n of ['u_res', 'u_size', 'u_crop', 'u_off', 'u_scale', 'u_rot', 'u_tex', 'u_src', 'u_orient', 'u_color', 'u_bright', 'u_contrast', 'u_sat', 'u_hue', 'u_look', 'u_time', 'u_texel', 'u_key', 'u_keyColor', 'u_keyExtra', 'u_keyN', 'u_keyLevel', 'u_keySoft', 'u_keyInv', 'u_keySpill', 'u_keyBordo', 'u_keySfuma', 'u_keyPulisci', 'u_matte', 'u_matte2', 'u_matteK', 'u_vista', - 'u_mirror', 'u_temp', 'u_vignette', 'u_alpha', 'u_color2', 'u_grad', 'u_box', 'u_boxPx', 'u_round', 'u_feather', 'u_auto', 'u_autoLo', 'u_autoHi', 'u_autoWb', 'u_autoK', 'u_autoGamma']) + for (const n of ['u_res', 'u_size', 'u_crop', 'u_off', 'u_scale', 'u_rot', 'u_tex', 'u_src', 'u_orient', 'u_color', 'u_bright', 'u_contrast', 'u_sat', 'u_hue', 'u_look', 'u_time', 'u_texel', 'u_key', 'u_keyColor', 'u_keyExtra', 'u_keyN', 'u_keyLevel', 'u_keySoft', 'u_keyInv', 'u_keySpill', 'u_keyBordo', 'u_keySfuma', 'u_keyPulisci', 'u_matte', 'u_matte2', 'u_matteK', 'u_forma', 'u_formaOn', 'u_vista', + ...UNIFORM_COLORE, 'u_mirror', 'u_temp', 'u_vignette', 'u_alpha', 'u_color2', 'u_grad', 'u_box', 'u_boxPx', 'u_round', 'u_feather', 'u_auto', 'u_autoLo', 'u_autoHi', 'u_autoWb', 'u_autoK', 'u_autoGamma', + 'u_numClic', 'u_clic', 'u_clicColore', 'u_clicRapporto']) this.uL[n] = gl.getUniformLocation(this.pLayer, n); - for (const n of ['u_src', 'u_lift', 'u_gamma', 'u_gain', 'u_shadow', 'u_high', 'u_sat', 'u_contrast', 'u_vignette', 'u_grain', 'u_time', 'u_split']) + for (const n of [...UNIFORM_COLORE, 'u_src', 'u_lift', 'u_gamma', 'u_gain', 'u_shadow', 'u_high', 'u_sat', 'u_contrast', 'u_vignette', 'u_grain', 'u_time', 'u_split']) this.uM[n] = gl.getUniformLocation(this.pMaster, n); for (const n of NOMI_COMBINA) this.uC[n] = gl.getUniformLocation(this.pComb, n); this.vao = gl.createVertexArray()!; @@ -1590,7 +1607,7 @@ export class Compositore { this.blank = this.newTex(); gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, 1, 1, 0, gl.RGBA, gl.UNSIGNED_BYTE, new Uint8Array([0, 0, 0, 0])); if ('addEventListener' in canvas) { - canvas.addEventListener('webglcontextlost', (e) => { e.preventDefault(); this.perso = true; }, false); + canvas.addEventListener('webglcontextlost', (e) => { e.preventDefault(); this.perso = true; this.coloreGpu.distruggi(); }, false); } } @@ -1679,6 +1696,7 @@ export class Compositore { const gl = this.gl; if (this.perso || gl.isContextLost()) return; const cw = this.canvas.width, ch = this.canvas.height; + this.coloreGpu.inizia(); this.ensureFbo(cw, ch); this.used.clear(); gl.bindVertexArray(this.vao); @@ -1748,6 +1766,7 @@ export class Compositore { gl.uniform1f(u.u_grain, g.grain); gl.uniform1f(u.u_time, (frame % 10000) / 25); gl.uniform1f(u.u_split, this.prima); + this.coloreGpu.imposta(p, g, u, false); gl.drawArrays(gl.TRIANGLE_STRIP, 0, 4); } this.uscita = uscita; @@ -1763,6 +1782,7 @@ export class Compositore { if (!this.used.has(k) && !k.startsWith('img:')) { gl.deleteTexture(t.tex); this.texs.delete(k); } } this.interp?.finisce(); + this.coloreGpu.finisce(); } private sovr: { firma: string; tela: HTMLCanvasElement | OffscreenCanvas } | null = null; @@ -1784,6 +1804,8 @@ export class Compositore { const u = this.uL; gl.activeTexture(gl.TEXTURE0); gl.bindTexture(gl.TEXTURE_2D, t.tex); + gl.uniform1i(u.u_numClic, 0); + gl.uniform1i(u.u_formaOn, 0); // la sovrimpressione non passa dalle maschere della clip di prima gl.uniform1i(u.u_tex, 0); gl.uniform2f(u.u_res, cw, ch); gl.uniform2f(u.u_size, cw, ch); @@ -1929,6 +1951,16 @@ export class Compositore { const t = this.upload('cd:' + c.id + ':' + i, tela as TexImageSource, tela.width, tela.height, frame + ':' + s.lf); tex = t.tex; sw = W; sh = H; + } else if (c.kind === 'title' && c.gen?.html) { + // un titolo animato HTML: il fotogramma di questo istante (preparato prima nell'export, in anticipo nel monitor) + const d = c.len * p.rate.den / p.rate.num; + const { rw, rh } = misuraResa(W, H, this.canvas.width); + const tela = fotogrammaHtml(c.gen.html, rw, rh, s.local, d, playing ? 6 : 2, p.rate.den / p.rate.num); + if (!tela) return false; + const t = this.upload('ht:' + c.id + ':' + i, tela as TexImageSource, rw, rh, tela); + tex = t.tex; + sw = W; sh = H; + fit = false; } else if (c.kind === 'title' && c.gen?.anim) { // un'animazione del catalogo: disegnata a ogni fotogramma su una tela grande quanto il progetto const tela = disegnaAnimazione(c.gen.anim, W, H, s.local, c.len * p.rate.den / p.rate.num); @@ -1967,6 +1999,8 @@ export class Compositore { gl.disable(gl.BLEND); gl.useProgram(this.pLayer); const u = this.uL; + gl.uniform1i(u.u_numClic, 0); // anche la passata dell'ombra parte senza anelli + gl.uniform1i(u.u_formaOn, 0); // e senza maschere a forma (si accendono solo per la clip vera) gl.activeTexture(gl.TEXTURE0); gl.bindTexture(gl.TEXTURE_2D, tex); gl.uniform1i(u.u_tex, 0); @@ -1985,6 +2019,7 @@ export class Compositore { gl.uniform4f(u.u_box, tf.cropL, tf.cropT, tf.cropR, tf.cropB); gl.uniform1i(u.u_grad, 0); if ((tf.ombra ?? 0) > 0) { + this.coloreGpu.imposta(p, gradeClip(), u, false); // l'ombra: lo stesso rettangolo, nero, più grande e sfumato, un po' più in basso; poi la clip ci va sopra const sf = Math.max(4, (tf.ombra ?? 0) * Math.min(W, H) * 0.045); const ex = (sf * 2) / Math.max(1, bw), ey = (sf * 2) / Math.max(1, bh); @@ -2016,6 +2051,14 @@ export class Compositore { // il bordo arrotondato si sfuma di un pixel dello schermo (niente scalini) gl.uniform1f(u.u_feather, raggio > 0 ? Math.max(0.6, W / Math.max(1, this.fbW)) : 0); gl.uniform1i(u.u_src, srcKind); + this.passataForma(c, sw / sh, u); + const clic = anelliClic(p, c, s.t, s.lf); + gl.uniform1i(u.u_numClic, clic.n); + if (clic.n) { + gl.uniform4fv(u.u_clic, clic.punti); + gl.uniform3fv(u.u_clicColore, clic.colore); + gl.uniform1f(u.u_clicRapporto, sw / sh); + } const col = hex(c.gen?.color ?? '#000000'); gl.uniform3f(u.u_color, col[0], col[1], col[2]); if (srcKind === 3 && c.gen?.color2) { @@ -2023,6 +2066,7 @@ export class Compositore { gl.uniform1i(u.u_grad, 1); gl.uniform3f(u.u_color2, c2[0], c2[1], c2[2]); } + this.coloreGpu.imposta(p, gradeClip(fx.colore), u, !!fx.colore); gl.uniform1f(u.u_bright, fe.bright); gl.uniform1f(u.u_contrast, fe.contrast); gl.uniform1f(u.u_sat, fe.sat); @@ -2084,6 +2128,27 @@ export class Compositore { return true; } + /** le maschere a forma della clip come texture a un canale (unità 6): si rifà solo se la forma, il tempo o le misure cambiano */ + private passataForma(c: Clip, aspetto: number, u: Record) { + const gl = this.gl; + const firma = firmaMaschere(c.maschere, aspetto); + gl.uniform1i(u.u_forma, 6); + gl.activeTexture(gl.TEXTURE6); + if (!firma) { gl.bindTexture(gl.TEXTURE_2D, this.blank); gl.uniform1i(u.u_formaOn, 0); gl.activeTexture(gl.TEXTURE0); return; } + let r = this.forme.get(firma); + if (!r) { + const x = rasterizzaMaschere(c.maschere, aspetto); + if (!x) { gl.bindTexture(gl.TEXTURE_2D, this.blank); gl.uniform1i(u.u_formaOn, 0); gl.activeTexture(gl.TEXTURE0); return; } + r = x; + this.forme.set(firma, r); + if (this.forme.size > 24) this.forme.delete(this.forme.keys().next().value!); + } else { this.forme.delete(firma); this.forme.set(firma, r); } + gl.bindTexture(gl.TEXTURE_2D, this.matte('fm:' + firma, r.w, r.h, r.dati)); + gl.uniform1i(u.u_formaOn, 1); + gl.activeTexture(gl.TEXTURE0); + } + private forme = new Map(); + /** una transizione fra A (buffer 0) e B (buffer "dentro"), scritta nel buffer "fuori": nel mix (2) si appoggia su * quello che c'è già; in un buffer della catena (5, 6) lo riempie da capo */ private combine(tr: Transition | null, prog: number, opacity: number, hasA: boolean, dentro = 1, fuori = 2, vecchia = 0) { @@ -2147,6 +2212,7 @@ export class Compositore { const gl = this.gl; for (const t of this.texs.values()) gl.deleteTexture(t.tex); this.texs.clear(); + this.coloreGpu.distruggi(); for (const f of this.fbo) { gl.deleteFramebuffer(f.fb); gl.deleteTexture(f.tex); } this.fbo = []; this.interp?.distruggi(); diff --git a/src/render/cursore.ts b/src/render/cursore.ts new file mode 100644 index 0000000..f01d7da --- /dev/null +++ b/src/render/cursore.ts @@ -0,0 +1,39 @@ +// Anelli originali: posizione del clic fissa nella sorgente, raggio crescente e dissolvenza al quadrato. +// Il layer li disegna prima della matrice della clip: seguono zoom, ritaglio, specchio e transizioni. +import type { Clip, Project } from '../core/tipi'; +import { clicAlTempo } from '../core/zoomCursore'; + +export const UNIFORM_CLIC = ` +uniform int u_numClic; +uniform vec4 u_clic[8]; // x, y, età normalizzata, forza +uniform vec3 u_clicColore; +uniform float u_clicRapporto; +`; + +export const DISEGNA_CLIC = ` + for (int i = 0; i < 8; i++) { + if (i >= u_numClic) break; + vec4 s = u_clic[i]; + float d = length((uv0 - s.xy) * vec2(u_clicRapporto, 1.0)); + float r = 0.009 + s.z * 0.025; + float bordo = 1.0 - smoothstep(0.0015, 0.003, abs(d - r)); + rgb = mix(rgb, u_clicColore, bordo * (1.0 - s.z) * (1.0 - s.z) * s.w); + } +`; + +export function anelliClic(p: Project, c: Clip, t: number, lf: number) { + const vuoto = { n: 0, punti: new Float32Array(32), colore: [1, 0.835, 0.29] }; + const m = p.media.find((m) => m.id === c.media), dati = m?.cursoreLive; + if (!dati || dati.v !== 1 || c.kind !== 'media') return vuoto; + const f = c.start + lf; + const blocchi = p.clips.filter((b) => b.kind === 'fx' && b.track === c.track && b.start <= f && f < b.start + b.len + && b.fxb?.id === 'clicLive' && b.fxb.tipo === 'effetto' && (!b.fxb.cursoreMedia || b.fxb.cursoreMedia === m.id)); + const b = blocchi.at(-1)?.fxb; + if (!b || b.forza <= 0 || !Number.isFinite(b.forza)) return vuoto; + const tMs = (t - (m.t0 || 0)) * 1000, clic = clicAlTempo(dati, tMs); + const punti = new Float32Array(32); + clic.forEach((s, i) => punti.set([s.cx, s.cy, (tMs - s.tMs) / 550, Math.min(1, b.forza)], i * 4)); + const col = /^#[0-9a-f]{6}$/i.test(b.colore) ? b.colore : '#ffd54a'; + const colore = [1, 3, 5].map((i) => parseInt(col.slice(i, i + 2), 16) / 255); + return { n: clic.length, punti, colore }; +} diff --git a/src/render/curve.ts b/src/render/curve.ts new file mode 100644 index 0000000..b59af92 --- /dev/null +++ b/src/render/curve.ts @@ -0,0 +1,50 @@ +// Tabelle delle curve derivate dal generatore OpenReel (MIT, TERZE-PARTI.md). +// Hermite con pendenze limitate: niente gobbe oltre i punti come con Catmull-Rom. +import type { CanaleCurva, ColoreAvanzato, PuntoColore } from '../core/tipi'; +export const CANALI_CURVA: CanaleCurva[] = ['master', 'red', 'green', 'blue', 'luma']; +export const CAMPIONI_CURVA = 1024; +const clamp = (v: number) => Math.max(0, Math.min(1, v)); +export const identitaCurva = (): PuntoColore[] => [{ id: 'inizio', x: 0, y: 0 }, { id: 'fine', x: 1, y: 1 }]; + +export function normalizzaCurva(punti: PuntoColore[] = []): PuntoColore[] { + const m = new Map(); + for (const p of punti) if (Number.isFinite(p.x) && Number.isFinite(p.y)) m.set(clamp(p.x), { ...p, x: clamp(p.x), y: clamp(p.y) }); + if (!m.has(0)) m.set(0, { id: 'inizio', x: 0, y: 0 }); + if (!m.has(1)) m.set(1, { id: 'fine', x: 1, y: 1 }); + return [...m.values()].sort((a, b) => a.x - b.x); +} +export function valutaCurva(punti: PuntoColore[], x: number): number { + const p = punti; + x = clamp(x); + let i = 0; + while (i < p.length - 2 && p[i + 1].x < x) i++; + const a = p[i], b = p[i + 1], h = b.x - a.x; + const d = (j: number) => (p[j + 1].y - p[j].y) / (p[j + 1].x - p[j].x); + const tang = (j: number) => { + if (j === 0) return d(0); + if (j === p.length - 1) return d(j - 1); + const l = d(j - 1), r = d(j); + return l * r <= 0 ? 0 : 2 * l * r / (l + r); + }; + const t = (x - a.x) / h, t2 = t * t, t3 = t2 * t; + return clamp((2 * t3 - 3 * t2 + 1) * a.y + (t3 - 2 * t2 + t) * h * tang(i) + + (-2 * t3 + 3 * t2) * b.y + (t3 - t2) * h * tang(i + 1)); +} +export function curveNeutre(curve?: ColoreAvanzato['curve']): boolean { + return CANALI_CURVA.every((c) => normalizzaCurva(curve?.[c]).every((p) => Math.abs(p.x - p.y) < 1e-7)); +} +/** Una riga per canale, float replicato in RGBA per filtraggio half float WebGL2. */ +export function tabellaCurve(curve?: ColoreAvanzato['curve']): Float32Array { + const out = new Float32Array(CAMPIONI_CURVA * 5 * 4); + CANALI_CURVA.forEach((c, r) => { + const p = normalizzaCurva(curve?.[c]); + for (let i = 0; i < CAMPIONI_CURVA; i++) out.fill(valutaCurva(p, i / (CAMPIONI_CURVA - 1)), (r * CAMPIONI_CURVA + i) * 4, (r * CAMPIONI_CURVA + i + 1) * 4); + }); + return out; +} +/** Luma Rec.709: scala il colore per conservarne i rapporti; nero con epsilon, uscita SDR. */ +export function curvaLuma(rgb: number[], punti: PuntoColore[]): number[] { + const y = rgb[0] * .2126 + rgb[1] * .7152 + rgb[2] * .0722; + const nuovo = valutaCurva(normalizzaCurva(punti), y); + return y > 1e-5 ? rgb.map((v) => clamp(v * nuovo / y)) : [nuovo, nuovo, nuovo]; +} diff --git a/src/render/libreriLut.ts b/src/render/libreriLut.ts new file mode 100644 index 0000000..0873465 --- /dev/null +++ b/src/render/libreriLut.ts @@ -0,0 +1,44 @@ +// Le LUT di partenza di DaProd Editor Video: file .cube nostri, generati da scripts/genera-lut.mjs (src/assets/lut/). +// Si leggono solo quando servono (un pezzetto di codice per ognuna), non pesano all'avvio. +import type { RisorsaLut } from '../core/tipi'; +import { campionaLut, lutDaTesto } from './lut'; + +export interface LutDiPartenza { id: string; nome: string; info: string } +export const LUT_DI_PARTENZA: LutDiPartenza[] = [ + { id: 'caldo', nome: 'Caldo', info: 'ambra morbida, pelle dorata' }, + { id: 'freddo', nome: 'Freddo', info: 'azzurro pulito, aria d\'inverno' }, + { id: 'pellicola-anni-70', nome: 'Pellicola anni 70', info: 'neri alzati, verde giallino, colori un po\' spenti' }, + { id: 'bianco-e-nero-ricco', nome: 'Bianco e nero ricco', info: 'contrasto pieno, rossi chiari e blu scuri' }, + { id: 'teal-e-orange', nome: 'Teal & orange', info: 'ombre verde-azzurro, pelle e luci arancio' }, +]; + +const file = import.meta.glob('../assets/lut/*.cube', { query: '?raw', import: 'default' }) as Record Promise>; +const lette = new Map>(); + +/** La LUT pronta da mettere nel progetto (stesso id di chi carica lo stesso file a mano: una sola copia). */ +export function caricaLutDiPartenza(id: string): Promise { + let p = lette.get(id); + if (!p) { + const voce = LUT_DI_PARTENZA.find((l) => l.id === id), apri = file[`../assets/lut/${id}.cube`]; + p = voce && apri ? apri().then((t) => lutDaTesto(t, voce.nome)) : Promise.reject(new Error('Questa LUT di partenza non c\'è')); + p.catch(() => lette.delete(id)); + lette.set(id, p); + } + return p; +} + +/** Una scena di prova (cielo, pelle, erba, grigi) per vedere cosa fa una LUT prima di sceglierla: w×h pixel RGB 0..1. */ +export function scenaDiProva(w: number, h: number): number[][] { + const px: number[][] = []; + for (let y = 0; y < h; y++) for (let x = 0; x < w; x++) { + const u = x / (w - 1), v = y / (h - 1); + if (v > 0.8) { px.push([u, u, u]); continue; } + const fascia = Math.min(3, Math.floor(u * 4)), l = 1 - v / 0.8 * 0.75; + const base = [[0.35, 0.55, 0.95], [0.86, 0.62, 0.5], [0.3, 0.7, 0.3], [0.9, 0.35, 0.3]][fascia]; + px.push(base.map((c) => Math.min(1, c * l * 1.15))); + } + return px; +} + +/** I pixel della scena passati dalla LUT (a intensità piena). */ +export const applicaAScena = (lut: RisorsaLut, scena: number[][]): number[][] => scena.map((p) => campionaLut(lut, p, 1)); diff --git a/src/render/lut.ts b/src/render/lut.ts new file mode 100644 index 0000000..5841cca --- /dev/null +++ b/src/render/lut.ts @@ -0,0 +1,76 @@ +// Parser e riferimento trilineare adattati da OpenReel (MIT): vedi TERZE-PARTI.md. +import type { RisorsaLut } from '../core/tipi'; + +export const MAX_CUBE_BYTE = 32 * 1024 * 1024; +export const MAX_CUBE_SIZE = 65; +const numero = /^[+-]?(?:\d+\.?\d*|\.\d+)(?:e[+-]?\d+)?$/i; + +export function validaLut(l: RisorsaLut): boolean { + return Number.isInteger(l.n) && l.n >= 2 && l.n <= MAX_CUBE_SIZE && Array.isArray(l.dati) && l.dati.length === l.n ** 3 * 3 + && l.dati.every((x) => Number.isFinite(x) && Math.abs(x) <= 65504) + && Array.isArray(l.domainMin) && Array.isArray(l.domainMax) && l.domainMin.length === 3 && l.domainMax.length === 3 + && l.domainMin.every((x, i) => Number.isFinite(x) && Math.abs(x) <= 65504 && Number.isFinite(l.domainMax[i]) && Math.abs(l.domainMax[i]) <= 65504 && l.domainMax[i] > x); +} + +/** Rosso più veloce, poi verde, poi blu. I float e DOMAIN_* restano intatti. */ +export function parseCube(testo: string, nome = 'LUT'): Omit { + if (testo.length > MAX_CUBE_BYTE || new TextEncoder().encode(testo).length > MAX_CUBE_BYTE) throw new Error('La LUT supera 32 MB'); + let n = 0, iniziati = false; + let domainMin: [number, number, number] = [0, 0, 0], domainMax: [number, number, number] = [1, 1, 1]; + const dati: number[] = [], viste = new Set(); + for (const [i, riga] of testo.replace(/^\uFEFF/, '').split(/\r?\n/).entries()) { + const r = riga.replace(/"[^"]*"|#.*$/g, (parte) => parte.startsWith('#') ? '' : parte).trim(); + if (!r) continue; + const parti = r.split(/\s+/), k = parti[0]; + const errore = () => new Error(`LUT: riga ${i + 1} non valida (${k})`); + if (numero.test(k)) { + if (!n || parti.length !== 3 || !parti.every((x) => numero.test(x) && Number.isFinite(Number(x)) && Math.abs(Number(x)) <= 65504)) throw errore(); + iniziati = true; + if (dati.length >= n ** 3 * 3) throw new Error('La LUT ha troppi campioni'); + dati.push(...parti.map(Number)); + continue; + } + if (iniziati || viste.has(k)) throw errore(); + viste.add(k); + if (k === 'TITLE') { if (!/^TITLE\s+".*"$/.test(r)) throw errore(); nome = r.slice(r.indexOf('"') + 1, -1); } + else if (k === 'LUT_3D_SIZE') { + n = Number(parti[1]); + if (parti.length !== 2 || !Number.isInteger(n) || n < 2 || n > MAX_CUBE_SIZE) throw new Error('La LUT deve avere da 2 a 65 punti per lato'); + } else if (k === 'DOMAIN_MIN' || k === 'DOMAIN_MAX') { + if (parti.length !== 4 || !parti.slice(1).every((x) => numero.test(x) && Number.isFinite(Number(x)))) throw errore(); + const v = parti.slice(1).map(Number) as [number, number, number]; + if (k === 'DOMAIN_MIN') domainMin = v; else domainMax = v; + } else throw new Error(`LUT: intestazione ${k} non supportata (servono LUT 3D .cube)`); + } + const l = { nome, n, domainMin, domainMax, dati }; + if (!validaLut({ ...l, id: '', hash: '' })) throw new Error('LUT incompleta o dominio non valido'); + return l; +} + +/** Dal testo di un .cube alla risorsa del progetto (id e hash sul contenuto): serve a chi legge un file e alla libreria di partenza. */ +export async function lutDaTesto(testo: string, nome: string): Promise { + const l = parseCube(testo, nome); + const bytes = new TextEncoder().encode(JSON.stringify([l.n, l.domainMin, l.domainMax, l.dati])); + const hash = Array.from(new Uint8Array(await crypto.subtle.digest('SHA-256', bytes)), (x) => x.toString(16).padStart(2, '0')).join(''); + return { ...l, id: 'lut-' + hash, hash }; +} + +export async function leggiLut(file: File): Promise { + if (!/\.cube$/i.test(file.name)) throw new Error('Scegli un file .cube'); + if (file.size > MAX_CUBE_BYTE) throw new Error('La LUT supera 32 MB'); + return lutDaTesto(await file.text(), file.name); +} + +/** Riferimento CPU per le prove; nell'app i pixel passano dalla texture 3D. */ +export function campionaLut(l: RisorsaLut, rgb: number[], intensita = 1): number[] { + if (intensita <= 0) return [...rgb]; + const p = rgb.map((v, i) => Math.max(0, Math.min(1, (v - l.domainMin[i]) / (l.domainMax[i] - l.domainMin[i]))) * (l.n - 1)); + const lo = p.map(Math.floor), hi = lo.map((v) => Math.min(l.n - 1, v + 1)), t = p.map((v, i) => v - lo[i]); + const out = [0, 0, 0]; + for (let b = 0; b < 2; b++) for (let g = 0; g < 2; g++) for (let r = 0; r < 2; r++) { + const w = (r ? t[0] : 1 - t[0]) * (g ? t[1] : 1 - t[1]) * (b ? t[2] : 1 - t[2]); + const j = ((b ? hi[2] : lo[2]) * l.n ** 2 + (g ? hi[1] : lo[1]) * l.n + (r ? hi[0] : lo[0])) * 3; + for (let c = 0; c < 3; c++) out[c] += l.dati[j + c] * w; + } + return out.map((v, i) => rgb[i] + (v - rgb[i]) * Math.min(1, intensita)); +} diff --git a/src/render/piano.ts b/src/render/piano.ts index 40be10f..bd4b922 100644 --- a/src/render/piano.ts +++ b/src/render/piano.ts @@ -5,6 +5,7 @@ // prima del suo inizio (con le maniglie della sorgente, o fermandosi sul primo/ultimo fotogramma). import type { Clip, Project, Transition } from '../core/tipi'; import { clipOpacity, end, mediaOf, srcTimeAt } from '../core/progetto'; +import { valutaClip } from '../core/automazioni'; import { prevAdjacent } from '../core/montaggio'; import { transizioniAttive } from '../core/blocchi'; import { f2s } from '../core/timecode'; @@ -53,7 +54,8 @@ function sorgente(p: Project, c: Clip, f: number): Sorgente { let t = srcTimeAt(p, c, f); const m = mediaOf(p, c); if (m && m.duration > 0) t = Math.max(m.t0 || 0, Math.min(t, m.duration - 1e-3)); - return { clip: c, t, local: f2s(f - c.start, p.rate), lf: f - c.start }; + // la clip com'è in questo fotogramma (con i keyframe già calcolati: senza animazioni è la clip stessa) + return { clip: valutaClip(c, f - c.start), t, local: f2s(f - c.start, p.rate), lf: f - c.start }; } /** strati video al fotogramma f, dal basso (V1) verso l'alto */ diff --git a/src/render/provino.ts b/src/render/provino.ts index 7749e66..f66a7ef 100644 --- a/src/render/provino.ts +++ b/src/render/provino.ts @@ -9,6 +9,7 @@ import { MASTER0, TITLE0, isVideoClip, newClip, newTrack } from '../core/progett import { durataBlocco, nuovoBlocco, posaBlocco } from '../core/blocchi'; import { applicaPresetTitolo, presetTitolo } from '../core/generatori'; import { animazione, nuovaAnim } from '../core/animazioni'; +import { modelloHtml, nuovoHtml } from '../core/titoliHtml'; import { fps } from '../core/timecode'; import type { Fotogramma } from '../media/fotogrammi'; import { Lettori } from '../export/esporta'; @@ -229,6 +230,17 @@ export function scenaAnimazione(id: string): Costruttore { }; } +/** un titolo animato HTML sopra il fotogramma al cursore (al massimo 5 secondi: il provino è breve) */ +export function scenaHtml(id: string): Costruttore { + return (a, b) => { + const { p, v1, v2, r } = base(a, b); + const L = Math.round(r * Math.min(5, modelloHtml(id)?.durata ?? 5)); + p.clips.push(foto(v1, 0, L)); + p.clips.push(newClip('title', v2, 0, L, { name: 'Titolo HTML', gen: { html: nuovoHtml(id) } })); + return { p, da: 0, a: L }; + }; +} + /** countdown da solo */ export function scenaConto(stile: 'pellicola' | 'moderno' | 'neon' | 'minimal', secondi: number): Costruttore { return (a) => { diff --git a/src/render/titoliHtml.ts b/src/render/titoliHtml.ts new file mode 100644 index 0000000..d369976 --- /dev/null +++ b/src/render/titoliHtml.ts @@ -0,0 +1,261 @@ +// Disegna i titoli animati HTML (src/core/titoliHtml.ts) su una tela, fotogramma per fotogramma. +// +// COME SI DISEGNA (e perché così). Un'HTML non si può disegnare su una tela da solo: OffscreenCanvas non sa fare il layout +// del testo HTML/CSS, e le funzioni nuove che lo permetterebbero (html-in-canvas) non ci sono né in WebView2 né in WebKit. +// L'unica strada che c'è in entrambi è: HTML dentro un SVG (``), l'SVG diventa un'immagine (`Image` con +// un indirizzo `data:`), l'immagine si disegna sulla tela (`drawImage`). Due conseguenze, e le abbiamo volute: +// 1. Un SVG usato come immagine è un documento a parte, isolato: niente script, niente file esterni, nessun accesso ai +// caratteri della pagina. Quindi i caratteri (@fontsource e DSEG7, tutti OFL) vengono incorporati nell'SVG come +// `data:` base64, e le animazioni NON possono essere CSS `animation` o Web Animations (nell'immagine non vanno +// a un orologio nostro). Il tempo lo diamo noi: a ogni fotogramma si calcola lo stato (funzione pura del tempo, +// src/core/titoliHtml.ts) e lo si scrive nell'HTML come variabili CSS (`--t`, `--in`, `--out`…) e valori in linea. +// Per questo monitor ed esportazione danno lo stesso fotogramma: stesso tempo → stesso testo HTML → stessa immagine. +// 2. Il disegno è asincrono (l'immagine va caricata). Il monitor chiede il fotogramma e, se non c'è ancora, mostra l'ultimo +// che ha e fa preparare i prossimi (`fotogrammaHtml`); l'esportazione li aspetta uno per uno (`preparaStrati`). +// Rete di sicurezza: all'avvio si fa una prova (un quadratino rosso disegnato e riletto). Se il sistema non sa leggere +// i pixel di un SVG con HTML dentro (alcune versioni di WebKit sporcano la tela), si disegna solo la scritta con la tela 2D. +import type { HtmlSpec, Project } from '../core/tipi'; +import { CSS_BASE, FONT_HTML, costruisciHtml, firmaHtml, modelloHtml, righeDi, statoHtml, type FotogrammaHtml } from '../core/titoliHtml'; +import { nuovaTela } from './grafica'; +import type { Strato } from './piano'; +import { f2s } from '../core/timecode'; + +type Tela = HTMLCanvasElement | OffscreenCanvas; + +// ——— i caratteri, incorporati nell'SVG ——— +const FILE_FONT: Record Promise<{ default: string }>> = { + 'dseg7': () => import('../stile/font/DSEG7Classic-Bold.woff2?url'), + 'orbitron-700': () => import('@fontsource/orbitron/files/orbitron-latin-700-normal.woff2?url'), + 'orbitron-900': () => import('@fontsource/orbitron/files/orbitron-latin-900-normal.woff2?url'), + 'rajdhani-500': () => import('@fontsource/rajdhani/files/rajdhani-latin-500-normal.woff2?url'), + 'rajdhani-700': () => import('@fontsource/rajdhani/files/rajdhani-latin-700-normal.woff2?url'), + 'montserrat-500': () => import('@fontsource/montserrat/files/montserrat-latin-500-normal.woff2?url'), + 'montserrat-700': () => import('@fontsource/montserrat/files/montserrat-latin-700-normal.woff2?url'), + 'montserrat-900': () => import('@fontsource/montserrat/files/montserrat-latin-900-normal.woff2?url'), + 'oswald-500': () => import('@fontsource/oswald/files/oswald-latin-500-normal.woff2?url'), + 'oswald-700': () => import('@fontsource/oswald/files/oswald-latin-700-normal.woff2?url'), + 'bebas-400': () => import('@fontsource/bebas-neue/files/bebas-neue-latin-400-normal.woff2?url'), + 'archivo-400': () => import('@fontsource/archivo-black/files/archivo-black-latin-400-normal.woff2?url'), + 'mono-700': () => import('@fontsource/space-mono/files/space-mono-latin-700-normal.woff2?url'), + 'playfair-400': () => import('@fontsource/playfair-display/files/playfair-display-latin-400-normal.woff2?url'), + 'playfair-700': () => import('@fontsource/playfair-display/files/playfair-display-latin-700-normal.woff2?url'), +}; + +const cssFont = new Map>(); + +function base64(b: ArrayBuffer): string { + const u = new Uint8Array(b); + let s = ''; + for (let i = 0; i < u.length; i += 0x8000) s += String.fromCharCode(...u.subarray(i, i + 0x8000)); + return btoa(s); +} + +/** la regola @font-face di un pezzo di carattere, con i byte dentro (una volta sola) */ +function regolaFont(chiave: string): Promise { + let p = cssFont.get(chiave); + if (!p) { + const f = FONT_HTML[chiave], carica = FILE_FONT[chiave]; + p = !f || !carica ? Promise.resolve('') : carica() + .then((m) => fetch(m.default)) + .then((r) => r.arrayBuffer()) + .then((b) => `@font-face{font-family:'${f.famiglia}';font-weight:${f.peso};font-style:normal;src:url(data:font/woff2;base64,${base64(b)}) format('woff2')}`) + .catch(() => ''); + cssFont.set(chiave, p); + } + return p; +} +const cssDeiFont = async (pezzi: string[]) => (await Promise.all(pezzi.map(regolaFont))).join(''); + +// ——— dall'HTML alla tela ——— +function svgDi(corpo: string, css: string, rw: number, rh: number): string { + return `` + + `
${corpo}
`; +} + +async function rasterizza(svg: string, rw: number, rh: number): Promise { + const img = new Image(rw, rh); + await new Promise((ok, ko) => { + img.onload = () => ok(); + img.onerror = () => ko(new Error('Immagine SVG non caricata')); + img.src = 'data:image/svg+xml;charset=utf-8,' + encodeURIComponent(svg); + }); + // WebKit a volte dice «caricata» prima di avere i pixel: decode() aspetta quelli (se manca o fallisce si va avanti) + try { await img.decode(); } catch { /* si prova lo stesso a disegnare */ } + const tela = nuovaTela(rw, rh); + (tela.getContext('2d') as CanvasRenderingContext2D).drawImage(img, 0, 0, rw, rh); + return tela; +} + +let prova: Promise | null = null; +/** il sistema sa disegnare HTML dentro un SVG e farne una tela leggibile? (si prova una volta sola) */ +export function htmlDisponibile(): Promise { + prova ??= (async () => { + if (typeof Image === 'undefined' || typeof document === 'undefined') return false; + try { + const t = await rasterizza(svgDi('
', '', 16, 16), 16, 16); + const px = (t.getContext('2d') as CanvasRenderingContext2D).getImageData(8, 8, 1, 1).data; + return px[0] > 200 && px[1] < 60 && px[3] > 200; + } catch { return false; } + })(); + return prova; +} +/** solo per le prove */ +export function azzeraProvaHtml(esito?: boolean) { prova = esito === undefined ? null : Promise.resolve(esito); } + +/** il ripiego: solo le scritte, con la tela 2D (se l'HTML non si può disegnare) */ +function disegnaRipiego(spec: HtmlSpec, rw: number, rh: number, t: number, d: number): Tela { + const tela = nuovaTela(rw, rh); + const c = tela.getContext('2d') as CanvasRenderingContext2D; + const s = statoHtml(spec, t, d); + const righe = righeDi(spec); + const px = rh / 1080; + c.globalAlpha = Math.max(0, Math.min(1, s.in * s.out)); + c.textAlign = 'center'; + c.textBaseline = 'middle'; + c.fillStyle = '#ffffff'; + c.shadowColor = 'rgba(0,0,0,.8)'; + c.shadowBlur = 12 * px; + righe.slice(0, 4).forEach((r, i) => { + c.font = `700 ${(i ? 56 : 110) * px}px Orbitron, sans-serif`; + c.fillText(r.slice(0, 60), rw / 2, rh / 2 + (i - (Math.min(righe.length, 4) - 1) / 2) * 120 * px, rw * 0.9); + }); + return tela; +} + +// ——— la cache e il lavoro ——— +const BUDGET_BYTE = 200 * 1024 * 1024; +interface Voce { tela: Tela; byte: number } +const cache = new Map(); // l'ordine di inserimento è l'ordine d'uso (si rimette in fondo a ogni uso) +let usati = 0; +const incorso = new Map>(); +const scaldati = new Set(); + +function tieni(chiave: string, tela: Tela, rw: number, rh: number) { + const byte = rw * rh * 4; + const prima = cache.get(chiave); + if (prima) usati -= prima.byte; + cache.delete(chiave); + cache.set(chiave, { tela, byte }); + usati += byte; + while (usati > BUDGET_BYTE && cache.size > 1) { + const [k, v] = cache.entries().next().value as [string, Voce]; + cache.delete(k); + usati -= v.byte; + } +} +const cercata = (chiave: string) => { + const v = cache.get(chiave); + if (v) { cache.delete(chiave); cache.set(chiave, v); } + return v?.tela ?? null; +}; +/** quanti fotogrammi ci sono in memoria (per le prove) */ +export const fotogrammiInCache = () => cache.size; +export function svuotaCacheHtml() { cache.clear(); usati = 0; incorso.clear(); ultimi.clear(); coda.length = 0; } + +/** disegna un fotogramma (asincrono). `chiave` = quella di costruisciHtml: se c'è già in cache o in lavoro non si rifà. */ +function disegna(spec: HtmlSpec, fr: FotogrammaHtml, rw: number, rh: number, t: number, d: number): Promise { + const dentro = cercata(fr.chiave); + if (dentro) return Promise.resolve(dentro); + let p = incorso.get(fr.chiave); + if (!p) { + p = (async () => { + let tela: Tela; + if (await htmlDisponibile()) { + const css = (await cssDeiFont(fr.font)) + CSS_BASE + fr.css; + const svg = svgDi(fr.corpo, css, rw, rh); + // la prima volta con un insieme di caratteri nuovo si disegna due volte: il motore a volte ha ancora + // da decodificare il carattere incorporato e la prima immagine esce col carattere di riserva + const insieme = fr.font.slice().sort().join(','); + if (!scaldati.has(insieme)) { scaldati.add(insieme); try { await rasterizza(svg, rw, rh); } catch { /* si riprova sotto */ } } + try { tela = await rasterizza(svg, rw, rh); } catch { tela = disegnaRipiego(spec, rw, rh, t, d); } + } else tela = disegnaRipiego(spec, rw, rh, t, d); + tieni(fr.chiave, tela, rw, rh); + return tela; + })().finally(() => { incorso.delete(fr.chiave); }); + incorso.set(fr.chiave, p); + } + return p; +} + +/** il fotogramma al tempo t (secondi dall'inizio della clip, clip lunga d secondi) su una tela rw×rh: lo aspetta */ +export async function preparaHtml(spec: HtmlSpec, rw: number, rh: number, t: number, d: number): Promise { + return disegna(spec, costruisciHtml(spec, rw, rh, t, d), rw, rh, t, d); +} + +// ——— il monitor: sincrono, con i prossimi fotogrammi preparati in anticipo ——— +interface Lavoro { spec: HtmlSpec; fr: FotogrammaHtml; rw: number; rh: number; t: number; d: number } +const coda: Lavoro[] = []; +let inLavoro = 0; +const CONTEMPORANEI = 2, CODA_MAX = 24; +/** l'ultimo fotogramma mostrato per ogni titolo (finché il nuovo non è pronto si vede questo, niente buchi) */ +const ultimi = new Map(); +let alPronto: (() => void) | null = null; +let avvisando = false; +/** chi vuole sapere quando arriva un fotogramma nuovo (il monitor ridisegna) */ +export function quandoPronto(fn: (() => void) | null) { alPronto = fn; } +function avvisa() { + if (avvisando || !alPronto) return; + avvisando = true; + setTimeout(() => { avvisando = false; alPronto?.(); }, 16); +} + +function pompa() { + while (inLavoro < CONTEMPORANEI && coda.length) { + const l = coda.pop()!; // l'ultimo richiesto è il più utile (scorrendo la timeline) + if (cache.has(l.fr.chiave)) continue; + inLavoro++; + void disegna(l.spec, l.fr, l.rw, l.rh, l.t, l.d).then(() => avvisa()).catch(() => undefined).finally(() => { inLavoro--; pompa(); }); + } +} +function metti(l: Lavoro) { + if (cache.has(l.fr.chiave) || incorso.has(l.fr.chiave) || coda.some((x) => x.fr.chiave === l.fr.chiave)) return; + coda.push(l); + if (coda.length > CODA_MAX) coda.splice(0, coda.length - CODA_MAX); +} + +/** + * Per il compositore (sincrono): il fotogramma se è già pronto; se no l'ultimo che c'era per questo titolo (o niente), + * e intanto si preparano questo e i prossimi `avanti` (a passo `passo` secondi) mentre si riproduce. + */ +export function fotogrammaHtml(spec: HtmlSpec, rw: number, rh: number, t: number, d: number, avanti = 0, passo = 0.04): Tela | null { + const fr = costruisciHtml(spec, rw, rh, t, d); + const idTitolo = firmaHtml(spec) + '|' + rw; + const pronto = cercata(fr.chiave); + if (pronto) { ultimi.set(idTitolo, pronto); if (ultimi.size > 40) ultimi.delete(ultimi.keys().next().value!); } + else metti({ spec, fr, rw, rh, t, d }); + for (let i = 1; i <= avanti; i++) { + const tt = t + i * passo; + if (tt > d) break; + metti({ spec, fr: costruisciHtml(spec, rw, rh, tt, d), rw, rh, t: tt, d }); + } + pompa(); + return pronto ?? ultimi.get(idTitolo) ?? null; +} + +// ——— l'esportazione: ogni fotogramma si aspetta ——— +/** la misura a cui si disegna un titolo: quella della tela di uscita, mai più grande del progetto */ +export function misuraResa(pw: number, ph: number, larghezzaTela: number): { rw: number; rh: number } { + const rw = Math.max(2, Math.round(Math.min(pw, larghezzaTela))); + return { rw, rh: Math.max(2, Math.round((rw * ph) / pw)) }; +} + +/** prepara i titoli HTML degli strati di questo fotogramma (prima di `render`, nell'esportazione e nelle istantanee) */ +export async function preparaStrati(p: Project, strati: Strato[], larghezzaTela: number): Promise { + const { rw, rh } = misuraResa(p.w, p.h, larghezzaTela); + const lavori: Promise[] = []; + for (const s of strati) { + for (const src of [s.b, s.a]) { + const h = src?.clip.kind === 'title' ? src.clip.gen?.html : undefined; + if (h && src) lavori.push(preparaHtml(h, rw, rh, src.local, f2s(src.clip.len, p.rate))); + } + } + if (lavori.length) await Promise.all(lavori); +} + +/** l'anteprima ferma di un modello nella libreria: disegnata davvero, a metà della sua entrata, su una tela piccola */ +export async function anteprimaHtml(cv: HTMLCanvasElement, spec: HtmlSpec): Promise { + const m = modelloHtml(spec.id); + if (!m) return; + const tela = await preparaHtml(spec, 384, 216, Math.min(m.durata * 0.45, 2.4), m.durata); + cv.getContext('2d')?.drawImage(tela as CanvasImageSource, 0, 0, cv.width, cv.height); +} diff --git a/src/stile/coloreAvanzato.css b/src/stile/coloreAvanzato.css new file mode 100644 index 0000000..4bc15f1 --- /dev/null +++ b/src/stile/coloreAvanzato.css @@ -0,0 +1,13 @@ +.colore-avanzato { display: grid; gap: 12px; padding: 12px; color: inherit; min-width: 0; } +.colore-avanzato fieldset { min-width: 0; border: 1px solid #67647366; border-radius: 6px; padding: 10px; display: grid; gap: 8px; } +.colore-avanzato legend { padding: 0 5px; font-weight: 600; } +.colore-avanzato label { display: flex; gap: 8px; align-items: center; justify-content: space-between; } +.colore-avanzato input[type=number] { width: 85px; min-width: 0; } +.colore-avanzato select { min-width: 0; max-width: 100%; } +.colore-avanzato .ca-ruote { display: grid; grid-template-columns: repeat(auto-fit, minmax(145px, 1fr)); gap: 8px; } +.colore-avanzato .ca-disco { width: 112px; height: 112px; border-radius: 50%; margin: 4px auto; position: relative; touch-action: none; cursor: crosshair; background: radial-gradient(circle, #999 0%, transparent 75%), conic-gradient(from 90deg, #f66, #ff6, #6f6, #6ff, #66f, #f6f, #f66); } +.colore-avanzato .ca-punto { position: absolute; width: 10px; height: 10px; border: 2px solid white; border-radius: 50%; transform: translate(-50%, -50%); box-shadow: 0 0 0 1px #111; pointer-events: none; } +.colore-avanzato .ca-curva { width: 100%; height: auto; display: block; border: 1px solid #777; touch-action: none; cursor: crosshair; } +.colore-avanzato .ca-punto-riga { display: flex; gap: 6px; flex-wrap: wrap; } +.colore-avanzato .ca-numero { font-size: 12px; } +.colore-avanzato .ca-stato { min-height: 1.4em; overflow-wrap: anywhere; } diff --git a/src/stile/coloreUI.css b/src/stile/coloreUI.css new file mode 100644 index 0000000..4c84522 --- /dev/null +++ b/src/stile/coloreUI.css @@ -0,0 +1,44 @@ +/* Colore avanzato e voce/musica collegati all'interfaccia: LUT di partenza, finestra mobile, interruttori. */ +.ck-ducking { display: grid; gap: 8px; min-width: 0; } +.ck-interruttore { display: flex; align-items: center; gap: 8px; cursor: pointer; padding: 6px 8px; border-radius: 6px; background: #1b1a22; border: 1px solid #000; box-shadow: inset 0 0 0 1px #ffffff12; color: #ebe7f4; } +.ck-interruttore.acceso { box-shadow: inset 0 0 0 1px #ffd54a66; } +.ck-interruttore input { position: absolute; opacity: 0; pointer-events: none; } +.ck-interruttore input:focus-visible + .led { outline: 2px solid #35e8ff; outline-offset: 2px; } +.ck-interruttore .led { width: 9px; height: 9px; border-radius: 50%; background: #3a3844; box-shadow: inset 0 0 0 1px #000; flex: none; } +.ck-interruttore .led.acceso { background: #5dffb4; box-shadow: 0 0 6px #5dffb4; } +.ck-numero { display: flex; gap: 8px; align-items: center; justify-content: space-between; font-size: 12px; } +.ck-numero input { width: 85px; min-width: 0; flex: none; } +.ck-numero span, .ck-interruttore span:last-child { min-width: 0; overflow-wrap: anywhere; } +.ck-altre summary { cursor: pointer; color: #a19db0; font-size: 12px; margin-bottom: 6px; } +.ck-altre[open] { display: grid; gap: 6px; } +.ck-ok { color: #5dffb4; } +.ck-da-fare { color: #ffb23d; } +.ck-stato { min-height: 1.2em; overflow-wrap: anywhere; } + +/* LUT di partenza con anteprima */ +.ca-libreria { display: grid; grid-template-columns: repeat(auto-fill, minmax(96px, 1fr)); gap: 8px; } +.ca-lut { display: grid; gap: 4px; padding: 4px; border-radius: 6px; background: #1b1a22; border: 1px solid #000; box-shadow: inset 0 0 0 1px #ffffff12; color: #ebe7f4; cursor: pointer; font: inherit; text-align: center; min-width: 0; } +.ca-lut canvas { width: 100%; height: auto; aspect-ratio: 16 / 9; border-radius: 3px; display: block; background: #000; } +.ca-lut b { font-size: 11px; font-weight: 600; overflow-wrap: anywhere; } +.ca-lut:hover { box-shadow: inset 0 0 0 1px #ffd54a99; } +.ca-lut.scelta { box-shadow: inset 0 0 0 2px #ffd54a; } +.ca-lut:focus-visible { outline: 2px solid #35e8ff; outline-offset: 2px; } +.ca-carica { display: flex; gap: 8px; align-items: center; justify-content: space-between; font-size: 12px; } +.ca-carica input { min-width: 0; max-width: 60%; } + +/* Colore avanzato nella pagina Finale */ +.ca-fin { display: grid; gap: 8px; min-width: 0; } +.ca-fin-scelta { display: flex; gap: 8px; align-items: center; justify-content: space-between; } +.ca-fin-scelta select { min-width: 0; max-width: 70%; } +.ca-fin-host { min-width: 0; } +.ca-fin-host .colore-avanzato { padding: 0; } + +/* Finestra mobile del colore avanzato: niente velo, il monitor resta in vista per vedere cosa succede */ +.ca-finestra { position: fixed; z-index: 800; top: calc(var(--bt-alto, 34px) + 56px); right: 16px; width: min(400px, calc(100vw - 32px)); max-height: calc(100vh - var(--bt-alto, 34px) - 72px); + display: flex; flex-direction: column; background: rgba(22, 17, 36, .82); backdrop-filter: blur(10px); border: 1px solid #ffffff2e; border-radius: 12px; box-shadow: 0 10px 40px #000a; color: #ebe7f4; } +.ca-finestra:focus { outline: none; } +.ca-finestra header { display: flex; align-items: center; gap: 8px; padding: 8px 10px; cursor: grab; border-bottom: 1px solid #ffffff1c; touch-action: none; user-select: none; } +.ca-finestra header b { flex: 1; font-family: Orbitron, sans-serif; font-size: 12px; letter-spacing: .06em; color: #ffd54a; } +.ca-finestra .ca-corpo { overflow: auto; min-height: 0; } +@media (max-width: 520px) { .ca-finestra { right: 16px; left: 16px; width: auto; } } +.striscia-btn { flex-wrap: wrap; justify-content: center; } diff --git a/src/stile/copieAI.css b/src/stile/copieAI.css new file mode 100644 index 0000000..dbef3ee --- /dev/null +++ b/src/stile/copieAI.css @@ -0,0 +1,11 @@ +/* Indicazioni dei modelli, nello stesso pannello del Centro AI. */ +.centro-ai .hub-opzionale { + display: inline-block; + margin-left: 8px; + color: var(--oro); + font-size: 11px; + font-weight: 400; +} +.centro-ai .hub-nome .hub-peso { color: var(--testo2); margin-top: 3px; } +.centro-ai .hub-nome .hub-macchina { line-height: 1.4; } +.centro-ai .hub-macchina[data-esito='lento'] { color: var(--oro); } diff --git a/src/stile/editor.css b/src/stile/editor.css index abad2d2..eff2ac0 100644 --- a/src/stile/editor.css +++ b/src/stile/editor.css @@ -57,12 +57,12 @@ button svg { pointer-events: none; } height: 100%; display: grid; grid-template-columns: var(--bin) 6px minmax(0, 1fr) 6px var(--lato); - grid-template-rows: 44px minmax(160px, min(var(--alto), calc(100vh - 340px))) auto 7px minmax(120px, 1fr) 22px; + grid-template-rows: 44px minmax(160px, min(var(--alto), calc(100vh - 340px))) 7px auto minmax(120px, 1fr) 22px; grid-template-areas: 'testa testa testa testa testa' 'bin bbin monitor blato lato' - 'puls puls puls puls puls' 'div div div div div' + 'puls puls puls puls puls' 'tl tl tl tl tl' 'stato stato stato stato stato'; gap: 0; @@ -78,12 +78,12 @@ button svg { pointer-events: none; } grid-template-areas: 'testa testa testa testa testa' 'bin bbin monitor blato lato' - 'puls puls puls blato lato' 'div div div blato lato' + 'puls puls puls blato lato' 'tl tl tl blato lato' 'stato stato stato stato stato'; } -#app.lato-lungo.senza-lato:not(.stretto):not([data-pagina='finale']):not([data-pagina='live']):not([data-pagina='montage']) { grid-template-areas: 'testa testa testa testa testa' 'bin bbin monitor blato lato' 'puls puls puls puls puls' 'div div div div div' 'tl tl tl tl tl' 'stato stato stato stato stato'; } +#app.lato-lungo.senza-lato:not(.stretto):not([data-pagina='finale']):not([data-pagina='live']):not([data-pagina='montage']) { grid-template-areas: 'testa testa testa testa testa' 'bin bbin monitor blato lato' 'div div div div div' 'puls puls puls puls puls' 'tl tl tl tl tl' 'stato stato stato stato stato'; } #app.lato-lungo .lato { border-bottom: 1px solid #000; } /* la pagina Finale: monitor grande, i ritocchi a destra, la timeline sotto */ #app[data-pagina='finale'] { @@ -531,7 +531,7 @@ button svg { pointer-events: none; } .jog { width: 42px; height: 42px; flex: none; cursor: grab; touch-action: none; } /* ——— pulsantiera ——— */ -.pulsantiera { display: flex; align-items: stretch; gap: 10px; padding: 6px 10px; background: linear-gradient(180deg, #25232d, #19181f); border-top: 1px solid #000; border-bottom: 1px solid #000; box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.06); overflow-x: auto; overflow-y: hidden; scrollbar-width: thin; } +.pulsantiera { display: flex; align-items: stretch; gap: 10px; padding: 4px 10px 6px; background: linear-gradient(180deg, #25232d, #19181f); border-top: 1px solid #000; border-bottom: 0; box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.06); overflow-x: auto; overflow-y: hidden; scrollbar-width: thin; } .gruppo-tasti { display: flex; gap: 5px; align-items: center; padding-right: 10px; border-right: 1px solid #000; box-shadow: 1px 0 0 var(--bordo); flex: none; } .gruppo-tasti:last-child { border-right: 0; box-shadow: none; } .tasto-num { position: relative; display: flex; flex-direction: column; align-items: center; justify-content: center; gap: 1px; width: 58px; height: 46px; border-radius: 8px; border: 1px solid #000; color: #e4e0ee; background: linear-gradient(180deg, #43414d 0%, #33313c 45%, #2a2932 100%); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.18), inset 0 -2px 0 rgba(0, 0, 0, 0.35), 0 3px 0 #0a090d, 0 4px 8px rgba(0, 0, 0, 0.4); transition: transform 0.05s; } @@ -552,10 +552,10 @@ button svg { pointer-events: none; } .divisore::after { content: ''; position: absolute; left: 50%; top: 2px; width: 40px; height: 2px; margin-left: -20px; border-radius: 2px; background: #3a3844; } /* ——— timeline ——— */ -.timeline { display: grid; grid-template-columns: 124px 1fr; grid-template-rows: 25px minmax(0, 1fr); min-height: 0; background: #0f0e14; border-top: 1px solid #000; position: relative; } -.tl-schede { grid-column: 1 / -1; display: flex; gap: 2px; align-items: flex-end; padding: 0 6px; background: #0b0a0f; border-bottom: 1px solid #000; overflow-x: auto; scrollbar-width: none; } +.timeline { display: grid; grid-template-columns: 124px 1fr; grid-template-rows: 25px minmax(0, 1fr); min-height: 0; background: #0f0e14; position: relative; } +.tl-schede { grid-column: 1 / -1; display: flex; gap: 2px; align-items: flex-end; padding: 2px 6px 0; background: #19181f; border-bottom: 1px solid #000; overflow-x: auto; scrollbar-width: none; } .tl-schede::-webkit-scrollbar { display: none; } -.tl-scheda { display: inline-flex; align-items: center; gap: 5px; height: 21px; padding: 0 10px; border-radius: 6px 6px 0 0; border: 1px solid #25232d; border-bottom: 0; background: #16151c; color: var(--testo3); font: 700 11.5px var(--ui); white-space: nowrap; flex: none; } +.tl-scheda { display: inline-flex; align-items: center; gap: 5px; height: 21px; padding: 0 10px; border-radius: 6px 6px 0 0; border: 1px solid #2c2a35; border-bottom: 0; background: #121118; color: var(--testo3); font: 700 11.5px var(--ui); white-space: nowrap; flex: none; } .tl-scheda:hover { color: var(--testo); } .tl-scheda.attiva { background: #1f1d27; color: var(--oro); border-color: rgba(255, 213, 74, 0.35); box-shadow: inset 0 2px 0 var(--oro); } .tl-scheda.piu { padding: 0 8px; color: var(--testo2); } @@ -618,17 +618,23 @@ button svg { pointer-events: none; } .isp-gruppo summary { padding: 6px 9px; font: 800 11px var(--ui); letter-spacing: 1px; text-transform: uppercase; color: var(--oro); cursor: pointer; list-style: none; display: flex; align-items: center; gap: 6px; } .isp-gruppo summary::before { content: '▸'; color: var(--testo3); transition: transform 0.15s; } .isp-gruppo[open] summary::before { transform: rotate(90deg); } -.isp-gruppo > :not(summary) { margin: 0 9px 7px; } +.isp-gruppo { min-width: 0; } +.isp-gruppo > :not(summary) { margin: 0 9px 7px; min-width: 0; } +/* i campi larghi quanto la sezione hanno il margine di 9px per lato: senza questo uscirebbero dal bordo destro */ +.isp-gruppo > .campo-testo, .isp-gruppo > select, .isp-gruppo > .mini-select.largo { width: calc(100% - 18px); text-overflow: ellipsis; } .isp-grip { margin-left: auto; padding: 0 4px; color: var(--testo3); font-size: 15px; line-height: 1; cursor: grab; touch-action: none; border-radius: 4px; } .isp-grip:hover { color: var(--oro); background: #23212b; } .isp-gruppo.trascinato { outline: 2px solid var(--oro); opacity: 0.88; box-shadow: 0 6px 18px rgba(0, 0, 0, 0.5); } .isp-gruppo.trascinato .isp-grip { cursor: grabbing; } .isp-ripristina { display: block; margin: 4px auto 10px; padding: 3px 10px; border-radius: 14px; border: 1px solid #000; background: #23212b; color: var(--testo3); font: 700 10.5px var(--ui); } .isp-ripristina:hover { color: var(--testo); } -.isp-riga { display: grid; grid-template-columns: 96px 1fr auto; gap: 6px; align-items: center; font-size: 12px; color: var(--testo2); } +.isp-riga { display: grid; grid-template-columns: minmax(64px, 96px) minmax(0, 1fr) auto; gap: 6px; align-items: center; font-size: 12px; color: var(--testo2); min-width: 0; } +.isp-riga > * { min-width: 0; } .isp-riga label { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } .isp-riga input[type='range'] { width: 100%; accent-color: var(--oro); } -.isp-riga select { grid-column: 2 / 4; } +.isp-riga select { grid-column: 2 / 4; width: 100%; text-overflow: ellipsis; } +/* una tendina sola nella riga (senza etichetta) prende tutta la larghezza */ +.isp-riga > select:only-child { grid-column: 1 / -1; } .isp-riga input[type='color'] { grid-column: 2 / 4; width: 100%; height: 22px; background: none; border: 1px solid #000; border-radius: 4px; padding: 0; } .isp-riga.spunta { grid-template-columns: auto 1fr; cursor: pointer; } .isp-num { display: flex; align-items: center; gap: 2px; } @@ -781,8 +787,8 @@ button svg { pointer-events: none; } /* ——— telefono e tablet stretto ——— */ #app.stretto, #app.stretto[data-pagina='finale'] { grid-template-columns: minmax(0, 1fr); - grid-template-rows: 44px minmax(180px, 38vh) auto 7px 1fr 0 56px; - grid-template-areas: 'testa' 'monitor' 'puls' 'div' 'tl' 'stato' 'tel'; + grid-template-rows: 44px minmax(180px, 38vh) 7px auto 1fr 0 56px; + grid-template-areas: 'testa' 'monitor' 'div' 'puls' 'tl' 'stato' 'tel'; } .stretto .bordo, .stretto .pagine { display: none; } #app.stretto .finale { display: flex; } @@ -834,7 +840,7 @@ button svg { pointer-events: none; } .isp-durata .isp-riga { grid-template-columns: 1fr 92px; } .isp-durata .isp-riga .nota { margin: 0; font-size: 10.5px; } /* la pulsantiera ci deve stare tutta anche con il tasto FOTO */ -.pulsantiera { gap: 8px; padding: 6px 8px; } +.pulsantiera { gap: 8px; padding: 4px 8px 6px; } .gruppo-tasti { gap: 4px; padding-right: 8px; } .tasto-num { width: 54px; } .tasto-piccolo { padding: 0 7px; } @@ -1006,20 +1012,26 @@ button svg { pointer-events: none; } .live-conto.batti { animation: live-batti 1s ease-out; } @keyframes live-batti { 0% { transform: scale(1.7); opacity: 0; } 18% { transform: scale(1); opacity: 1; } 80% { opacity: 1; } 100% { transform: scale(0.85); opacity: 0.15; } } /* la colonna dei comandi: la regia resta in alto, le scelte scorrono sotto */ -.live-comandi { display: flex; flex-direction: column; gap: 8px; min-height: 0; min-width: 0; overflow-x: hidden; overflow-y: auto; padding: 0 4px 0 2px; } +.live-comandi { display: flex; flex-direction: column; gap: 6px; min-height: 0; min-width: 0; overflow-x: hidden; overflow-y: auto; padding: 0 4px 0 2px; } .live-comandi > * { min-width: 0; max-width: 100%; } -.live-regia { position: sticky; top: 0; z-index: 1; display: flex; flex-direction: column; gap: 6px; background: var(--pann); padding-bottom: 6px; border-bottom: 1px solid var(--bordo); } -.live-tempo { font: 400 54px var(--tc); color: #3a1820; text-align: center; background: #0a0709; border-radius: 8px; padding: 8px 0; box-shadow: inset 0 2px 8px #000; letter-spacing: 2px; } +.live-regia { position: sticky; top: 0; z-index: 1; display: flex; flex-direction: column; gap: 5px; background: var(--pann); padding-bottom: 8px; border-bottom: 1px solid var(--bordo); } +.live-display { position: relative; background: #0a0709; border-radius: 8px; padding: 15px 0 3px; box-shadow: inset 0 2px 8px #000; } +.live-display .live-fase-certa { position: absolute; top: 4px; left: 10px; right: 10px; margin: 0; padding: 0; border: 0; font: 800 9.5px var(--ui); letter-spacing: 1.4px; color: var(--testo3); text-align: left; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; } +.live-tempo { font: 400 42px/1.1 var(--tc); color: #3a1820; text-align: center; letter-spacing: 2px; } +.live-display .live-fase-certa[data-fase='registra'] { color: var(--rosso); } +.live-display .live-fase-certa[data-fase='pausa'] { color: var(--oro); } .live.in-onda .live-tempo { color: var(--rosso); text-shadow: 0 0 12px rgba(255, 77, 109, 0.6); } .live.in-pausa .live-tempo { color: var(--oro); text-shadow: 0 0 10px rgba(255, 213, 74, 0.5); } -.live-stato { text-align: center; font: 700 13px var(--ui); color: var(--testo2); min-height: 17px; } -.live-info { text-align: center; font: 600 11px var(--ui); color: var(--testo3); min-height: 14px; } -.live-tasti { display: grid; grid-template-columns: 1.4fr 1fr 1fr; gap: 6px; } +.live-stato { text-align: center; font: 700 12.5px var(--ui); color: var(--testo2); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } +.live-info { text-align: center; font: 600 10.5px var(--ui); color: var(--testo3); margin-top: -3px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } +.live-info:empty { display: none; } +.live-gruppo { display: flex; flex-direction: column; gap: 4px; } +.live-tasti { display: grid; grid-template-columns: 1.4fr 1fr 1fr; gap: 4px; } .live-tasti.due { grid-template-columns: 1fr 1.4fr; } .live-tasti.tre { grid-template-columns: 1fr 1fr 1.5fr; } -.live-tasti.tre .live-btn { height: 36px; font-size: 11.5px; padding: 0 4px; } +.live-tasti.tre .live-btn { height: 30px; min-height: 30px; font-size: 11px; padding: 0 4px; box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.12), 0 2px 0 #0b0a0e; } .live-btn.cam.acceso { color: #d9fbe6; border-color: #1c6b3e; background: linear-gradient(180deg, #2f9c63, #1e6d44); } -.live-btn { height: 48px; border-radius: 9px; border: 1px solid #000; background: var(--metallo-chiaro); color: var(--testo); font: 800 13px var(--ui); letter-spacing: 0.5px; display: inline-flex; align-items: center; justify-content: center; gap: 7px; box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.12), 0 3px 0 #0b0a0e; } +.live-btn { height: 40px; border-radius: 9px; border: 1px solid #000; background: var(--metallo-chiaro); color: var(--testo); font: 800 13px var(--ui); letter-spacing: 0.5px; display: inline-flex; align-items: center; justify-content: center; gap: 7px; box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.12), 0 3px 0 #0b0a0e; } .live-tasti.due .live-btn { height: 34px; font-size: 11.5px; } .live-btn:disabled { opacity: 0.4; cursor: default; } .live-btn.reg { background: linear-gradient(180deg, #5a1a26, #3a0f18); color: #ffd9df; } @@ -1029,12 +1041,35 @@ button svg { pointer-events: none; } .live-vu-riga { display: grid; grid-template-columns: auto 1fr auto; align-items: center; gap: 7px; color: var(--testo3); padding: 2px 2px 0; } .live-vu { width: 100%; height: 10px; cursor: pointer; border-radius: 2px; background: #0a090d; } .live-vu-nome { font: 600 10.5px var(--ui); color: var(--testo3); min-width: 70px; text-align: right; } -.live-sez { margin: 8px 2px 0; font: 800 10.5px var(--ui); letter-spacing: 1.2px; text-transform: uppercase; color: var(--testo3); } +.live-sez { margin: 8px 2px 3px; font: 800 10.5px var(--ui); letter-spacing: 1.2px; text-transform: uppercase; color: var(--testo3); } .live-comandi .fin-interruttore { padding: 9px 12px; gap: 9px; font-size: 13px; } +/* le sorgenti: interruttore, scelta e misuratore sulla stessa riga; le colonne si allineano fra le righe come i canali di un banco */ +.live-sorgenti { display: grid; grid-template-columns: max-content minmax(0, 1fr) 76px 22px; gap: 4px 6px; align-items: center; min-width: 0; } +.live-sorgenti > .fin-interruttore { grid-column: 1; } +/* finestra stretta (colonna di 340 px): il nome dell'interruttore si accorcia coi puntini, cosi' la scelta del dispositivo resta leggibile */ +@media (max-width: 1150px) { .live-sorgenti { grid-template-columns: 112px minmax(0, 1fr) 76px 22px; } .live-sorgenti > .fin-interruttore { min-width: 0; } } +.live-sorgenti .fin-interruttore { height: 28px; padding: 0 9px; gap: 6px; font-size: 12px; white-space: nowrap; box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 #0a090d; } +.live-sorgenti .fin-interruttore.acceso, .live-configurazione .fin-interruttore.acceso { box-shadow: inset 0 0 0 1px rgba(93, 255, 180, 0.45), 0 1px 0 #0a090d; } +.live-sorgenti .fin-int-testo, .live-configurazione .fin-int-testo { overflow: hidden; text-overflow: ellipsis; min-width: 0; } +.live-sorgenti .live-sel { max-width: none; width: 100%; height: 28px; font-size: 11.5px; } +.live-sorgenti > .live-sel-cam { grid-column: 2 / -1; } +.live-sorgenti > .la-stato { font: 600 10.5px var(--ui); color: var(--testo3); text-align: left; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } +.live-sorg-misura { display: flex; align-items: center; height: 28px; padding: 0 5px; border-radius: 6px; background: #0c0b10; box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.8), 0 1px 0 rgba(255, 255, 255, 0.04); transition: opacity 0.2s; min-width: 0; } +.live-sorg-misura.spenta { opacity: 0.35; } +.live-sorgenti > .live-btn { grid-column: 1 / -1; height: 26px; font-size: 11.5px; box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.12), 0 2px 0 #0b0a0e; } +.live-sorgenti > .live-prime { grid-column: 1 / -1; } .live-riga { display: flex; gap: 6px; align-items: center; min-width: 0; } .live-riga > .fin-interruttore { flex: 1; min-width: 0; } -.live-sel { max-width: 46%; min-width: 0; height: 32px; border-radius: 7px; border: 1px solid #000; background: #15141a; color: var(--testo2); font: 600 11.5px var(--ui); padding: 0 6px; } +.live-sel { max-width: 46%; min-width: 0; height: 28px; border-radius: 7px; border: 1px solid #000; background: #15141a; color: var(--testo2); font: 600 11.5px var(--ui); padding: 0 6px; } .live-chips { display: flex; flex-wrap: wrap; gap: 4px; } +.live-griglia { display: grid; grid-template-columns: repeat(auto-fit, minmax(165px, 1fr)); gap: 4px; } +.live-configurazione .fin-interruttore { height: 28px; padding: 0 9px; gap: 7px; font-size: 11.5px; white-space: nowrap; min-width: 0; box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 #0a090d; } +.live-configurazione .live-btn { height: 26px; font-size: 11px; padding: 0 10px; box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.12), 0 2px 0 #0b0a0e; } +.live-riga.live-qualita { justify-content: space-between; flex-wrap: wrap; gap: 4px 10px; } +.live-schermo-scelta { margin-top: 5px; } +.live-schermo-scelta label { display: flex; align-items: center; gap: 8px; font: 700 11px var(--ui); color: var(--testo3); } +.live-schermo-scelta label > .live-sel { flex: 1; max-width: none; } +.live-schermo-scelta .nota { margin: 4px 2px 0; font-size: 11px; } .live-chips .chip { padding: 3px 9px; } .live-chips .chip.acceso { background: linear-gradient(180deg, #ff8a9e, #d9344f); box-shadow: 0 0 10px rgba(255, 77, 109, 0.35); } .live-riga.cam-scelte { justify-content: space-between; flex-wrap: wrap; } @@ -1369,7 +1404,8 @@ html[data-finestra='web'] .barra-titolo, html[data-finestra='mac'] .barra-titolo /* ——— le Proprietà rifatte (1.4.0): quadro in miniatura, posizioni pronte, tessere con anteprima, durata chiara ——— */ .isp-gruppo.principale { box-shadow: inset 0 0 0 1px rgba(255, 213, 74, 0.35), inset 0 1px 0 rgba(255, 255, 255, 0.04); } .isp-gruppo.principale > summary { font-size: 12px; } -.isp-riga.col { grid-template-columns: 1fr; gap: 3px; } +.isp-riga.col { grid-template-columns: minmax(0, 1fr); gap: 3px; } +.isp-riga.col .campo-testo { min-width: 0; } .isp-riga.col label small { display: block; color: var(--testo3); font: 600 10.5px var(--ui); } .mq { display: flex; flex-direction: column; gap: 4px; } .mq-tela { width: 100%; display: block; border-radius: 6px; background: #0b0a10; box-shadow: 0 0 0 1px #000, 0 4px 14px rgba(0, 0, 0, 0.45); touch-action: none; } diff --git a/src/stile/esportazione.css b/src/stile/esportazione.css new file mode 100644 index 0000000..b8676e3 --- /dev/null +++ b/src/stile/esportazione.css @@ -0,0 +1,60 @@ +/* L'esportazione: preset, anteprima di cosa esce, ritocchi, coda. Colori e pezzi sono quelli del resto dell'editor + (metallo scuro, oro per l'azione principale, LED). */ +.es { display: flex; flex-direction: column; gap: 10px; } +.es-sezione { margin-bottom: 0; } + +/* i preset: carte con un LED, come le cassette per scegliere */ +.es-preset { display: grid; grid-template-columns: repeat(auto-fill, minmax(150px, 1fr)); gap: 7px; } +.es-carta { position: relative; display: flex; flex-direction: column; gap: 2px; text-align: left; padding: 8px 9px 8px 24px; border-radius: 9px; border: 1px solid #000; background: linear-gradient(180deg, #2b2a33, #1f1e26); color: var(--testo); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.07), 0 2px 0 rgba(0, 0, 0, 0.35); } +.es-carta:hover { border-color: rgba(255, 213, 74, 0.4); } +.es-carta .led { position: absolute; left: 9px; top: 11px; } +.es-carta b { font: 700 13px var(--ui); } +.es-carta small { font-size: 11px; color: var(--testo3); line-height: 1.2; } +.es-carta em { font: normal 600 11px var(--ui); color: var(--cia); margin-top: 2px; } +.es-carta.acceso { box-shadow: 0 0 0 2px var(--oro), 0 0 14px rgba(255, 213, 74, 0.28); } +.es-carta.acceso .led { background: radial-gradient(circle at 35% 35%, #d8ffe9, var(--verde) 60%); box-shadow: 0 0 8px var(--verde); } + +/* cosa esce: righe etichetta / valore */ +.es-anteprima { border: 1px solid #000; border-radius: 9px; background: #0f0e14; padding: 8px 10px; box-shadow: inset 0 2px 6px rgba(0, 0, 0, 0.6); } +.es-righe { display: grid; gap: 3px; } +.es-riga { display: grid; grid-template-columns: 96px 1fr; gap: 8px; font-size: 12px; align-items: baseline; } +.es-riga > span { color: var(--testo3); text-transform: uppercase; letter-spacing: 0.6px; font-size: 10.5px; } +.es-riga > b { font: 700 13px var(--ui); color: var(--testo); } +.es-riga small { font-weight: 500; color: var(--testo3); font-size: 11px; } +.es-nota { margin: 6px 0 0; font-size: 12px; line-height: 1.3; color: var(--testo2); } +.es-nota b { color: var(--oro); } +.es-nota.attento { color: var(--ambra); } +.es-nota.male { color: var(--rosso); } + +/* i ritocchi */ +.es-regole { display: flex; flex-direction: column; gap: 8px; } +.es-scelta { display: grid; grid-template-columns: 96px 1fr; gap: 8px; align-items: center; font-size: 12px; color: var(--testo2); } +.es-scelta .chip:disabled { opacity: 0.4; cursor: default; } +.es-qualita input[type='range'] { width: 100%; } +.es-qdice { font-size: 12px; margin-top: 2px; color: var(--testo2); } +.es-qdice b { color: var(--oro); font-weight: 700; } +.es-qdice small { color: var(--testo3); font-size: 11px; } +.es-nome { display: flex; align-items: center; gap: 4px; } +.es-nome .campo-testo { flex: 1; min-width: 0; } +.es-nome small { color: var(--testo3); } + +.es-azioni { display: flex; gap: 8px; flex-wrap: wrap; align-items: center; } +.es-azioni .fin-vai { flex: 1 1 200px; } + +/* la coda */ +.es-coda-testa { display: flex; align-items: center; justify-content: space-between; gap: 8px; margin-bottom: 6px; } +.es-coda-riep { font-size: 12px; color: var(--testo2); } +.es-lista { display: flex; flex-direction: column; gap: 6px; } +.es-voce { display: flex; gap: 8px; align-items: flex-start; padding: 7px 9px; border-radius: 9px; border: 1px solid #000; background: #1a1920; } +.es-voce .led { margin-top: 5px; } +.es-voce.lavoro { box-shadow: 0 0 0 1px rgba(255, 213, 74, 0.45); } +.es-voce.errore { box-shadow: 0 0 0 1px rgba(255, 77, 109, 0.5); } +.es-voce.annullata { opacity: 0.65; } +.es-voce-testi { flex: 1; min-width: 0; display: flex; flex-direction: column; gap: 1px; } +.es-voce-testi b { font: 700 13px var(--ui); } +.es-voce-testi small { font-size: 11px; color: var(--testo3); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } +.es-voce .barra-avanz { margin-top: 5px; height: 6px; } +.es-voce-stato { font-size: 11.5px; color: var(--testo2); margin-top: 2px; } +.es-voce.errore .es-voce-stato { color: var(--rosso); } +.es-voce-tasti { display: flex; align-items: center; gap: 2px; flex: none; } +.dialogo.dlg-esporta { width: min(860px, calc(100vw - 24px)); } diff --git a/src/stile/flussi.css b/src/stile/flussi.css index 01be2c6..9ad2cd7 100644 --- a/src/stile/flussi.css +++ b/src/stile/flussi.css @@ -15,15 +15,20 @@ button, select, summary { touch-action: manipulation; } .fin-sezione { margin-bottom: 12px; } .fin-looks { grid-template-columns: repeat(auto-fit, minmax(110px, 1fr)); } .fin-riepilogo .fin-numeri { flex-wrap: wrap; } -.live-regia { position: sticky; top: 0; z-index: 2; background: var(--pann); padding-bottom: 10px; } +.live-regia { position: sticky; top: 0; z-index: 2; background: var(--pann); } +@media (max-height: 760px) { .live-regia { position: static; } } .live-fase-certa { display: block; padding: 8px; border: 1px solid var(--bordo); border-radius: 6px; font-size: 13px; letter-spacing: .04em; } .live-fase-certa[data-fase='registra'] { color: var(--rosso); border-color: var(--rosso); } .live-fase-certa[data-fase='pausa'] { color: var(--ambra); border-color: var(--ambra); } .live-fonti-stato { font-size: 12px; line-height: 1.5; margin: 8px 0; } -.live-configurazione, .live-archivio { padding: 10px 0; border-top: 1px solid var(--bordo); } -.live-configurazione summary, .live-archivio summary { cursor: pointer; color: var(--oro); padding: 8px; } +.live-configurazione, .live-archivio { padding: 2px 0 4px; border-top: 1px solid var(--bordo); } +.live-configurazione summary, .live-archivio summary { cursor: pointer; color: var(--oro); padding: 6px 2px; font: 800 11.5px var(--ui); letter-spacing: 1px; text-transform: uppercase; list-style: none; user-select: none; } +.live-configurazione summary::-webkit-details-marker, .live-archivio summary::-webkit-details-marker { display: none; } +.live-configurazione summary::before, .live-archivio summary::before { content: '▸'; display: inline-block; width: 14px; color: var(--testo3); transition: transform 0.15s; } +.live-configurazione[open] > summary::before, .live-archivio[open] > summary::before { transform: rotate(90deg); } +.live-configurazione > :not(summary) { margin-bottom: 5px; } .live-tasti { flex-wrap: wrap; } -.live-tasti .live-btn { min-width: 0; white-space: normal; flex: 1 1 90px; min-height: 36px; } +.live-tasti .live-btn { min-width: 0; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; } .live-tastiera { white-space: normal; } .mt-etapes { display: none; flex-wrap: wrap; gap: 8px; padding: 8px 12px; } .mt-etapes button[aria-current='step'] { border-color: var(--oro); color: var(--oro); } @@ -79,8 +84,7 @@ button, select, summary { touch-action: manipulation; } .att-r-comandi:empty { display: none; } .att-riga[data-stato='manuale'] .att-pista { display: none; } .att-fin { opacity: .85; } -.live-guida { margin: 8px 2px; } -.live-rapide { display: flex; flex-direction: column; gap: 6px; padding: 6px 0; } +.live-guida { margin: 2px; } .live-prime { display: flex; flex-direction: column; gap: 4px; } .live-prime:empty { display: none; } .live-prime .live-fonte { display: flex; align-items: center; gap: 8px; padding: 4px 8px; border-radius: 6px; background: #1d1c24; } diff --git a/src/stile/guscio.css b/src/stile/guscio.css new file mode 100644 index 0000000..ac42835 --- /dev/null +++ b/src/stile/guscio.css @@ -0,0 +1,51 @@ +/* Il guscio di DaProd Video allineato allo stile comune DaProd (cammoWiki: stile-interfacce-daprod). + Barra in alto con logo che gira e nome in Orbitron, chip della macchina, tasto novità, vetro sui dialoghi e sugli avvisi. + La pagina Montaggio e i popup Attività / Modifica clip non si toccano. */ + +/* ——— barra in alto: logo che gira, «DaP» in oro sfumato e il nome del programma ——— */ +.barra-titolo .logo-giro { display: grid; place-items: center; width: 24px; height: 24px; filter: drop-shadow(0 0 4px rgba(255, 171, 0, 0.3)); } +.barra-titolo .logo-giro svg { display: block; } +.logo-giro .anello { transform-box: fill-box; transform-origin: center; animation: logo-gira 14s linear infinite; } +@keyframes logo-gira { to { transform: rotate(360deg); } } +.barra-titolo .marchio { gap: 8px; } +.barra-titolo .scritta { display: inline-flex; align-items: baseline; gap: 7px; font-family: var(--marchio); } +.barra-titolo .scritta b { + font: 900 17px var(--marchio); letter-spacing: 0.02em; + background: linear-gradient(180deg, #f3c21a, #e0a000 50%, #9a5f00); -webkit-background-clip: text; background-clip: text; color: transparent; +} +.barra-titolo .scritta i { + font: 700 11px var(--marchio); font-style: normal; letter-spacing: 0.3em; text-transform: uppercase; color: #c41bb9; +} +@media (prefers-reduced-motion: reduce) { .logo-giro .anello { animation: none; } } + +/* ——— chip della macchina, al centro ——— */ +.bt-chip-hw { display: flex; align-items: center; gap: 6px; margin-left: 4px; } +.barra-titolo .chip-hw { + display: inline-flex; align-items: center; gap: 6px; height: 22px; padding: 0 10px; border-radius: 11px; + background: #f3f1f6; border: 1px solid #e2dfe8; color: #4a4655; font: 700 11.5px var(--ui); letter-spacing: 0.02em; white-space: nowrap; +} +.barra-titolo .chip-gpu { color: #24212c; } +.barra-titolo .chip-hw .led { width: 7px; height: 7px; background: #b9b5c4; box-shadow: none; } +.barra-titolo .chip-hw .led.verde { background: #1fbf7a; box-shadow: 0 0 6px rgba(31, 191, 122, 0.55); } +.barra-titolo .chip-hw .led.ambra { background: #f0a020; box-shadow: 0 0 6px rgba(240, 160, 32, 0.5); } +@media (max-width: 1500px) { .barra-titolo .chip-cpu { display: none; } } +@media (max-width: 1280px) { .bt-chip-hw { display: none; } } + +/* ——— tasto novità ✦ ——— */ +.bt-novita svg { color: #b0169f; } +.bt-novita:hover:not(:disabled) svg { color: #8a0f7c; } + +/* ——— vetro: dialoghi generici e avvisi (non Attività, non l'editor della clip) ——— + sfondo che sfuma quello che c'è dietro, bordo chiaro sottile; il velo sfuma di più */ +.velo:not(:has(.editor-clip)) { background: rgba(5, 4, 8, 0.36); backdrop-filter: blur(12px) saturate(1.2); -webkit-backdrop-filter: blur(12px) saturate(1.2); } +.velo:not(:has(.editor-clip)) ~ .velo:not(:has(.editor-clip)) { background: rgba(5, 4, 8, 0.2); backdrop-filter: blur(6px); -webkit-backdrop-filter: blur(6px); } +.dialogo:not(.editor-clip), .avviso { + background: rgba(18, 16, 26, 0.52); + backdrop-filter: blur(22px) saturate(1.5); + -webkit-backdrop-filter: blur(22px) saturate(1.5); + border-color: rgba(255, 255, 255, 0.13); + box-shadow: 0 18px 48px rgba(0, 0, 0, 0.42), inset 0 1px 0 rgba(255, 255, 255, 0.07); +} +.avviso.errore { background: rgba(42, 18, 25, 0.5); border-color: rgba(255, 77, 109, 0.4); } +/* gli avvisi si lasciano toccare: col mouse sopra la chiusura da sola si ferma (src/ui/dom.ts) */ +.avvisi .avviso { pointer-events: auto; } diff --git a/src/stile/home.css b/src/stile/home.css new file mode 100644 index 0000000..c3acb93 --- /dev/null +++ b/src/stile/home.css @@ -0,0 +1,90 @@ +/* La pagina iniziale «da banco di montaggio»: pannelli di metallo con le viti, LED, display a sette segmenti. + Le regole vecchie `.home-*` stanno ancora in editor.css; qui sopra le stesse classi si ridisegnano con `.home.hm` + e le classi nuove cominciano con `hm-`. */ +.home.hm { background: radial-gradient(120% 90% at 50% 0%, rgba(53, 16, 70, 0.55), rgba(8, 7, 12, 0.97) 70%); align-items: start; } +.home.hm .hm-dentro { width: min(1280px, 97vw); max-height: none; padding: 18px 16px 28px; gap: 16px; } +.hm-testa { padding-bottom: 12px; border-bottom: 1px solid var(--bordo); } +.hm-targa { margin-left: auto; display: inline-flex; align-items: center; gap: 8px; padding: 5px 12px; border-radius: 6px; background: #060509; box-shadow: inset 0 2px 6px #000, 0 1px 0 rgba(255, 255, 255, 0.07); } +.hm-targa .hm-seg { font-size: 15px; } +.home.hm .home-chiudi { margin-left: 6px; } + +.hm-corpo { display: grid; grid-template-columns: minmax(320px, 400px) minmax(0, 1fr); gap: 16px; align-items: start; } +.hm-destra { display: flex; flex-direction: column; gap: 16px; min-width: 0; } + +/* il pannello: metallo scuro, bordo nero, viti negli angoli */ +.home.hm .hm-col { position: relative; background: var(--metallo); border: 1px solid #000; border-radius: 12px; padding: 16px 16px 16px; gap: 12px; + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.09), inset 0 0 0 1px rgba(255, 255, 255, 0.03), 0 10px 28px rgba(0, 0, 0, 0.45); overflow: visible; } +.home.hm .hm-col::before, .home.hm .hm-col::after { content: ''; position: absolute; top: 7px; width: 7px; height: 7px; border-radius: 50%; + background: radial-gradient(circle at 35% 30%, #6d6a78, #25232c 70%); box-shadow: 0 0 0 1px #000, inset 0 -1px 0 rgba(0, 0, 0, 0.5); } +.home.hm .hm-col::before { left: 7px; } +.home.hm .hm-col::after { right: 7px; } +.home.hm .hm-ultimi { overflow: visible; } + +/* l'intestazione: targhetta incisa col suo LED */ +.hm-intesta { display: flex; align-items: center; gap: 9px; margin: 6px 0 0; padding: 5px 10px; border-radius: 6px; background: #100f15; box-shadow: inset 0 1px 3px #000, 0 1px 0 rgba(255, 255, 255, 0.06); + font: 900 13px var(--marchio); letter-spacing: 2px; text-transform: uppercase; color: var(--oro); } +.hm-conta { margin-left: auto; font: 700 11px var(--ui); letter-spacing: 1px; color: var(--testo3); text-transform: none; } +.hm-centro { margin-left: auto; letter-spacing: 0; } + +/* i LED */ +.hm-led { display: inline-block; flex: none; width: 9px; height: 9px; border-radius: 50%; background: #2b2a31; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.7), 0 0 0 1px #000; } +.hm-led.ok { background: radial-gradient(circle at 35% 35%, #e0fff0, var(--verde) 60%); box-shadow: 0 0 8px var(--verde), 0 0 0 1px #000; } +.hm-led.no { background: radial-gradient(circle at 35% 35%, #ffe3ea, var(--rosso) 60%); box-shadow: 0 0 8px var(--rosso), 0 0 0 1px #000; } +.hm-led.forse { background: radial-gradient(circle at 35% 35%, #fff0d2, var(--ambra) 60%); box-shadow: 0 0 8px var(--ambra), 0 0 0 1px #000; } + +/* il display a sette segmenti */ +.hm-seg { font-family: var(--tc); color: var(--verde); text-shadow: 0 0 8px rgba(93, 255, 180, 0.55); letter-spacing: 1px; } +.hm-unita { font: 700 12px var(--ui); color: var(--testo2); } + +/* da dove comincio */ +.hm-nuovo { display: flex; flex-direction: column; gap: 8px; padding: 12px; border-radius: 10px; background: rgba(0, 0, 0, 0.28); box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.6), 0 1px 0 rgba(255, 255, 255, 0.05); } +.hm-strade { display: flex; flex-direction: column; gap: 8px; } +.home.hm .home-grande, .home.hm .hm-strada { display: flex; align-items: center; gap: 10px; width: 100%; padding: 11px 14px; text-align: left; } +.hm-etichetta-doppia { display: flex; flex-direction: column; min-width: 0; line-height: 1.15; } +.hm-etichetta-doppia b { font: 800 14px var(--ui); } +.hm-etichetta-doppia small { font: 600 11px var(--ui); opacity: 0.75; } +.home.hm .home-montage small { color: rgba(255, 255, 255, 0.85); } +.hm-rec { width: 14px; height: 14px; border-radius: 50%; flex: none; background: radial-gradient(circle at 35% 30%, #ffd3dc, var(--rosso) 60%); box-shadow: 0 0 10px var(--rosso); } +.home.hm .home-impara { margin-top: 2px; } + +/* i recenti */ +.home.hm .home-griglia { grid-template-columns: repeat(auto-fill, minmax(200px, 1fr)); } +.home.hm .home-carta { background: #1a1921; border: 1px solid #000; box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.07); } +.home.hm .home-carta:hover { box-shadow: 0 0 0 2px var(--oro), 0 8px 20px rgba(0, 0, 0, 0.5); } +.hm-quando { font-family: var(--tc) !important; font-size: 9.5px !important; color: var(--verde) !important; opacity: 0.75; letter-spacing: 0.5px; } +.home.hm .home-nulla { border: 2px dashed rgba(255, 255, 255, 0.1); } + +/* come sta il PC: le finestrelle */ +.hm-tessere { display: grid; grid-template-columns: repeat(auto-fill, minmax(215px, 1fr)); gap: 10px; } +.hm-tessera { display: flex; flex-direction: column; gap: 4px; padding: 10px 12px; border-radius: 9px; background: #07060b; box-shadow: inset 0 2px 7px #000, 0 1px 0 rgba(255, 255, 255, 0.07); min-width: 0; } +.hm-tessera[hidden] { display: none; } +.hm-tessera-testa { display: flex; align-items: center; gap: 7px; } +.hm-titolo { font: 800 10.5px var(--ui); letter-spacing: 1.3px; text-transform: uppercase; color: var(--testo3); } +.hm-valore { font: 800 19px var(--ui); color: var(--testo); min-height: 28px; display: flex; align-items: baseline; gap: 2px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } +.hm-valore .hm-seg { font-size: 22px; } +.hm-sotto { font: 600 11.5px var(--ui); color: var(--testo2); line-height: 1.25; display: flex; align-items: center; gap: 8px; flex-wrap: wrap; } +.hm-azione { color: var(--oro); } + +/* Aggiusta tutto */ +.hm-aggiusta { display: flex; flex-direction: column; gap: 10px; padding: 12px; border-radius: 10px; background: rgba(0, 0, 0, 0.28); box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.6), 0 1px 0 rgba(255, 255, 255, 0.05); } +.hm-aggiusta-testa { display: flex; align-items: center; gap: 14px; flex-wrap: wrap; } +.hm-aggiusta-tasto { padding: 11px 22px; font: 900 15px var(--marchio); letter-spacing: 1.5px; text-transform: uppercase; } +.hm-aggiusta-tasto .hm-led { background: #6b4d00; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.6); } +.hm-aggiusta-tasto.lavora .hm-led { background: radial-gradient(circle at 35% 35%, #fff, #35e8ff 60%); box-shadow: 0 0 8px var(--cia); animation: hm-lampeggia 0.8s infinite; } +.hm-aggiusta-riga { font: 700 13px var(--ui); color: var(--testo2); } +.hm-aggiusta-riga.no { color: var(--ambra); } +.hm-passi { list-style: none; margin: 0; padding: 0; display: flex; flex-direction: column; gap: 6px; } +.hm-passo { display: grid; grid-template-columns: 22px minmax(120px, 190px) minmax(0, 1fr); gap: 8px; align-items: baseline; padding: 7px 10px; border-radius: 7px; background: #0c0b11; box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.7); font: 600 13px var(--ui); } +.hm-passo b { font-weight: 800; color: var(--testo); } +.hm-passo-testo { color: var(--testo2); } +.hm-segno { font: 900 15px var(--ui); text-align: center; color: var(--testo3); } +.hm-passo.ok .hm-segno { color: var(--verde); text-shadow: 0 0 8px rgba(93, 255, 180, 0.6); } +.hm-passo.salta .hm-segno { color: #3f9a74; } +.hm-passo.salta .hm-passo-testo { color: var(--testo3); } +.hm-passo.no .hm-segno { color: var(--rosso); text-shadow: 0 0 8px rgba(255, 77, 109, 0.6); } +.hm-passo.no .hm-passo-testo { color: #ffb3c0; } +.hm-passo.corre .hm-segno { color: var(--cia); animation: hm-lampeggia 0.8s infinite; } +@keyframes hm-lampeggia { 50% { opacity: 0.35; } } + +@media (max-width: 1000px) { .hm-corpo { grid-template-columns: 1fr; } .hm-passo { grid-template-columns: 22px 1fr; } .hm-passo-testo { grid-column: 2; } } +@media (prefers-reduced-motion: reduce) { .hm-aggiusta-tasto.lavora .hm-led, .hm-passo.corre .hm-segno { animation: none; } } diff --git a/src/stile/keyframe.css b/src/stile/keyframe.css new file mode 100644 index 0000000..42bc4e9 --- /dev/null +++ b/src/stile/keyframe.css @@ -0,0 +1,42 @@ +/* Keyframe e maschere a forma: il rombo accanto ai parametri, le frecce, il menu del tasto destro e le righe delle maschere. + Le classi nuove cominciano con «kf-» e «mk-». Colori: quelli del banco (oro per ciò che è acceso). */ + +/* la riga di un parametro con il rombo: una colonna in più in fondo */ +.isp-riga.kf-riga { grid-template-columns: minmax(64px, 96px) minmax(0, 1fr) auto auto; } + +.kf { display: inline-flex; align-items: center; gap: 1px; opacity: 0.55; transition: opacity 0.12s; } +.kf.acceso, .kf:hover, .kf:focus-within { opacity: 1; } + +.kf-rombo { + width: 18px; height: 18px; padding: 0; line-height: 1; font-size: 13px; cursor: pointer; + background: none; border: 0; color: var(--testo3); +} +.kf-rombo:hover:not(:disabled) { color: var(--oro); } +.kf-rombo.animato { color: var(--oro2); text-shadow: 0 0 0 transparent; } +.kf-rombo.chiave { color: var(--oro); text-shadow: 0 0 6px rgba(255, 213, 74, 0.7); } +.kf-rombo:disabled { cursor: default; opacity: 0.35; } + +.kf-freccia { + width: 12px; height: 18px; padding: 0; font-size: 9px; line-height: 1; cursor: pointer; + background: none; border: 0; color: var(--testo2); +} +.kf-freccia:hover:not(:disabled) { color: var(--oro); } +.kf-freccia:disabled { color: var(--testo3); opacity: 0.4; cursor: default; } + +/* il menu del tasto destro sul rombo */ +.kf-menu { + position: fixed; z-index: 9999; display: flex; flex-direction: column; min-width: 230px; padding: 4px; + background: rgba(22, 17, 36, 0.92); border: 1px solid var(--bordo-forte); border-radius: 8px; + backdrop-filter: blur(10px); box-shadow: var(--ombra); +} +.kf-menu button { + text-align: left; padding: 5px 9px; font-size: 12px; font-weight: 600; color: var(--testo); + background: none; border: 0; border-radius: 5px; cursor: pointer; +} +.kf-menu button:hover { background: rgba(255, 213, 74, 0.14); color: var(--oro); } + +/* le maschere nel pannello */ +.mk-testa { display: flex; flex-wrap: wrap; align-items: center; justify-content: space-between; gap: 6px; min-width: 0; margin-top: 6px; padding: 3px 0; border-top: 1px solid var(--bordo); font-size: 12px; color: var(--oro); } +.mk-azioni { display: inline-flex; flex-wrap: wrap; gap: 4px; } + +/* i rombi delle chiavi sulla clip scelta in timeline sono disegnati sulla tela: niente CSS */ diff --git a/src/stile/liveAudio.css b/src/stile/liveAudio.css index 3dade05..b2441fc 100644 --- a/src/stile/liveAudio.css +++ b/src/stile/liveAudio.css @@ -4,12 +4,12 @@ /* ——— le barre ——— */ .la-misura { display: block; width: 100%; background: transparent; cursor: pointer; } .la-misura.grande { height: 18px; } -.la-misura.piccolo { height: 11px; flex: 1; min-width: 0; } +.la-misura.piccolo { height: 12px; flex: 1; min-width: 0; } -/* le due barre sempre in vista in cima alla colonna (dentro .live-regia, che resta ferma mentre la colonna scorre) */ -.la-compatto { display: flex; flex-direction: column; gap: 3px; padding: 2px 2px 0; color: var(--testo3); } -.la-c-riga { display: flex; align-items: center; gap: 7px; } -.la-c-riga svg { flex: none; } +/* il tasto piccolo accanto al microfono: prova il livello senza registrare */ +.la-prova-mini { width: 22px; height: 22px; padding: 0; border-radius: 6px; border: 1px solid #000; background: var(--metallo-chiaro); color: var(--testo2); font: 800 10px var(--ui); display: grid; place-items: center; cursor: pointer; box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1); } +.la-prova-mini:hover { color: #fff; } +.la-prova-mini.acceso { color: #ffd9df; background: linear-gradient(180deg, #5a1a26, #3a0f18); } /* ——— il pannello ——— */ .la { display: flex; flex-direction: column; gap: 6px; min-width: 0; } diff --git a/src/stile/montaggioTesto.css b/src/stile/montaggioTesto.css new file mode 100644 index 0000000..c189c38 --- /dev/null +++ b/src/stile/montaggioTesto.css @@ -0,0 +1,13 @@ +/* Il testo sta nel suo pannello: il banco sotto conserva i suoi spazi. */ +.montaggio-testo { width: min(880px, 94vw); } +.montaggio-testo .testo-riga { display: flex; align-items: center; flex-wrap: wrap; gap: 8px; margin: 12px 0; } +.montaggio-testo .testo-riga label { display: flex; align-items: center; gap: 8px; max-width: 100%; } +.montaggio-testo select { max-width: 100%; } +.montaggio-testo input[type='text'] { flex: 1; min-width: 150px; } +.montaggio-testo .num { width: 72px; } +.montaggio-testo .testo-parlato { min-height: 140px; max-height: 34vh; overflow: auto; padding: 14px; margin: 12px 0; line-height: 2; font-size: 16px; background: var(--fondo, #171b20); border: 1px solid var(--bordo, #424850); border-radius: 4px; user-select: text; cursor: text; } +.montaggio-testo .testo-parola { border-radius: 3px; cursor: pointer; } +.montaggio-testo .testo-parola:hover, .montaggio-testo .testo-parola:focus-visible { outline: 1px solid currentColor; } +.montaggio-testo .testo-parola.scelta { background: #385d83; color: #fff; } +.montaggio-testo .testo-parola.taglio { text-decoration: line-through; background: #683b3b; color: #fff; } +.montaggio-testo .testo-anteprima { min-height: 1.5em; } diff --git a/src/stile/titoliHtml.css b/src/stile/titoliHtml.css new file mode 100644 index 0000000..61387da --- /dev/null +++ b/src/stile/titoliHtml.css @@ -0,0 +1,7 @@ +/* Titoli animati HTML: le righe dedicate nel pannello Proprietà e nella Libreria. + (Il CSS dei titoli veri sta dentro i modelli, in src/core/titoliHtml.ts: gira dentro l'immagine SVG, non nella pagina.) */ +.html-nota { color: var(--testo-3, #6f6b7d); font-size: 12px; line-height: 1.4; margin: 6px 0 0; overflow-wrap: anywhere; } +.html-stato { display: flex; align-items: flex-start; gap: 6px; margin-top: 6px; font-size: 12px; line-height: 1.35; color: var(--testo-2, #a19db0); overflow-wrap: anywhere; } +.html-stato i { flex: none; margin-top: 4px; width: 8px; height: 8px; border-radius: 50%; background: #5dffb4; box-shadow: 0 0 6px #5dffb4; } +.html-stato.ripiego i { background: #ffb23d; box-shadow: 0 0 6px #ffb23d; } +.carta[data-html] .carta-nome { letter-spacing: .02em; } diff --git a/src/ui/aggiornamenti.ts b/src/ui/aggiornamenti.ts index 5451a8c..8f6e197 100644 --- a/src/ui/aggiornamenti.ts +++ b/src/ui/aggiornamenti.ts @@ -94,7 +94,7 @@ export function markdown(md: string): HTMLElement { /** le novità della versione che stai usando (o di un'altra) */ export function finestraNovita(versione = VERSIONE) { const n = noteDi(versione); - const d = dialogo(`Novità di DaProd Video ${versione}`, { largo: true }); + const d = dialogo(`Novità di DaProd Editor Video ${versione}`, { largo: true }); d.el.classList.add('novita'); if (n) d.corpo.append(h('div', { class: 'novita-titolo' }, n.titolo.replace(/^\[[^\]]+\]\s*—?\s*/, '')), markdown(n.note)); else d.corpo.append(h('p', null, 'Le novità di questa versione sono nel CHANGELOG su GitHub.')); @@ -130,6 +130,14 @@ function fileGiusto(r: Release, v: Variante): Asset | undefined { } let tasto: HTMLElement | null = null; +let ultimoControllo: { quando: number; r: Release } | null = null; + +/** com'è messa la versione: l'ultima release, ricordata 10 minuti (la pagina iniziale non rifà la rete a ogni apertura) */ +export async function controllaAggiornamento(forza = false): Promise<{ versione: string; nuova: boolean; release: Release }> { + if (forza || !ultimoControllo || Date.now() - ultimoControllo.quando > 600_000) ultimoControllo = { quando: Date.now(), r: await ultimaRelease() }; + const r = ultimoControllo.r; + return { versione: r.versione, nuova: piuNuova(r.versione, VERSIONE), release: r }; +} /** il tasto in alto (solo nell'app): controlla, e si accende se c'è una versione nuova */ export function tastoAggiornamenti(icona: (n: string, s?: number) => SVGElement): HTMLElement | null { @@ -144,7 +152,7 @@ export function tastoAggiornamenti(icona: (n: string, s?: number) => SVGElement) tasto?.classList.add('nuova'); testo.textContent = `Aggiornamento ${r.versione} disponibile`; tasto?.setAttribute('title', `È uscita la versione ${r.versione}: clic per le novità e per aggiornare`); - if (avvisata !== r.versione) { avvisata = r.versione; avviso(`⬆ È uscita DaProd Video ${r.versione}: clic sul tasto in alto per aggiornare`, 'info', 5000); } + if (avvisata !== r.versione) { avvisata = r.versione; avviso(`⬆ È uscita DaProd Editor Video ${r.versione}: clic sul tasto in alto per aggiornare`, 'info', 5000); } } setTimeout(controlla, CONTROLLO_OGNI); }).catch(() => { setTimeout(controlla, DOPO_ERRORE); }); @@ -210,7 +218,7 @@ export async function finestraAggiornamenti() { clearInterval(giro); (barra.firstChild as HTMLElement).style.width = '100%'; fase.textContent = v.os === 'windows' - ? (v.portatile ? `Pronta: ${path}. Si apre la nuova, questa si chiude (poi puoi cancellare il file vecchio).` : 'Pronta: parte l\'installazione, DaProd Video si chiude e si riapre aggiornato.') + ? (v.portatile ? `Pronta: ${path}. Si apre la nuova, questa si chiude (poi puoi cancellare il file vecchio).` : 'Pronta: parte l\'installazione, DaProd Editor Video si chiude e si riapre aggiornato.') : 'Pronto: si apre il file .dmg. Trascina DaProd Video in Applicazioni (sostituisci quella vecchia).'; vai.textContent = v.os === 'windows' ? 'Installa adesso' : 'Apri'; vai.disabled = false; diff --git a/src/ui/app.ts b/src/ui/app.ts index 6e7fb21..aed84cf 100644 --- a/src/ui/app.ts +++ b/src/ui/app.ts @@ -25,7 +25,7 @@ import { attivaRotella } from './rotella'; import { finestraEsporta, finestraInfo, finestraProgetto, finestraTasti, esportaEdl, esportaFotogramma, VERSIONE } from './dialoghi'; import { apri, apriFile, salvaPacchetto, autosalva, importaDaDrop, importaDialogo, importaFile, nuovo, ricollega, riprendi, salva } from '../progetti'; import { invoke, isAndroid, isTauri, schermoIntero, GRANDEZZE_UI, grandezzaUI, impostaGrandezzaUI } from '../platform'; -import { novitaDopoAggiornamento, tastoAggiornamenti } from './aggiornamenti'; +import { finestraNovita, novitaDopoAggiornamento, tastoAggiornamenti } from './aggiornamenti'; import { montaggioDimostrativo } from '../demo'; import { statoDecoder } from '../media/fotogrammi'; import { CentroAttivita } from './attivita'; @@ -101,6 +101,7 @@ export function avvia(radice: HTMLElement) { if (radice.dataset.pagina === 'live' && live.registrando) avviso('La registrazione continua: torna su LIVE per fermarla', 'info', 2600); radice.dataset.pagina = pg; live.mostrata(pg === 'live'); + finale.mostrata(pg === 'finale'); montage.mostrata(pg === 'montage'); // i VU vanno dove si guarda: nelle proprietà durante il montaggio, nel Finale alla fine if (pg === 'finale') finale.el.insertBefore(vuCornice, finale.el.children[1] ?? null); @@ -110,7 +111,7 @@ export function avvia(radice: HTMLElement) { if (pg === 'finale' && radice.classList.contains('stretto')) radice.dataset.foglio = 'finale'; setTimeout(() => { monitor.adatta(); tl.adattaTutto(); }, 80); }; - const home = new Home(() => pagina('montage')); + const home = new Home(() => pagina('montage'), () => pagina('live')); document.addEventListener('dpv:home', () => home.mostra()); const tastoPagina = (pg: Pagina, nome: string, ic: string, title: string) => h('button', { class: 'pagina-btn' + (pg === 'montaggio' ? ' attiva' : ''), 'data-p': pg, title, on: { click: () => pagina(pg) } }, icona(ic, 16), h('span', null, nome)); @@ -124,6 +125,7 @@ export function avvia(radice: HTMLElement) { const barra = barraTitolo({ info: () => finestraInfo(), progetti: () => home.mostra(), salva: () => void salva(), importa: () => void importaDialogo(), annulla: () => esegui('annulla'), ripeti: () => esegui('ripeti'), cerca: () => apriCerca(), progetto: () => finestraProgetto(), + novita: () => finestraNovita(), aggiornamenti: tastoAggiornamenti(icona), }); const testa = h('header', { class: 'testata' }, @@ -141,7 +143,7 @@ export function avvia(radice: HTMLElement) { const msg = h('span', { class: 'stato-msg' }, 'Pronto. 1 taglia · 2 elimina · S separa/unisci · rotella = un fotogramma · Q/W scarto a sinistra/destra · F9 Finale · F1 tutti i tasti'); const dec = h('span', { class: 'stato-dec' }); const centro = new CentroAttivita(bin.el); - const statoBar = h('footer', { class: 'stato' }, msg, dec, centro.el, h('span', { class: 'stato-ver' }, `DaProd Video ${VERSIONE}`)); + const statoBar = h('footer', { class: 'stato' }, msg, dec, centro.el, h('span', { class: 'stato-ver' }, `DaProd Editor Video ${VERSIONE}`)); motore.ogniGiro(() => { if (Math.random() > 0.05) return; const s = statoDecoder(); @@ -177,7 +179,7 @@ export function avvia(radice: HTMLElement) { const linguetta = h('button', { class: 'linguetta-lato', title: 'Riapri il pannello delle proprietà', on: { click: () => disp.alterna('senza-lato', false) } }, '‹ Proprietà'); radice.dataset.pagina = 'montaggio'; radice.before(barra); - radice.append(testa, bin.el, bordoBin, monitor.el, bordoLato, pannelloLato, finale.el, live.el, montage.el, home.el, puls.el, divisore, tl.el, statoBar, barraTel, linguetta); + radice.append(testa, bin.el, bordoBin, monitor.el, bordoLato, pannelloLato, finale.el, live.el, montage.el, home.el, divisore, puls.el, tl.el, statoBar, barraTel, linguetta); const rimettiBanco = () => { disp.rimetti(); setTimeout(() => { monitor.adatta(); tl.adattaTutto(); }, 60); }; disp.ripristina(); diff --git a/src/ui/barraTitolo.ts b/src/ui/barraTitolo.ts index 18759a3..628e13a 100644 --- a/src/ui/barraTitolo.ts +++ b/src/ui/barraTitolo.ts @@ -6,6 +6,8 @@ // barra delle cose rapide, senza i tasti della finestra. import { store } from '../core/store'; import { h, icona } from './dom'; +import { NOME_PROGRAMMA } from '../nome'; +import { chipHardware } from './chipHardware'; import { isAndroid, isMac, isTauri, edizione } from '../platform'; export interface AzioniBarra { @@ -17,12 +19,23 @@ export interface AzioniBarra { ripeti: () => void; cerca: () => void; progetto: () => void; + /** le novità della versione (il tasto ✦ accanto agli aggiornamenti) */ + novita: () => void; aggiornamenti: HTMLElement | null; } /** che finestra abbiamo: 'win' = senza cornice, coi nostri tasti; 'mac' = semafori sopra la barra; 'web' = niente */ export const tipoFinestra: 'win' | 'mac' | 'web' = isTauri && !isAndroid ? (isMac ? 'mac' : 'win') : 'web'; +/** il logo: il disco con la D e il tasto play, e attorno l'anello tratteggiato che gira lento (CSS: .logo-giro .anello) */ +const LOGO = ``; + /** la finestra dell'app (solo nell'app sul computer) */ async function finestra() { const { getCurrentWindow } = await import('@tauri-apps/api/window'); @@ -68,24 +81,25 @@ export function barraTitolo(a: AzioniBarra): HTMLElement { bRipeti.disabled = !store.canRedo(); bAnnulla.title = store.canUndo() ? `Annulla: ${store.undoLabel()} (Ctrl+Z)` : 'Niente da annullare'; bRipeti.title = store.canRedo() ? `Ripeti: ${store.redoLabel()} (Ctrl+Y)` : 'Niente da ripetere'; - document.title = `${store.dirty ? '● ' : ''}${p.name} · DaProd Video`; + document.title = `${store.dirty ? '● ' : ''}${p.name} · DaP ${NOME_PROGRAMMA}`; }; store.on('doc', aggiorna); store.on('status', aggiorna); aggiorna(); const barra = h('header', { class: 'barra-titolo', ...trascina }, - h('button', { class: 'marchio', title: 'DaProd Video', on: { click: a.info } }, - h('span', { class: 'moneta' }, 'D'), h('span', { class: 'scritta' }, 'Da', h('b', null, 'Prod'), h('i', null, ' VIDEO'))), + h('button', { class: 'marchio', title: `DaP ${NOME_PROGRAMMA}`, on: { click: a.info } }, + h('span', { class: 'logo-giro', html: LOGO }), h('span', { class: 'scritta' }, h('b', null, 'DaP'), h('i', null, NOME_PROGRAMMA))), h('div', { class: 'bt-rapidi' }, h('button', { class: 'btn-progetti', title: 'I tuoi progetti: nuovo, apri, recenti', on: { click: a.progetti } }, icona('apri', 15), h('span', null, 'Progetti')), h('button', { class: 'bt-icona', title: 'Salva (Ctrl+S)', on: { click: a.salva } }, icona('salva', 16)), h('button', { class: 'bt-icona', title: 'Importa video, audio, immagini (Ctrl+I)', on: { click: a.importa } }, icona('importa', 16)), h('span', { class: 'bt-sep' }), bAnnulla, bRipeti), - h('div', { class: 'bt-centro' }, nome, formato), + h('div', { class: 'bt-centro' }, nome, formato, chipHardware()), h('div', { class: 'bt-destra' }, h('span', { class: 'badge edizione' + (isTauri ? '' : ' prova') }, isTauri ? edizione : 'VERSIONE PROVA · WEB'), + h('button', { class: 'bt-icona bt-novita', title: 'Novità di questa versione', on: { click: a.novita } }, icona('novita', 17)), a.aggiornamenti), tipoFinestra === 'win' ? tastiFinestra() : null); return barra; diff --git a/src/ui/centroAI.ts b/src/ui/centroAI.ts index 96614e4..164f681 100644 --- a/src/ui/centroAI.ts +++ b/src/ui/centroAI.ts @@ -15,12 +15,16 @@ import { MODELLO_RUMORE, MODELLO_SEPARAZIONE, installaRumore, installaSeparazion import { disinstallaMotore, motoreNemo } from '../media/nemo'; import { diagnosi, modelliScaricati, svuotaModelli, type Diagnosi } from '../media/diagnosiAI'; import { LS_CHIAVE_HF, chiaveHFSalvata, impostaSchedaAI, usaSchedaAI } from '../media/libreriaAI'; -import { raccontaHardware } from '../media/hardware'; +import { hardwareNoto, raccontaHardware, rilevaHardware } from '../media/hardware'; +import { idoneitaAI } from '../media/idoneitaAI'; import { spiegaErroreAI } from '../media/erroriAI'; import { avviso, conferma, dialogo, evidenzia, h } from './dom'; import { vaiFinale, vaiPagina, vaiSezione } from './guida'; import { fonteCerca } from './cerca'; import { modelliHub, statoModelli, type ModelloHub } from '../media/modelliAI'; +import { liberaVram } from '../media/vram'; +import { registra as reg } from '../azioni'; +import '../stile/copieAI.css'; export interface FunzioneAI { id: string; @@ -131,12 +135,62 @@ export const FUNZIONI_AI: FunzioneAI[] = [ const mb = (b: number) => (b >= 1 << 30 ? (b / (1 << 30)).toFixed(1).replace('.', ',') + ' GB' : Math.max(1, Math.round(b / (1 << 20))) + ' MB'); +/** quanto spazio prendono i modelli sul computer (lo usano il Centro AI e la pagina iniziale) */ +export async function spazioModelli(): Promise<{ n: number; byte: number; testo: string }> { + const m = await modelliScaricati(); + const byte = [...m.values()].reduce((s, x) => s + x, 0); + return { n: m.size, byte, testo: m.size ? `${m.size} modelli sul computer · ${mb(byte)}` : 'Nessun modello scaricato' }; +} + +/** com'è messa la scorta di modelli: anche quelli consigliati restano opzionali */ +export async function riassuntoModelli(): Promise<{ pronti: number; totale: number; consigliati: number; consigliatiPronti: number }> { + const lista = modelliHub(); + const st = await statoModelli(lista); + const pronto = (m: ModelloHub) => st.get(m.id)?.stato === 'pronto'; + const cons = lista.filter((m) => m.consigliato); + return { pronti: lista.filter(pronto).length, totale: lista.length, consigliati: cons.length, consigliatiPronti: cons.filter(pronto).length }; +} + +export interface OpzioniRiparaAI { + lista?: ModelloHub[]; + /** cosa sto facendo adesso, a parole */ + passo?: (testo: string) => void; + dopoDiagnosi?: (g: Diagnosi) => void; + /** il motore non partiva con la scheda video e l'ho spenta */ + schedaSpenta?: () => void; +} + +/** + * Controlla il motore AI, la scheda video, la rete e i modelli già presenti. Non scarica modelli: si scelgono uno per + * uno nel Centro AI. Vale anche da «Aggiusta tutto» della pagina iniziale. `testo` è la frase da dire. + */ +export async function riparaAI(o: OpzioniRiparaAI = {}): Promise<{ ok: boolean; testo: string }> { + const passo = o.passo ?? (() => {}); + const lista = o.lista ?? modelliHub(); + try { + passo('Controllo il motore AI, la scheda video e la connessione…'); + let g = await diagnosi(); + // il motore non parte con la scheda video: si prova sul processore + if (!g.libreria.ok && usaSchedaAI()) { + impostaSchedaAI(false); o.schedaSpenta?.(); + passo('Il motore non parte con la scheda video: provo sul processore…'); + g = await diagnosi(); + } + o.dopoDiagnosi?.(g); + if (!g.libreria.ok) return { ok: false, testo: 'Il motore AI non parte nemmeno sul processore: aggiorna DaProd Editor Video o guarda le righe qui sotto.' }; + const st = await statoModelli(lista); + const pronti = lista.filter((m) => st.get(m.id)?.stato === 'pronto').length; + return { ok: true, testo: `Il motore funziona. ${pronti} modelli sul computer; gli altri sono opzionali: scegli «Scarica» nel Centro AI se ti servono. Nessun modello scaricato dal controllo.` }; + } catch (e) { return { ok: false, testo: 'Non sono riuscito a sistemare tutto: ' + spiegaErroreAI(e) }; } +} + /** la finestra del Centro AI: un posto solo per controllare i modelli (e il motore). Le funzioni si usano dalle Proprietà. */ export function finestraCentroAI(subito = false) { - const d = dialogo('Centro AI · i modelli', { largo: true }); + const d = dialogo('Centro AI · i modelli', { largo: true, onChiudi: () => document.removeEventListener('dpv:hardware', aggiornaHardware) }); d.el.classList.add('centro-ai'); - const lista = modelliHub(); - const righe = new Map(); + let lista = modelliHub(); + let hardware = hardwareNoto(); + const righe = new Map(); let occupato = false; /** com'è messo ogni modello, dalla cache e da quello che si è caricato davvero */ @@ -151,6 +205,11 @@ export function finestraCentroAI(subito = false) { r.scarica.textContent = s.stato === 'pronto' ? 'Ricontrolla' : s.stato === 'parziale' ? 'Completa' : 'Scarica'; r.togli.disabled = s.stato === 'da-scaricare'; r.scarica.disabled = occupato; + r.togli.disabled ||= occupato; + r.peso.textContent = `Download completo: circa ${m.mb} MB · resta su questo computer`; + const idoneita = idoneitaAI(m, hardware, usaSchedaAI()); + r.macchina.textContent = `${idoneita.dove} · ${idoneita.testo}`; + r.macchina.dataset.esito = idoneita.ok === false ? 'lento' : 'stima'; } }; @@ -177,57 +236,54 @@ export function finestraCentroAI(subito = false) { ...lista.filter((m) => m.gruppo === g).map((m) => { const stato = h('span', { class: 'hub-stato' }, '…'); const msg = h('small', { class: 'hub-msg' }); - const bScarica = h('button', { class: 'btn-mini', on: { click: async () => { bloccaTutto(true); await scarica(m); bloccaTutto(false); await disegna(); void aggSpazio(); } } }, 'Scarica') as HTMLButtonElement; - const bTogli = h('button', { class: 'btn-mini', title: 'Toglie il modello dal computer (si riscarica quando serve)', on: { click: async () => { bloccaTutto(true); await m.togli(); bloccaTutto(false); await disegna(); void aggSpazio(); } } }, 'Togli') as HTMLButtonElement; - const el = h('div', { class: 'hub-riga', 'data-m': m.id }, h('div', { class: 'hub-nome' }, h('b', null, m.nome), h('small', null, m.info), msg), stato, bScarica, bTogli); - righe.set(m.id, { el, stato, msg, scarica: bScarica, togli: bTogli }); + const peso = h('small', { class: 'hub-peso' }); + const macchina = h('small', { class: 'hub-macchina' }); + const attuale = () => lista.find((x) => x.id === m.id)!; + const bScarica = h('button', { class: 'btn-mini', disabled: true, on: { click: async () => { bloccaTutto(true); await scarica(attuale()); bloccaTutto(false); await disegna(); void aggSpazio(); } } }, 'Scarica') as HTMLButtonElement; + const bTogli = h('button', { class: 'btn-mini', disabled: true, title: 'Toglie il modello dal computer (potrai scaricarlo di nuovo)', on: { click: async () => { bloccaTutto(true); try { await attuale().togli(); } finally { bloccaTutto(false); await disegna(); void aggSpazio(); } } } }, 'Togli') as HTMLButtonElement; + const el = h('div', { class: 'hub-riga', 'data-m': m.id }, h('div', { class: 'hub-nome' }, h('b', null, m.nome, h('span', { class: 'hub-opzionale' }, 'Opzionale')), h('small', null, m.uso), h('small', null, m.info), peso, macchina, msg), stato, bScarica, bTogli); + righe.set(m.id, { el, stato, msg, peso, macchina, scarica: bScarica, togli: bTogli }); return el; }), ])); void disegna(); + function aggiornaHardware() { + hardware = hardwareNoto(); + lista = modelliHub(); // anche il peso di MossFormer cambia fra scheda video e processore + void disegna(); + } + document.addEventListener('dpv:hardware', aggiornaHardware); + void rilevaHardware().then(aggiornaHardware).catch(() => { + for (const r of righe.values()) r.macchina.textContent = 'Hardware non rilevato: prestazioni da verificare; è disponibile il processore.'; + }); - // ——— controlla e ripara: il motore, la scheda video, la rete e i modelli consigliati + // ——— controlla: nessun modello viene scaricato da questo tasto, nemmeno con subito=true const esito = h('div', { class: 'ai-diagnosi' }); const progresso = h('p', { class: 'nota hub-progresso' }); - const ripara = h('button', { class: 'btn primario ai-ripara', on: { click: () => void fai() } }, '🔧 Controlla e ripara tutto') as HTMLButtonElement; + const ripara = h('button', { class: 'btn primario ai-ripara', on: { click: () => void fai() } }, '🔍 Controlla l’AI') as HTMLButtonElement; async function fai() { + if (occupato) return; ripara.disabled = true; bloccaTutto(true); try { - progresso.textContent = 'Controllo il motore AI, la scheda video e la connessione…'; - let g = await diagnosi(); - // il motore non parte con la scheda video: si prova sul processore - if (!g.libreria.ok && usaSchedaAI()) { - impostaSchedaAI(false); scheda.checked = false; - progresso.textContent = 'Il motore non parte con la scheda video: provo sul processore…'; - g = await diagnosi(); - } - disegnaDiagnosi(esito, g); - if (!g.libreria.ok) { progresso.textContent = 'Il motore AI non parte nemmeno sul processore: aggiorna DaProd Video o guarda le righe qui sotto.'; return; } - const st = await statoModelli(lista); - const daFare = lista.filter((m) => m.consigliato && st.get(m.id)!.stato !== 'pronto'); - if (!daFare.length) { progresso.textContent = 'Fatto: il motore funziona e i modelli consigliati sono sul computer.'; return; } - if (!g.internet) { progresso.textContent = 'Senza internet non posso scaricare i modelli mancanti: quelli già sul computer funzionano.'; return; } - let ok = 0; - const falliti: string[] = []; - for (const [i, m] of daFare.entries()) { - progresso.textContent = `Scarico ${m.nome} (${i + 1} di ${daFare.length})…`; - if (await scarica(m)) ok++; else falliti.push(m.nome); - await disegna(); - } - progresso.textContent = falliti.length ? `${ok} modelli a posto, non sono riuscito con: ${falliti.join(', ')}.` : `Fatto: ${ok} modelli scaricati e provati, adesso partono senza scaricare niente.`; - } catch (e) { progresso.textContent = 'Non sono riuscito a sistemare tutto: ' + spiegaErroreAI(e); } - finally { ripara.disabled = false; bloccaTutto(false); await disegna(); void aggSpazio(); } + const r = await riparaAI({ lista, passo: (t) => { progresso.textContent = t; }, dopoDiagnosi: (g) => disegnaDiagnosi(esito, g), schedaSpenta: () => { scheda.checked = false; aggiornaHardware(); } }); + progresso.textContent = r.testo; + } finally { ripara.disabled = false; bloccaTutto(false); await disegna(); void aggSpazio(); } } // ——— le impostazioni const scheda = h('input', { type: 'checkbox', checked: usaSchedaAI() }) as HTMLInputElement; - scheda.addEventListener('change', () => impostaSchedaAI(scheda.checked)); + scheda.addEventListener('change', () => { impostaSchedaAI(scheda.checked); aggiornaHardware(); }); // la chiave di Hugging Face: serve ai modelli «gated» come SAM 3 (si crea gratis su huggingface.co → Settings → Access Tokens) const chiaveHF = h('input', { type: 'password', class: 'campo-testo', placeholder: 'hf_…', value: chiaveHFSalvata(), 'aria-label': 'Chiave Hugging Face', autocomplete: 'off' }) as HTMLInputElement; - const salvaChiave = h('button', { class: 'btn-mini', on: { click: () => { try { if (chiaveHF.value.trim()) localStorage.setItem(LS_CHIAVE_HF, chiaveHF.value.trim()); else localStorage.removeItem(LS_CHIAVE_HF); } catch { /* niente */ } avviso(chiaveHF.value.trim() ? 'Chiave salvata: vale dal prossimo scaricamento' : 'Chiave tolta', 'ok', 2400); } } }, 'Salva'); + const salvaChiave = h('button', { class: 'btn-mini', on: { click: () => { + try { + if (chiaveHF.value.trim()) localStorage.setItem(LS_CHIAVE_HF, chiaveHF.value.trim()); else localStorage.removeItem(LS_CHIAVE_HF); + avviso(chiaveHF.value.trim() ? 'Chiave salvata: vale dal prossimo scaricamento' : 'Chiave tolta', 'ok', 2400); + } catch { avviso('Non riesco a cambiare la chiave: il browser non permette di salvare le impostazioni. Controlla lo spazio e i permessi, poi riprova.', 'errore', 6000); } + } } }, 'Salva'); const spazio = h('span', { class: 'nota' }, '…'); - const aggSpazio = async () => { const m = await modelliScaricati(); const tot = [...m.values()].reduce((s, x) => s + x, 0); spazio.textContent = m.size ? `${m.size} modelli sul computer · ${mb(tot)}` : 'Nessun modello scaricato'; }; + const aggSpazio = async () => { spazio.textContent = (await spazioModelli()).testo; }; void aggSpazio(); const svuota = h('button', { class: 'btn-mini', on: { click: async () => { if (!(await conferma('Libera lo spazio dei modelli', 'I modelli AI scaricati si tolgono dal computer. Si riscaricano da qui, o da soli la prossima volta che servono (serve internet).', 'Toglili', 'Annulla'))) return; @@ -235,6 +291,7 @@ export function finestraCentroAI(subito = false) { try { localStorage.removeItem('dpv-modelli-pronti'); } catch { /* niente */ } await disegna(); await aggSpazio(); } } }, 'Libera lo spazio'); + const liberaMemoria = h('button', { class: 'btn-mini', title: 'Chiude i modelli caricati nella scheda video (SAM 3, Whisper, traduzione). Non toglie nulla dal computer: i modelli già sul computer si ricaricano in pochi secondi al prossimo uso. Succede da solo dopo un minuto e mezzo senza AI.', on: { click: () => { const n = liberaVram(); avviso(n ? `Scheda video liberata: ${n} ${n === 1 ? 'modello scaricato' : 'modelli scaricati'} dalla memoria` : 'Nella scheda video non c\'è niente da liberare (o un lavoro AI sta girando)', n ? 'ok' : 'info', 2600); } } }, 'Libera la memoria della scheda video'); const nvidia = motoreNemo() ? h('div', { class: 'ai-imp' }, h('span', null, 'Motore NVIDIA (sottotitoli e voce nell\'app)'), h('button', { class: 'btn-mini', on: { click: async () => { @@ -245,12 +302,14 @@ export function finestraCentroAI(subito = false) { d.corpo.append( h('section', { class: 'ai-sezione' }, - h('div', { class: 'ai-riga' }, ripara, h('span', { class: 'nota' }, 'Controlla motore, scheda video e connessione, e scarica i modelli consigliati. «Pronto» vuol dire provato: il modello parte da qui senza riscaricare.')), + h('p', { class: 'nota' }, 'Tutti i modelli sono opzionali. Montaggio ed export funzionano anche senza. Scegli «Scarica» solo per quelli che vuoi, oppure avvia tu la funzione che li usa. I tuoi video restano sul computer.'), + h('div', { class: 'ai-riga' }, ripara, h('span', { class: 'nota' }, 'Controlla motore, scheda video e connessione senza scaricare modelli. I pesi sono indicativi; le prestazioni vanno provate sul modello.')), progresso, tabella), h('details', { class: 'ai-sezione' }, h('summary', null, 'Se qualcosa non va'), h('div', { class: 'ai-riga' }, h('button', { class: 'btn ai-controlla', on: { click: () => void fai() } }, '🔍 Controlla l\'AI'), h('span', { class: 'nota' }, 'Prova il motore AI, la scheda video e la connessione, e ti dice cosa fare.')), esito), h('section', { class: 'ai-sezione' }, h('h4', null, 'Impostazioni'), - h('label', { class: 'ai-imp spunta-riga', title: 'Su alcuni computer la scheda video (WebGPU) c\'è ma sbaglia: spenta, l\'AI usa il processore (più lento ma sicuro)' }, scheda, ' Usa la scheda video (WebGPU) quando c\'è'), + h('label', { class: 'ai-imp spunta-riga', title: 'Su alcuni computer la scheda video c\'è ma sbaglia: spenta, l\'AI usa il processore (più lento ma sicuro)' }, scheda, ' Usa la scheda video quando c\'è'), h('div', { class: 'ai-imp' }, spazio, svuota), + h('div', { class: 'ai-imp' }, h('span', null, 'Dopo un minuto e mezzo senza AI i modelli escono da soli dalla scheda video'), liberaMemoria), h('div', { class: 'ai-imp ai-chiave', title: 'Per i modelli che Hugging Face concede solo con una chiave (come SAM 3). Resta sul tuo computer e viaggia solo verso huggingface.co' }, h('span', null, 'Chiave Hugging Face (SAM 3)'), chiaveHF, salvaChiave), nvidia)); d.piede.append(h('button', { class: 'btn', on: { click: () => { d.chiudi(); document.dispatchEvent(new CustomEvent('dpv:guida', { detail: 'problemi-ai' })); } } }, '❓ Se un\'AI non parte'), h('span', { class: 'spazio' }), h('button', { class: 'btn primario', on: { click: d.chiudi } }, 'Chiudi')); @@ -272,9 +331,15 @@ function disegnaDiagnosi(el: HTMLElement, g: Diagnosi) { riga(g.internet, 'Hugging Face', g.internet ? 'si raggiunge: i modelli si possono scaricare' : 'non si raggiunge: i modelli già scaricati vanno, per gli altri serve internet (o una rete che non blocchi huggingface.co)'), riga(g.modelli.size > 0 ? true : null, 'Modelli sul computer', g.modelli.size ? `${[...g.modelli.keys()].map((k) => k.split('/')[1]).join(', ')} · ${mb(tot)}` : 'nessuno ancora: ognuno si scarica la prima volta che serve'), g.nvidia ? riga(g.nvidia.installato ? true : null, 'Motore NVIDIA', g.nvidia.installato ? `installato (${g.nvidia.backend}${g.nvidia.nvidia ? ', scheda NVIDIA trovata' : ''})` : `non ancora: si scarica la prima volta (versione ${g.nvidia.consigliato === 'cuda' ? 'per la scheda NVIDIA' : g.nvidia.consigliato === 'metal' ? 'per il Mac' : 'per il processore'})`) : riga(null, 'Motore NVIDIA', 'solo nell\'app per Windows e Mac: qui si usano Whisper e gli altri modelli'), - g.libreria.ok ? h('p', { class: 'nota' }, 'Tutto quello che serve c\'è. Se una funzione dà ancora errore, il messaggio ora spiega cosa fare; scrivilo a chi ti aiuta insieme a queste righe.') : h('p', { class: 'nota' }, 'Il motore AI non parte: aggiorna DaProd Video all\'ultima versione o prova un altro browser (Chrome, Edge).'), + g.libreria.ok ? h('p', { class: 'nota' }, 'Tutto quello che serve c\'è. Se una funzione dà ancora errore, il messaggio ora spiega cosa fare; scrivilo a chi ti aiuta insieme a queste righe.') : h('p', { class: 'nota' }, 'Il motore AI non parte: aggiorna DaProd Editor Video all\'ultima versione o prova un altro browser (Chrome, Edge).'), ); } // le funzioni AI si trovano anche con la ricerca dei comandi (Ctrl+K) fonteCerca(() => FUNZIONI_AI.map((f) => ({ id: 'ai:' + f.id, titolo: f.nome, sotto: f.cosaFa, cat: 'AI' as const, parole: 'ai intelligenza artificiale ' + f.come.join(' '), fn: f.apri }))); + +reg({ + id: 'liberaVram', nome: 'Libera la memoria della scheda video (AI)', gruppo: 'AI', + info: 'Scarica dalla scheda video i modelli AI che non stanno lavorando (SAM 3, Whisper, traduzione): torna la memoria a giochi e altri programmi. I modelli già sul computer si ricaricano in pochi secondi al prossimo uso.', + fn: () => { const n = liberaVram(); avviso(n ? `Scheda video liberata: ${n} ${n === 1 ? 'modello scaricato' : 'modelli scaricati'}` : 'Nella scheda video non c\'è niente da liberare', n ? 'ok' : 'info', 2400); }, +}); diff --git a/src/ui/chipHardware.ts b/src/ui/chipHardware.ts new file mode 100644 index 0000000..b4c42dd --- /dev/null +++ b/src/ui/chipHardware.ts @@ -0,0 +1,42 @@ +// I due chip al centro della barra in alto: la scheda video che l'AI usa davvero e il processore. +// Leggono quello che ha trovato il rilevatore (src/media/hardware.ts) e si aggiornano da soli con l'evento dpv:hardware. +import { h } from './dom'; +import { hardwareNoto, nomeDellaScheda, type Hardware } from '../media/hardware'; +import { usaSchedaAI } from '../media/libreriaAI'; + +/** il nome corto di una scheda: «NVIDIA GeForce RTX 4060» → «RTX 4060» */ +function corto(nome: string): string { + const n = nome.replace(/\b(nvidia|geforce|amd|radeon|intel|graphics|corporation|\(tm\)|\(r\))\b/gi, ' ').replace(/\s+/g, ' ').trim(); + const r = n || nome; + return r.length > 26 ? r.slice(0, 25) + '…' : r; +} + +export function chipHardware(): HTMLElement { + const led = h('i', { class: 'led' }); + const gpu = h('span', { class: 'chip-hw chip-gpu' }, led, h('span', { class: 'chip-testo' }, 'Guardo la scheda…')); + const thread = navigator.hardwareConcurrency || 0; + const cpu = h('span', { class: 'chip-hw chip-cpu', title: 'Il processore: quanti lavori contemporanei sa fare' }, + h('i', { class: 'led ambra' }), h('span', { class: 'chip-testo' }, thread ? `${thread} thread` : 'Processore')); + + const mostra = (hw: Hardware | null) => { + const testo = gpu.querySelector('.chip-testo') as HTMLElement; + if (!hw) { led.className = 'led lampeggia'; testo.textContent = 'Guardo la scheda…'; gpu.title = 'Sto guardando che scheda video ha il computer'; return; } + const s = hw.scelta >= 0 ? hw.schede[hw.scelta] : null; + if (s && usaSchedaAI()) { + led.className = 'led verde'; + testo.textContent = corto(nomeDellaScheda(s)); + gpu.title = `Scheda video che l'AI e le conversioni usano: ${nomeDellaScheda(s)}`; + } else { + led.className = 'led'; + testo.textContent = 'Solo processore'; + gpu.title = usaSchedaAI() + ? 'Nessuna scheda video ha superato la prova: l\'AI lavora col processore (funziona lo stesso, più lenta)' + : 'La scheda video è spenta nelle impostazioni dell\'AI: si lavora col processore'; + } + }; + mostra(hardwareNoto()); + document.addEventListener('dpv:hardware', (e) => mostra((e as CustomEvent).detail ?? hardwareNoto())); + // se l'utente accende o spegne la scheda dal Centro AI il chip si rilegge quando si torna sulla finestra + window.addEventListener('focus', () => mostra(hardwareNoto())); + return h('div', { class: 'bt-chip-hw' }, gpu, cpu); +} diff --git a/src/ui/coloreAvanzato.ts b/src/ui/coloreAvanzato.ts new file mode 100644 index 0000000..8745cae --- /dev/null +++ b/src/ui/coloreAvanzato.ts @@ -0,0 +1,201 @@ +// Pannello autonomo: l'host decide dove mostrarlo. Nessuna modifica alla pagina Montaggio. +import '../stile/coloreAvanzato.css'; +import '../stile/coloreUI.css'; +import type { CanaleCurva, Clip, ColoreAvanzato, Project, RisorsaLut } from '../core/tipi'; +import { store } from '../core/store'; +import { DUCKING0 } from '../core/ducking'; +import { leggiLut } from '../render/lut'; +import { LUT_DI_PARTENZA, applicaAScena, caricaLutDiPartenza, scenaDiProva } from '../render/libreriLut'; +import { creaDuckingClip } from './duckingClip'; +import { CANALI_CURVA, identitaCurva, normalizzaCurva, valutaCurva } from '../render/curve'; +import { h } from './dom'; + +const NOMI_CURVE: Record = { master: 'RGB insieme', red: 'Rosso', green: 'Verde', blue: 'Blu', luma: 'Luma · Rec.709' }; +const errore = (e: unknown) => e instanceof Error ? e.message : String(e); +const clipDi = (p: Project, id: string) => p.clips.find((c) => c.id === id); +const ANTEPRIMA_W = 96, ANTEPRIMA_H = 54; +const SCENA = scenaDiProva(ANTEPRIMA_W, ANTEPRIMA_H); +/** le anteprime già calcolate (il pannello si rifà a ogni modifica, le LUT non cambiano) */ +const anteprime = new Map(); +function disegnaScena(ctx: CanvasRenderingContext2D, px: number[][]) { + const img = ctx.createImageData(ANTEPRIMA_W, ANTEPRIMA_H); + px.forEach((c, i) => { for (let k = 0; k < 3; k++) img.data[i * 4 + k] = Math.round(Math.max(0, Math.min(1, c[k])) * 255); img.data[i * 4 + 3] = 255; }); + ctx.putImageData(img, 0, 0); +} + +/** + * Uso: const pannello = creaPannelloColoreAvanzato(id, { ascolta: () => … }); contenitore.append(pannello.el). + * Si aggiorna da solo su doc/undo; chiamare distruggi() quando si chiude. Ascolta è affidato al trasporto dell'host. + */ +export function creaPannelloColoreAvanzato(clipId: string, opzioni: { ascolta?: () => void } = {}) { + const el = h('section', { class: 'colore-avanzato', 'aria-label': 'Colore avanzato' }); + let canale: CanaleCurva = 'master', trascina = false, morto = false; + let messaggio = '', selezionato = 'inizio'; + const stato = h('p', { class: 'ca-stato', role: 'status', 'aria-live': 'polite' }); + const dice = (s: string) => { messaggio = s; stato.textContent = s; }; + const modifica = (nome: string, fn: (p: Project, c: Clip) => void) => { + store.edit(nome, (p) => { const c = clipDi(p, clipId); if (c) fn(p, c); }); + }; + const cambiaColore = (fn: (col: ColoreAvanzato) => void) => modifica('Colore della clip', (_, c) => { c.fx.colore ??= {}; fn(c.fx.colore); }); + const numero = (nome: string, v: number, min: number, max: number, step: number, fn: (v: number) => void) => { + const input = h('input', { type: 'number', value: v, min, max, step, 'aria-label': nome }); + input.onchange = () => { if (Number.isFinite(input.valueAsNumber)) fn(Math.max(min, Math.min(max, input.valueAsNumber))); }; + return h('label', { class: 'ca-numero' }, h('span', null, nome), input); + }; + const bottone = (nome: string, fn: () => void, disabled = false) => h('button', { type: 'button', class: 'btn', disabled, on: { click: fn } }, nome); + + function ruota(col: ColoreAvanzato, campo: 'lift' | 'gamma' | 'gain', nome: string) { + const base = campo === 'lift' ? 0 : 1, scala = campo === 'lift' ? .25 : .75; + const valori = col[campo] ?? [base, base, base]; + const medio = valori.reduce((a, b) => a + b, 0) / 3; + const gruppo = h('fieldset', { class: 'ca-ruota' }, h('legend', null, nome)); + const disco = h('div', { class: 'ca-disco', role: 'img', 'aria-label': `${nome}: trascina il colore, oppure usa i campi RGB` }); + const punto = h('i', { class: 'ca-punto' }); + punto.style.left = `${50 + Math.max(-1, Math.min(1, (valori[0] - medio) / scala)) * 45}%`; + punto.style.top = `${50 + Math.max(-1, Math.min(1, (valori[1] - valori[2]) / (Math.sqrt(3) * scala))) * 45}%`; + disco.append(punto); + disco.onpointerdown = (e) => { + if (e.button !== 0) return; + trascina = true; store.begin(nome); disco.setPointerCapture(e.pointerId); + const muovi = (e: PointerEvent) => { + const r = disco.getBoundingClientRect(); + let x = (e.clientX - r.left - r.width / 2) / (r.width * .45), y = (e.clientY - r.top - r.height / 2) / (r.height * .45); + const len = Math.hypot(x, y); if (len > 1) { x /= len; y /= len; } + const c = clipDi(store.doc, clipId); if (!c) return; + c.fx.colore ??= {}; + c.fx.colore[campo] = [medio + x * scala, medio + (-x / 2 + y * Math.sqrt(3) / 2) * scala, medio + (-x / 2 - y * Math.sqrt(3) / 2) * scala] + .map((v) => Math.max(campo === 'gamma' ? .1 : campo === 'gain' ? 0 : -1, Math.min(campo === 'lift' ? 1 : 4, v))) as [number, number, number]; + punto.style.left = `${50 + x * 45}%`; punto.style.top = `${50 + y * 45}%`; store.liveChange(); + }; + disco.onpointermove = muovi; + disco.onpointerup = () => { disco.onpointermove = null; trascina = false; store.commit(); aggiorna(); }; + disco.onpointercancel = () => { disco.onpointermove = null; trascina = false; store.cancelLive(); aggiorna(); }; + muovi(e); + }; + gruppo.append(disco, numero('Livello', medio, campo === 'lift' ? -1 : .1, campo === 'lift' ? 1 : 4, .01, (v) => cambiaColore((c) => { + c[campo] = valori.map((x) => Math.max(campo === 'gamma' ? .1 : campo === 'gain' ? 0 : -1, Math.min(campo === 'lift' ? 1 : 4, x + v - medio))) as [number, number, number]; + }))); + ['R', 'G', 'B'].forEach((n, i) => gruppo.append(numero(n, valori[i], campo === 'lift' ? -1 : campo === 'gain' ? 0 : .1, campo === 'lift' ? 1 : 4, .01, (v) => cambiaColore((c) => { + const vv: [number, number, number] = [...valori]; vv[i] = v; c[campo] = vv; + })))); + return gruppo; + } + + function editorCurve(col: ColoreAvanzato) { + const box = h('fieldset', null, h('legend', null, 'Curve')); + const scelta = h('select', { 'aria-label': 'Canale della curva' }, CANALI_CURVA.map((c) => h('option', { value: c, selected: c === canale }, NOMI_CURVE[c]))); + scelta.onchange = () => { canale = scelta.value as CanaleCurva; selezionato = 'inizio'; aggiorna(); }; + const punti = normalizzaCurva(col.curve?.[canale]); + const tela = h('canvas', { width: 320, height: 200, class: 'ca-curva', 'aria-label': 'Curva: trascina i punti; doppio clic per aggiungerne uno' }); + const disegna = () => { + const ctx = tela.getContext('2d')!; + const p = normalizzaCurva(clipDi(store.doc, clipId)?.fx.colore?.curve?.[canale]); + ctx.fillStyle = '#17171e'; ctx.fillRect(0, 0, 320, 200); ctx.strokeStyle = '#44444f'; ctx.lineWidth = 1; + for (let i = 1; i < 4; i++) { ctx.beginPath(); ctx.moveTo(i * 80, 0); ctx.lineTo(i * 80, 200); ctx.moveTo(0, i * 50); ctx.lineTo(320, i * 50); ctx.stroke(); } + ctx.strokeStyle = canale === 'red' ? '#ff7777' : canale === 'green' ? '#88df98' : canale === 'blue' ? '#88baff' : '#ffe09a'; ctx.lineWidth = 2; ctx.beginPath(); + for (let x = 0; x <= 320; x++) { const y = (1 - valutaCurva(p, x / 320)) * 200; if (x) ctx.lineTo(x, y); else ctx.moveTo(x, y); } ctx.stroke(); + for (const pt of p) { ctx.beginPath(); ctx.arc(pt.x * 320, (1 - pt.y) * 200, pt.id === selezionato ? 6 : 4, 0, Math.PI * 2); ctx.fillStyle = '#fff'; ctx.fill(); } + }; + const coordinate = (e: MouseEvent) => { const r = tela.getBoundingClientRect(); return { x: Math.max(0, Math.min(1, (e.clientX - r.left) / r.width)), y: Math.max(0, Math.min(1, 1 - (e.clientY - r.top) / r.height)) }; }; + tela.ondblclick = (e) => { + const q = coordinate(e); if (q.x <= .005 || q.x >= .995 || punti.some((p) => Math.abs(p.x - q.x) < .005)) return; + selezionato = crypto.randomUUID(); + cambiaColore((c) => { c.curve ??= {}; c.curve[canale] = normalizzaCurva([...punti, { id: selezionato, ...q }]); }); + }; + tela.onpointerdown = (e) => { + if (e.button !== 0) return; + const q = coordinate(e), p = punti.reduce((a, b) => Math.hypot(a.x - q.x, a.y - q.y) < Math.hypot(b.x - q.x, b.y - q.y) ? a : b); + if (Math.hypot(p.x - q.x, p.y - q.y) > .08) return; + selezionato = p.id; trascina = true; store.begin('Curva colore'); tela.setPointerCapture(e.pointerId); + let modificata = false; + const indice = punti.indexOf(p); + tela.onpointermove = (e) => { + const q = coordinate(e), c = clipDi(store.doc, clipId); if (!c) return; + p.x = indice === 0 ? 0 : indice === punti.length - 1 ? 1 : Math.max(punti[indice - 1].x + .001, Math.min(punti[indice + 1].x - .001, q.x)); p.y = q.y; + modificata = true; + c.fx.colore ??= {}; c.fx.colore.curve ??= {}; c.fx.colore.curve[canale] = punti.map((p) => ({ ...p })); store.liveChange(); disegna(); + }; + tela.onpointerup = () => { tela.onpointermove = null; trascina = false; store.commit(modificata); aggiorna(); }; + tela.onpointercancel = () => { tela.onpointermove = null; trascina = false; store.cancelLive(); aggiorna(); }; + disegna(); + }; + box.append(scelta, tela, h('p', { class: 'nota' }, 'Doppio clic: aggiungi un punto. Gli estremi restano ai bordi.')); + for (const [i, p] of punti.entries()) { + const riga = h('div', { class: 'ca-punto-riga' }, numero(`Ingresso ${i + 1}`, p.x, i ? punti[i - 1].x + .001 : 0, i < punti.length - 1 ? punti[i + 1].x - .001 : 1, .001, (v) => { + if (i === 0 || i === punti.length - 1) return; + cambiaColore((c) => { c.curve ??= {}; c.curve[canale] = punti.map((q) => q.id === p.id ? { ...q, x: v } : q); }); + }), numero(`Uscita ${i + 1}`, p.y, 0, 1, .001, (v) => cambiaColore((c) => { c.curve ??= {}; c.curve[canale] = punti.map((q) => q.id === p.id ? { ...q, y: v } : q); }))); + if (i === 0 || i === punti.length - 1) riga.querySelector('input')!.readOnly = true; + if (i > 0 && i < punti.length - 1) riga.append(bottone('Togli punto', () => cambiaColore((c) => { c.curve ??= {}; c.curve[canale] = punti.filter((q) => q.id !== p.id); }))); + box.append(riga); + } + box.append(bottone('Azzera questa curva', () => cambiaColore((c) => { c.curve ??= {}; c.curve[canale] = identitaCurva(); }))); + disegna(); return box; + } + + /** Mette la LUT nel progetto (una sola copia per contenuto) e la lega alla clip, se nel frattempo il montaggio non è cambiato. */ + async function mettiLut(lut: RisorsaLut, testo: string) { + const p0 = store.doc, sequenza = p0.seqAttiva, target = clipDi(p0, clipId); + if (morto) return; + if (store.doc !== p0 || p0.seqAttiva !== sequenza || clipDi(p0, clipId) !== target) { dice('Il montaggio è cambiato nel frattempo: riprova a scegliere la LUT'); return; } + modifica('LUT della clip', (p, c) => { + p.luts ??= []; if (!p.luts.some((l) => l.hash === lut.hash)) p.luts.push(lut); + c.fx.colore ??= {}; c.fx.colore.lut = { id: lut.id, intensita: c.fx.colore.lut?.intensita || 1 }; + }); + dice(testo); aggiorna(); + } + + /** Le LUT di partenza: ognuna con un'anteprima su una scena di prova. Un clic la mette sulla clip, e la si vede sul monitor. */ + function libreria(attuale: string | undefined) { + const griglia = h('div', { class: 'ca-libreria', role: 'group', 'aria-label': 'LUT di partenza' }); + const tessera = (nome: string, info: string, disegna: (ctx: CanvasRenderingContext2D) => void | Promise, fn: () => void, scelta: boolean) => { + const tela = h('canvas', { width: ANTEPRIMA_W, height: ANTEPRIMA_H }); + const b = h('button', { type: 'button', class: 'ca-lut' + (scelta ? ' scelta' : ''), title: info, 'aria-pressed': String(scelta), on: { click: fn } }, tela, h('b', null, nome)); + void Promise.resolve(disegna(tela.getContext('2d')!)).catch(() => {}); + return b; + }; + griglia.append(tessera('Nessuna', 'Senza LUT', (ctx) => disegnaScena(ctx, SCENA), () => cambiaColore((c) => { delete c.lut; }), !attuale)); + for (const v of LUT_DI_PARTENZA) { + const b = tessera(v.nome, v.info, async (ctx) => { + const lut = await caricaLutDiPartenza(v.id); + let px = anteprime.get(v.id); if (!px) anteprime.set(v.id, px = applicaAScena(lut, SCENA)); + disegnaScena(ctx, px); + if (lut.id === attuale) { b.classList.add('scelta'); b.setAttribute('aria-pressed', 'true'); } + }, () => { dice('Carico la LUT…'); caricaLutDiPartenza(v.id).then((l) => mettiLut(l, `LUT «${v.nome}» messa sulla clip`)).catch((e) => dice(errore(e))); }, false); + griglia.append(b); + } + return griglia; + } + + function aggiorna() { + if (morto || trascina) return; + el.replaceChildren(); const c = clipDi(store.doc, clipId); + if (!c) { el.append(h('p', null, 'La clip non c’è più')); return; } + const t = store.doc.tracks.find((t) => t.id === c.track); + if (t?.kind === 'video' && c.kind !== 'fx') { + const col = c.fx.colore ?? {}; + el.append(h('h3', null, 'Colore della clip'), h('p', { class: 'nota' }, 'SDR · usa LUT pensate per lo spazio colore della ripresa. Nessuna conversione log automatica.'), + h('div', { class: 'ca-ruote' }, ruota(col, 'lift', 'Lift · ombre'), ruota(col, 'gamma', 'Gamma · mezzi toni'), ruota(col, 'gain', 'Gain · luci')), editorCurve(col)); + const lut = store.doc.luts?.find((l) => l.id === col.lut?.id); + const file = h('input', { type: 'file', accept: '.cube', 'aria-label': 'Carica il tuo file .cube' }); + file.onchange = async () => { + const f = file.files?.[0]; if (!f) return; + try { await mettiLut(await leggiLut(f), 'LUT caricata e incorporata nel progetto'); } catch (e) { dice(errore(e)); } + }; + el.append(h('fieldset', { class: 'ca-luts' }, h('legend', null, 'LUT 3D · look di partenza'), libreria(col.lut?.id), + h('label', { class: 'ca-carica' }, h('span', null, 'Carica il tuo .cube'), file), h('p', null, lut?.nome ?? (col.lut ? 'LUT mancante: ricarica il file .cube' : 'Nessuna LUT')), + numero('Intensità LUT (%)', (col.lut?.intensita ?? 0) * 100, 0, 100, 1, (v) => cambiaColore((c) => { if (c.lut) c.lut.intensita = v / 100; })), + bottone('Togli LUT', () => cambiaColore((c) => { delete c.lut; }))), + bottone('Azzera il colore avanzato', () => modifica('Azzera colore avanzato', (_, c) => { delete c.fx.colore; }))); + } + const voce = creaDuckingClip(clipId, { ascolta: opzioni.ascolta }); + if (voce.el.childElementCount) el.append(h('fieldset', null, h('legend', null, 'Voce e musica'), voce.el)); + stato.textContent = messaggio; el.append(stato); + } + const off = store.on('doc', aggiorna); + aggiorna(); + return { el, aggiorna, distruggi() { morto = true; off(); if (trascina) { trascina = false; store.cancelLive(); } el.remove(); } }; +} + +/** Configurazione neutra per chi costruisce il pannello senza usare lo Store. */ +export { DUCKING0 }; diff --git a/src/ui/coloreAvanzatoFinestra.ts b/src/ui/coloreAvanzatoFinestra.ts new file mode 100644 index 0000000..fea6271 --- /dev/null +++ b/src/ui/coloreAvanzatoFinestra.ts @@ -0,0 +1,41 @@ +// «Colore avanzato…» dalle Proprietà: lo stesso pannello della pagina Finale, in una finestra mobile senza velo, +// così il monitor resta in vista e si vede subito l'effetto. Se ne apre una sola alla volta. +import '../stile/coloreUI.css'; +import { creaPannelloColoreAvanzato } from './coloreAvanzato'; +import { store } from '../core/store'; +import { h, icona } from './dom'; + +let aperta: { clipId: string; chiudi: () => void } | null = null; + +export function apriColoreAvanzato(clipId: string) { + if (aperta?.clipId === clipId) return; + aperta?.chiudi(); + const pannello = creaPannelloColoreAvanzato(clipId); + const corpo = h('div', { class: 'ca-corpo' }, pannello.el); + const chiudi = () => { + off(); pannello.distruggi(); el.remove(); document.removeEventListener('keydown', esc, true); + if (aperta?.chiudi === chiudi) aperta = null; + }; + const off = store.on('doc', () => { if (!store.doc.clips.some((c) => c.id === clipId)) chiudi(); }); + const esc = (e: KeyboardEvent) => { if (e.key === 'Escape' && el.contains(document.activeElement)) { e.stopPropagation(); chiudi(); } }; + const testa = h('header', null, h('span', { class: 'led acceso' }), h('b', null, 'COLORE AVANZATO'), + h('button', { class: 'btn-icona', title: 'Chiudi (Esc)', 'aria-label': 'Chiudi il colore avanzato', on: { click: chiudi } }, icona('x', 16))); + const el = h('section', { class: 'ca-finestra', role: 'dialog', 'aria-label': 'Colore avanzato', tabindex: -1 }, testa, corpo); + // si sposta dalla testata (eventi pointer: nell'app il trascinamento di sistema non c'è) + testa.addEventListener('pointerdown', (e) => { + if ((e.target as HTMLElement).closest('button') || e.button !== 0) return; + const r = el.getBoundingClientRect(), dx = e.clientX - r.left, dy = e.clientY - r.top; + testa.setPointerCapture(e.pointerId); + const muovi = (m: PointerEvent) => { + el.style.left = Math.max(0, Math.min(innerWidth - 80, m.clientX - dx)) + 'px'; + el.style.top = Math.max(0, Math.min(innerHeight - 40, m.clientY - dy)) + 'px'; + el.style.right = 'auto'; + }; + const fine = () => { testa.removeEventListener('pointermove', muovi); testa.removeEventListener('pointerup', fine); testa.removeEventListener('pointercancel', fine); }; + testa.addEventListener('pointermove', muovi); testa.addEventListener('pointerup', fine); testa.addEventListener('pointercancel', fine); + }); + document.addEventListener('keydown', esc, true); + document.body.appendChild(el); + el.focus({ preventScroll: true }); // così Esc la chiude subito + aperta = { clipId, chiudi }; +} diff --git a/src/ui/contenitore.ts b/src/ui/contenitore.ts index cd03efa..6d7ee3a 100644 --- a/src/ui/contenitore.ts +++ b/src/ui/contenitore.ts @@ -24,7 +24,9 @@ import { STILI_CONTO, disegnaCountdown, specAlTempo, telaTitolo } from '../rende import { ANIMAZIONI, GRUPPI_LIBRERIA, animazioniDi, nuovaAnim } from '../core/animazioni'; import { disegnaAnimazione } from '../render/animazioni'; import { caricaFontAnimazioni } from '../render/font'; -import { scenaAnimazione, scenaConto, scenaEffetto, scenaRitocco, scenaSala, scenaTitolo, scenaTransizione, suonaProvino, type Costruttore } from '../render/provino'; +import { GRUPPI_HTML, MODELLI_HTML, modelliDi, nuovoHtml } from '../core/titoliHtml'; +import { anteprimaHtml } from '../render/titoliHtml'; +import { scenaHtml, scenaAnimazione, scenaConto, scenaEffetto, scenaRitocco, scenaSala, scenaTitolo, scenaTransizione, suonaProvino, type Costruttore } from '../render/provino'; // ——— l'albero ——— interface Ramo { id: string; nome: string; icona: string; figli?: [string, string][] } @@ -38,7 +40,7 @@ const TIPI: Ramo[] = [ const LIBRERIA: Ramo[] = [ { id: 'transizioni', nome: 'Transizioni', icona: 'transizione', figli: [['tr:dissolvenze', 'Dissolvenze'], ['tr:movimento', 'Movimento'], ['tr:3d', '3D e forme'], ['tr:luce', 'Luce'], ['tr:stile', 'Stile'], ['tr:tendine', 'Tendine SMPTE']] }, - { id: 'titoli', nome: 'Titoli', icona: 'titolo', figli: [['tit:titoli', 'Titoli'], ['tit:sott', 'Sottotitoli'], ['tit:tv', 'TV e social'], ['tit:conto', 'Countdown'], ['tit:sala', 'Macchine della sala']] }, + { id: 'titoli', nome: 'Titoli', icona: 'titolo', figli: [['tit:titoli', 'Titoli'], ...GRUPPI_HTML.map((g): [string, string] => ['tit:html-' + g.id, 'Animati · ' + g.nome]), ['tit:sott', 'Sottotitoli'], ['tit:tv', 'TV e social'], ['tit:conto', 'Countdown'], ['tit:sala', 'Macchine della sala']] }, { id: 'animazioni', nome: 'Animazioni', icona: 'effetti', figli: GRUPPI_LIBRERIA.map((g): [string, string] => ['an:' + g.id, g.nome]) }, { id: 'effetti', nome: 'Effetti', icona: 'effetti', figli: [['fx:rapidi', 'Rapidi'], ['fx:lunghi', 'Lunghi'], ['fx:luci', 'Luci'], ['fx:distorsioni', 'Distorsioni'], ['fx:colore', 'Colore'], ['fx:particelle', 'Particelle'], ['fx:clip', 'Stile della clip'], ['fx:audio', 'Audio']] }, ]; @@ -737,6 +739,21 @@ export class Contenitore { anteprima: anteprimaTitolo(id), provino: scenaTitolo(id), dato: 'g:title:' + id, etichetta: '📺 ' + nome, clic: () => { inserisciGeneratore('title', undefined, undefined, { titolo: id }); avviso(`${nome} al cursore`, 'ok', 1000); }, }); + // i titoli animati HTML: l'anteprima ferma è il fotogramma vero (disegnato una carta alla volta), al passaggio gira + const html = (m: typeof MODELLI_HTML[number]) => { + const cv = h('canvas', { class: 'gen-anteprima', width: 192, height: 108 }) as HTMLCanvasElement; + const x = cv.getContext('2d')!; + const g = x.createLinearGradient(0, 0, 192, 108); + g.addColorStop(0, '#1d2a4a'); g.addColorStop(1, '#2a1333'); + x.fillStyle = g; x.fillRect(0, 0, 192, 108); + codaAnteprimeHtml = codaAnteprimeHtml.then(() => anteprimaHtml(cv, nuovoHtml(m.id))).catch(() => undefined); + return this.cartaLibreria({ + cls: 'gen gen-voce', nome: m.nome, titolo: `${m.nome} · ${m.info} +Clic: al cursore (su una traccia libera) · trascina: dove vuoi`, + anteprima: cv, provino: scenaHtml(m.id), dato: 'g:html:' + m.id, etichetta: '🎞 ' + m.nome, attr: { 'data-html': m.id }, + clic: () => { inserisciGeneratore('html', undefined, undefined, { html: m.id }); avviso(`${m.nome} al cursore`, 'ok', 1000); }, + }); + }; const conto = (stile: typeof STILI_CONTO[number]) => { const cv = h('canvas', { width: 192, height: 108 }) as HTMLCanvasElement; const t = disegnaCountdown(192, 108, 0.5, stile.secondi, stile.id); @@ -766,6 +783,7 @@ export class Contenitore { ].filter((c) => !this.filtro || (c.textContent ?? '').toLowerCase().includes(this.filtro.toLowerCase())); this.corpo.replaceChildren(h('div', { class: 'gen-lista' }, ...this.sezioni('titoli', [ ['tit:titoli', 'Titoli', this.filtra(PRESET_TITOLI.filter((x) => x.gruppo === 'titoli')).map((x) => titolo(x.id, x.nome))], + ...GRUPPI_HTML.map((g): [string, string, HTMLElement[]] => ['tit:html-' + g.id, 'Animati · ' + g.nome, this.filtra(modelliDi(g.id)).map(html)]), ['tit:sott', 'Sottotitoli', voceSott], ['tit:tv', 'TV e social', this.filtra(PRESET_TITOLI.filter((x) => x.gruppo === 'tv')).map((x) => titolo(x.id, x.nome))], ['tit:conto', 'Countdown', this.filtra(STILI_CONTO).map(conto)], @@ -839,6 +857,9 @@ export class Contenitore { export { fps }; +/** le anteprime dei titoli HTML si disegnano una dopo l'altra */ +let codaAnteprimeHtml: Promise = Promise.resolve(); + /** l'anteprima ferma di un'animazione: disegnata davvero a metà della sua entrata, su un fondo scuro */ function anteprimaAnimazione(cv: HTMLCanvasElement, id: string) { const x = cv.getContext('2d')!; diff --git a/src/ui/dialoghi.ts b/src/ui/dialoghi.ts index 977950a..631548a 100644 --- a/src/ui/dialoghi.ts +++ b/src/ui/dialoghi.ts @@ -2,112 +2,36 @@ import { store } from '../core/store'; import { CADENZE, RISOLUZIONI, formatoDa, sceltaDa } from '../core/tipi'; import { projectEnd } from '../core/progetto'; -import { frameToTc, durataUmana, f2s } from '../core/timecode'; +import { scalaAnim } from '../core/automazioni'; +import { frameToTc } from '../core/timecode'; import { azioni } from '../azioni'; -import { esporta, fotogrammaPng, scegliCodec, type Formato, type Qualita } from '../export/esporta'; +import { fotogrammaPng } from '../export/esporta'; import { creaEdl } from '../export/edl'; import { dialogoSalva, edizione, invoke, isTauri, salvaTesto, scarica, apriLink } from '../platform'; import { avviso, dialogo, h } from './dom'; import { motore } from '../motore'; +import { pannelloEsporta, type PannelloEsporta } from './esportazione'; declare const __VERSIONE__: string; export const VERSIONE = __VERSIONE__; -/** la finestra dell'export; dalla pagina Finale arriva già con formato, qualità e misura scelti */ -export function finestraEsporta(preset: { formato?: string; qualita?: string; misura?: string } = {}) { +/** la finestra dell'export (Ctrl+M): lo stesso pannello della pagina Finale (preset, cosa esce, coda). Si può chiudere + * quando si vuole: le esportazioni in coda continuano da sole e si vedono anche in Attività. */ +export function finestraEsporta(scelta: { preset?: string } = {}) { const p = store.doc; motore.stop(); const fine = projectEnd(p); if (!fine) { avviso('La timeline è vuota: prima monta qualcosa', 'info'); return; } - let annulla = false; - let lavorando = false; - let fatto = false; - // mentre esporta la finestra resta aperta (Esc o un clic fuori non la chiudono): si ferma con Annulla - const d = dialogo('Esporta il master', { largo: true, chiudibile: () => { if (lavorando) avviso('L\'export è in corso: premi Annulla per fermarlo', 'info', 2200); return !lavorando; } }); - const nome = h('input', { class: 'campo-testo', value: p.name.replace(/[\\/:*?"<>|]/g, '_') }) as HTMLInputElement; - const formato = h('select', { class: 'mini-select' }, - h('option', { value: 'mp4' }, 'MP4 · H.264 + AAC (va ovunque)'), - h('option', { value: 'mov' }, 'MOV · QuickTime'), - h('option', { value: 'webm' }, 'WebM · VP9 + Opus (web)'), - h('option', { value: 'wav' }, 'WAV · solo audio 48 kHz')) as HTMLSelectElement; - const misura = h('select', { class: 'mini-select' }, - h('option', { value: '1' }, `Come il progetto · ${p.w}×${p.h}`), - h('option', { value: '0.5' }, `Metà · ${Math.round(p.w / 2)}×${Math.round(p.h / 2)}`), - p.h > 720 ? h('option', { value: String(720 / p.h) }, `720p · ${Math.round(p.w * 720 / p.h)}×720`) : null, - p.h < 2160 ? h('option', { value: String(2160 / p.h) }, `4K · ${Math.round(p.w * 2160 / p.h)}×2160`) : null) as HTMLSelectElement; - const qualita = h('select', { class: 'mini-select' }, - h('option', { value: 'media' }, 'Media (file leggero)'), - h('option', { value: 'alta', selected: true }, 'Alta (consigliata)'), - h('option', { value: 'altissima' }, 'Altissima (master)'), - h('option', { value: 'bassa' }, 'Bassa (anteprima)')) as HTMLSelectElement; - const haInOut = p.inF !== null && p.outF !== null; - if (preset.formato) formato.value = preset.formato; - if (preset.qualita) qualita.value = preset.qualita; - if (preset.misura && [...misura.options].some((o) => o.value === preset.misura)) misura.value = preset.misura; - const soloInOut = h('input', { type: 'checkbox', checked: haInOut, disabled: !haInOut }) as HTMLInputElement; - const codec = h('span', { class: 'nota' }, 'controllo i codec…'); - const aggCodec = async () => { - const k = Number(misura.value); - const c = await scegliCodec(formato.value as Formato, Math.round(p.w * k / 2) * 2, Math.round(p.h * k / 2) * 2); - codec.textContent = formato.value === 'wav' ? 'Audio PCM 16 bit' : c.v ? `Video ${c.v.toUpperCase()} · audio ${c.a ? c.a.toUpperCase() : 'nessuno'}` : '⚠ questo sistema non codifica questo formato'; - }; - formato.addEventListener('change', aggCodec); - misura.addEventListener('change', aggCodec); - void aggCodec(); - const barra = h('div', { class: 'barra-avanz' }, h('i')); - const stato = h('div', { class: 'export-stato' }, `Durata ${frameToTc(haInOut ? p.outF! - p.inF! : fine, p.rate, p.drop)} · ${durataUmana(f2s(haInOut ? p.outF! - p.inF! : fine, p.rate))}`); - d.corpo.append( - h('div', { class: 'form' }, - h('label', null, 'Nome del file'), nome, - h('label', null, 'Formato'), formato, - h('label', null, 'Dimensione'), misura, - h('label', null, 'Qualità'), qualita, - h('label', null, 'Solo attacco–stacco'), h('span', null, soloInOut, haInOut ? ` ${frameToTc(p.inF!, p.rate, p.drop)} → ${frameToTc(p.outF!, p.rate, p.drop)}` : ' (segna I e O sulla timeline)'), - h('label', null, 'Codec'), codec), - stato, barra); - const vai = h('button', { class: 'btn primario' }, 'Esporta') as HTMLButtonElement; - const chiudi = h('button', { class: 'btn', on: { click: () => { if (lavorando) { annulla = true; chiudi.textContent = 'Fermo…'; } else d.chiudi(); } } }, 'Annulla') as HTMLButtonElement; - vai.addEventListener('click', async () => { - // a lavoro finito il bottone dice "Fatto" e chiude (prima faceva ripartire l'export da capo) - if (fatto) { d.chiudi(); return; } - if (lavorando) return; - const k = Number(misura.value); - lavorando = true; - vai.disabled = true; - d.el.classList.add('lavora'); - const f = formato.value as Formato; - try { - const file = await esporta(p, { - formato: f, w: Math.round(p.w * k), h: Math.round(p.h * k), qualita: qualita.value as Qualita, soloInOut: soloInOut.checked, - nome: (nome.value || 'montaggio') + '.' + f, - }, (a) => { - (barra.firstChild as HTMLElement).style.width = (a.fatti / a.totale) * 100 + '%'; - stato.textContent = a.fase === 'video' - ? `Video: ${frameToTc(Math.round(a.fatti), p.rate, p.drop)} di ${frameToTc(a.totale, p.rate, p.drop)} · ${a.fpsResa.toFixed(0)} fps${a.fpsResa > 0 ? ' · mancano ' + durataUmana((a.totale - a.fatti) / a.fpsResa) : ''}` - : a.fase === 'audio' ? 'Audio…' : 'Chiudo il file…'; - }, () => annulla); - lavorando = false; - if (file) { - avviso(`🎬 Esportato: ${file.split(/[\\/]/).pop()}`, 'ok', 5000); - stato.textContent = `Fatto! ${file}`; - (barra.firstChild as HTMLElement).style.width = '100%'; - vai.textContent = 'Fatto'; - chiudi.textContent = 'Chiudi'; - fatto = true; - vai.disabled = false; - } else { d.chiudi(); avviso('Export annullato', 'info'); } - } catch (e) { - lavorando = false; - vai.disabled = false; - d.el.classList.remove('lavora'); - stato.textContent = '⚠ ' + (e instanceof Error ? e.message : String(e)); - avviso('Export non riuscito', 'errore'); - } - }); + let pannello: PannelloEsporta | null = null; + const d = dialogo('Esporta', { largo: true, onChiudi: () => pannello?.smonta() }); + d.el.classList.add('dlg-esporta'); + pannello = pannelloEsporta(scelta.preset); + d.corpo.append(pannello.el); d.piede.append( h('button', { class: 'btn', title: 'La lista di montaggio per Resolve, Avid, Premiere, EDIUS', on: { click: () => esportaEdl() } }, 'EDL CMX3600'), h('button', { class: 'btn', title: 'Il fotogramma sotto il cursore, a piena risoluzione', on: { click: () => esportaFotogramma() } }, 'Fotogramma PNG'), - h('span', { class: 'spazio' }), chiudi, vai); + h('span', { class: 'spazio' }), + h('button', { class: 'btn', on: { click: d.chiudi } }, 'Chiudi')); } export async function esportaEdl() { @@ -164,7 +88,7 @@ export function finestraProgetto() { // le posizioni restano nello stesso istante: si convertono i fotogrammi const k = (f2.rate.num / f2.rate.den) / (pp.rate.num / pp.rate.den); if (Math.abs(k - 1) > 1e-6) { - for (const c of pp.clips) { const e = Math.round((c.start + c.len) * k); c.start = Math.round(c.start * k); c.len = Math.max(1, e - c.start); c.fadeIn = Math.round(c.fadeIn * k); c.fadeOut = Math.round(c.fadeOut * k); if (c.trIn) c.trIn.len = Math.max(1, Math.round(c.trIn.len * k)); c.opKeys.forEach((x) => { x.f = Math.round(x.f * k); }); c.gainKeys.forEach((x) => { x.f = Math.round(x.f * k); }); } + for (const c of pp.clips) { const e = Math.round((c.start + c.len) * k); c.start = Math.round(c.start * k); c.len = Math.max(1, e - c.start); c.fadeIn = Math.round(c.fadeIn * k); c.fadeOut = Math.round(c.fadeOut * k); if (c.trIn) c.trIn.len = Math.max(1, Math.round(c.trIn.len * k)); c.opKeys.forEach((x) => { x.f = Math.round(x.f * k); }); c.gainKeys.forEach((x) => { x.f = Math.round(x.f * k); }); scalaAnim(c, k); } for (const m of pp.markers) m.f = Math.round(m.f * k); for (const r of pp.sottotitoli?.righe ?? []) { r.da = Math.round(r.da * k); r.a = Math.max(r.da + 1, Math.round(r.a * k)); } if (pp.inF !== null) pp.inF = Math.round(pp.inF * k); @@ -193,7 +117,7 @@ export function finestraTasti() { } export function finestraInfo() { - const d = dialogo('DaProd Video'); + const d = dialogo('DaProd Editor Video'); d.corpo.append( h('div', { class: 'info-logo' }, h('span', { class: 'marchio-grande' }, 'Da', h('b', null, 'Prod'), ' Video')), h('p', null, `Versione ${VERSIONE} · ${edizione}`), diff --git a/src/ui/dom.ts b/src/ui/dom.ts index 715be06..7ed1317 100644 --- a/src/ui/dom.ts +++ b/src/ui/dom.ts @@ -100,6 +100,7 @@ const P: Record = { logo: '', lingua: '', apertura: '', + novita: '', foto: '', }; @@ -110,35 +111,52 @@ export function icona(nome: keyof typeof P | string, size = 18): SVGElement { } // ——— avvisi (toast) ——— +/** + * La chiusura da sola di un avviso: dopo `ms` sparisce, ma col mouse sopra resta dov'è e riparte da capo quando il mouse esce + * (così si fa in tempo a leggerlo). `riarma` cambia il tempo (un avviso che si aggiorna al suo posto). + */ +function chiusuraAvviso(el: HTMLElement, ms: number, via: () => void): (ms: number) => void { + let timer = 0, sopra = false, durata = ms; + const arma = () => { clearTimeout(timer); if (!sopra) timer = window.setTimeout(via, durata); }; + el.addEventListener('pointerenter', () => { sopra = true; clearTimeout(timer); }); + el.addEventListener('pointerleave', () => { sopra = false; durata = Math.max(durata, 1500); arma(); }); + arma(); + return (nuovo) => { durata = nuovo; arma(); }; +} + let zonaAvvisi: HTMLElement | null = null; -export function avviso(testo: string, tipo: 'info' | 'ok' | 'errore' | 'tasto' = 'info', ms = 2200) { +function zona(): HTMLElement { if (!zonaAvvisi) { zonaAvvisi = h('div', { class: 'avvisi', 'aria-live': 'polite' }); document.body.appendChild(zonaAvvisi); } + return zonaAvvisi; +} +export function avviso(testo: string, tipo: 'info' | 'ok' | 'errore' | 'tasto' = 'info', ms = 2200) { + const z = zona(); const el = h('div', { class: 'avviso ' + tipo }, testo); - zonaAvvisi.appendChild(el); - while (zonaAvvisi.children.length > 4) zonaAvvisi.firstChild?.remove(); - setTimeout(() => { el.classList.add('via'); setTimeout(() => el.remove(), 300); }, ms); + z.appendChild(el); + while (z.children.length > 4) z.firstChild?.remove(); + chiusuraAvviso(el, ms, () => { el.classList.add('via'); setTimeout(() => el.remove(), 300); }); } /** un avviso che si aggiorna al suo posto: lo stesso testo che cambia (un avanzamento) non mette un avviso nuovo a ogni passo */ -const unici = new Map(); +const unici = new Map void }>(); export function avvisoUnico(chiave: string, testo: string, tipo: 'info' | 'ok' | 'errore' | 'tasto' = 'info', ms = 2200) { - if (!zonaAvvisi) { - zonaAvvisi = h('div', { class: 'avvisi', 'aria-live': 'polite' }); - document.body.appendChild(zonaAvvisi); - } + const z = zona(); let v = unici.get(chiave); if (!v || !v.el.isConnected) { - v = { el: h('div', { class: 'avviso ' + tipo }, testo), timer: 0 }; - unici.set(chiave, v); - zonaAvvisi.appendChild(v.el); - while (zonaAvvisi.children.length > 4) zonaAvvisi.firstChild?.remove(); - } else { v.el.textContent = testo; v.el.className = 'avviso ' + tipo; } - clearTimeout(v.timer); - const mio = v; - v.timer = window.setTimeout(() => { mio.el.classList.add('via'); setTimeout(() => { mio.el.remove(); if (unici.get(chiave) === mio) unici.delete(chiave); }, 300); }, ms); + const el = h('div', { class: 'avviso ' + tipo }, testo); + const mio: { el: HTMLElement; riarma: (ms: number) => void } = { el, riarma: () => {} }; + mio.riarma = chiusuraAvviso(el, ms, () => { el.classList.add('via'); setTimeout(() => { el.remove(); if (unici.get(chiave) === mio) unici.delete(chiave); }, 300); }); + unici.set(chiave, mio); + z.appendChild(el); + while (z.children.length > 4) z.firstChild?.remove(); + } else { + v.el.textContent = testo; + v.el.className = 'avviso ' + tipo; + v.riarma(ms); + } } // ——— dialoghi ——— diff --git a/src/ui/duckingClip.ts b/src/ui/duckingClip.ts new file mode 100644 index 0000000..49f0f11 --- /dev/null +++ b/src/ui/duckingClip.ts @@ -0,0 +1,112 @@ +// Voce e musica di una clip audio: «Questa è la voce» e, sulla musica, «Abbassa sotto la voce» (ducking). +// Il motore legge `ruoloAudio` della clip (o della traccia), `ducking` (clip, poi traccia) e le attenuazioni `duckKeys` +// che si rifanno con Rigenera; qui si cambia solo questo. Sta nelle Proprietà (sezione del volume) e nel Mixer (traccia). +import '../stile/coloreUI.css'; +import type { Clip, Ducking, Project, RuoloAudio } from '../core/tipi'; +import { store } from '../core/store'; +import { impostazioneDucking, duckingValido, ruoloAudio } from '../core/ducking'; +import { conIncroci } from '../media/audio'; +import { firmaDuckingAttuale, preparaDucking } from '../media/ducking'; +import { h } from './dom'; + +const errore = (e: unknown) => e instanceof Error ? e.message : String(e); +const clipDi = (p: Project, id: string) => p.clips.find((c) => c.id === id); +/** L'analisi in corso e l'ultimo messaggio restano qui: il pannello si rifà spesso, il lavoro no. */ +const lavori = new Map(); +const messaggi = new Map(); +/** «Altre regolazioni» resta aperto anche se il pannello si rifà a ogni modifica */ +let altreAperte = false; + +/** Rigenera l'abbassamento di una musica (o di tutte). Controlla che il montaggio non sia cambiato nel frattempo. */ +export async function rigeneraDucking(clipId: string | undefined, quandoCambia: () => void) { + const chiave = clipId ?? '*'; + if (lavori.size) return; + const controller = new AbortController(), progetto = store.doc, sequenza = progetto.seqAttiva; + lavori.set(chiave, controller); + const dice = (s: string) => { messaggi.set(chiave, s); quandoCambia(); }; + dice('Analizzo le voci…'); + try { + const risultati = await preparaDucking(progetto, clipId ? [clipId] : undefined, controller.signal, dice); + if (controller.signal.aborted) { dice('Fermato.'); return; } + if (store.doc !== progetto || progetto.seqAttiva !== sequenza || risultati.some((r) => { const c = clipDi(progetto, r.id); return !c || firmaDuckingAttuale(progetto, c) !== r.firma; })) throw new Error('Il montaggio è cambiato durante l\'analisi: premi Rigenera'); + store.edit('Abbassa la musica sotto la voce', (p) => { for (const r of risultati) { const c = clipDi(p, r.id)!; c.duckKeys = r.keys; c.duckFirma = r.firma; } }); + dice('Fatto. Ascolta e regola «Quanto abbassare» se serve.'); + } catch (e) { dice(errore(e)); } + finally { lavori.delete(chiave); quandoCambia(); } +} + +/** La traccia intera è la voce (o non lo è più): serve al Mixer. */ +export function segnaTracciaVoce(trackId: string, voce: boolean) { + store.edit(voce ? 'Traccia = voce' : 'Traccia non più voce', (p) => { + const t = p.tracks.find((x) => x.id === trackId); if (t) t.ruoloAudio = voce ? 'voce' : undefined; + }); +} + +/** + * Il pezzo per una clip audio. Ritorna `null` se la clip non è su una traccia audio (lì il ducking non vale). + * `aggiorna()` lo rifà dai dati attuali: chi lo ospita lo chiama quando cambia il documento. + */ +export function creaDuckingClip(clipId: string, opzioni: { ascolta?: () => void } = {}) { + const el = h('div', { class: 'ck-ducking' }); + const modifica = (nome: string, fn: (p: Project, c: Clip) => void) => store.edit(nome, (p) => { const c = clipDi(p, clipId); if (c) fn(p, c); }); + const numero = (nome: string, v: number, min: number, max: number, step: number, fn: (v: number) => void) => { + const input = h('input', { type: 'number', value: v, min, max, step, 'aria-label': nome }); + input.onchange = () => { if (Number.isFinite(input.valueAsNumber)) fn(Math.max(min, Math.min(max, input.valueAsNumber))); }; + return h('label', { class: 'ck-numero' }, h('span', null, nome), input); + }; + const interruttore = (testo: string, acceso: boolean, fn: (on: boolean) => void, aiuto: string) => { + const i = h('input', { type: 'checkbox', checked: acceso, title: aiuto }); + i.onchange = () => fn(i.checked); + return h('label', { class: 'ck-interruttore' + (acceso ? ' acceso' : ''), title: aiuto }, i, h('span', { class: 'led' + (acceso ? ' acceso' : '') }), h('span', null, testo)); + }; + const bottone = (nome: string, fn: () => void, spento = false) => h('button', { type: 'button', class: 'btn-mini', disabled: spento, on: { click: fn } }, nome); + + function aggiorna() { + el.replaceChildren(); + const p = store.doc, c = clipDi(p, clipId), t = c && p.tracks.find((x) => x.id === c.track); + if (!c || t?.kind !== 'audio') return; + const ruolo = ruoloAudio(p, c), voce = ruolo === 'voce'; + el.append(interruttore('Questa è la voce', voce, (on) => modifica('Questa è la voce', (pp, cc) => { + const daTraccia: RuoloAudio | undefined = pp.tracks.find((x) => x.id === cc.track)?.ruoloAudio; + // se la traccia è già la voce, spegnere vuol dire «no, questa clip no»; se no basta togliere il segno + cc.ruoloAudio = on ? 'voce' : daTraccia === 'voce' ? 'nessuno' : undefined; + }), 'Le voci sono ascoltate: la musica si abbassa quando parlano')); + if (!voce) { + const d = impostazioneDucking(p, c), acceso = ruolo === 'musica' && d.attivo; + el.append(interruttore('Abbassa sotto la voce', acceso, (on) => modifica('Abbassa sotto la voce', (pp, cc) => { + const base: Ducking = { ...impostazioneDucking(pp, cc), attivo: on }; + if (on) cc.ruoloAudio = 'musica'; + cc.ducking = base; + }), 'Questa è musica: si abbassa da sola quando c\'è una voce')); + if (acceso) { + const cambia = (fn: (d: Ducking) => void) => modifica('Regola l\'abbassamento', (_, cc) => { cc.ducking = { ...d }; fn(cc.ducking); }); + const chiave = c.id, inCorso = lavori.size > 0; + const valida = duckingValido(conIncroci(p), c); + el.append( + numero('Quanto abbassare (dB)', d.quantita, 0, 60, .5, (v) => cambia((x) => { x.quantita = v; })), + numero('Attacco (s)', d.attacco, .005, 10, .005, (v) => cambia((x) => { x.attacco = v; })), + numero('Rilascio (s)', d.rilascio, .005, 10, .005, (v) => cambia((x) => { x.rilascio = v; })), + h('details', { class: 'ck-altre', open: altreAperte, on: { toggle: (e: Event) => { altreAperte = (e.target as HTMLDetailsElement).open; } } }, h('summary', null, 'Altre regolazioni'), + numero('Soglia della voce (dBFS)', d.soglia, -90, 0, 1, (v) => cambia((x) => { x.soglia = v; })), + numero('Isteresi (dB)', d.isteresi, 0, 24, 1, (v) => cambia((x) => { x.isteresi = v; })), + numero('Durata minima (s)', d.minimo, 0, 2, .01, (v) => cambia((x) => { x.minimo = v; })), + numero('Tenuta (s)', d.hold, 0, 5, .01, (v) => cambia((x) => { x.hold = v; }))), + h('p', { class: valida ? 'nota ck-ok' : 'nota ck-da-fare' }, valida ? 'Abbassamento pronto.' : 'Da rigenerare: finché non premi Rigenera la musica resta al volume che hai scelto.'), + h('div', { class: 'isp-pulsanti' }, + bottone('Rigenera', () => void rigeneraDucking(chiave, aggiorna), inCorso), + bottone('Rigenera tutta la musica', () => void rigeneraDucking(undefined, aggiorna), inCorso), + bottone('Usa per tutta la traccia', () => modifica('Abbassamento per tutta la traccia', (pp, cc) => { + pp.tracks.find((x) => x.id === cc.track)!.ducking = { ...d }; + pp.tracks.find((x) => x.id === cc.track)!.ruoloAudio = 'musica'; + for (const k of pp.clips) if (k.track === cc.track) k.ducking = undefined; + })), + opzioni.ascolta ? bottone('Ascolta', opzioni.ascolta) : null, + inCorso ? bottone('Ferma', () => lavori.forEach((l) => l.abort())) : null), + h('p', { class: 'nota ck-stato', role: 'status', 'aria-live': 'polite' }, messaggi.get(chiave) ?? messaggi.get('*') ?? ''), + h('p', { class: 'nota' }, 'Sente il volume delle clip segnate come voce, anche i rumori forti. Dopo tagli e spostamenti premi Rigenera.')); + } else el.append(h('p', { class: 'nota' }, 'Segna le voci con «Questa è la voce», poi accendi questo sulla musica.')); + } + } + aggiorna(); + return { el, aggiorna }; +} diff --git a/src/ui/esportazione.ts b/src/ui/esportazione.ts new file mode 100644 index 0000000..5f7c1ad --- /dev/null +++ b/src/ui/esportazione.ts @@ -0,0 +1,308 @@ +// Il pannello dell'esportazione: lo usano la pagina Finale (sezione Esporta) e la finestra Esporta (Ctrl+M). +// In cima si sceglie dove va il video (YouTube, verticale, WhatsApp…), in mezzo si vede cosa esce davvero +// (misura, fotogrammi, codec, peso stimato), poi i ritocchi, e in fondo la coda: le esportazioni vanno una dopo l'altra. +// I conti stanno in `src/core/esportazione.ts`, la coda in `src/export/coda.ts`, i codec in `src/export/codec.ts`. +import '../stile/esportazione.css'; +import { store } from '../core/store'; +import { projectEnd } from '../core/progetto'; +import { durataUmana, f2s, fps, frameToTc } from '../core/timecode'; +import { durataTesto } from '../core/stima'; +import { + CODEC_DI, INFO_CODEC, MISURE, NOME_CODEC, NOME_CONTENITORE, PRESET, codecPossibili, descriviQualita, impostazioni, + nomeFile, pesoStimato, pesoTesto, presetDi, proporzioneTesto, testoAdattamento, + type Adatta, type CodecVideo, type Contenitore, type Impostazioni, type Scelte, +} from '../core/esportazione'; +import { statiCodec, type StatoCodec } from '../export/codec'; +import { accoda, annullaVoce, coda, mostraNellaCartella, pulisciFinite, quandoCoda, quandoFinita, spostaVoce, togliVoce } from '../export/coda'; +import type { StatoVoce } from '../core/codaExport'; +import { isTauri } from '../platform'; +import { avviso, h, icona } from './dom'; + +/** le scelte di adesso: valgono per tutti i pannelli aperti (pagina Finale e finestra) */ +const S = { + preset: 'yt1080', + formato: 'mp4' as Contenitore, + codec: null as CodecVideo | null, + /** null = quella del preset */ + qualita: null as number | null, + adatta: null as Adatta | null, + misura: 'progetto', + inOut: false, + nome: '', +}; + +let avvisiPronti = false; +function preparaAvvisi() { + if (avvisiPronti) return; + avvisiPronti = true; + quandoFinita((v) => { + if (v.stato === 'fatta') avviso(`🎬 Esportato: ${v.messaggio ?? v.dato.titolo}`, 'ok', 5000); + else if (v.stato === 'errore') avviso(`Export non riuscito: ${v.messaggio ?? ''}`, 'errore', 6000); + else avviso('Export annullato', 'info'); + }); +} + +export interface PannelloEsporta { el: HTMLElement; smonta: () => void } + +export function pannelloEsporta(preset?: string): PannelloEsporta { + preparaAvvisi(); + if (preset && PRESET.some((x) => x.id === preset)) { S.preset = preset; S.codec = null; S.qualita = null; S.adatta = null; } + const el = h('div', { class: 'es' }); + const pre = h('div', { class: 'es-preset' }); + const anteprima = h('div', { class: 'es-anteprima' }); + const regole = h('div', { class: 'es-regole' }); + const azioni = h('div', { class: 'es-azioni' }); + const lista = h('div', { class: 'es-lista' }); + const testaCoda = h('span', { class: 'es-coda-riep' }); + const sez = (titolo: string, ic: string, ...figli: HTMLElement[]) => h('div', { class: 'fin-sezione es-sezione' }, h('h4', null, icona(ic, 14), titolo), ...figli); + el.append( + sez('Dove lo porti', 'video', pre), + sez('Cosa esce', 'info', anteprima), + sez('Regola', 'ingranaggio', regole), + azioni, + sez('Coda', 'esporta', h('div', { class: 'es-coda-testa' }, testaCoda, h('button', { class: 'btn piccolo', title: 'Toglie dalla lista quelle già finite', on: { click: () => pulisciFinite() } }, 'Svuota le finite')), lista)); + + let ultimo: { imp: Impostazioni; stati: StatoCodec[]; vuota: boolean; durata: number } | null = null; + let giro = 0; + + const scelte = (): Scelte => ({ preset: S.preset, codec: S.codec, formato: S.formato, qualita: S.qualita ?? undefined, adatta: S.adatta ?? undefined, misura: S.misura }); + const progettoOra = () => { const p = store.doc; return { w: p.w, h: p.h, fps: fps(p.rate) }; }; + /** i fotogrammi da esportare: tutto, oppure da attacco a stacco */ + const tratto = () => { + const p = store.doc; + const haInOut = p.inF !== null && p.outF !== null && p.outF > p.inF; + const usa = S.inOut && haInOut; + const fine = projectEnd(p); + return { haInOut, usa, len: usa ? p.outF! - p.inF! : fine }; + }; + + /** calcola cosa uscirebbe e, per i video, quali codec la macchina sa fare a quella misura */ + async function calcola(): Promise> { + const p = store.doc; + const prog = progettoOra(); + const pr = presetDi(S.preset); + const formato = pr.libero ? S.formato : pr.formato; + let imp = impostazioni(scelte(), prog, CODEC_DI[formato]); + let stati: StatoCodec[] = []; + if (formato !== 'wav') { + stati = await statiCodec(formato, imp.w, imp.h, imp.fps); + imp = impostazioni(scelte(), prog, stati.filter((s) => s.disponibile).map((s) => s.codec)); + } + const t = tratto(); + return { imp, stati, vuota: !projectEnd(p), durata: f2s(t.len, p.rate) }; + } + + function disegnaPreset() { + pre.replaceChildren(...PRESET.map((pr) => { + const prog = progettoOra(); + const imp = impostazioni({ preset: pr.id, formato: pr.formato }, prog, CODEC_DI[pr.libero ? 'mp4' : pr.formato]); + const sotto = pr.formato === 'wav' ? 'WAV · solo suono' : pr.libero ? 'tutto a mano' : `${imp.w}×${imp.h} · ${NOME_CONTENITORE[pr.formato]}`; + return h('button', { + class: 'es-carta' + (pr.id === S.preset ? ' acceso' : ''), 'data-preset': pr.id, title: pr.info, + on: { click: () => { S.preset = pr.id; S.codec = null; S.qualita = null; S.adatta = null; if (pr.libero) S.formato = S.formato || 'mp4'; ridisegna(); } }, + }, h('span', { class: 'led' }), h('b', null, pr.nome), h('small', null, pr.info), h('em', null, sotto)); + })); + } + + function riga(nome: string, ...v: (string | HTMLElement)[]) { return h('div', { class: 'es-riga' }, h('span', null, nome), h('b', null, ...v)); } + + function disegnaAnteprima() { + if (!ultimo) return; + const { imp, stati, vuota, durata } = ultimo; + const p = store.doc; + const righe: HTMLElement[] = []; + if (imp.formato === 'wav') { + righe.push(riga('File', 'WAV · audio PCM 16 bit, 48 kHz, stereo'), riga('Video', 'nessuno: esce solo il suono')); + } else { + righe.push(riga('Quadro', `${imp.w}×${imp.h} (${proporzioneTesto(imp.w, imp.h)})`)); + righe.push(riga('Fotogrammi', `${imp.fps.toFixed(imp.fps % 1 ? 2 : 0).replace('.', ',')} al secondo${imp.passo > 1 ? ` · ne tiene uno ogni ${imp.passo} del progetto` : ''}`)); + const audio = imp.formato === 'webm' ? 'Opus' : 'AAC'; + righe.push(riga('File', imp.codec ? `${NOME_CONTENITORE[imp.formato]} · video ${NOME_CODEC[imp.codec]} · audio ${audio}` : `${NOME_CONTENITORE[imp.formato]} · ⚠ nessun codec`)); + const st = stati.find((x) => x.codec === imp.codec); + if (st) righe.push(riga('Lo prepara', st.scheda ? 'la scheda video (più veloce)' : 'il processore (più lento, ma va bene)')); + } + righe.push(riga('Peso', ultimo.vuota ? '—' : `circa ${pesoTesto(pesoStimato(imp, durata))}`, h('small', null, ' a occhio: dipende da quanto è movimentato'))); + righe.push(riga('Durata', vuota ? '—' : durataUmana(durata))); + const note: HTMLElement[] = []; + if (imp.formato !== 'wav') { + note.push(h('p', { class: 'es-nota' }, h('b', null, 'Forma. '), testoAdattamento(p.w, p.h, imp.w, imp.h, imp.adatta ?? S.adatta ?? presetDi(S.preset).adatta))); + if (imp.w > p.w * 1.01 && imp.h > p.h * 1.01) note.push(h('p', { class: 'es-nota attento' }, `Il progetto è ${p.w}×${p.h} e l'uscita è più grande: titoli e grafica escono nitidi, le riprese vengono ingrandite.`)); + if (!imp.codec) note.push(h('p', { class: 'es-nota male' }, `⚠ Questo sistema non sa codificare ${NOME_CONTENITORE[imp.formato]} a questa misura. Prova un altro formato o una misura più piccola.`)); + } + if (vuota) note.push(h('p', { class: 'es-nota attento' }, 'La timeline è vuota: prima monta qualcosa.')); + anteprima.replaceChildren(h('div', { class: 'es-righe' }, ...righe), ...note); + } + + function chips(nome: string, opz: { v: T; t: string; info?: string; spento?: boolean }[], attuale: T, scegli: (v: T) => void): HTMLElement { + return h('div', { class: 'es-scelta' }, h('span', null, nome), h('div', { class: 'isp-chips' }, opz.map((o) => h('button', { + class: 'chip' + (o.v === attuale ? ' acceso' : ''), title: o.info ?? '', disabled: !!o.spento, on: { click: () => scegli(o.v) }, + }, o.t)))); + } + + function disegnaRegole() { + if (!ultimo) return; + const { imp, stati } = ultimo; + const pr = presetDi(S.preset); + const p = store.doc; + const t = tratto(); + const out: HTMLElement[] = []; + out.push(chips('Tratto', [ + { v: 'tutto', t: 'Tutto il montaggio' }, + { v: 'inout', t: t.haInOut ? `Attacco–stacco · ${frameToTc(p.inF!, p.rate, p.drop)} → ${frameToTc(p.outF!, p.rate, p.drop)}` : 'Attacco–stacco (segna I e O)', spento: !t.haInOut }, + ], t.usa ? 'inout' : 'tutto', (v) => { S.inOut = v === 'inout'; ridisegna(); })); + if (pr.libero) { + out.push(chips('Formato', (['mp4', 'mov', 'webm', 'wav'] as Contenitore[]).map((f) => ({ v: f, t: f === 'wav' ? 'Solo audio (WAV)' : NOME_CONTENITORE[f] })), imp.formato, (v) => { S.formato = v; S.codec = null; ridisegna(); })); + if (imp.formato !== 'wav') out.push(chips('Misura', MISURE.map((m) => ({ v: m.id, t: m.nome })), S.misura, (v) => { S.misura = v; ridisegna(); })); + } + if (imp.formato !== 'wav') { + const buoni = stati.filter((s) => s.disponibile && codecPossibili(pr, imp.formato, [s.codec]).length); + if (buoni.length) { + out.push(chips('Codec', buoni.map((s) => ({ v: s.codec, t: NOME_CODEC[s.codec] + (s.scheda ? ' · scheda video' : ''), info: INFO_CODEC[s.codec] })), imp.codec ?? buoni[0].codec, (v) => { S.codec = v; ridisegna(); })); + if (imp.codec) out.push(h('p', { class: 'es-nota' }, INFO_CODEC[imp.codec] + '.')); + } + if (imp.geometria) { + out.push(chips('Se la forma è diversa', [{ v: 'bande', t: 'Bande nere', info: 'L\'immagine resta intera' }, { v: 'ritaglio', t: 'Ritaglia al centro', info: 'L\'immagine riempie il quadro' }] as { v: Adatta; t: string; info: string }[], imp.adatta ?? 'bande', (v) => { S.adatta = v; ridisegna(); })); + } + // la qualità: dice cosa succede, non solo un numero + const q0 = S.qualita ?? pr.qualita; + const r = h('input', { type: 'range', min: 0, max: 100, step: 1, value: String(q0) }) as HTMLInputElement; + const dice = h('div', { class: 'es-qdice' }); + const bitrateDi = (q: number) => impostazioni({ ...scelte(), qualita: q }, progettoOra(), imp.codec ? [imp.codec] : []).bitrate; + const aggQ = () => { + const q = Number(r.value); + const bps = bitrateDi(q); + const peso = ultimo?.vuota ? '' : ` · circa ${pesoTesto(pesoStimato({ ...imp, bitrate: bps }, ultimo?.durata ?? 0))}`; + dice.replaceChildren(h('b', null, descriviQualita(q)), h('small', null, `${peso}${bps ? ` · ${(bps / 1e6).toFixed(1).replace('.', ',')} Mbit/s` : ''}`)); + }; + r.addEventListener('input', () => { S.qualita = Number(r.value); aggQ(); void aggiornaSoloAnteprima(); }); + r.addEventListener('dblclick', () => { S.qualita = null; void ridisegna(); }); + aggQ(); + out.push(h('div', { class: 'es-scelta es-qualita' }, h('span', null, 'Qualità'), h('div', null, r, dice))); + } + const nome = h('input', { class: 'campo-testo', placeholder: nomeFile(p.name, pr, imp.formato).replace(/\.[^.]+$/, ''), value: S.nome }) as HTMLInputElement; + nome.addEventListener('input', () => { S.nome = nome.value; }); + out.push(h('div', { class: 'es-scelta' }, h('span', null, 'Nome del file'), h('div', { class: 'es-nome' }, nome, h('small', null, '.' + imp.formato)))); + regole.replaceChildren(...out); + } + + /** muovendo il cursore della qualità si rifà solo il riquadro «Cosa esce» (il cursore non deve sparire sotto le dita) */ + async function aggiornaSoloAnteprima() { + const mio = ++giro; + const nuovo = await calcola(); + if (mio !== giro) return; + ultimo = nuovo; + disegnaAnteprima(); + } + + function disegnaAzioni() { + const occupata = coda.voci.some((v) => v.stato === 'attesa' || v.stato === 'lavoro'); + const vuota = !!ultimo?.vuota; + const nessunCodec = !!ultimo && ultimo.imp.formato !== 'wav' && !ultimo.imp.codec; + const spento = vuota || nessunCodec; + azioni.replaceChildren( + h('button', { class: 'btn primario fin-vai', disabled: spento, title: occupata ? 'C\'è già un\'esportazione al lavoro: questa va in coda' : 'Esporta adesso e scegli dove salvare', on: { click: () => lancia(true) } }, icona('esporta', 18), occupata ? 'ESPORTA (VA IN CODA)' : 'ESPORTA'), + h('button', { class: 'btn', disabled: spento, title: isTauri ? 'La aggiunge alla coda: il file va in Video/DaProd Video' : 'La aggiunge alla coda: il file si scarica', on: { click: () => lancia(false) } }, icona('piu', 16), 'Metti in coda')); + } + + function lancia(chiedi: boolean) { + if (!ultimo || ultimo.vuota) return; + const { imp } = ultimo; + const p = store.doc; + const pr = presetDi(S.preset); + const t = tratto(); + const file = S.nome.trim() ? `${S.nome.trim().replace(/[\\/:*?"<>|]/g, '_')}.${imp.formato}` : nomeFile(p.name, pr, imp.formato); + const riassunto = imp.formato === 'wav' + ? `WAV · solo audio · circa ${pesoTesto(pesoStimato(imp, ultimo.durata))}` + : `${imp.w}×${imp.h} · ${imp.fps.toFixed(imp.fps % 1 ? 2 : 0).replace('.', ',')} fps · ${NOME_CONTENITORE[imp.formato]}${imp.codec ? ' ' + NOME_CODEC[imp.codec] : ''} · circa ${pesoTesto(pesoStimato(imp, ultimo.durata))}`; + const v = accoda({ + titolo: `Esporto «${file}»`, + presetNome: pr.nome, + riassunto, + tratto: t.usa ? `Da ${frameToTc(p.inF!, p.rate, p.drop)} a ${frameToTc(p.outF!, p.rate, p.drop)}` : 'Tutto il montaggio', + progetto: structuredClone(p), + opzioni: { + formato: imp.formato, w: imp.w, h: imp.h, qualita: 'alta', soloInOut: t.usa, nome: file, + codec: imp.codec ?? undefined, bitrate: imp.bitrate || undefined, audioBps: imp.audioBps || undefined, passo: imp.passo, geometria: imp.geometria, + }, + }, chiedi); + if (v.dato.chiedi) return; + avviso(coda.voci.filter((x) => x.stato === 'attesa').length > 0 && coda.inLavoro() !== v ? '➕ Messa in coda' : '▶ Parte l\'esportazione', 'info', 1800); + } + + // ——— la coda ——— + const righeCoda = new Map(); + let firmaLista = ''; + + function testoVoce(stato: StatoVoce, d: ReturnType & object): string { + const x = d.dato; + if (stato === 'lavoro') return `${x.dettaglio}${x.restante !== null ? ` · mancano circa ${durataTesto(x.restante)}` : ' · calcolo il tempo…'}`; + if (stato === 'fatta') return `Fatta · ${d.messaggio ?? ''}`; + if (stato === 'errore') return `⚠ ${d.messaggio ?? 'non riuscita'}`; + if (stato === 'annullata') return `Annullata${d.messaggio && d.messaggio !== 'annullata' ? ' · ' + d.messaggio : ''}`; + return 'Aspetta il suo turno'; + } + + function disegnaCoda() { + testaCoda.textContent = coda.riepilogo(); + const firma = coda.voci.map((v) => `${v.id}:${v.stato}`).join('|'); + if (firma !== firmaLista) { + firmaLista = firma; + righeCoda.clear(); + if (!coda.voci.length) { lista.replaceChildren(h('p', { class: 'es-nota' }, 'Qui compaiono le esportazioni: puoi metterne quante vuoi (altri formati, altri tratti) e vanno una dopo l\'altra. Si vedono e si fermano anche da Attività.')); return; } + const attese = coda.voci.filter((v) => v.stato === 'attesa'); + lista.replaceChildren(...coda.voci.map((v) => { + const barra = h('i'); + const testo = h('div', { class: 'es-voce-stato' }); + const pulsanti: HTMLElement[] = []; + if (v.stato === 'attesa') { + const k = attese.indexOf(v); + pulsanti.push(h('button', { class: 'btn-icona', title: 'Più su', disabled: k === 0, on: { click: () => spostaVoce(v.id, -1) } }, '▲')); + pulsanti.push(h('button', { class: 'btn-icona', title: 'Più giù', disabled: k === attese.length - 1, on: { click: () => spostaVoce(v.id, 1) } }, '▼')); + } + if (v.stato === 'attesa' || v.stato === 'lavoro') pulsanti.push(h('button', { class: 'btn-icona', title: v.stato === 'lavoro' ? 'Annulla questa esportazione' : 'Togli dalla coda', on: { click: () => annullaVoce(v.id) } }, icona('x', 14))); + if (v.stato === 'fatta' && v.dato.percorso) pulsanti.push(h('button', { class: 'btn piccolo', title: 'Apre la cartella e mostra il file', on: { click: () => void mostraNellaCartella(v.dato.percorso!) } }, icona('cartella', 13), 'Apri cartella')); + if (v.stato !== 'attesa' && v.stato !== 'lavoro') pulsanti.push(h('button', { class: 'btn-icona', title: 'Toglila dalla lista', on: { click: () => togliVoce(v.id) } }, icona('x', 14))); + const riga = h('div', { class: 'es-voce ' + v.stato, 'data-id': v.id }, + h('span', { class: 'led' + (v.stato === 'lavoro' ? ' lampeggia acceso' : v.stato === 'fatta' ? ' acceso' : '') }), + h('div', { class: 'es-voce-testi' }, + h('b', null, `${v.dato.presetNome} · ${v.dato.tratto}`), + h('small', null, `${v.dato.opzioni.nome} · ${v.dato.riassunto}`), + h('div', { class: 'barra-avanz' }, barra), testo), + h('div', { class: 'es-voce-tasti' }, ...pulsanti)); + righeCoda.set(v.id, { riga, barra, testo, firma: v.stato }); + return riga; + })); + } + for (const v of coda.voci) { + const r = righeCoda.get(v.id); + if (!r) continue; + r.barra.style.width = (v.stato === 'fatta' ? 1 : v.dato.k) * 100 + '%'; + r.testo.textContent = testoVoce(v.stato, v); + } + } + + // ——— tutto insieme ——— + async function ridisegna() { + disegnaPreset(); + const mio = ++giro; + const nuovo = await calcola(); + if (mio !== giro) return; + ultimo = nuovo; + disegnaAnteprima(); + disegnaRegole(); + disegnaAzioni(); + disegnaCoda(); + } + + let attesa = 0; + const suDoc = () => { clearTimeout(attesa); attesa = window.setTimeout(() => void ridisegna(), 200); }; + const sciolti: (() => unknown)[] = [store.on('doc', suDoc)]; + let rAF = 0; + sciolti.push(quandoCoda(() => { + if (rAF) return; + rAF = requestAnimationFrame(() => { rAF = 0; disegnaCoda(); disegnaAzioni(); }); + })); + void ridisegna(); + + return { el, smonta: () => { for (const s of sciolti) s(); clearTimeout(attesa); if (rAF) cancelAnimationFrame(rAF); } }; +} diff --git a/src/ui/finale.ts b/src/ui/finale.ts index 2e44858..4c54d25 100644 --- a/src/ui/finale.ts +++ b/src/ui/finale.ts @@ -5,6 +5,7 @@ import { progettoAttuale } from '../media/attivita'; import { confermaAvvioAI } from './aiPassi'; import { store } from '../core/store'; import type { LookFinale, Master, Project, Sottotitoli } from '../core/tipi'; +import { togliAnimazione } from '../core/automazioni'; import { MASTER0, TITLE0, end, isVideoClip, masterDi, newClip, projectEnd, trackOf, uid } from '../core/progetto'; import * as M from '../core/montaggio'; import { nuovoBlocco, posaBlocco } from '../core/blocchi'; @@ -23,8 +24,10 @@ import { LOOKS } from '../render/colore'; import { mediaRT, preparaOra, senzaColoreMisurato, quandoPreparazioni } from '../media/libreria'; import { motore } from '../motore'; import { volumeLivellato } from '../effetti'; -import { finestraEsporta, esportaEdl, esportaFotogramma } from './dialoghi'; +import { esportaEdl, esportaFotogramma } from './dialoghi'; +import { pannelloEsporta } from './esportazione'; import { avviso, clamp, conferma, h, icona } from './dom'; +import { creaPannelloColoreAvanzato } from './coloreAvanzato'; type Campo = { aggiorna: () => void }; @@ -68,13 +71,19 @@ export class Finale { private riepilogo: HTMLElement; private menu: HTMLElement; private campi: Campo[] = []; - private formato = 'mp4'; - private qualita = 'alta'; - private misura = '1'; private sezione: Sezione = 'colore'; private pagine = new Map(); private listaSott: HTMLElement | null = null; private firmaSott = ''; + // colore avanzato di una clip: la scelta, il posto del pannello e il pannello (c'è solo mentre si guarda la pagina Colore) + private sceltaClip: HTMLSelectElement | null = null; + private postoClip: HTMLElement | null = null; + private pannelloClip: ReturnType | null = null; + private clipColore: string | null = null; + private idPannello: string | null = null; + private firmaClip = ''; + private visibile = false; + private selVista = ''; constructor() { this.riepilogo = h('div', { class: 'fin-riepilogo' }); @@ -89,10 +98,15 @@ export class Finale { h('div', { class: 'fin-dentro' }, this.corpo, this.menu)); this.mostra('colore'); quandoPreparazioni(() => this.aggiornaRiepilogo()); - store.on('doc', () => { this.aggiornaRiepilogo(); for (const c of this.campi) c.aggiorna(); this.aggiornaSott(); }); + store.on('doc', () => { this.aggiornaRiepilogo(); for (const c of this.campi) c.aggiorna(); this.aggiornaSott(); this.sincronizzaClipColore(false); }); + // ogni modifica manda anche 'sel': conta come «scelta nella timeline» solo se la scelta è cambiata davvero + store.on('sel', () => { const f = [...store.sel].sort().join('|'); const cambiata = f !== this.selVista; this.selVista = f; this.sincronizzaClipColore(cambiata); }); store.on('head', () => this.segnaRigaCorrente()); } + /** la pagina Finale è in vista (o no): il pannello del colore avanzato esiste solo mentre la si guarda */ + mostrata(on: boolean) { this.visibile = on; this.sincronizzaClipColore(true); } + private m(): Master { return masterDi(store.doc); } /** modifica annullabile dei ritocchi finali */ @@ -117,8 +131,51 @@ export class Finale { this.aggiornaRiepilogo(); for (const c of this.campi) c.aggiorna(); if (z === 'sottotitoli') { this.firmaSott = ''; this.aggiornaSott(); } + this.sincronizzaClipColore(true); + } + + /** la sezione «Colore avanzato»: si sceglie la clip, sotto c'è il pannello (LUT, ruote, curve) e il monitor mostra il risultato */ + private coloreAvanzatoClip(): HTMLElement { + const scelta = h('select', { 'aria-label': 'Clip da ritoccare' }); + scelta.onchange = () => { this.clipColore = scelta.value || null; this.sincronizzaClipColore(false); const c = this.clipColore ? store.doc.clips.find((x) => x.id === this.clipColore) : null; if (c) motore.vaiA(c.start); }; + this.sceltaClip = scelta; this.postoClip = h('div', { class: 'ca-fin-host' }); this.firmaClip = ''; + return h('div', { class: 'ca-fin' }, + h('label', { class: 'ca-fin-scelta' }, h('span', null, 'Clip'), scelta), + h('p', { class: 'nota' }, 'LUT .cube con intensità, ruote lift/gamma/gain e curve, solo sulla clip scelta. Il monitor mostra il risultato; Ctrl+Z torna indietro. Sceglierla nella timeline cambia anche qui.'), + this.postoClip); + } + + /** le riprese su cui si può lavorare di colore (video e immagini), nell'ordine della timeline */ + private clipPerColore() { + const p = store.doc; + return p.clips.filter((c) => c.kind === 'media' && p.tracks.find((t) => t.id === c.track)?.kind === 'video').sort((a, b) => a.start - b.start); } + /** tiene d'accordo la tendina, la clip scelta e il pannello del colore avanzato; col pannello solo se la pagina Colore è aperta */ + private sincronizzaClipColore(dallaScelta: boolean) { + const scelta = this.sceltaClip, posto = this.postoClip; + if (!scelta || !posto) return; + if (this.sezione !== 'colore' || !this.visibile) { this.pannelloClip?.distruggi(); this.pannelloClip = null; this.idPannello = null; return; } + const lista = this.clipPerColore(), p = store.doc; + const firma = lista.map((c) => c.id + c.name + c.start).join('|'); + if (firma !== this.firmaClip) { + this.firmaClip = firma; + scelta.replaceChildren(...lista.map((c) => h('option', { value: c.id }, `${c.name} · ${frameToTc(c.start, p.rate, p.drop)}`))); + } + // la clip scelta nella timeline passa avanti; se no resta quella di prima, se c'è ancora; se no la prima + const dallaTimeline = dallaScelta ? lista.find((c) => store.sel.has(c.id)) : undefined; + const id = dallaTimeline?.id ?? (lista.some((c) => c.id === this.clipColore) ? this.clipColore : lista[0]?.id ?? null); + scelta.value = id ?? ''; scelta.disabled = !id; + this.clipColore = id; + if (this.pannelloClip && this.idPannello === id) return; + this.idPannello = id; + this.pannelloClip?.distruggi(); this.pannelloClip = null; + if (!id) { posto.replaceChildren(h('p', { class: 'nota' }, 'Nel montaggio non ci sono riprese o immagini: mettine una in timeline e poi scegli qui quale ritoccare.')); return; } + this.pannelloClip = creaPannelloColoreAvanzato(id); + posto.replaceChildren(this.pannelloClip.el); + } + + private costruisci(z: Sezione): HTMLElement { const sez = (titolo: string, ic: string, ...figli: (HTMLElement | null)[]) => h('div', { class: 'fin-sezione' }, h('h4', null, icona(ic, 14), titolo), ...figli.filter(Boolean) as HTMLElement[]); const pagina = (...figli: HTMLElement[]) => h('div', { class: 'fin-pagina', 'data-s': z }, ...figli); @@ -150,7 +207,8 @@ export class Finale { this.cursore('Grana', 0, 100, (m) => Math.round(m.grain * 100), (m, v) => { m.grain = v / 100; }, ''), h('div', { class: 'isp-pulsanti' }, h('button', { class: 'btn-mini', on: { click: () => this.cambia('Azzera ritocchi', (m) => { Object.assign(m, { look: 'nessuno', intensita: 1, bright: 0, contrast: 1, sat: 1, temp: 0, tint: 0, vignette: 0, grain: 0 }); }) } }, 'Azzera look e ritocchi'), - h('button', { class: 'btn-mini prima-dopo-fin', on: { click: () => (document.querySelector('.monitor .prima-dopo') as HTMLElement | null)?.click() } }, 'Prima | dopo')))); + h('button', { class: 'btn-mini prima-dopo-fin', on: { click: () => (document.querySelector('.monitor .prima-dopo') as HTMLElement | null)?.click() } }, 'Prima | dopo'))), + sez('Colore avanzato di una clip', 'immagine', this.coloreAvanzatoClip())); } if (z === 'audio') { return pagina(sez('Audio finale', 'altoparlante', @@ -164,18 +222,16 @@ export class Finale { if (z === 'logo') return pagina(this.paginaLogo(sez)); if (z === 'apertura') return pagina(...this.paginaApertura(sez)); if (z === 'lingue') return pagina(...this.paginaLingue(sez)); + // l'esportazione ha il suo pannello (preset, cosa esce, coda): lo stesso della finestra Ctrl+M const esporta = h('div', { class: 'fin-esporta' }, - this.scelte('Formato', [['mp4', 'MP4'], ['mov', 'MOV'], ['webm', 'WebM'], ['wav', 'Solo audio']], () => this.formato, (v) => { this.formato = v; }), - this.scelte('Qualità', [['media', 'Leggera'], ['alta', 'Alta'], ['altissima', 'Master']], () => this.qualita, (v) => { this.qualita = v; }), - this.scelte('Misura', [['1', 'Come il progetto'], ['0.5', 'Metà']], () => this.misura, (v) => { this.misura = v; }), - h('button', { class: 'btn primario fin-vai', on: { click: () => finestraEsporta({ formato: this.formato, qualita: this.qualita, misura: this.misura }) } }, icona('esporta', 18), 'ESPORTA IL MASTER'), + pannelloEsporta().el, h('div', { class: 'fin-altri' }, h('button', { class: 'btn piccolo', title: 'La lista di montaggio per Resolve, Avid, Premiere, EDIUS', on: { click: () => esportaEdl() } }, 'EDL CMX3600'), h('button', { class: 'btn piccolo', title: 'Il fotogramma sotto il cursore, con il colore finale', on: { click: () => esportaFotogramma() } }, 'Fotogramma PNG'), h('button', { class: 'btn piccolo', title: 'I sottotitoli in un file a parte', on: { click: () => void this.esportaSrt() } }, 'Sottotitoli .srt'), h('button', { class: 'btn piccolo', title: 'I sottotitoli in un file a parte, per il web (WebVTT)', on: { click: () => void this.esportaSrt('vtt') } }, 'Sottotitoli .vtt')), h('p', { class: 'nota' }, 'Nel master escono anche il logo e i sottotitoli (se sono "scritti nel video"), gli FX sulle clip (coi loro suoni) e il colore finale.')); - return pagina(sez('Esporta', 'esporta', esporta)); + return pagina(esporta); } // ——— sottotitoli ——— @@ -596,7 +652,7 @@ export class Finale { const f = projectEnd(p); store.edit('Titoli di coda', (pp) => { const v = M.tracciaLibera(pp, 'video', pp.tracks.filter((t) => t.kind === 'video').slice(-1)[0]?.id ?? null, f, f + len); - pp.clips.push(newClip('title', v, f, len, { name: 'Titoli di coda', gen: { title: { ...TITLE0, style: 'rullo', size: 64, text: `${pp.name}\n\nMontaggio\nDaProd Video\n\nMusica\n…\n\nGrazie per la visione` } } })); + pp.clips.push(newClip('title', v, f, len, { name: 'Titoli di coda', gen: { title: { ...TITLE0, style: 'rullo', size: 64, text: `${pp.name}\n\nMontaggio\nDaProd Editor Video\n\nMusica\n…\n\nGrazie per la visione` } } })); }); avviso('Titoli di coda alla fine: il testo si cambia dalle proprietà', 'ok'); } @@ -709,6 +765,7 @@ export class Finale { c.afx = { ...c.afx, norm: c.afx?.norm ?? c.gain }; c.gain = g; c.gainKeys = []; + togliAnimazione(c, 'gain'); n++; } }); @@ -785,9 +842,4 @@ export class Finale { this.campi.push({ aggiorna: agg }); return h('label', { class: 'isp-riga spunta' }, i, h('span', null, nome)); } - - private scelte(nome: string, opzioni: [string, string][], get: () => string, put: (v: string) => void): HTMLElement { - const bottoni = opzioni.map(([v, t]) => h('button', { class: 'chip' + (get() === v ? ' acceso' : ''), 'data-v': v, on: { click: () => { put(v); bottoni.forEach((b) => b.classList.toggle('acceso', b.dataset.v === v)); } } }, t)); - return h('div', { class: 'fin-scelte' }, h('span', null, nome), h('div', { class: 'isp-chips' }, bottoni)); - } } diff --git a/src/ui/fontiCerca.ts b/src/ui/fontiCerca.ts index fb2aeac..0e3f917 100644 --- a/src/ui/fontiCerca.ts +++ b/src/ui/fontiCerca.ts @@ -9,6 +9,7 @@ import { TENDINE, EFFETTI as TRANSIZIONI_DVE } from '../render/transizioni'; import { EFFETTI as EFFETTI_CLIP, adatte, alternaEffetto } from '../effetti'; import { PRESET_TITOLI } from '../core/generatori'; import { ANIM_LIBRERIA, GRUPPI_ANIM } from '../core/animazioni'; +import { GRUPPI_HTML, MODELLI_HTML } from '../core/titoliHtml'; import { STILI_CONTO } from '../render/grafica'; import { avviso } from './dom'; import { fonteCerca, type VoceCerca } from './cerca'; @@ -56,6 +57,7 @@ fonteCerca(() => EFFETTI_CLIP.map((e): VoceCerca => ({ // i titoli pronti, le animazioni e i countdown: al cursore fonteCerca(() => [ ...PRESET_TITOLI.map((t): VoceCerca => ({ id: 'tit:' + t.id, titolo: 'Titolo ' + t.nome, sotto: 'al cursore', cat: 'Titoli', parole: 'titolo testo scritta ' + t.gruppo, fn: () => { inserisciGeneratore('title', undefined, undefined, { titolo: t.id }); } })), + ...MODELLI_HTML.map((m): VoceCerca => ({ id: 'html:' + m.id, titolo: m.nome, sotto: `titolo animato HTML · ${GRUPPI_HTML.find((g) => g.id === m.gruppo)?.nome ?? ''} · al cursore`, cat: 'Titoli', parole: 'titolo animato html neon display sette segmenti terzo inferiore nome ruolo cinema notizie ticker capitolo logo iscriviti conto alla rovescia rec vumetro citazione virgolette karaoke sottotitolo macchina da scrivere didascalia social post freccia evidenziatore prima dopo diviso prezzo offerta sconto luogo data documentario intervista domanda titoli di coda scorrono barra capitoli fine schermo finale video', fn: () => { inserisciGeneratore('html', undefined, undefined, { html: m.id }); } })), ...ANIM_LIBRERIA.map((a): VoceCerca => ({ id: 'anim:' + a.id, titolo: a.nome, sotto: `animazione · ${GRUPPI_ANIM.find((g) => g.id === a.gruppo)?.nome ?? ''} · al cursore`, cat: 'Animazioni', parole: 'animazione sottopancia ' + a.gruppo, fn: () => { inserisciGeneratore('anim', undefined, undefined, { anim: a.id }); } })), ...STILI_CONTO.map((s): VoceCerca => ({ id: 'conto:' + s.id, titolo: 'Countdown ' + s.nome, sotto: `${s.secondi}…1 al cursore`, cat: 'Generatori', parole: 'conto alla rovescia countdown numeri', fn: () => { inserisciGeneratore('countdown', undefined, undefined, { conto: { stile: s.id, secondi: s.secondi } }); } })), ]); diff --git a/src/ui/home.ts b/src/ui/home.ts index 46f38d2..07a0450 100644 --- a/src/ui/home.ts +++ b/src/ui/home.ts @@ -1,11 +1,20 @@ -// La pagina iniziale: i progetti. Da qui si ricomincia, si apre un progetto (uno dei recenti o uno da file), si va -// al montaggio automatico o si torna al montaggio in corso. Compare quando si apre il programma (se non si è -// aperto un file col doppio clic) e quando si preme "Progetti" in alto o File → Pagina iniziale. +// La pagina iniziale: il banco da cui si parte. Tre cose: «Da dove comincio» (progetto nuovo con i formati, apri, +// registra, importa e monta), «Ultimi» (i progetti recenti con la miniatura) e «Come sta il PC» (scheda video, AI, +// modelli, spazio, versione) con un tasto solo, «Aggiusta tutto», che sistema quello che si può e dice come è andata +// passo per passo. Compare quando si apre il programma (se non si è aperto un file col doppio clic) e quando si preme +// «Progetti» in alto o File → Pagina iniziale. Funziona anche nel browser (versione prova): i passi che lì non servono +// lo dicono. Stile: src/stile/home.css (le classi nuove cominciano con «hm-»). +import '../stile/home.css'; import { store } from '../core/store'; import { CADENZE, OBIETTIVI, RISOLUZIONI, formatoDa } from '../core/tipi'; import { apri, apriRecente, dimenticaRecente, nuovo, recenti, type Recente } from '../progetti'; +import { hardwareNoto, messaggioScheda, nomeDellaScheda, rilevaHardware } from '../media/hardware'; +import { usaSchedaAI } from '../media/libreriaAI'; +import { invoke, isAndroid, isTauri } from '../platform'; import { h, icona } from './dom'; - +import { VERSIONE } from './dialoghi'; +import { controllaAggiornamento, finestraAggiornamenti } from './aggiornamenti'; +import { finestraCentroAI, riassuntoModelli, riparaAI, spazioModelli } from './centroAI'; const quando = (t: number) => { const d = Date.now() - t; @@ -17,6 +26,33 @@ const quando = (t: number) => { }; const evento = (nome: string, detail?: unknown) => document.dispatchEvent(new CustomEvent(nome, { detail })); const durataUmana = (s: number) => { const m = Math.floor(s / 60), r = Math.round(s % 60); return m ? `${m}:${String(r).padStart(2, '0')}` : `${r} s`; }; +/** 1,3 GB oppure 480 MB, in due pezzi: il numero va sul display a sette segmenti, l'unità accanto */ +const pesoParti = (byte: number): [string, string] => (byte >= 1 << 30 ? [(byte / (1 << 30)).toFixed(1), 'GB'] : [String(Math.max(0, Math.round(byte / (1 << 20)))), 'MB']); +const messaggioErrore = (e: unknown) => (e instanceof Error ? e.message : String(e)); + +type Luce = '' | 'ok' | 'no' | 'forse'; +interface Tessera { el: HTMLElement; imposta: (luce: Luce, valore: (Node | string)[], sotto: string, azione?: { testo: string; fai: () => void }) => void } +type StatoPasso = 'attesa' | 'corre' | 'ok' | 'no' | 'salta'; +interface Passo { id: string; nome: string; stato: StatoPasso; testo: string } +type Esito = { stato: 'ok' | 'no' | 'salta'; testo: string }; + +/** una finestrella del banco: LED, titolo, il valore sul display e una riga che spiega */ +function tessera(titolo: string): Tessera { + const led = h('i', { class: 'hm-led' }); + const valore = h('b', { class: 'hm-valore' }, '…'); + const sotto = h('small', { class: 'hm-sotto' }); + const el = h('div', { class: 'hm-tessera' }, h('div', { class: 'hm-tessera-testa' }, led, h('small', { class: 'hm-titolo' }, titolo)), valore, sotto); + return { + el, + imposta(luce, v, riga, azione) { + led.className = 'hm-led ' + luce; + valore.replaceChildren(...v.map((x) => (typeof x === 'string' ? document.createTextNode(x) : x))); + sotto.replaceChildren(riga, azione ? h('button', { class: 'btn-mini hm-azione', on: { click: azione.fai } }, azione.testo) : ''); + }, + }; +} +/** numero sul display a sette segmenti, con la sua unità in carattere normale */ +const display = (numero: string, unita = '') => [h('span', { class: 'hm-seg' }, numero), unita ? h('span', { class: 'hm-unita' }, ' ' + unita) : ''] as (Node | string)[]; export class Home { el: HTMLElement; @@ -25,14 +61,27 @@ export class Home { private ris = 'fhd'; private cad = '25'; visibile = false; + /** i passi di «Aggiusta tutto», con l'ultimo esito (restano finché non si ripremi il tasto) */ + private passi: Passo[] = [ + { id: 'file', nome: 'Apertura dei file', stato: 'attesa', testo: 'Fa aprire i .dap, .daprod e .dpv col doppio clic' }, + { id: 'cartelle', nome: 'Cartelle di lavoro', stato: 'attesa', testo: 'Video/DaProd Video e Registrazioni' }, + { id: 'ai', nome: 'Motore e modelli AI', stato: 'attesa', testo: 'Lo stesso controllo del Centro AI' }, + { id: 'agg', nome: 'Aggiornamenti', stato: 'attesa', testo: 'Guarda se è uscita una versione nuova' }, + ]; + private aggiustando = false; + private elPassi: HTMLElement | null = null; + private elRiga: HTMLElement | null = null; + private tasto: HTMLButtonElement | null = null; + private tess: Record<'scheda' | 'ai' | 'modelli' | 'spazio' | 'versione' | 'file', Tessera> | null = null; - constructor(private vaiAMontage: () => void) { - this.corpo = h('div', { class: 'home-corpo' }); - this.el = h('div', { class: 'home', style: 'display:none' }, - h('div', { class: 'home-dentro' }, - h('header', { class: 'home-testa' }, + constructor(private vaiAMontage: () => void, private vaiALive: () => void) { + this.corpo = h('div', { class: 'home-corpo hm-corpo' }); + this.el = h('div', { class: 'home hm', style: 'display:none' }, + h('div', { class: 'home-dentro hm-dentro' }, + h('header', { class: 'home-testa hm-testa' }, h('span', { class: 'moneta' }, 'D'), - h('div', null, h('b', null, 'DaProd Video'), h('small', null, 'i tuoi progetti')), + h('div', null, h('b', null, 'DaProd Editor Video'), h('small', null, 'da dove vuoi cominciare?')), + h('span', { class: 'hm-targa', title: 'La versione del programma' }, h('i', { class: 'hm-led ok' }), h('span', { class: 'hm-seg' }, VERSIONE)), h('button', { class: 'btn-icona home-chiudi', title: 'Torna al montaggio (Esc)', on: { click: () => this.nascondi() } }, icona('x', 18))), this.corpo)); document.addEventListener('keydown', (e) => { if (this.visibile && e.key === 'Escape' && !document.querySelector('.cerca-velo, .velo')) { e.stopPropagation(); this.nascondi(); } }, true); @@ -46,6 +95,7 @@ export class Home { this.visibile = true; // i tasti del montaggio non arrivano al banco nascosto qui sotto (prima Spazio suonava e 2 toglieva una clip) document.documentElement.classList.add('home-aperta'); + void this.aggiornaPc(); } nascondi() { @@ -55,65 +105,232 @@ export class Home { } private disegna() { + this.corpo.replaceChildren(this.colonnaInizio(), h('div', { class: 'hm-destra' }, this.sezioneUltimi(), this.sezionePc())); + } + + // ——— 1 · da dove comincio ——— + private colonnaInizio(): HTMLElement { const p = store.doc; const inCorso = p.clips.length || p.media.length; - // 1 · ricominciare + // il formato del progetto nuovo const riassunto = h('div', { class: 'home-formato-riga' }); const aggiorna = () => { const f = formatoDa(this.ris, this.cad); riassunto.replaceChildren(h('b', null, `${f.w}×${f.h}`), ` · ${RISOLUZIONI.find((r) => r.id === this.ris)?.nome ?? ''} · `, h('b', null, `${CADENZE.find((c) => c.id === this.cad)?.nome ?? ''} fps`)); - sinistra?.querySelectorAll('[data-ris]').forEach((c) => c.classList.toggle('acceso', (c as HTMLElement).dataset.ris === this.ris)); - sinistra?.querySelectorAll('[data-cad]').forEach((c) => c.classList.toggle('acceso', (c as HTMLElement).dataset.cad === this.cad)); - sinistra?.querySelectorAll('[data-ob]').forEach((c) => { const o = OBIETTIVI.find((x) => x.id === (c as HTMLElement).dataset.ob); c.classList.toggle('acceso', !!o && o.ris === this.ris && o.cad === this.cad); }); + col.querySelectorAll('[data-ris]').forEach((c) => c.classList.toggle('acceso', (c as HTMLElement).dataset.ris === this.ris)); + col.querySelectorAll('[data-cad]').forEach((c) => c.classList.toggle('acceso', (c as HTMLElement).dataset.cad === this.cad)); + col.querySelectorAll('[data-ob]').forEach((c) => { const o = OBIETTIVI.find((x) => x.id === (c as HTMLElement).dataset.ob); c.classList.toggle('acceso', !!o && o.ris === this.ris && o.cad === this.cad); }); }; - // 1a · per cosa lo fai: un clic e risoluzione e fotogrammi sono quelli giusti + // per cosa lo fai: un clic e risoluzione e fotogrammi sono quelli giusti const forma = (w: number, hh: number) => { const k = 26 / Math.max(w, hh); return h('i', { class: 'home-forma', style: `width:${Math.max(8, Math.round(w * k))}px;height:${Math.max(8, Math.round(hh * k))}px` }); }; const obiettivi = h('div', { class: 'home-obiettivi' }, OBIETTIVI.map((o) => { const r = RISOLUZIONI.find((x) => x.id === o.ris)!; return h('button', { class: 'home-obiettivo', 'data-ob': o.id, title: `${o.nome}: ${r.w}×${r.h}, ${CADENZE.find((c) => c.id === o.cad)?.nome} fotogrammi al secondo`, on: { click: () => { this.ris = o.ris; this.cad = o.cad; aggiorna(); } } }, forma(r.w, r.h), h('span', null, h('b', null, o.nome), h('small', null, o.info))); })); - // 1b · oppure si sceglie a mano + // oppure si sceglie a mano const chipRis = h('div', { class: 'isp-chips' }, RISOLUZIONI.map((r) => h('button', { class: 'chip', 'data-ris': r.id, title: `${r.w}×${r.h} · ${r.info}`, on: { click: () => { this.ris = r.id; aggiorna(); } } }, r.nome))); const chipCad = h('div', { class: 'isp-chips' }, CADENZE.map((c) => h('button', { class: 'chip', 'data-cad': c.id, title: c.info, on: { click: () => { this.cad = c.id; aggiorna(); } } }, c.nome))); const nuovoB = h('button', { class: 'btn primario home-grande', on: { click: async () => { await nuovo(formatoDa(this.ris, this.cad)); if (!(store.dirty && store.doc.clips.length)) this.nascondi(); } } }, '+ Nuovo progetto'); - const apriB = h('button', { class: 'btn home-grande', on: { click: async () => { this.nascondi(); await apri(); } } }, icona('apri', 16), ' Apri un progetto…'); - const mont = h('button', { class: 'btn home-grande home-montage', title: 'Butta dentro le foto e il programma monta da solo', on: { click: () => { this.nascondi(); this.vaiAMontage(); } } }, '✨ DaProdMontage · il montaggio automatico'); - const demo = h('button', { class: 'btn-mini', on: { click: () => { this.nascondi(); document.dispatchEvent(new CustomEvent('dpv:demo')); } } }, 'Prova con il montaggio dimostrativo'); - - // eslint-disable-next-line prefer-const - let sinistra: HTMLElement | undefined; - sinistra = h('section', { class: 'home-col' }, + const apriB = h('button', { class: 'btn home-grande', title: 'Un progetto .dap, .daprod o .dpv', on: { click: async () => { this.nascondi(); await apri(); } } }, + icona('apri', 16), h('span', { class: 'hm-etichetta-doppia' }, h('b', null, 'Apri un progetto…'), h('small', null, '.dap · .daprod · .dpv'))); + const registraB = h('button', { class: 'btn hm-strada hm-registra', title: 'Registra lo schermo, la voce e la webcam (F10)', on: { click: () => { this.nascondi(); this.vaiALive(); } } }, + h('i', { class: 'hm-rec' }), h('span', { class: 'hm-etichetta-doppia' }, h('b', null, 'Registra lo schermo'), h('small', null, 'pagina LIVE · F10'))); + const montaB = h('button', { class: 'btn home-grande home-montage', title: 'Butta dentro le foto e i video e il programma monta da solo', on: { click: () => { this.nascondi(); this.vaiAMontage(); } } }, + '✨', h('span', { class: 'hm-etichetta-doppia' }, h('b', null, 'Importa e monta'), h('small', null, 'DaProdMontage · foto e video, a tempo di musica'))); + const col: HTMLElement = h('section', { class: 'home-col hm-col hm-inizio' }, + h('h3', { class: 'hm-intesta' }, h('i', { class: 'hm-led ok' }), 'Da dove comincio'), inCorso ? h('div', { class: 'home-continua' }, h('b', null, 'Montaggio in corso'), h('span', null, `${p.name || 'Montaggio senza nome'} · ${p.clips.filter((c) => c.kind !== 'fx').length} clip`), h('button', { class: 'btn primario', on: { click: () => this.nascondi() } }, '▶ Continua')) : null, - h('h3', null, 'Nuovo progetto'), - h('label', { class: 'home-etichetta' }, 'Per cosa lo fai?'), obiettivi, - h('label', { class: 'home-etichetta' }, 'Risoluzione'), chipRis, - h('label', { class: 'home-etichetta' }, 'Fotogrammi al secondo'), chipCad, - riassunto, nuovoB, - h('h3', null, 'Altro'), - apriB, mont, demo, - // per chi comincia: la guida, la ricerca dei comandi e il Centro AI (prima non c'era un posto da cui partire) - h('h3', null, 'Impara a usarlo'), + h('div', { class: 'hm-nuovo' }, + h('label', { class: 'home-etichetta' }, 'Un progetto nuovo: per cosa lo fai?'), obiettivi, + h('label', { class: 'home-etichetta' }, 'Risoluzione'), chipRis, + h('label', { class: 'home-etichetta' }, 'Fotogrammi al secondo'), chipCad, + riassunto, nuovoB), + h('div', { class: 'hm-strade' }, apriB, registraB, montaB), + // per chi comincia: la guida, la ricerca dei comandi e il Centro AI h('div', { class: 'home-impara' }, h('button', { class: 'btn', on: { click: () => evento('dpv:guida', 'inizio') } }, '🚀 Il primo montaggio in un minuto'), h('button', { class: 'btn', on: { click: () => evento('dpv:guida') } }, '📖 Come si fa (tutte le guide, F1)'), - h('button', { class: 'btn', on: { click: () => evento('dpv:centro-ai') } }, '✨ Centro AI: sottotitoli, sfondo, voce…'))); + h('button', { class: 'btn', on: { click: () => evento('dpv:centro-ai') } }, '✨ Centro AI: sottotitoli, sfondo, voce…'), + h('button', { class: 'btn-mini', on: { click: () => { this.nascondi(); evento('dpv:demo'); } } }, 'Prova con il montaggio dimostrativo'))); + aggiorna(); + return col; + } - // 2 · i recenti + // ——— 2 · ultimi ——— + private sezioneUltimi(): HTMLElement { const lista = recenti(); const carta = (r: Recente) => h('div', { class: 'home-carta', 'data-chiave': r.chiave, title: r.path ?? r.nome, on: { click: async () => { if (await apriRecente(r)) this.nascondi(); } } }, r.miniatura ? h('img', { src: r.miniatura, alt: '' }) : h('div', { class: 'home-vuota' }, icona('montaggio', 30)), - h('div', { class: 'home-info' }, h('b', null, r.nome), h('small', null, `${r.clip} clip · ${durataUmana(r.durata)} · ${r.formato}`), h('small', null, quando(r.data))), - h('button', { class: 'home-togli btn-icona', title: 'Toglila dall\'elenco (il progetto resta dov\'è)', on: { click: (e: MouseEvent) => { e.stopPropagation(); dimenticaRecente(r.chiave); this.disegna(); } } }, icona('x', 13))); - const destra = h('section', { class: 'home-col home-recenti' }, - h('h3', null, 'Progetti recenti'), + h('div', { class: 'home-info' }, h('b', null, r.nome), h('small', null, `${r.clip} clip · ${durataUmana(r.durata)} · ${r.formato}`), h('small', { class: 'hm-quando' }, quando(r.data))), + h('button', { class: 'home-togli btn-icona', title: 'Toglila dall\'elenco (il progetto resta dov\'è)', on: { click: (e: MouseEvent) => { e.stopPropagation(); dimenticaRecente(r.chiave); this.disegna(); void this.aggiornaPc(); } } }, icona('x', 13))); + return h('section', { class: 'home-col home-recenti hm-col hm-ultimi' }, + h('h3', { class: 'hm-intesta' }, h('i', { class: 'hm-led ok' }), 'Ultimi', h('span', { class: 'hm-conta' }, lista.length ? `${lista.length} ${lista.length === 1 ? 'progetto' : 'progetti'}` : '')), lista.length ? h('div', { class: 'home-griglia' }, lista.map(carta)) : h('div', { class: 'home-nulla' }, h('b', null, 'Ancora niente'), h('p', null, 'I progetti che salvi o apri compaiono qui, con la loro miniatura, pronti da riaprire con un clic.'))); - this.corpo.replaceChildren(sinistra, destra); - aggiorna(); } -} + // ——— 3 · come sta il PC, e «Aggiusta tutto» ——— + private sezionePc(): HTMLElement { + const t = { + scheda: tessera('Scheda video'), ai: tessera('L\'AI gira sulla scheda video?'), modelli: tessera('Modelli AI pronti'), + spazio: tessera('Spazio dei modelli'), versione: tessera('Versione'), file: tessera('Doppio clic sui file'), + }; + t.file.el.hidden = true; + this.tess = t; + this.tasto = h('button', { class: 'btn primario hm-aggiusta-tasto', title: 'Sistema l\'apertura dei file, le cartelle, i modelli AI e guarda gli aggiornamenti', on: { click: () => void this.aggiustaTutto() } }, h('i', { class: 'hm-led' }), 'Aggiusta tutto') as HTMLButtonElement; + this.tasto.disabled = this.aggiustando; + this.elRiga = h('div', { class: 'hm-aggiusta-riga' }); + this.elPassi = h('ul', { class: 'hm-passi' }); + this.disegnaPassi(); + return h('section', { class: 'home-col hm-col hm-pc' }, + h('h3', { class: 'hm-intesta' }, h('i', { class: 'hm-led ok' }), 'Come sta il PC', + h('button', { class: 'btn-mini hm-centro', title: 'I modelli uno per uno: scaricare, togliere, controllare', on: { click: () => finestraCentroAI() } }, 'Centro AI')), + h('div', { class: 'hm-tessere' }, t.scheda.el, t.ai.el, t.modelli.el, t.spazio.el, t.versione.el, t.file.el), + h('div', { class: 'hm-aggiusta' }, h('div', { class: 'hm-aggiusta-testa' }, this.tasto, this.elRiga), this.elPassi)); + } + + /** guarda com'è messo il PC e riempie le finestrelle, una alla volta man mano che le risposte arrivano */ + private async aggiornaPc() { + const t = this.tess; + if (!t) return; + const vivo = () => this.tess === t; + // scheda video e AI + void (async () => { + try { + const hw = hardwareNoto() ?? await rilevaHardware(); + if (!vivo()) return; + const s = hw.scelta >= 0 ? hw.schede[hw.scelta] : null; + if (s) t.scheda.imposta('ok', [nomeDellaScheda(s)], `${hw.cpu} thread nel processore${hw.ram ? ` · memoria circa ${hw.ram} GB o più` : ''}`); + else t.scheda.imposta('forse', ['Solo il processore'], hw.gpuApi ? 'nessuna scheda ha superato la prova per l\'AI' : 'questo programma non vede la scheda video (WebGPU)'); + if (!hw.gpuApi) t.ai.imposta('no', ['No'], 'WebGPU non c\'è: lavora il processore (va bene, solo più lento)'); + else if (!usaSchedaAI()) t.ai.imposta('forse', ['Spenta'], 'l\'hai spenta nelle impostazioni del Centro AI'); + else if (s && messaggioScheda().scheda) t.ai.imposta('ok', ['Sì'], `l'AI lavora sulla ${nomeDellaScheda(s)}`); + else t.ai.imposta('forse', ['No'], 'lavora il processore: la scheda non ha passato la prova'); + } catch { + if (!vivo()) return; + t.scheda.imposta('forse', ['Non so'], 'non riesco a guardare la scheda video'); + t.ai.imposta('forse', ['Non so'], 'lavora il processore, che va bene lo stesso'); + } + })(); + // modelli e spazio: le stesse funzioni del Centro AI + void (async () => { + try { + const [m, sp] = await Promise.all([riassuntoModelli(), spazioModelli()]); + if (!vivo()) return; + const tutti = m.consigliatiPronti >= m.consigliati; + t.modelli.imposta(tutti ? 'ok' : 'forse', display(`${m.pronti}`, `su ${m.totale}`), tutti ? 'quelli consigliati ci sono tutti (restano opzionali)' : 'I modelli sono opzionali: scegli quali scaricare nel Centro AI'); + const [n, u] = pesoParti(sp.byte); + t.spazio.imposta(sp.n ? 'ok' : '', sp.n ? display(n, u) : ['Vuoto'], sp.n ? `${sp.n} ${sp.n === 1 ? 'modello' : 'modelli'} sul computer` : 'nessun modello scaricato ancora'); + } catch { + if (!vivo()) return; + t.modelli.imposta('forse', ['Non so'], 'non riesco a leggere i modelli'); + t.spazio.imposta('', ['—'], ''); + } + })(); + // versione e aggiornamento (nel browser la versione prova è sempre l'ultima) + void (async () => { + if (!isTauri) { t.versione.imposta('ok', display(VERSIONE), 'versione prova sul web: è sempre l\'ultima'); return; } + t.versione.imposta('', display(VERSIONE), 'guardo se c\'è un aggiornamento…'); + try { + const a = await controllaAggiornamento(); + if (!vivo()) return; + if (a.nuova) t.versione.imposta('forse', display(VERSIONE), `è uscita la ${a.versione}`, { testo: 'Aggiorna', fai: () => void finestraAggiornamenti() }); + else t.versione.imposta('ok', display(VERSIONE), 'è l\'ultima versione'); + } catch { + if (vivo()) t.versione.imposta('', display(VERSIONE), 'non riesco a controllare gli aggiornamenti (serve internet)'); + } + })(); + // l'apertura dei file col doppio clic (solo Windows) + void (async () => { + if (!isTauri || isAndroid) return; + try { + const r = await invoke<{ windows: boolean; a_posto: boolean; altro_programma: string[] }>('associa_file', { applica: false }); + if (!vivo() || !r.windows) return; + t.file.el.hidden = false; + if (r.a_posto) t.file.imposta('ok', ['Sì'], 'i .dap, .daprod e .dpv si aprono con questo programma'); + else if (r.altro_programma.length) t.file.imposta('forse', ['Altro'], `${r.altro_programma.join(', ')} si aprono con un altro programma, scelto da te`); + else t.file.imposta('forse', ['Da fare'], '«Aggiusta tutto» li collega al programma'); + } catch { /* senza questo controllo la finestrella resta nascosta */ } + })(); + } + + private disegnaPassi() { + if (!this.elPassi) return; + const segno: Record = { attesa: '·', corre: '…', ok: '✓', no: '✗', salta: '✓' }; + this.elPassi.replaceChildren(...this.passi.map((x) => h('li', { class: 'hm-passo ' + x.stato, 'data-passo': x.id }, + h('span', { class: 'hm-segno' }, segno[x.stato]), h('b', null, x.nome), h('span', { class: 'hm-passo-testo' }, x.testo)))); + if (this.elRiga) { + const fatti = this.passi.filter((x) => x.stato === 'ok' || x.stato === 'salta').length; + const finito = this.passi.every((x) => x.stato !== 'attesa' && x.stato !== 'corre'); + this.elRiga.textContent = this.aggiustando ? 'Sto sistemando, un passo alla volta…' : finito ? (fatti === this.passi.length ? 'Tutto a posto.' : `${fatti} passi su ${this.passi.length} a posto: leggi sotto cosa è rimasto.`) : 'Un tasto solo per mettere a posto il programma.'; + this.elRiga.classList.toggle('no', finito && fatti < this.passi.length); + } + } + + private imposta(id: string, stato: StatoPasso, testo: string) { + const x = this.passi.find((p) => p.id === id); + if (x) { x.stato = stato; x.testo = testo; } + this.disegnaPassi(); + } + + /** il tasto «Aggiusta tutto»: quattro passi in fila, ognuno dice com'è andata (un passo che fallisce non ferma gli altri) */ + private async aggiustaTutto() { + if (this.aggiustando) return; + this.aggiustando = true; + if (this.tasto) { this.tasto.disabled = true; this.tasto.classList.add('lavora'); } + const giri: [string, () => Promise][] = [ + ['file', () => this.passoFile()], ['cartelle', () => this.passoCartelle()], ['ai', () => this.passoAI()], ['agg', () => this.passoAggiornamenti()], + ]; + for (const x of this.passi) { x.stato = 'attesa'; } + for (const [id, fai] of giri) { + this.imposta(id, 'corre', 'ci sto lavorando…'); + let e: Esito; + try { e = await fai(); } catch (err) { e = { stato: 'no', testo: 'Non ci sono riuscito: ' + messaggioErrore(err) }; } + this.imposta(id, e.stato, e.testo); + } + this.aggiustando = false; + if (this.tasto) { this.tasto.disabled = false; this.tasto.classList.remove('lavora'); } + this.disegnaPassi(); + void this.aggiornaPc(); + } + + private async passoFile(): Promise { + if (!isTauri) return { stato: 'salta', testo: 'Non serve qui: nel browser i progetti si aprono dal tasto «Apri».' }; + const r = await invoke<{ windows: boolean; a_posto: boolean; scritte: string[]; altro_programma: string[] }>('associa_file', { applica: true }); + if (!r.windows) return { stato: 'salta', testo: 'Non serve qui: il sistema apre i progetti col programma da solo.' }; + if (r.altro_programma.length) return { stato: 'no', testo: `Windows apre ${r.altro_programma.join(', ')} con un altro programma perché l'hai scelto tu: tasto destro sul file, «Apri con», DaProd Editor Video, «Usa sempre».` }; + if (r.scritte.length) return { stato: 'ok', testo: `Fatto: ora ${r.scritte.join(', ')} si aprono con il doppio clic.` }; + return { stato: 'ok', testo: 'Era già tutto a posto: .dap, .daprod e .dpv si aprono con il doppio clic.' }; + } + + private async passoCartelle(): Promise { + if (!isTauri || isAndroid) return { stato: 'salta', testo: 'Non serve qui: i file restano dentro il programma.' }; + const c = await invoke<{ nome: string; percorso: string; creata: boolean }[]>('cartelle_lavoro'); + const nuove = c.filter((x) => x.creata); + const dove = c[0]?.percorso ? ` (${c[0].percorso})` : ''; + return nuove.length + ? { stato: 'ok', testo: `Ho creato ${nuove.map((x) => '«' + x.nome + '»').join(' e ')}${dove}.` } + : { stato: 'ok', testo: `Le cartelle «DaProd Video» e «Registrazioni» ci sono già${dove}.` }; + } + + private async passoAI(): Promise { + const r = await riparaAI({ passo: (testo) => this.imposta('ai', 'corre', testo) }); + return { stato: r.ok ? 'ok' : 'no', testo: r.testo }; + } + + private async passoAggiornamenti(): Promise { + if (!isTauri) return { stato: 'salta', testo: 'Non serve qui: la versione prova sul web è sempre l\'ultima.' }; + try { + const a = await controllaAggiornamento(true); + return a.nuova + ? { stato: 'ok', testo: `È uscita la ${a.versione} (hai la ${VERSIONE}): premi «Aggiorna» qui sopra, nella finestrella Versione.` } + : { stato: 'ok', testo: `Hai l'ultima versione (${VERSIONE}).` }; + } catch (e) { + return { stato: 'no', testo: 'Non riesco a controllare (serve internet): ' + messaggioErrore(e) }; + } + } +} diff --git a/src/ui/ispettore.ts b/src/ui/ispettore.ts index 6b85712..e1843cb 100644 --- a/src/ui/ispettore.ts +++ b/src/ui/ispettore.ts @@ -3,6 +3,9 @@ // chiuso in "Avanzate". Il colore di tutto il montaggio sta nella pagina Finale. import { store } from '../core/store'; import type { Clip, TitleSpec } from '../core/tipi'; +import { copiaLeggera, descrittore, haLinea, mettiChiave, percorsiAnimati, togliAnimazione, togliLinea, valutaClip } from '../core/automazioni'; +import { nuovaMaschera, nomeForma } from '../core/maschereForma'; +import { creaRombo, frameLocale, nomeParametro, parametriAnimabili, valoreVivo } from './keyframe'; import { clipById, end, isVideoClip, mediaOf, newClip, newTrack, nextTrackName, trackOf, FX0 } from '../core/progetto'; import { frameToTc, fps } from '../core/timecode'; import { avviso, h, evidenzia } from './dom'; @@ -18,6 +21,8 @@ import { SUONI } from '../core/suoni'; import { ascoltaSuono } from '../media/audio'; import { MOVIMENTI, movimentoPronto, SFONDI } from '../core/cornici'; import { motore } from '../motore'; +import { GRUPPI_HTML, modelliDi, modelloHtml, nuovoHtml, valoriHtmlDi } from '../core/titoliHtml'; +import { htmlDisponibile } from '../render/titoliHtml'; import { ANIMAZIONI as CATALOGO_ANIM, GRUPPI_ANIM, animazione, nuovaAnim, valoriDi, type CampoAnim } from '../core/animazioni'; import { CHIAVI, coloriChiave, QUALITA_RITAGLIO, SPILL0 } from '../core/sfondo'; import { maschereAggiornate } from '../media/ritaglio'; @@ -27,9 +32,11 @@ import { cosaCiMetto } from './seguiMenu'; import { righeAudioAI, faiTogliRumore } from './audioAI'; import { possibilita as audioAIPossibile } from '../media/audioAI'; import { anteprimaScena } from './anteprimaScena'; +import { apriColoreAvanzato } from './coloreAvanzatoFinestra'; +import { creaDuckingClip } from './duckingClip'; import { bilanciaBianco, azzeraPunti, elaboraClip, fermaClip, impostaModo, lavoroDi, modiPossibili, modoSfondo, cliccaCosaTenere, dettaglioModello, controllaScena, seguiConAI, provaOggetto, scegliColore, statoMaschere, togliColoreExtra, togliPunto, trovaColore, altroOggetto, oggettiDi, riprovaOggetti, togliSfondoAI, SECONDI_ANTEPRIMA } from './sfondo'; -type Campo = { el: HTMLElement; aggiorna: () => void }; +type Campo = { el: HTMLElement; aggiorna: () => void; /** si rinfresca anche quando il cursore si sposta (ha i keyframe) */ anim?: boolean }; /** tutti gli stili della titolatrice (l'elenco delle proprietà) */ const STILI_TITOLO: [string, string][] = [ @@ -60,7 +67,9 @@ export class Ispettore { constructor(private completo = false) { this.corpo = h('div', { class: 'isp-corpo' }); this.el = h('div', { class: 'ispettore' + (completo ? ' completo' : '') }, this.corpo); - this.disiscrivi.push(store.on('sel', () => this.costruisci()), store.on('doc', () => this.costruisci())); + this.disiscrivi.push(store.on('sel', () => this.costruisci()), store.on('doc', () => this.costruisci()), + // il cursore si sposta: i parametri con i keyframe mostrano il valore di lì + store.on('head', () => { for (const c of this.campi) if (c.anim) c.aggiorna(); })); // le maschere dell'AI sono pronte (o è cambiato il lavoro): il gruppo "Togli lo sfondo" si rifà const rifai = () => { this.firma = ''; this.costruisci(); }; document.addEventListener('dpv:maschere', rifai); @@ -80,7 +89,7 @@ export class Ispettore { private costruisci() { const cs = this.sel(); // si ricostruisce se cambia la scelta o se cambiano i blocchi FX (le transizioni della clip scelta) - const firma = cs.map((c) => c.id + c.kind + (c.fxb ? c.fxb.id : '') + ':' + c.fx.key + (c.fx.keyColori?.length ?? 0) + (c.gen?.anim?.id ?? '') + (c.afx?.pulito ? 'p' + c.afx.pulito.forza : '') + (c.afx?.separata?.ruolo ?? '') + (c.ritaglio ? c.ritaglio.modo + (c.ritaglio.punti?.length ?? 0) + (maschereAggiornate(c) ? 'ok' : 'no') : '')) + const firma = cs.map((c) => c.id + c.kind + (c.fxb ? c.fxb.id : '') + ':' + c.fx.key + (c.fx.keyColori?.length ?? 0) + (c.gen?.anim?.id ?? '') + (c.gen?.html?.id ?? '') + (c.afx?.pulito ? 'p' + c.afx.pulito.forza : '') + (c.afx?.separata?.ruolo ?? '') + (c.ritaglio ? c.ritaglio.modo + (c.ritaglio.punti?.length ?? 0) + (maschereAggiornate(c) ? 'ok' : 'no') : '') + (c.anim ? ':' + percorsiAnimati(c).join('+') : '') + (c.maschere?.length ? ':m' + c.maschere.map((m) => m.id + m.forma + (m.punti?.length ?? '') + (m.spenta ? 'x' : '')).join(',') : '')) .join(',') + '|' + store.doc.clips.filter((c) => c.kind === 'fx').map((c) => c.id + c.start + ':' + c.len + (c.fxb?.id ?? '')).join(','); if (firma === this.firma && this.campi.length) { for (const c of this.campi) c.aggiorna(); return; } this.firma = firma; @@ -115,7 +124,7 @@ export class Ispettore { const out: HTMLElement[] = []; // ——— il riassunto: cos'è, dove sta, da dove viene if (cs.some((c) => c.media)) out.push(preparazioni); - const tipo = primo.kind === 'title' ? (primo.gen?.anim ? 'Animazione' : 'Titolo') : primo.kind === 'media' ? (m?.type === 'image' ? 'Immagine' : isVideoClip(primo) ? 'Video' : 'Audio') : 'Generatore'; + const tipo = primo.kind === 'title' ? (primo.gen?.anim ? 'Animazione' : primo.gen?.html ? 'Titolo animato' : 'Titolo') : primo.kind === 'media' ? (m?.type === 'image' ? 'Immagine' : isVideoClip(primo) ? 'Video' : 'Audio') : 'Generatore'; const legate = primo.link ? p.clips.filter((c) => c.link === primo.link).length - 1 : 0; out.push(h('div', { class: 'isp-testa' }, h('input', { @@ -150,11 +159,11 @@ export class Ispettore { // — la posizione: il quadro in miniatura che si trascina, le posizioni pronte, l'opacità const pronte = h('div', { class: 'pp-griglia' }, posizioniPronte().map((x) => h('button', { class: 'pp-tessera', title: x.titolo, - on: { click: () => store.edit(x.nome, () => { for (const c of vive()) { c.tf = x.fn(c); c.tfFine = undefined; c.via = undefined; } }) }, + on: { click: () => store.edit(x.nome, () => { for (const c of vive()) { c.tf = x.fn(c); c.tfFine = undefined; c.via = undefined; togliAnimazione(c, 'tf.x', 'tf.y', 'tf.scale', 'tf.sx', 'tf.rot'); } }) }, }, disegnino(x.box), h('span', null, x.nome)))); out.push(this.gruppo('immagine', 'Posizione e movimento', [ h('label', { class: 'etichetta' }, 'Posizioni pronte'), pronte, - this.cursore('Opacità', 0, 100, 1, (c) => Math.round(c.opacity * 100), (c, v) => { c.opacity = v / 100; c.opKeys = []; }, '%', video), + this.cursore('Opacità', 0, 100, 1, (c) => Math.round(c.opacity * 100), (c, v) => { c.opacity = v / 100; c.opKeys = []; }, '%', video, 'opacity'), h('div', { class: 'isp-riga col' }, h('label', null, 'Movimento', h('small', null, 'la clip si sposta o si ingrandisce da sola durante la ripresa')), h('div', { class: 'pp-griglia' }, MOVIMENTI.map((m) => h('button', { class: 'pp-tessera' + ((m.id === 'fermo') === !video[0].tfFine && m.id === 'fermo' ? ' acceso' : ''), @@ -163,13 +172,13 @@ export class Ispettore { }, h('span', { class: 'mv-prev' }, h('i', { class: 'mv-box mv-' + m.id })), h('span', null, m.nome))))), video[0].tfFine ? h('p', { class: 'nota' }, `Si muove: parte da dove l'hai messa all'inizio, passa da ${(video[0].via ?? []).length ? (video[0].via ?? []).length + ' tappe di mezzo e ' : 'nessuna tappa di mezzo, '}arriva dove l'hai messa alla fine. Sul monitor grande: ◀ Inizio / Fine ▶, + Tappa; o ferma il cursore fra due tappe e muovi: ne nasce una.`) : null, h('details', { class: 'pp-piu' }, h('summary', null, 'Numeri precisi'), - this.cursore('Zoom', 20, 300, 1, (c) => Math.round(c.tf.scale * 100), (c, v) => { c.tf.scale = v / 100; }, '%', video), - this.cursore('Larghezza (stira)', 20, 300, 1, (c) => Math.round((c.tf.sx ?? 1) * 100), (c, v) => { c.tf.sx = v / 100; }, '%', video), - this.cursore('Orizzontale', -p.w, p.w, 1, (c) => Math.round(c.tf.x), (c, v) => { c.tf.x = v; }, 'px', video), - this.cursore('Verticale', -p.h, p.h, 1, (c) => Math.round(c.tf.y), (c, v) => { c.tf.y = v; }, 'px', video), - this.cursore('Rotazione', -180, 180, 0.5, (c) => c.tf.rot, (c, v) => { c.tf.rot = v; }, '°', video), - this.cursore('Angoli tondi', 0, 100, 1, (c) => Math.round((c.tf.angoli ?? 0) * 100), (c, v) => { c.tf.angoli = v / 100; }, '%', video), - this.cursore('Ombra', 0, 100, 1, (c) => Math.round((c.tf.ombra ?? 0) * 100), (c, v) => { c.tf.ombra = v / 100; }, '%', video)), + this.cursore('Zoom', 20, 300, 1, (c) => Math.round(c.tf.scale * 100), (c, v) => { c.tf.scale = v / 100; }, '%', video, 'tf.scale'), + this.cursore('Larghezza (stira)', 20, 300, 1, (c) => Math.round((c.tf.sx ?? 1) * 100), (c, v) => { c.tf.sx = v / 100; }, '%', video, 'tf.sx'), + this.cursore('Orizzontale', -p.w, p.w, 1, (c) => Math.round(c.tf.x), (c, v) => { c.tf.x = v; }, 'px', video, 'tf.x'), + this.cursore('Verticale', -p.h, p.h, 1, (c) => Math.round(c.tf.y), (c, v) => { c.tf.y = v; }, 'px', video, 'tf.y'), + this.cursore('Rotazione', -180, 180, 0.5, (c) => c.tf.rot, (c, v) => { c.tf.rot = v; }, '°', video, 'tf.rot'), + this.cursore('Angoli tondi', 0, 100, 1, (c) => Math.round((c.tf.angoli ?? 0) * 100), (c, v) => { c.tf.angoli = v / 100; }, '%', video, 'tf.angoli'), + this.cursore('Ombra', 0, 100, 1, (c) => Math.round((c.tf.ombra ?? 0) * 100), (c, v) => { c.tf.ombra = v / 100; }, '%', video, 'tf.ombra')), video.some((c) => c.opKeys.length) ? h('p', { class: 'nota' }, 'Questa clip ha una linea elastica: la trasparenza cambia nel tempo. Muovere l\'opacità la toglie.') : null, ], primo.kind === 'media')); @@ -203,25 +212,35 @@ export class Ispettore { const sg = this.seguiGruppo(video); if (sg) out.push(sg); out.push(this.gruppo('colore', 'Colore: regola a mano', [ - this.cursore('Luce', -50, 50, 1, (c) => Math.round(c.fx.bright * 100), (c, v) => { c.fx.bright = v / 100; }, '', video), - this.cursore('Contrasto', 50, 150, 1, (c) => Math.round(c.fx.contrast * 100), (c, v) => { c.fx.contrast = v / 100; }, '%', video), - this.cursore('Saturazione', 0, 200, 1, (c) => Math.round(c.fx.sat * 100), (c, v) => { c.fx.sat = v / 100; }, '%', video), - this.cursore('Temperatura', -100, 100, 1, (c) => Math.round((c.fx.temp ?? 0) * 100), (c, v) => { c.fx.temp = v / 100; }, ' (freddo ↔ caldo)', video), - this.cursore('Tinta', -180, 180, 1, (c) => c.fx.hue, (c, v) => { c.fx.hue = v; }, '°', video), - this.pulsanti([['💧 Bilancia il bianco (clic sul monitor)', () => bilanciaBianco(video[0].id)], ['Azzera il colore', () => store.edit('Azzera colore', () => { for (const c of vive()) { c.fx.bright = 0; c.fx.contrast = 1; c.fx.sat = 1; c.fx.hue = 0; c.fx.temp = 0; c.fx.look = 'none'; c.fx.effetti = undefined; } })]]), + this.cursore('Luce', -50, 50, 1, (c) => Math.round(c.fx.bright * 100), (c, v) => { c.fx.bright = v / 100; }, '', video, 'fx.bright'), + this.cursore('Contrasto', 50, 150, 1, (c) => Math.round(c.fx.contrast * 100), (c, v) => { c.fx.contrast = v / 100; }, '%', video, 'fx.contrast'), + this.cursore('Saturazione', 0, 200, 1, (c) => Math.round(c.fx.sat * 100), (c, v) => { c.fx.sat = v / 100; }, '%', video, 'fx.sat'), + this.cursore('Temperatura', -100, 100, 1, (c) => Math.round((c.fx.temp ?? 0) * 100), (c, v) => { c.fx.temp = v / 100; }, ' (freddo ↔ caldo)', video, 'fx.temp'), + this.cursore('Tinta', -180, 180, 1, (c) => c.fx.hue, (c, v) => { c.fx.hue = v; }, '°', video, 'fx.hue'), + this.pulsanti([['💧 Bilancia il bianco (clic sul monitor)', () => bilanciaBianco(video[0].id)], ['Azzera il colore', () => store.edit('Azzera colore', () => { for (const c of vive()) { c.fx.bright = 0; c.fx.contrast = 1; c.fx.sat = 1; c.fx.hue = 0; c.fx.temp = 0; togliAnimazione(c, 'fx.bright', 'fx.contrast', 'fx.sat', 'fx.hue', 'fx.temp'); c.fx.look = 'none'; c.fx.effetti = undefined; } })]]), + this.pulsanti([['Colore avanzato…', () => apriColoreAvanzato(video[0].id)]]), h('p', { class: 'nota' }, 'Per dare lo stesso colore a tutto il montaggio c\'è la pagina Finale. Doppio clic su un cursore = valore di partenza.'), ])); } + // le maschere a forma (una clip sola, con un'immagine) e i keyframe di tutti gli altri parametri + if (cs.length === 1 && video.length === 1 && ['media', 'color', 'bars', 'countdown'].includes(video[0].kind)) out.push(this.maschereGruppo(video[0])); if (audio.length) { out.push(this.gruppo('audio', 'Volume', [ - this.cursore('Volume', -40, 12, 0.5, (c) => c.gain, (c, v) => { c.gain = v; c.gainKeys = []; }, 'dB', audio), - this.pulsanti([['−6', () => store.edit('Volume', () => { for (const c of audio) { c.gain = -6; c.gainKeys = []; } })], ['0 dB', () => store.edit('Volume', () => { for (const c of audio) { c.gain = 0; c.gainKeys = []; } })], ['+6', () => store.edit('Volume', () => { for (const c of audio) { c.gain = 6; c.gainKeys = []; } })], ['Muto', () => store.edit('Volume', () => { for (const c of audio) { c.gain = -60; c.gainKeys = []; } })]]), - this.cursore('Panorama', -100, 100, 1, (c) => Math.round(c.pan * 100), (c, v) => { c.pan = v / 100; }, '', audio), + this.cursore('Volume', -40, 12, 0.5, (c) => c.gain, (c, v) => { c.gain = v; c.gainKeys = []; }, 'dB', audio, 'gain'), + this.pulsanti([['−6', () => store.edit('Volume', () => { for (const c of audio) { c.gain = -6; c.gainKeys = []; togliAnimazione(c, 'gain'); } })], ['0 dB', () => store.edit('Volume', () => { for (const c of audio) { c.gain = 0; c.gainKeys = []; togliAnimazione(c, 'gain'); } })], ['+6', () => store.edit('Volume', () => { for (const c of audio) { c.gain = 6; c.gainKeys = []; togliAnimazione(c, 'gain'); } })], ['Muto', () => store.edit('Volume', () => { for (const c of audio) { c.gain = -60; c.gainKeys = []; togliAnimazione(c, 'gain'); } })]]), + this.cursore('Panorama', -100, 100, 1, (c) => Math.round(c.pan * 100), (c, v) => { c.pan = v / 100; }, '', audio, 'pan'), h('p', { class: 'nota' }, 'Nella timeline la linea gialla è il volume: un clic ci mette un punto da portare su e giù (per alzare o abbassare solo in quel momento); Maiusc+trascina alza o abbassa tutto il tratto.'), ], true)); + // «Questa è la voce» e «Abbassa sotto la voce»: una clip alla volta + if (audio.length === 1 && !video.length) { + const duck = creaDuckingClip(audio[0].id); + this.campi.push({ el: duck.el, aggiorna: duck.aggiorna }); + if (duck.el.childElementCount) out.push(this.gruppo('ducking', 'Voce e musica', [duck.el])); + } out.push(this.gruppo('fxa', video.length ? 'Effetti audio' : 'Effetti rapidi', [this.tessereAudio(audio, chips)])); } // l'audio con l'AI: togliere i rumori e separare voce e base. Per l'audio sta aperto (è quello che si cerca); per una ripresa con audio sta chiuso + if (cs.length === 1 && primo.kind !== 'fx') out.push(this.animazioniGruppo(primo)); const conAudio = audio.find((c) => c.kind === 'media') ?? video.find((c) => c.kind === 'media' && audioAIPossibile(c).rumore); if (conAudio) out.push(this.gruppo('audioai', 'Audio: pulisci e separa (AI)', righeAudioAI(conAudio), audio.length > 0)); if (this.completo) out.push(this.gruppo('durata', 'Durata e velocità', [this.durata(cs.filter((c) => c.kind !== 'fx'))])); @@ -246,8 +265,10 @@ export class Ispettore { out.push(this.gruppo('generatore', 'Generatore', righe, true)); } const animati = cs.filter((c) => c.kind === 'title' && c.gen?.anim); - const titoli = cs.filter((c) => c.kind === 'title' && !c.gen?.anim); + const htmlCs = cs.filter((c) => c.kind === 'title' && !c.gen?.anim && c.gen?.html); + const titoli = cs.filter((c) => c.kind === 'title' && !c.gen?.anim && !c.gen?.html); if (animati.length) out.push(this.animatrice(animati)); + if (htmlCs.length) out.push(this.titoloHtml(htmlCs)); if (titoli.length) out.push(this.titolatrice(titoli)); // il suono dentro titoli, countdown e colori: niente clip audio a parte, sta tutto su una riga const sonore = cs.filter((c) => c.kind === 'title' || c.kind === 'countdown' || c.kind === 'color'); @@ -276,17 +297,17 @@ export class Ispettore { })]; out.push(this.gruppo('ritaglio', 'Ritaglio (taglia i bordi)', [ this.pulsanti([taglia('Nessuno', 0, 0, 0, 0), centro(1), centro(9 / 16), taglia('Bande cinema', 0, 0, 0.12, 0.12)]), - this.cursore('A sinistra', 0, 50, 0.5, (c) => c.tf.cropL * 100, (c, v) => { c.tf.cropL = v / 100; }, '%', video), - this.cursore('A destra', 0, 50, 0.5, (c) => c.tf.cropR * 100, (c, v) => { c.tf.cropR = v / 100; }, '%', video), - this.cursore('In alto', 0, 50, 0.5, (c) => c.tf.cropT * 100, (c, v) => { c.tf.cropT = v / 100; }, '%', video), - this.cursore('In basso', 0, 50, 0.5, (c) => c.tf.cropB * 100, (c, v) => { c.tf.cropB = v / 100; }, '%', video), + this.cursore('A sinistra', 0, 50, 0.5, (c) => c.tf.cropL * 100, (c, v) => { c.tf.cropL = v / 100; }, '%', video, 'tf.cropL'), + this.cursore('A destra', 0, 50, 0.5, (c) => c.tf.cropR * 100, (c, v) => { c.tf.cropR = v / 100; }, '%', video, 'tf.cropR'), + this.cursore('In alto', 0, 50, 0.5, (c) => c.tf.cropT * 100, (c, v) => { c.tf.cropT = v / 100; }, '%', video, 'tf.cropT'), + this.cursore('In basso', 0, 50, 0.5, (c) => c.tf.cropB * 100, (c, v) => { c.tf.cropB = v / 100; }, '%', video, 'tf.cropB'), h('p', { class: 'nota' }, 'Toglie una parte dell\'immagine ai quattro lati (la parte tolta non si vede). Sul monitor grande c\'è anche ✂ Ritaglia, per farlo col mouse dai lati.'), ])); } // per titoli, animazioni e generatori la sezione loro (testo, campi, colore…) sta in cima, subito sotto il riassunto const prima = out.findIndex((e) => ['titolo', 'animazione', 'generatore'].includes(e.dataset?.g ?? '')); if (prima > 1) out.splice(1, 0, ...out.splice(prima, 1)); - const chiaveClip = (primo.kind === 'title' ? (primo.gen?.anim ? 'animazione' : 'titolo') : primo.kind === 'media' ? (m?.type === 'image' ? 'immagine' : isVideoClip(primo) ? 'video' : 'audio') : 'generatore'); + const chiaveClip = (primo.kind === 'title' ? (primo.gen?.anim || primo.gen?.html ? 'animazione' : 'titolo') : primo.kind === 'media' ? (m?.type === 'image' ? 'immagine' : isVideoClip(primo) ? 'video' : 'audio') : 'generatore'); this.corpo.replaceChildren(...this.conOrdine('clip:' + chiaveClip, out)); } @@ -345,7 +366,7 @@ export class Ispettore { let timer = 0; campo.addEventListener('input', () => { clearTimeout(timer); timer = window.setTimeout(() => metti(k.id, campo.value), 250); }); this.campi.push({ el: campo, aggiorna: () => { if (document.activeElement !== campo) campo.value = String(v0()[k.id] ?? ''); } }); - righe.push(h('label', { class: 'etichetta' }, k.nome), campo); + righe.push(h('div', { class: 'isp-riga col' }, h('label', { title: k.nome }, k.nome), campo)); } else if (k.tipo === 'numero') { const min = k.min ?? 0, max = k.max ?? 100, step = k.step ?? 1; if (max - min > 1000) { @@ -363,6 +384,67 @@ export class Ispettore { return this.gruppo('animazione', 'Animazione', righe, true); } + /** i titoli animati HTML: quale modello, e tutti i campi che ha (testi, colori, tempi), con i loro valori */ + private titoloHtml(an: Clip[]): HTMLElement { + const h0 = an[0].gen!.html!; + const def = modelloHtml(h0.id); + const righe: (HTMLElement | null)[] = []; + righe.push(this.scelta('Titolo animato', GRUPPI_HTML.flatMap((g) => modelliDi(g.id).map((m) => [m.id, m.nome] as [string, string])), + (c) => c.gen?.html?.id ?? '', (c, v) => { + if (!c.gen?.html || c.gen.html.id === v) return; + // si cambia modello tenendo i testi e i tempi uguali per nome e per tipo (nome, titolo, entrata, uscita, grandezza…) + const vecchi = valoriHtmlDi(c.gen.html); + const nuovo = nuovoHtml(v); + for (const k of modelloHtml(v)?.campi ?? []) { + if ((k.tipo === 'testo' || k.tipo === 'lungo' || k.id === 'ent' || k.id === 'usc' || k.id === 'dim') && k.id in vecchi && typeof vecchi[k.id] === typeof k.def) nuovo.v[k.id] = vecchi[k.id]; + } + c.gen.html = nuovo; + c.name = modelloHtml(v)?.nome ?? c.name; + }, an, Object.fromEntries(GRUPPI_HTML.flatMap((g) => modelliDi(g.id).map((m) => [m.id, g.nome]))))); + if (def) righe.push(h('p', { class: 'html-nota' }, def.info + '.')); + const v0 = () => valoriHtmlDi(store.doc.clips.find((c) => c.id === an[0].id)?.gen?.html ?? h0); + const metti = (id: string, valore: string | number | boolean) => store.edit('Titolo animato: ' + id, (pp) => { for (const x of an) { const z = pp.clips.find((c) => c.id === x.id); if (z?.gen?.html) z.gen.html.v[id] = valore; } }); + const valoreDi = (c: Clip, k: CampoAnim) => (c.gen?.html ? valoriHtmlDi(c.gen.html)[k.id] : undefined) ?? k.def; + const scrivi = (k: CampoAnim) => (c: Clip, v: string | number | boolean) => { if (c.gen?.html) c.gen.html.v[k.id] = v; }; + for (const k of def?.campi ?? []) { + if (k.tipo === 'testo' || k.tipo === 'lungo') { + const campo = (k.tipo === 'lungo' ? h('textarea', { class: 'campo-testo', rows: 3 }) : h('input', { class: 'campo-testo', type: 'text' })) as HTMLInputElement | HTMLTextAreaElement; + campo.value = String(v0()[k.id] ?? ''); + let timer = 0; + campo.addEventListener('input', () => { clearTimeout(timer); timer = window.setTimeout(() => metti(k.id, campo.value), 250); }); + this.campi.push({ el: campo, aggiorna: () => { if (document.activeElement !== campo) campo.value = String(v0()[k.id] ?? ''); } }); + righe.push(h('label', { class: 'etichetta' }, k.nome), campo); + } else if (k.tipo === 'numero') { + const min = k.min ?? 0, max = k.max ?? 100, step = k.step ?? 1; + if (max - min > 1000) { + const n = h('input', { type: 'number', class: 'num largo', min, max, step }) as HTMLInputElement; + n.value = String(v0()[k.id] ?? k.def); + n.addEventListener('change', () => metti(k.id, Math.max(min, Math.min(max, Number(n.value) || 0)))); + this.campi.push({ el: n, aggiorna: () => { if (document.activeElement !== n) n.value = String(v0()[k.id] ?? k.def); } }); + righe.push(h('div', { class: 'isp-riga' }, h('label', null, k.nome), n)); + } else righe.push(this.cursore(k.nome, min, max, step, (c) => Number(valoreDi(c, k)), scrivi(k) as (c: Clip, v: number) => void, '', an)); + } else if (k.tipo === 'colore') righe.push(this.colore(k.nome, (c) => String(valoreDi(c, k)), scrivi(k) as (c: Clip, v: string) => void, an)); + else if (k.tipo === 'scelta') righe.push(this.scelta(k.nome, k.scelte ?? [], (c) => String(valoreDi(c, k)), scrivi(k) as (c: Clip, v: string) => void, an)); + else righe.push(this.spunta(k.nome, (c) => !!valoreDi(c, k), scrivi(k) as (c: Clip, v: boolean) => void, an)); + } + // la durata della clip: la stessa cosa della sezione «Durata e velocità», qui a portata di mano + const r = fps(store.doc.rate); + const durata = h('input', { type: 'number', class: 'num largo', min: 0.5, max: 600, step: 0.1 }) as HTMLInputElement; + const aggDurata = () => { const c = store.doc.clips.find((x) => x.id === an[0].id); if (c && document.activeElement !== durata) durata.value = (c.len / r).toFixed(1); }; + aggDurata(); + durata.addEventListener('change', () => { + store.edit('Durata', (p) => { for (const x of an) { const c = p.clips.find((z) => z.id === x.id); if (c) { const d = Math.max(1, Math.round(Number(durata.value) * r)) - c.len; if (d) M.trimClip(p, c.id, 'out', d, { ripple: modi.ripple, linked: true }); } } }); + aggDurata(); + }); + this.campi.push({ el: durata, aggiorna: aggDurata }); + righe.push(h('div', { class: 'isp-riga' }, h('label', null, 'Durata (secondi)'), durata)); + const stato = h('div', { class: 'html-stato' }, h('i'), 'Disegno dei titoli HTML: controllo…'); + void htmlDisponibile().then((si) => { stato.classList.toggle('ripiego', !si); stato.lastChild!.textContent = si ? 'Disegno dei titoli HTML: pieno' : "Questo sistema non sa disegnare l'HTML: si vedono solo le scritte"; }); + righe.push(stato); + righe.push(h('p', { class: 'html-nota' }, "Entra all'inizio ed esce alla fine: i tempi si decidono qui sopra. Sull'immagine del monitor si sposta e si ingrandisce come ogni clip.")); + return this.gruppo('animazione', 'Titolo animato', righe, true); + } + /** "Togli lo sfondo": il colore (green screen), la luce, o l'AI che lo toglie da sola (persona, soggetto, oggetti coi clic) */ private sfondoGruppo(video: Clip[], scelte = 1): HTMLElement { const c0 = video[0]; @@ -506,13 +588,13 @@ export class Ispettore { const righe: HTMLElement[] = []; if (c0.kind === 'media' && isVideoClip(c0, p) && mediaOf(p, c0)?.type === 'video') { const tr = c0.traccia; - righe.push(this.pulsanti([['✨ Segui con l’AI (clicchi l’oggetto)', () => seguiConAI(c0.id)], [tr ? '🎯 Rifai il tracking' : '🎯 Segna un oggetto sul monitor', () => document.dispatchEvent(new CustomEvent('dpv:mira'))]])); + righe.push(this.pulsanti([['✨ Segui con l’AI (clicchi l’oggetto)', () => seguiConAI(c0.id)], [tr ? '🎯 Rifai l’inseguimento' : '🎯 Segna un oggetto sul monitor', () => document.dispatchEvent(new CustomEvent('dpv:mira'))]])); if (tr) { righe.push(h('p', { class: 'nota' }, `Oggetto seguito: ${tr.punti.length} punti, sicurezza ${Math.round(tr.fiducia * 100)}%. Il percorso azzurro si vede sul monitor.`)); righe.push(this.spunta('Tieni ferma la ripresa sull\'oggetto (stabilizza)', (c) => !!c.stabilizza, (c, v) => { c.stabilizza = v || undefined; }, [c0])); // e una volta tracciato? Si mette qualcosa che lo segue: testo, immagine, segnali, effetti (src/ui/seguiMenu.ts) righe.push(...cosaCiMetto(c0)); - righe.push(this.pulsanti([['Togli il tracking', () => store.edit('Toglie il tracking', (pp) => { for (const z of pp.clips) { if (z.id === c0.id) { delete z.traccia; delete z.stabilizza; } if (z.segue === c0.id) delete z.segue; if (z.fxb?.segue === c0.id) delete z.fxb.segue; } })]])); + righe.push(this.pulsanti([['Togli l’inseguimento', () => store.edit('Toglie l’inseguimento', (pp) => { for (const z of pp.clips) { if (z.id === c0.id) { delete z.traccia; delete z.stabilizza; } if (z.segue === c0.id) delete z.segue; if (z.fxb?.segue === c0.id) delete z.fxb.segue; } })]])); } else righe.push(h('p', { class: 'nota' }, 'Metti il cursore dove l\'oggetto si vede bene, premi il tasto e trascina il mirino sopra: il programma lo segue per tutta la ripresa.')); } const seguibili = tracciate(p).filter((x) => x.id !== c0.id); @@ -604,9 +686,9 @@ export class Ispettore { const segue = !!fb.segue; out.push(this.gruppo('btipo', 'Effetto', [ this.scelta('Effetto', EFFETTI_TEMPO.map((e) => [e.id, `${e.nome} · ${e.info}`] as [string, string]), (c) => c.fxb?.id ?? 'flash', (c, v) => { c.fxb = cambiaModello(c.fxb!, v); c.name = effettoTempo(v)!.nome; }, bs), - this.cursore('Forza', 0, 150, 1, (c) => Math.round((c.fxb?.forza ?? 1) * 100), (c, v) => { c.fxb!.forza = v / 100; }, '%', bs), + this.cursore('Forza', 0, 150, 1, (c) => Math.round((c.fxb?.forza ?? 1) * 100), (c, v) => { c.fxb!.forza = v / 100; }, '%', bs, 'fxb.forza'), ...(effettoTempo(fb.id)?.parametri ?? []).map((p) => this.cursore(p.nome, p.min, p.max, p.passo, - (c) => parametroFx(c.fxb!, p.chiave), (c, v) => { (c.fxb!.parametri ??= {})[p.chiave] = v; }, '', bs)), + (c) => parametroFx(c.fxb!, p.chiave), (c, v) => { (c.fxb!.parametri ??= {})[p.chiave] = v; }, '', bs, 'fxb.parametri.' + p.chiave)), fb.id === 'censura' ? h('p', { class: 'nota avviso-rosso' }, 'Controlla tutta la clip: mosaico e inseguimento non garantiscono anonimizzazione. Nella versione 1.5.7 la censura NON viene applicata.') : null, this.cursore('Si ripete', 1, 12, 1, (c) => c.fxb?.ripeti ?? 1, (c, v) => { c.fxb!.ripeti = v > 1 ? v : undefined; }, 'volte', bs), colori ? this.colore('Colore', (c) => c.fxb?.colore ?? '#ffffff', (c, v) => { c.fxb!.colore = v; }, bs) : null, @@ -627,6 +709,7 @@ export class Ispettore { this.cursore('Volume', -24, 6, 1, (c) => c.fxb?.volume ?? 0, (c, v) => { c.fxb!.volume = v; }, ' dB', bs), h('div', { class: 'isp-chips' }, h('button', { class: 'chip', disabled: !fb.suono, on: { click: () => { if (fb.suono) ascoltaSuono(fb.suono, fb.volume ?? 0); } } }, '▶ Ascolta')), ])); + if (bs.length === 1) out.push(this.animazioniGruppo(b0)); out.push(this.pulsanti([ ['Centra sul taglio', () => { const tg2 = taglioVicino(store.doc, b0.start + b0.len / 2, Math.round(r * 5), b0.track); @@ -765,6 +848,119 @@ export class Ispettore { } // ——— mattoncini ——— + /** i keyframe: i parametri che si muovono nel tempo, e un menu per farne muovere altri (colore, ruote, maschere, effetti…) */ + private animazioniGruppo(c0: Clip): HTMLElement { + const id = c0.id; + const viva = () => clipById(store.doc, id) ?? c0; + const righe: (HTMLElement | null)[] = []; + const animati = percorsiAnimati(c0); + righe.push(h('p', { class: 'nota' }, 'Il rombo ◆ accanto a un parametro mette una chiave dove sta il cursore: da lì il valore cambia nel tempo. ◀ ▶ saltano alla chiave prima e dopo; tasto destro sul rombo = come si va alla chiave dopo (dritta, morbida, a gradino). Se il parametro ha già chiavi, muovere il cursore del valore cambia la chiave qui.')); + for (const path of animati) { + const meta = parametriAnimabili(c0).find((x) => x.path === path); + const d = descrittore(path); + if (!d) continue; + righe.push(this.cursore(meta?.nome ?? nomeParametro(c0, path), meta?.min ?? -1000, meta?.max ?? 1000, meta?.passo ?? 0.01, (c) => d.get(c), (c, v) => d.set(c, v), meta?.unita ?? '', [c0], path)); + } + if (!animati.length) righe.push(h('p', { class: 'nota' }, 'Nessun parametro si muove, per ora.')); + // aggiungere un altro parametro: si mette una chiave col valore di adesso + const altri = parametriAnimabili(c0).filter((x) => !animati.includes(x.path)); + if (altri.length) { + const gruppi = [...new Set(altri.map((x) => x.gruppo))]; + const sel = h('select', { class: 'mini-select' }, h('option', { value: '' }, 'Fai muovere un altro parametro…'), + ...gruppi.map((g) => h('optgroup', { label: g }, ...altri.filter((x) => x.gruppo === g).map((x) => h('option', { value: x.path }, x.nome))))) as HTMLSelectElement; + sel.addEventListener('change', () => { + const path = sel.value; + if (!path) return; + store.edit('Keyframe', () => { + const c = viva(); + const lf = frameLocale(c) ?? 0; + mettiChiave(c, path, lf, valoreVivo(c, path, lf)); + }); + this.aperti.add('anim'); + }); + righe.push(h('div', { class: 'isp-riga' }, sel)); + } + if (animati.length) { + righe.push(this.pulsanti([['Ferma tutto (resta il valore di qui)', () => store.edit('Togli le animazioni', () => { + const c = viva(); + const lf = frameLocale(c) ?? 0; + for (const p of percorsiAnimati(c)) togliLinea(c, p, lf); + })]])); + } + return this.gruppo('anim', 'Keyframe (animazioni)', righe, false); + } + + /** il rapporto larghezza/altezza della sorgente di una clip (serve a fare un cerchio che sia un cerchio) */ + private aspettoClip(c: Clip): number { + const p = store.doc, m = mediaOf(p, c); + if (m?.width && m.height) return m.rotation % 180 ? m.height / m.width : m.width / m.height; + return p.w / p.h; + } + + /** le maschere a forma: rettangolo, ellisse e Bézier (punti cliccati sul monitor), sommate o sottratte, con sfumatura, espansione e inversione */ + private maschereGruppo(c0: Clip): HTMLElement { + const id = c0.id; + const mask = (c: Clip, mid: string) => c.maschere?.find((m) => m.id === mid); + const sul = (cid: string, mid: string, disegna: boolean) => document.dispatchEvent(new CustomEvent('dpv:maschera', { detail: { clip: cid, mask: mid, disegna } })); + const aggiungi = (forma: 'rettangolo' | 'ellisse' | 'bezier') => { + const asp = this.aspettoClip(c0); + const mid = 'm' + Date.now().toString(36) + Math.random().toString(36).slice(2, 5); + store.edit('Maschera: ' + forma, (pp) => { + const c = clipById(pp, id); + if (!c) return; + const tondo = asp >= 1 ? { w: 0.6 / asp, h: 0.6 } : { w: 0.6, h: 0.6 * asp }; + const m = nuovaMaschera(forma, mid, forma === 'rettangolo' ? { w: 0.6, h: 0.6 } : forma === 'ellisse' ? tondo : {}); + (c.maschere ??= []).push(m); + }); + this.aperti.add('maschere'); + this.firma = ''; + this.costruisci(); + motore.setMonitor('recorder'); + sul(id, mid, forma === 'bezier'); + }; + const righe: (HTMLElement | null)[] = [ + h('p', { class: 'nota' }, 'Mostra solo una parte dell\'immagine, con la forma che scegli. Le maschere si sommano o si tolgono in ordine; ogni numero ha il suo rombo ◆ per muoversi nel tempo. Sul monitor: trascina la forma, i suoi punti o la maniglia che gira.'), + h('div', { class: 'isp-pulsanti' }, + h('button', { class: 'btn-mini', title: 'Un rettangolo', on: { click: () => aggiungi('rettangolo') } }, '▭ Rettangolo'), + h('button', { class: 'btn-mini', title: 'Un\'ellisse (un cerchio, se la sorgente è quadrata)', on: { click: () => aggiungi('ellisse') } }, '◯ Ellisse'), + h('button', { class: 'btn-mini', title: 'Una forma libera: poi clicchi i punti sul monitor', on: { click: () => aggiungi('bezier') } }, '✎ Bézier')), + ]; + for (const m0 of c0.maschere ?? []) { + const mid = m0.id; + const M = (c: Clip) => mask(c, mid)!; + const pc = (nome: string, campo: 'x' | 'y' | 'w' | 'h' | 'sfuma' | 'espandi' | 'opacita', min: number, max: number) => + this.cursore(nome, min, max, 0.5, (c) => Math.round((M(c)?.[campo] ?? 0) * 1000) / 10, (c, v) => { const m = M(c); if (m) m[campo] = v / 100; }, '%', [c0], `mask.${mid}.${campo}`); + const bez = m0.forma === 'bezier'; + const togli = () => { + store.edit('Toglie la maschera', (pp) => { + const c = clipById(pp, id); + if (!c) return; + c.maschere = (c.maschere ?? []).filter((m) => m.id !== mid); + if (!c.maschere.length) delete c.maschere; + for (const k of Object.keys(c.anim ?? {})) if (k.startsWith(`mask.${mid}.`)) delete c.anim![k]; + if (c.anim && !Object.keys(c.anim).length) delete c.anim; + }); + sul('', '', false); + }; + righe.push(h('div', { class: 'mk-testa' }, h('b', null, nomeForma(m0)), + h('span', { class: 'mk-azioni' }, + h('button', { class: 'btn-mini', title: bez ? 'Disegna o sposta i punti sul monitor' : 'Mostra la forma sul monitor', on: { click: () => { motore.setMonitor('recorder'); sul(id, mid, bez && (m0.punti?.length ?? 0) < 3); } } }, bez ? '✎ Sul monitor' : '⌖ Sul monitor'), + h('button', { class: 'btn-mini', title: 'Toglie la maschera', on: { click: togli } }, '🗑')))); + righe.push(this.spunta('Accesa', (c) => !M(c)?.spenta, (c, v) => { const m = M(c); if (m) { if (v) delete m.spenta; else m.spenta = true; } }, [c0])); + righe.push(this.scelta('Con le altre', [['somma', 'Aggiunge'], ['sottrai', 'Toglie']], (c) => M(c)?.op ?? 'somma', (c, v) => { const m = M(c); if (m) m.op = v as 'somma'; }, [c0])); + righe.push(this.spunta('Inverti (si vede fuori)', (c) => !!M(c)?.inverti, (c, v) => { const m = M(c); if (m) m.inverti = v; }, [c0])); + if (bez) { + righe.push(this.spunta('Curve morbide', (c) => !!M(c)?.morbida, (c, v) => { const m = M(c); if (m) m.morbida = v; }, [c0])); + righe.push(h('p', { class: 'nota' }, `${m0.punti?.length ?? 0} punti. Con ✎ Sul monitor: clic = nuovo punto, trascina = sposta, tasto destro = toglie, Invio o Esc = finito.`)); + } else { + righe.push(pc('Centro X', 'x', 0, 100), pc('Centro Y', 'y', 0, 100), pc('Larghezza', 'w', 1, 200), pc('Altezza', 'h', 1, 200)); + righe.push(this.cursore('Rotazione', -180, 180, 0.5, (c) => M(c)?.rot ?? 0, (c, v) => { const m = M(c); if (m) m.rot = v; }, '°', [c0], `mask.${mid}.rot`)); + } + righe.push(pc('Sfumatura', 'sfuma', 0, 50), pc('Allarga / stringi', 'espandi', -50, 50), pc('Quanto conta', 'opacita', 0, 100)); + } + return this.gruppo('maschere', 'Maschere (forme)', righe, !!c0.maschere?.length); + } + /** una sezione del pannello; `principale` = quella che serve per questo tipo di elemento: parte aperta (se non l'hai chiusa tu) */ private gruppo(id: string, titolo: string, righe: (HTMLElement | null)[], principale = false): HTMLElement { const grip = h('span', { class: 'isp-grip', title: 'Trascina per spostare la sezione (l\'ordine si ricorda)' }, '⠿'); @@ -843,17 +1039,32 @@ export class Ispettore { this.firma = ''; this.costruisci(); } - private cursore(nome: string, min: number, max: number, step: number, get: (c: Clip) => number, put: (c: Clip, v: number) => void, unita: string, quali: Clip[]): HTMLElement { + /** anim = il percorso del parametro per i keyframe (src/core/automazioni.ts): accanto al cursore compare il rombo ◆ */ + private cursore(nome: string, min: number, max: number, step: number, get: (c: Clip) => number, put: (c: Clip, v: number) => void, unita: string, quali: Clip[], anim?: string): HTMLElement { const ids = quali.map((c) => c.id); const trova = () => store.doc.clips.filter((c) => ids.includes(c.id)); + const rombo = anim ? creaRombo(anim, ids) : null; const r = h('input', { type: 'range', min, max, step }) as HTMLInputElement; const n = h('input', { type: 'number', class: 'num', min, max, step }) as HTMLInputElement; - const agg = () => { const c = trova()[0]; if (!c) return; const v = get(c); if (document.activeElement !== n) n.value = String(Math.round(v * 100) / 100); r.value = String(v); }; + const agg = () => { + const c0 = trova()[0]; if (!c0) return; + // con la linea dei keyframe si mostra il valore di adesso (sotto il cursore), non quello fermo + const lf = anim ? frameLocale(c0) : null; + const c = anim && lf !== null && haLinea(c0, anim) ? valutaClip(c0, lf) : c0; + const v = get(c); if (document.activeElement !== n) n.value = String(Math.round(v * 100) / 100); r.value = String(v); + rombo?.aggiorna(); + }; agg(); let vivo = false; const applica = (v: number) => { if (!vivo) { store.begin(nome); vivo = true; } - for (const c of trova()) put(c, v); + for (const c of trova()) { + const lf = anim ? frameLocale(c) : null; + if (anim && lf !== null && haLinea(c, anim)) { + // parametro animato: il valore nuovo diventa la chiave sotto il cursore (passa dalla stessa put, su una copia) + const sc = copiaLeggera(c); put(sc, v); mettiChiave(c, anim, lf, descrittore(anim)!.get(sc)); + } else put(c, v); + } store.liveChange(); }; r.addEventListener('input', () => { applica(Number(r.value)); n.value = r.value; }); @@ -864,14 +1075,17 @@ export class Ispettore { const def: Record = { Opacità: 100, Zoom: 100, Orizzontale: 0, Verticale: 0, Rotazione: 0, Luce: 0, Contrasto: 100, Saturazione: 100, Temperatura: 0, Tinta: 0, Volume: 0, Panorama: 0 }; if (nome in def) { applica(def[nome]); store.commit(true); vivo = false; agg(); } }); - const el = h('div', { class: 'isp-riga' }, h('label', null, nome), r, h('span', { class: 'isp-num' }, n, h('small', null, unita))); - this.campi.push({ el, aggiorna: agg }); + const el = h('div', { class: 'isp-riga' + (rombo ? ' kf-riga' : '') }, h('label', null, nome), r, h('span', { class: 'isp-num' }, n, h('small', null, unita)), rombo?.el ?? null); + this.campi.push({ el, aggiorna: agg, anim: !!anim }); return el; } - private scelta(nome: string, opzioni: [string, string][], get: (c: Clip) => string, put: (c: Clip, v: string) => void, quali: Clip[]): HTMLElement { + /** `categorie` (valore → nome della categoria) mette le voci in gruppi dentro la tendina, nell'ordine in cui compaiono */ + private scelta(nome: string, opzioni: [string, string][], get: (c: Clip) => string, put: (c: Clip, v: string) => void, quali: Clip[], categorie?: Record): HTMLElement { const ids = quali.map((c) => c.id); - const s = h('select', { class: 'mini-select' }, opzioni.map(([v, t]) => h('option', { value: v }, t))) as HTMLSelectElement; + const voce = ([v, t]: [string, string]) => h('option', { value: v }, t); + const nomi = categorie ? [...new Set(opzioni.map(([v]) => categorie[v] ?? ''))] : []; + const s = h('select', { class: 'mini-select' }, categorie ? nomi.map((g) => h('optgroup', { label: g }, ...opzioni.filter(([v]) => (categorie[v] ?? '') === g).map(voce))) : opzioni.map(voce)) as HTMLSelectElement; const agg = () => { const c = store.doc.clips.find((x) => ids.includes(x.id)); if (c) s.value = get(c); }; agg(); s.addEventListener('change', () => store.edit(nome, () => { for (const c of store.doc.clips) if (ids.includes(c.id)) put(c, s.value); })); diff --git a/src/ui/keyframe.ts b/src/ui/keyframe.ts new file mode 100644 index 0000000..482dbbb --- /dev/null +++ b/src/ui/keyframe.ts @@ -0,0 +1,180 @@ +// L'interfaccia dei keyframe: il rombo ◆ accanto a un parametro (mette o toglie la chiave sotto il cursore, le frecce +// ◀ ▶ saltano alla chiave prima e dopo), l'elenco dei parametri che si possono animare e i piccoli aiuti per scrivere +// un valore tenendo conto delle animazioni. La parte che calcola è in src/core/automazioni.ts. Stile: src/stile/keyframe.css. +import '../stile/keyframe.css'; +import { store } from '../core/store'; +import type { Clip, ModoAnim } from '../core/tipi'; +import { end, keyValue, tfAl } from '../core/progetto'; +import { MODI_ANIM, chiaveVicina, descrittore, haChiaveA, haLinea, impostaModoChiave, mettiChiave, togliChiave, togliLinea, valoreAl, valoreFermo } from '../core/automazioni'; +import { effettoTempo, parametroFx } from '../core/blocchi'; +import { nomeForma } from '../core/maschereForma'; +import { motore } from '../motore'; +import { h } from './dom'; + +/** il fotogramma locale sotto il cursore (intero), o null se il cursore sta fuori dalla clip */ +export function frameLocale(c: Clip): number | null { + const f = Math.floor(store.head + 1e-6); + return f >= c.start && f < end(c) ? f - c.start : null; +} + +/** il valore «vivo» di un parametro al fotogramma locale lf: con la linea è quello animato, senza è quello che si vede adesso (anche in movimento) */ +export function valoreVivo(c: Clip, path: string, lf: number): number { + if (haLinea(c, path)) return valoreAl(c, path, lf); + // la vecchia linea elastica: la prima chiave parte da dove si vede adesso (se no al primo rombo il valore salterebbe) + if (path === 'opacity' && c.opKeys.length) return keyValue(c.opKeys, lf, c.opacity); + if (path === 'gain' && c.gainKeys.length) return keyValue(c.gainKeys, lf, c.gain); + if (path.startsWith('tf.')) { + const k = path.slice(3); + const t = tfAl(c, lf) as unknown as Record; + return t[k] ?? valoreFermo(c, path); + } + const m = /^fxb\.parametri\.(.+)$/.exec(path); + if (m && c.fxb) return parametroFx(c.fxb, m[1]); + return valoreFermo(c, path); +} + +/** scrive un valore: se il parametro ha la linea, la chiave sotto il cursore; se no il valore fermo */ +export function scriviParametro(c: Clip, path: string, lf: number, v: number) { + if (haLinea(c, path)) mettiChiave(c, path, lf, v); + else descrittore(path)?.set(c, v); +} + +// ——— i nomi e i limiti dei parametri ——— + +export interface MetaParametro { path: string; nome: string; min: number; max: number; passo: number; unita: string; gruppo: string } + +const RUOTE: [string, string, number, number][] = [['lift', 'Ombre (lift)', -1, 1], ['gamma', 'Mezzi toni (gamma)', 0.1, 4], ['gain', 'Luci (gain)', 0, 4]]; + +/** i parametri che si possono animare su questa clip (oltre a quelli che hanno già il rombo nel pannello) */ +export function parametriAnimabili(c: Clip): MetaParametro[] { + const o: MetaParametro[] = []; + const m = (path: string, nome: string, min: number, max: number, passo: number, unita: string, gruppo: string) => o.push({ path, nome, min, max, passo, unita, gruppo }); + if (c.kind === 'fx' && c.fxb) { + m('fxb.forza', 'Forza', 0, 1.5, 0.01, '', 'Effetto'); + for (const p of effettoTempo(c.fxb.id)?.parametri ?? []) m('fxb.parametri.' + p.chiave, p.nome, p.min, p.max, p.passo, '', 'Effetto'); + return o; + } + const video = c.kind === 'media' || c.kind === 'color' || c.kind === 'bars' || c.kind === 'countdown' || c.kind === 'title'; + if (video) { + m('opacity', 'Opacità', 0, 1, 0.01, '', 'Posizione'); + m('tf.scale', 'Zoom', 0.2, 3, 0.01, '', 'Posizione'); + m('tf.sx', 'Larghezza (stira)', 0.2, 3, 0.01, '', 'Posizione'); + m('tf.x', 'Orizzontale', -4000, 4000, 1, 'px', 'Posizione'); + m('tf.y', 'Verticale', -4000, 4000, 1, 'px', 'Posizione'); + m('tf.rot', 'Rotazione', -360, 360, 0.5, '°', 'Posizione'); + m('tf.angoli', 'Angoli tondi', 0, 1, 0.01, '', 'Posizione'); + m('tf.ombra', 'Ombra', 0, 1, 0.01, '', 'Posizione'); + for (const [k, n] of [['cropL', 'Ritaglio a sinistra'], ['cropR', 'Ritaglio a destra'], ['cropT', 'Ritaglio in alto'], ['cropB', 'Ritaglio in basso']]) m('tf.' + k, n, 0, 0.5, 0.005, '', 'Ritaglio'); + m('fx.bright', 'Luce', -0.5, 0.5, 0.01, '', 'Colore'); + m('fx.contrast', 'Contrasto', 0.5, 1.5, 0.01, '', 'Colore'); + m('fx.sat', 'Saturazione', 0, 2, 0.01, '', 'Colore'); + m('fx.temp', 'Temperatura', -1, 1, 0.01, '', 'Colore'); + m('fx.hue', 'Tinta', -180, 180, 1, '°', 'Colore'); + m('fx.vignette', 'Vignetta', 0, 1, 0.01, '', 'Colore'); + for (const [r, nome, lo, hi] of RUOTE) for (const [ch, n] of [['r', 'rosso'], ['g', 'verde'], ['b', 'blu']]) m(`fx.colore.${r}.${ch}`, `${nome} · ${n}`, lo, hi, 0.01, '', 'Ruote colore'); + if (c.fx.colore?.lut) m('fx.colore.lut', 'Intensità della LUT', 0, 1, 0.01, '', 'Ruote colore'); + if (c.fx.key !== 'none') { + m('fx.keyLevel', 'Soglia della chiave', 0, 1, 0.01, '', 'Togli lo sfondo'); + m('fx.keySoft', 'Morbidezza della chiave', 0, 0.5, 0.01, '', 'Togli lo sfondo'); + } + } + if (c.kind === 'media' || c.kind === 'tone' || c.kind === 'beep') { + m('gain', 'Volume', -60, 12, 0.5, 'dB', 'Audio'); + m('pan', 'Panorama', -1, 1, 0.01, '', 'Audio'); + } + for (const mk of c.maschere ?? []) { + const nome = nomeForma(mk); + if (mk.forma !== 'bezier') { + m(`mask.${mk.id}.x`, `${nome} · centro X`, 0, 1, 0.005, '', 'Maschere'); + m(`mask.${mk.id}.y`, `${nome} · centro Y`, 0, 1, 0.005, '', 'Maschere'); + m(`mask.${mk.id}.w`, `${nome} · larghezza`, 0, 2, 0.005, '', 'Maschere'); + m(`mask.${mk.id}.h`, `${nome} · altezza`, 0, 2, 0.005, '', 'Maschere'); + m(`mask.${mk.id}.rot`, `${nome} · rotazione`, -360, 360, 0.5, '°', 'Maschere'); + } else { + (mk.punti ?? []).forEach((_, i) => { m(`mask.${mk.id}.p${i}.x`, `${nome} · punto ${i + 1} X`, -0.5, 1.5, 0.005, '', 'Maschere'); m(`mask.${mk.id}.p${i}.y`, `${nome} · punto ${i + 1} Y`, -0.5, 1.5, 0.005, '', 'Maschere'); }); + } + m(`mask.${mk.id}.sfuma`, `${nome} · sfumatura`, 0, 0.5, 0.005, '', 'Maschere'); + m(`mask.${mk.id}.espandi`, `${nome} · espansione`, -0.5, 0.5, 0.005, '', 'Maschere'); + m(`mask.${mk.id}.opacita`, `${nome} · quanto conta`, 0, 1, 0.01, '', 'Maschere'); + } + return o; +} + +/** come si chiama un parametro nell'elenco delle animazioni */ +export function nomeParametro(c: Clip, path: string): string { + return parametriAnimabili(c).find((x) => x.path === path)?.nome ?? path; +} + +// ——— il rombo ——— + +export interface Rombo { el: HTMLElement; aggiorna: () => void } + +/** + * Il rombo con le due frecce per un parametro. `ids` sono le clip toccate (la prima comanda il disegno). Un clic sul rombo: + * se c'è una chiave sotto il cursore la toglie, se no ne mette una col valore di adesso. Tasto destro: come si va alla chiave dopo. + */ +export function creaRombo(path: string, ids: string[], dopo?: () => void): Rombo { + const trova = () => store.doc.clips.filter((c) => ids.includes(c.id)); + const su = h('button', { class: 'kf-freccia', title: 'Alla chiave prima', type: 'button' }, '◀') as HTMLButtonElement; + const gi = h('button', { class: 'kf-freccia', title: 'Alla chiave dopo', type: 'button' }, '▶') as HTMLButtonElement; + const r = h('button', { class: 'kf-rombo', type: 'button', title: 'Metti o togli una chiave qui (tasto destro: come si arriva alla chiave dopo)' }, '◆') as HTMLButtonElement; + const el = h('span', { class: 'kf' }, su, r, gi); + const aggiorna = () => { + const c = trova()[0]; + if (!c) return; + const lf = frameLocale(c); + const linea = haLinea(c, path); + r.disabled = lf === null; + r.classList.toggle('animato', linea); + r.classList.toggle('chiave', lf !== null && haChiaveA(c, path, lf)); + const f = lf ?? Math.max(0, Math.floor(store.head) - c.start); + su.disabled = !linea || chiaveVicina(c, path, f, -1) === null; + gi.disabled = !linea || chiaveVicina(c, path, f, 1) === null; + el.classList.toggle('acceso', linea); + }; + const salta = (dir: -1 | 1) => { + const c = trova()[0]; + if (!c) return; + const f = chiaveVicina(c, path, Math.floor(store.head + 1e-6) - c.start, dir); + if (f !== null) { motore.setMonitor('recorder'); motore.vaiA(c.start + f); } + }; + su.addEventListener('click', () => salta(-1)); + gi.addEventListener('click', () => salta(1)); + r.addEventListener('click', () => { + const quali = trova(); + if (!quali.length) return; + store.edit('Keyframe', () => { + for (const c of trova()) { + const lf = frameLocale(c); + if (lf === null) continue; + if (haChiaveA(c, path, lf)) togliChiave(c, path, lf); + else mettiChiave(c, path, lf, valoreVivo(c, path, lf)); + } + }); + aggiorna(); + dopo?.(); + }); + r.addEventListener('contextmenu', (e) => { + e.preventDefault(); + const c = trova()[0]; + const lf = c ? frameLocale(c) : null; + if (!c || lf === null) return; + const menu = h('div', { class: 'kf-menu' }); + const chiudi = () => { menu.remove(); removeEventListener('pointerdown', fuori, true); }; + const fuori = (ev: Event) => { if (!menu.contains(ev.target as Node)) chiudi(); }; + const voci: [string, () => void][] = []; + if (haChiaveA(c, path, lf)) { + for (const mo of MODI_ANIM) voci.push([`Verso la prossima: ${mo.nome.toLowerCase()}`, () => store.edit('Keyframe: come si va avanti', () => { for (const x of trova()) impostaModoChiave(x, path, lf, mo.id as ModoAnim); })]); + } + if (haLinea(c, path)) voci.push(['Togli tutte le chiavi (resta il valore di qui)', () => { store.edit('Togli le chiavi', () => { for (const x of trova()) { const f = frameLocale(x); togliLinea(x, path, f ?? 0); } }); dopo?.(); }]); + if (!voci.length) { chiudi(); return; } + for (const [t, fn] of voci) menu.append(h('button', { type: 'button', on: { click: () => { chiudi(); fn(); aggiorna(); } } }, t)); + document.body.append(menu); + const b = r.getBoundingClientRect(); + menu.style.left = Math.max(4, Math.min(innerWidth - 250, b.left - 120)) + 'px'; + menu.style.top = Math.min(innerHeight - menu.offsetHeight - 4, b.bottom + 4) + 'px'; + addEventListener('pointerdown', fuori, true); + }); + aggiorna(); + return { el, aggiorna }; +} diff --git a/src/ui/live.ts b/src/ui/live.ts index 6792316..ee0f1a8 100644 --- a/src/ui/live.ts +++ b/src/ui/live.ts @@ -27,7 +27,10 @@ import * as M from '../core/montaggio'; import { ANGOLI, bolla, presentazione, SFONDI, type Angolo } from '../core/cornici'; import type { MediaItem } from '../core/tipi'; import { importaFile } from '../progetti'; -import { isAndroid, salvaMediaSulDisco } from '../platform'; +import { invoke, isAndroid, salvaMediaSulDisco } from '../platform'; +import { CursoreLive } from '../media/cursoreLive'; +import { SceltaSchermoLive } from './liveCursore'; +import { applicaZoomCursore, bloccoClicLive } from '../core/zoomCursore'; import { motore } from '../motore'; import { avviso, h, icona } from './dom'; import { Telecomando, type StatoTelecomando } from './telecomando'; @@ -50,6 +53,25 @@ export const impostaSorgenteLive = (s: Sorgente | null, mic: (() => Promise !!sorgenteProva || (!!navigator.mediaDevices?.getDisplayMedia && typeof MediaRecorder !== 'undefined' && !isAndroid); +async function avvisaErroreSchermo(e: unknown) { + if (!sorgenteProva && !navigator.mediaDevices?.getDisplayMedia) { + avviso('Qui non si può condividere lo schermo: usa l’app oppure Chrome o Edge su una pagina sicura (HTTPS).', 'errore', 6500); + return; + } + const { name = '', message = '' } = (e ?? {}) as { name?: string; message?: string }; + let negato = /permission.*denied|permesso.*negato|denied by system|not allowed by|permissions? policy/i.test(message); + if (name === 'NotAllowedError' || name === 'AbortError') { + try { + const permesso = await navigator.permissions.query({ name: 'display-capture' as PermissionName }); + negato ||= permesso.state === 'denied'; + } catch { /* alcuni browser non espongono questo permesso */ } + if (!negato) return; // Il selettore è stato chiuso: non è un errore da mostrare. + } + avviso(negato + ? 'La condivisione dello schermo è bloccata: controlla i permessi del browser e del sistema, poi riprova.' + : 'Non riesco ad aggiungere la finestra: ' + (message || String(e)), 'errore', 6500); +} + function formato(soloVideo = false): string { const lista = soloVideo ? ['video/webm;codecs=vp9', 'video/webm;codecs=vp8', 'video/webm', 'video/mp4;codecs=avc1', 'video/mp4'] @@ -75,7 +97,7 @@ interface Tratto { blob: Blob; taglio: number; nota: string } /** i pezzi fra una pausa e l'altra, cuciti uno dopo l'altro in un file solo, senza ricodificare, ognuno tagliato * dove si è premuto PAUSA o FERMA (null se non si riesce: allora si prova pezzo per pezzo) */ -async function cuci(tratti: Tratto[], mp4: boolean, note: string[]): Promise { +async function cuci(tratti: Tratto[], mp4: boolean, note: string[], tempi?: { indice: number; daMs: number; durataMs: number }[]): Promise { const ingressi = tratti.map((x) => new Input({ source: new BlobSource(x.blob), formats: ALL_FORMATS })); try { const v0 = await ingressi[0].getPrimaryVideoTrack(); @@ -124,6 +146,7 @@ async function cuci(tratti: Tratto[], mp4: boolean, note: string[]): Promise this.mixer, - prova: () => void this.provaMic(), + prova: () => { if (!this.opz.mic && !this.micProva) avviso('Il microfono è spento: accendilo per provarlo', 'info'); else void this.provaMic(); }, inProva: () => !!this.micProva, suLivelli: (pc, voce) => { if (this.tele.aperto) this.tele.livelli(pc, voce); }, }); // ——— le scelte ——— const salva = () => this.salvaOpzioni(); - const fisse = new Set(['mic', 'sistema', 'separato', 'qualita', 'fps', 'cursore', 'micId', 'camId', 'finestre']); + const fisse = new Set(['mic', 'sistema', 'separato', 'qualita', 'fps', 'cursore', 'micId', 'camId', 'finestre', 'zoomCursore', 'clicAnimati']); const cambia = (k: K, v: Opzioni[K]) => { if (this.fase !== 'fermo' && fisse.has(k)) { avviso('Questo si cambia prima di registrare', 'info'); this.sinc.forEach((f) => f()); return false; } this.opz[k] = v; @@ -424,7 +453,7 @@ export class Live { this.sinc.forEach((f) => f()); return true; }; - const interruttore = (k: 'mic' | 'sistema' | 'separato' | 'cam' | 'cursore' | 'conto' | 'timeline' | 'presentazione' | 'finestre', ic: string | null, testo: string, info: string, dopo?: () => void) => { + const interruttore = (k: 'mic' | 'sistema' | 'separato' | 'cam' | 'cursore' | 'conto' | 'timeline' | 'presentazione' | 'finestre' | 'zoomCursore' | 'clicAnimati', ic: string | null, testo: string, info: string, dopo?: () => void) => { const led = h('span', { class: 'led' }); const b = h('button', { class: 'fin-interruttore', title: info, on: { click: () => { if (cambia(k, !this.opz[k])) dopo?.(); } } }, led, ic ? icona(ic, 14) : null, h('span', { class: 'fin-int-testo' }, testo)); @@ -440,7 +469,7 @@ export class Live { return h('div', { class: 'live-chips' }, bb); }; this.selMic = h('select', { class: 'live-sel', title: 'Quale microfono', on: { change: () => { cambia('micId', this.selMic.value); if (this.micProva) { this.fermaProvaMic(); void this.provaMic(); } } } }, h('option', { value: '' }, 'Predefinito')) as HTMLSelectElement; - this.selCam = h('select', { class: 'live-sel', title: 'Quale webcam', on: { change: () => { if (cambia('camId', this.selCam.value) && this.opz.cam) { this.chiudiCam(); void this.apriCam(); } } } }, h('option', { value: '' }, 'Predefinita')) as HTMLSelectElement; + this.selCam = h('select', { class: 'live-sel live-sel-cam', title: 'Quale webcam', on: { change: () => { if (cambia('camId', this.selCam.value) && this.opz.cam) { this.chiudiCam(); void this.apriCam(); } } } }, h('option', { value: '' }, 'Predefinita')) as HTMLSelectElement; const sfondi = h('div', { class: 'live-sfondi' }, SFONDI.map((x) => { const b = h('button', { class: 'live-sfondo', title: x.nome, style: `background: linear-gradient(135deg, ${x.a}, ${x.b})`, on: { click: () => cambia('sfondo', x.id) } }); this.sinc.push(() => b.classList.toggle('acceso', this.opz.sfondo === x.id)); @@ -461,6 +490,21 @@ export class Live { const vuoto = h('div', { class: 'live-vuoto' }, icona('schermo', 54), h('b', null, 'Premi REGISTRA'), h('span', null, 'scegli lo schermo, una finestra o una scheda: qui vedi quello che registri')); const sezione = (t: string) => h('h4', { class: 'live-sez' }, t); + const griglia = (...figli: (HTMLElement | null)[]) => h('div', { class: 'live-griglia' }, ...figli); + // le sorgenti: interruttore, scelta e misuratore sulla stessa riga (le righe si allineano a colonne, come i canali di un banco) + const sorgMic = this.audio.sorgente('voce'), sorgPc = this.audio.sorgente('computer'); + const misura = (barra: HTMLElement, chi: 'mic' | 'sistema') => { + const m = h('span', { class: 'live-sorg-misura' }, barra); + this.sinc.push(() => { m.classList.toggle('spenta', !this.opz[chi]); if (chi === 'mic' && !this.opz.mic && this.micProva) this.fermaProvaMic(); }); + return m; + }; + const bProva = this.audio.provaPiccola; + const sorgenti = h('div', { class: 'live-sorgenti' }, + interruttore('mic', 'mic', 'Microfono', 'La tua voce mentre registri'), this.selMic, misura(sorgMic.barra, 'mic'), bProva, + interruttore('sistema', 'altoparlante', 'Audio del computer', 'Il suono di quello che registri (dove il sistema lo permette)'), sorgPc.stato, misura(sorgPc.barra, 'sistema'), + interruttore('cam', 'webcam', 'Webcam', 'La tua faccia in un angolo: registrata a parte, va sulla traccia sopra. Si accende e si spegne anche mentre registri (tasto C)', () => { if (this.opz.cam) void this.accendiCam(); else this.spegniCam(); }), this.selCam, + this.bAggiungi, this.elPrime); + this.bReg.title += '. ' + (puoRegistrare() ? 'Registra lo schermo con l\'audio del computer e il microfono; la pausa non lascia buchi' : 'Qui lo schermo non si può registrare'); this.el = h('section', { class: 'pannello live' }, h('header', { class: 'fin-testa' }, h('span', { class: 'live-marchio' }, h('i'), 'LIVE'), h('span', null, 'registra lo schermo e mettilo nel montaggio'), h('span', { class: 'live-tastiera' }, h('kbd', null, 'R'), ' registra ', h('kbd', null, 'Spazio'), ' pausa ', h('kbd', null, 'M'), ' segno ', h('kbd', null, '1-9'), ' finestra ', h('kbd', null, 'N'), ' nuova ', h('kbd', null, 'C'), ' webcam ', h('kbd', null, 'F'), ' ferma')), @@ -468,38 +512,40 @@ export class Live { h('div', { class: 'live-schermo' }, h('div', { class: 'live-quadro' }, vuoto, this.video), this.camVideo, this.contoEl), h('div', { class: 'live-comandi' }, h('div', { class: 'live-regia' }, - this.faseCerta, this.tempo, this.stato, this.info, - h('div', { class: 'live-tasti' }, this.bReg, this.bPausa, this.bFerma), - h('div', { class: 'live-tasti tre' }, this.bSegna, this.bCam, bTele), - this.elFonti, - this.audio.compatto), - h('p', { class: 'nota live-guida' }, puoRegistrare() - ? 'REGISTRA parte subito: registra lo schermo con l\'audio del computer e il microfono. La pausa non lascia buchi.' - : 'Qui non si può registrare lo schermo: su Android il sistema non lo permette alle app come questa. Usa la versione per Windows o Mac, o Chrome/Edge sul computer.'), - h('div', { class: 'live-rapide' }, - h('div', { class: 'live-riga' }, interruttore('mic', 'mic', 'Microfono', 'La tua voce mentre registri'), this.selMic), - interruttore('sistema', 'altoparlante', 'Audio del computer', 'Il suono di quello che registri (dove il sistema lo permette)'), - h('div', { class: 'live-riga' }, interruttore('cam', 'webcam', 'Webcam', 'La tua faccia in un angolo: registrata a parte, va sulla traccia sopra. Si accende e si spegne anche mentre registri (tasto C)', () => { if (this.opz.cam) void this.accendiCam(); else this.spegniCam(); }), this.selCam), - h('div', { class: 'live-riga' }, this.bAggiungi), - this.elPrime), + h('div', { class: 'live-display' }, this.faseCerta, this.tempo), + this.stato, this.info, + h('div', { class: 'live-gruppo' }, + h('div', { class: 'live-tasti' }, this.bReg, this.bPausa, this.bFerma), + h('div', { class: 'live-tasti tre' }, this.bSegna, this.bCam, bTele)), + puoRegistrare() ? null : h('p', { class: 'nota live-guida' }, 'Qui non si può registrare lo schermo: su Android il sistema non lo permette alle app come questa. Usa la versione per Windows o Mac, o Chrome/Edge sul computer.'), + sorgenti, + this.elFonti), h('details', { class: 'live-configurazione' }, h('summary', null, 'Altre opzioni'), + sezione('Cursore e clic'), + griglia( + interruttore('zoomCursore', null, 'Zoom che segue il cursore', 'Zoom morbido sulle zone dei clic: dopo lo cambi dalle tappe del movimento della clip'), + interruttore('clicAnimati', null, 'Clic animati', 'Un cerchietto sui clic: dopo lo accorci o lo togli come un blocco effetto'), + interruttore('cursore', null, 'Cursore visibile', 'Il puntatore del mouse nella registrazione (dove il sistema lo permette)')), + this.sceltaSchermo.el, sezione('Qualità'), - chips('qualita', QUALITA.map(([q, n]): [number, string] => [q, n])), - h('div', { class: 'live-riga' }, chips('fps', [[30, '30 fps'], [60, '60 fps', 'Più fluido (giochi, animazioni): file più grandi']]), - interruttore('cursore', null, 'Cursore', 'Il puntatore del mouse nella registrazione (dove il sistema lo permette)')), - interruttore('separato', null, 'Voce e computer separati', 'Se registri tutti e due, il microfono va in un file suo e su una traccia audio a parte: dopo puoi livellare i volumi di voce e computer uno per uno'), + h('div', { class: 'live-riga live-qualita' }, + chips('qualita', QUALITA.map(([q, n]): [number, string] => [q, n])), + chips('fps', [[30, '30 fps'], [60, '60 fps', 'Più fluido (giochi, animazioni): file più grandi']])), + sezione('Registrazione'), + griglia( + interruttore('separato', null, 'Voce e computer separati', 'Se registri tutti e due, il microfono va in un file suo e su una traccia audio a parte: dopo puoi livellare i volumi di voce e computer uno per uno'), + interruttore('conto', null, 'Conto alla rovescia 3-2-1', 'Tre secondi per sistemarti prima che parta'), + interruttore('timeline', null, 'In fondo alla timeline', 'Quando fermi, la registrazione va anche in coda al montaggio'), + interruttore('presentazione', null, 'Stile presentazione', 'Lo schermo un po\' più piccolo, angoli tondi e ombra, sopra uno sfondo sfumato (si cambia dopo nelle proprietà)')), + sfondi, sezione('Webcam'), h('div', { class: 'live-riga cam-scelte' }, chips('camAngolo', ANGOLI.map(([a, s]): [Angolo, string, string] => [a, s, 'La webcam in questo angolo'])), chips('camTonda', [[true, 'Bolla', 'Tonda'], [false, 'Riquadro', 'Un riquadro con gli angoli tondi']])), sezione('Più finestre'), - chips('layout', [['solo', 'Una sola', 'La finestra scelta a tutto quadro'], ['angolo', 'In angolo', 'La scelta grande e la prossima piccola in un angolo'], ['affiancate', 'Affiancate', 'Due finestre una accanto all\'altra']], () => this.applicaLayout()), - h('div', { class: 'live-riga' }, this.bProssima), - sezione('Partenza e arrivo'), - interruttore('conto', null, 'Conto alla rovescia 3-2-1', 'Tre secondi per sistemarti prima che parta'), - interruttore('timeline', null, 'Mettila in fondo alla timeline', 'Quando fermi, la registrazione va anche in coda al montaggio'), - interruttore('presentazione', null, 'Stile presentazione', 'Lo schermo un po\' più piccolo, angoli tondi e ombra, sopra uno sfondo sfumato (si cambia dopo nelle proprietà)'), - sfondi), + h('div', { class: 'live-riga' }, + chips('layout', [['solo', 'Una sola', 'La finestra scelta a tutto quadro'], ['angolo', 'In angolo', 'La scelta grande e la prossima piccola in un angolo'], ['affiancate', 'Affiancate', 'Due finestre una accanto all\'altra']], () => this.applicaLayout()), + this.bProssima)), h('details', { class: 'live-archivio' }, h('summary', null, 'Registrazioni pronte'), this.lista)))); this.video.addEventListener('loadedmetadata', () => vuoto.classList.add('via')); this.video.addEventListener('emptied', () => vuoto.classList.remove('via')); @@ -770,6 +816,7 @@ export class Live { private nuovoPezzo() { const t0 = performance.now(); const n = nastro(this.flusso!, this.tipo, bitrate(this.opz.qualita, this.opz.fps)); + this.cursoreLive?.pezzo(t0); this.pezzi.push(n.fatto); // la webcam parte con lo schermo solo se è accesa; dopo una pausa riprende nel suo segmento if (this.cam && this.opz.cam) this.avviaNastroCam(this.fase === 'pausa' ? this.fatto / 1000 : 0); @@ -780,7 +827,7 @@ export class Live { this.pezziMic.push(mc.fatto); } catch { /* il microfono a parte no: resta muto, lo schermo va lo stesso */ } } - this.pezzo = { chiudi: () => { const t = (performance.now() - t0) / 1000; n.ferma(t); this.fermaNastroCam(); mc?.ferma(t); } }; + this.pezzo = { chiudi: () => { const adesso = performance.now(); const t = (adesso - t0) / 1000; this.cursoreLive?.pausa(adesso); n.ferma(t); this.fermaNastroCam(); mc?.ferma(t); } }; } /** la webcam registra da adesso (`da` = a che punto della registrazione, in secondi): un segmento nuovo, o quello aperto */ @@ -856,7 +903,7 @@ export class Live { // automatico (sono fatti per la voce e rovinano musica e suoni), in stereo audio: o.sistema ? { echoCancellation: false, noiseSuppression: false, autoGainControl: false, channelCount: 2, sampleRate: 48000, ...({ suppressLocalAudioPlayback: false } as object) } as MediaTrackConstraints : false, // Chrome: niente "questa scheda" in cima, l'audio del sistema (anche registrando una finestra sola) - ...({ selfBrowserSurface: 'exclude', systemAudio: 'include', windowAudio: 'system', surfaceSwitching: 'include' } as object), + ...({ selfBrowserSurface: 'exclude', systemAudio: 'include', windowAudio: 'system', surfaceSwitching: o.zoomCursore || o.clicAnimati ? 'exclude' : 'include' } as object), } as DisplayMediaStreamOptions); } catch { mix.chiudi(); @@ -958,10 +1005,21 @@ export class Live { this.nastroCam = null; this.pezziMic = []; this.segni = []; + this.scelteCursore = { zoom: o.zoomCursore, clic: o.clicAnimati }; + if (o.zoomCursore || o.clicAnimati) { + const monitor = this.sceltaSchermo.scelto; + const rapporto = st0.width && st0.height && monitor ? Math.abs(st0.width / st0.height - monitor.width / monitor.height) : Infinity; + if (!this.regia && st0.displaySurface === 'monitor' && monitor && rapporto < 0.02) { + try { this.cursoreLive = await CursoreLive.avvia(monitor); } + catch (e) { avviso('Registro senza dati del cursore: ' + String(e), 'info', 5000); } + } else avviso('Registro senza dati del cursore: serve uno schermo intero, scelto anche nelle Altre opzioni di LIVE', 'info', 6000); + } try { this.nuovoPezzo(); } catch (e) { this.fase = 'fermo'; + void this.cursoreLive?.ferma().catch(() => {}); + this.cursoreLive = null; this.chiudiFlussi(); this.aggiornaTasti(); avviso('Non riesco a registrare: ' + String(e), 'errore', 4000); @@ -1082,6 +1140,12 @@ export class Live { if (this.fase === 'registra') this.fatto += performance.now() - this.da; this.pezzo?.chiudi(); this.pezzo = null; + const cursore = this.cursoreLive?.ferma().catch((e) => { + avviso('La registrazione resta disponibile, ma non i dati del cursore: ' + String(e), 'info', 5000); + return null; + }) ?? Promise.resolve(null); + const scelteCursore = { ...this.scelteCursore }; + this.cursoreLive = null; this.fase = 'fermo'; clearInterval(this.giro); this.aggiornaTempo(); @@ -1118,7 +1182,8 @@ export class Live { if (this.fase === 'fermo') this.video.srcObject = null; // la webcam resta accesa per l'anteprima solo se si è ancora su LIVE if (!this.visibile) this.chiudiCam(); - await this.consegna(tratti.filter((x) => x.blob.size), segmentiCam.map((g) => ({ da: g.da, tratti: g.tratti.filter((x) => x.blob.size) })).filter((g) => g.tratti.length), trattiMic.filter((x) => x.blob.size), durata, segni, foto); + await this.consegna(tratti.filter((x) => x.blob.size), segmentiCam.map((g) => ({ da: g.da, tratti: g.tratti.filter((x) => x.blob.size) })).filter((g) => g.tratti.length), trattiMic.filter((x) => x.blob.size), durata, segni, foto, + await cursore, scelteCursore, tratti.flatMap((x, i) => x.blob.size ? [i] : [])); })().catch((e) => { this.stato.textContent = 'Non sono riuscito a mettere via la registrazione'; avviso('La registrazione non si salva: ' + String(e), 'errore', 4000); @@ -1135,11 +1200,13 @@ export class Live { } /** la registrazione finita: cucita, sul disco (nell'app), nel contenitore e in fondo alla timeline */ - private async consegna(tratti: Tratto[], segmentiCam: { da: number; tratti: Tratto[] }[], trattiMic: Tratto[], durata: number, segni: number[], foto: string) { + private async consegna(tratti: Tratto[], segmentiCam: { da: number; tratti: Tratto[] }[], trattiMic: Tratto[], durata: number, segni: number[], foto: string, + cursore: Awaited> | null = null, scelteCursore = { zoom: false, clic: false }, indici: number[] = tratti.map((_, i) => i)) { if (!tratti.length) { this.stato.textContent = 'La registrazione è vuota'; return; } const mp4 = /mp4/.test(tratti[0].blob.type); // di solito un file solo; se la cucitura non riesce, i pezzi vanno uno dopo l'altro (sempre senza buchi) - const cucito = await cuci(tratti, mp4, this.diagnosi); + const tempi: { indice: number; daMs: number; durataMs: number }[] = []; + const cucito = await cuci(tratti, mp4, this.diagnosi, tempi); const files = cucito ? [cucito] : await Promise.all(tratti.map((x) => rimetteInOrdine(x.blob, mp4))); // la webcam: un file per ogni segmento (se l'hai accesa e spenta più volte), ognuno con il punto da cui parte const camBlob: { blob: Blob; da: number }[] = []; @@ -1172,7 +1239,22 @@ export class Live { for (const [i, blob] of files.entries()) { // il formato del progetto non si cambia per una registrazione (una finestra può avere una misura qualsiasi) const m = await importa(`${radice}${files.length > 1 ? ` parte ${i + 1}` : ''}.${mp4 ? 'mp4' : 'webm'}`, blob); - if (m) schermi.push(m); + if (m) { + if (cursore) { + const parti = cucito ? tempi.map((t) => ({ ...t, indice: indici[t.indice] })) + : [{ indice: indici[i], daMs: 0, durataMs: Math.min(tratti[i].taglio * 1000, m.duration * 1000) }]; + const dati = cursore.perVideo(parti, (m.duration - (m.t0 || 0)) * 1000); + dati.video = { nome: m.name, size: m.size }; + // Sono metadati della sorgente, come durata e dimensioni: restano anche nei vecchi stati dell'annulla. + store.aggiornaMedia(m.id, { cursoreLive: dati }); + m.cursoreLive = dati; + if (m.path) { + try { await invoke('progetto_scrivi', { path: m.path + '.cursore.json', text: JSON.stringify(dati) }); } + catch (e) { avviso('I dati del cursore restano nel progetto, ma il file accanto al video non si salva: ' + String(e), 'info', 5000); } + } + } + schermi.push(m); + } } if (!schermi.length) { this.stato.textContent = 'Non sono riuscito a leggere la registrazione'; return; } const estAudio = (b: Blob) => (/mp4/.test(b.type) ? 'm4a' : 'webm'); @@ -1187,7 +1269,7 @@ export class Live { if (m) cams.push({ m, da: g.da }); } const mCam = cams[0]?.m; - const ids = this.opz.timeline ? this.inTimeline(schermi, cams, segni, mics) : []; + const ids = this.opz.timeline ? this.inTimeline(schermi, cams, segni, mics, scelteCursore) : []; if (ids.length) store.select(ids); const { id, name: nome } = schermi[0]; this.stato.textContent = `Fatto: ${nome}`; @@ -1204,7 +1286,7 @@ export class Live { * In fondo alla timeline, dal basso: lo sfondo (stile presentazione), lo schermo, la webcam sopra. Se le tracce * video non bastano se ne aggiungono. Tutto legato insieme, così si sposta in un colpo; i segni diventano marcatori. */ - private inTimeline(schermi: MediaItem[], cams: { m: MediaItem; da: number }[], segni: number[], mics: MediaItem[] = []): string[] { + private inTimeline(schermi: MediaItem[], cams: { m: MediaItem; da: number }[], segni: number[], mics: MediaItem[] = [], cursore = { zoom: false, clic: false }): string[] { const o = this.opz; return store.edit('Registrazione in timeline', (p) => { const inizio = projectEnd(p); @@ -1239,6 +1321,11 @@ export class Live { if (o.presentazione) v.tf = presentazione(); link ??= v.link ?? (v.link = uid('l')); for (const c of p.clips) if (nuovi.includes(c.id)) { c.link = link; if (tMic && c.track !== tSchermo) c.name = 'Audio del computer'; } + if (cursore.zoom) applicaZoomCursore(p, v, m); + if (cursore.clic && m.cursoreLive?.clic.length) { + const blocco = bloccoClicLive(v); + p.clips.push(blocco); ids.push(blocco.id); + } // la voce di questo pezzo, nello stesso punto e legata al resto if (tMic && mics[i]) { const voce = M.placeSource(p, { mediaId: mics[i].id, srcIn: mics[i].t0 || 0, srcOut: mics[i].duration }, v.start, null, { video: null, audio: [tMic] }, 'libero'); @@ -1300,7 +1387,7 @@ export class Live { this.prime.push(voce); s.getVideoTracks()[0]?.addEventListener('ended', () => { this.prime = this.prime.filter((x) => x !== voce); this.disegnaPrime(); }); this.disegnaPrime(); - } catch { /* il selettore è stato chiuso */ } finally { this.aggiungendo = false; } + } catch (e) { await avvisaErroreSchermo(e); } finally { this.aggiungendo = false; } } private disegnaPrime() { @@ -1337,7 +1424,7 @@ export class Live { this.disegnaFonti(); this.aggiornaTasti(); this.stato.textContent = `● In onda: ${f.nome.slice(0, 28)}`; - } catch { /* il selettore è stato chiuso */ } finally { this.aggiungendo = false; } + } catch (e) { await avvisaErroreSchermo(e); } finally { this.aggiungendo = false; } } /** una finestra si è chiusa (o l'hai tolta): se era l'ultima è come premere FERMA */ diff --git a/src/ui/liveAudio.ts b/src/ui/liveAudio.ts index 1d46aea..340ef29 100644 --- a/src/ui/liveAudio.ts +++ b/src/ui/liveAudio.ts @@ -32,7 +32,7 @@ export class LivelloStereo { private dpr = 1; private visto = ''; - constructor(classe: string, titolo: string) { + constructor(classe: string, titolo: string, private segmenti = 36) { this.el = h('canvas', { class: 'la-misura ' + classe, title: titolo, 'data-livello': '-60', 'data-clip': '0' }); this.el.addEventListener('click', () => { this.misura.azzera(); this.visto = ''; }); new ResizeObserver(() => this.adatta()).observe(this.el); @@ -44,6 +44,8 @@ export class LivelloStereo { this.el.width = Math.round(r.width * this.dpr); this.el.height = Math.round(r.height * this.dpr); this.visto = ''; + // ridimensionare svuota il disegno: a riposo nessuno lo rifà, quindi i LED spenti si ridisegnano subito + this.disegna(this.misura.clip(performance.now())); } aggiorna(picchi: Picchi, ora: number) { @@ -65,7 +67,7 @@ export class LivelloStereo { if (!W || !H) return; ctx.setTransform(1, 0, 0, 1, 0, 0); ctx.clearRect(0, 0, W, H); - const gap = 2 * d, bh = (H - gap) / 2, spia = Math.min(bh * 2.4, 14 * d), N = 36; + const gap = 2 * d, bh = (H - gap) / 2, spia = Math.min(bh * 2.4, 14 * d), N = this.segmenti; const x0 = 0, w = W - spia - 3 * d; for (let i = 0; i < 2; i++) { const y = i * (bh + gap); @@ -77,7 +79,7 @@ export class LivelloStereo { const acceso = k < this.misura.barra[i]; const picco = Math.abs(k - this.misura.tenuto[i]) < 1 / N + 0.001 && this.misura.tenuto[i] > 0.02; const on = acceso || picco; - ctx.fillStyle = db > -6 ? (on ? '#ff3a4a' : '#3a1418') : db > -18 ? (on ? '#ffd54a' : '#3a3214') : (on ? '#5dffb4' : '#143a28'); + ctx.fillStyle = db > -6 ? (on ? '#ff3a4a' : '#4a1a20') : db > -18 ? (on ? '#ffd54a' : '#4a4018') : (on ? '#5dffb4' : '#1b4a35'); ctx.fillRect(x0 + s * sw + d * 0.5, y + d * 0.5, sw - d, bh - d); } } @@ -94,13 +96,15 @@ type Lettura = () => number; export class PannelloAudio { /** il pannello grande (nella colonna di LIVE) */ el: HTMLElement; - /** le due barre piccole, sempre in vista in cima alla colonna */ - compatto: HTMLElement; + /** il tasto piccolo accanto al microfono: apre il microfono per vedere il livello senza registrare */ + provaPiccola: HTMLButtonElement; private sinc: (() => void)[] = []; private grandi: { computer: LivelloStereo; voce: LivelloStereo }; private piccoli: { computer: LivelloStereo; voce: LivelloStereo }; private statoPc: HTMLElement; private statoVoce: HTMLElement; + /** le scritte di stato nelle righe compatte delle sorgenti (le stesse parole delle strisce grandi) */ + private statiPiccoli: { computer: HTMLElement; voce: HTMLElement }; private bProva: HTMLButtonElement; private giro = 0; private ascoltaEl: HTMLElement; @@ -113,14 +117,13 @@ export class PannelloAudio { voce: new LivelloStereo('grande', 'Voce (microfono), sinistro e destro. Clic: azzera la spia di saturazione'), }; this.piccoli = { - computer: new LivelloStereo('piccolo', 'Audio del computer'), - voce: new LivelloStereo('piccolo', 'Voce (microfono)'), + computer: new LivelloStereo('piccolo', 'Audio del computer', 28), + voce: new LivelloStereo('piccolo', 'Voce (microfono)', 28), }; this.statoPc = h('span', { class: 'la-stato' }); this.statoVoce = h('span', { class: 'la-stato' }); - this.compatto = h('div', { class: 'la-compatto' }, - h('div', { class: 'la-c-riga' }, icona('altoparlante', 12), this.piccoli.computer.el), - h('div', { class: 'la-c-riga' }, icona('mic', 12), this.piccoli.voce.el)); + this.statiPiccoli = { computer: h('span', { class: 'la-stato' }), voce: h('span', { class: 'la-stato' }) }; + this.provaPiccola = h('button', { class: 'la-prova-mini', title: 'Prova il microfono: vedi il livello senza registrare', on: { click: () => this.col.prova() } }) as HTMLButtonElement; this.bProva = h('button', { class: 'la-prova', title: 'Apre il microfono per vedere i livelli e sentire i filtri, senza registrare', on: { click: () => this.col.prova() } }) as HTMLButtonElement; this.ascoltaEl = this.interruttore('Ascolto quello che esce (meglio con le cuffie)', 'Fa uscire dalle casse la voce trattata, per sentire i filtri. Con le casse accese il microfono la riprende e fischia: usa le cuffie', @@ -223,8 +226,12 @@ export class PannelloAudio { h('p', { class: 'nota' }, 'Le regolazioni valgono dal vivo e finiscono nella registrazione. La voce si prova subito con "Prova l\'audio"; l\'audio del computer si vede quando parte la registrazione, dopo aver scelto lo schermo.')); this.aggiorna(); this.sincronizza(); + this.scriviStati(null, performance.now()); } + /** i pezzi di una sorgente per le righe compatte di LIVE: la barra stereo a LED e la scritta di stato */ + sorgente(chi: 'computer' | 'voce') { return { barra: this.piccoli[chi].el, stato: this.statiPiccoli[chi] }; } + /** un tasto con la spia, come gli altri interruttori di LIVE */ private interruttore(testo: string, info: string, leggi: () => boolean, clic: () => void, attr?: string, valore?: string): HTMLElement { const led = h('span', { class: 'led' }); @@ -261,6 +268,9 @@ export class PannelloAudio { const prova = this.col.inProva(); this.bProva.textContent = prova ? '■ Ferma la prova' : '▶ Prova l\'audio'; this.bProva.classList.toggle('acceso', prova); + this.provaPiccola.textContent = prova ? '■' : '▶'; + this.provaPiccola.classList.toggle('acceso', prova); + this.provaPiccola.title = prova ? 'Ferma la prova del microfono' : 'Prova il microfono: vedi il livello senza registrare'; this.ascoltaEl.classList.toggle('via', !prova); this.sincronizza(); } @@ -294,9 +304,10 @@ export class PannelloAudio { private scriviStati(m: MixerLive | null, ora: number) { const a = this.col.leggi(); const r = m?.riduzioni(); - const scrivi = (el: HTMLElement, testo: string, avviso: boolean) => { + const scrivi = (el: HTMLElement, testo: string, avviso: boolean, barra?: HTMLElement, nome?: string) => { if (el.textContent !== testo) el.textContent = testo; el.classList.toggle('avviso', avviso); + if (barra && nome) { const t = `${nome}: ${testo} · clic: azzera la spia`; if (barra.title !== t) barra.title = t; } }; const satPc = this.grandi.computer.misura.clip(ora), satVoce = this.grandi.voce.misura.clip(ora); const picco = (l: LivelloStereo) => { const d = l.misura.picchiDb(); return d < -59 ? 'silenzio' : `picco ${Math.round(d)} dB`; }; @@ -304,11 +315,13 @@ export class PannelloAudio { if (satPc) pc = 'satura: abbassa il volume'; else if (m && r && a.abbassa && r.duck < -1) pc = `abbassato di ${Math.round(-r.duck)} dB`; scrivi(this.statoPc, pc, satPc); - let vo = m ? picco(this.grandi.voce) : 'microfono spento'; + scrivi(this.statiPiccoli.computer, pc, satPc, this.piccoli.computer.el, 'Audio del computer'); + let vo = m ? picco(this.grandi.voce) : 'a riposo'; if (satVoce) vo = 'satura: abbassa il volume'; else if (m && r && a.filtri.porta && r.porta < -10) vo = 'porta chiusa'; else if (m && r && a.filtri.compressore && r.comp < -1) vo = `compressore ${Math.round(r.comp)} dB`; scrivi(this.statoVoce, vo, satVoce); + scrivi(this.statiPiccoli.voce, vo, satVoce, this.piccoli.voce.el, 'Microfono'); } /** le misure per le prove */ diff --git a/src/ui/liveCursore.ts b/src/ui/liveCursore.ts new file mode 100644 index 0000000..58ae38d --- /dev/null +++ b/src/ui/liveCursore.ts @@ -0,0 +1,32 @@ +// Il browser non espone l'identità del monitor: la corrispondenza la indica chi registra. +import { cursoreDisponibile, schermiCursore } from '../media/cursoreLive'; +import type { SchermoCursore } from '../core/zoomCursore'; +import { h } from './dom'; + +export class SceltaSchermoLive { + private schermi: SchermoCursore[] = []; + private select = h('select', { class: 'live-sel', 'aria-label': 'Schermo per il cursore', disabled: !cursoreDisponibile }) as HTMLSelectElement; + el = h('div', { class: 'live-schermo-scelta' }, + h('label', { title: cursoreDisponibile + ? 'Scegli qui il monitor, poi lo stesso schermo intero nel selettore di Windows. Finestre, schede e più finestre non sono supportate. Clic campionati a circa 60 Hz: i colpi molto rapidi possono sfuggire.' + : 'Zoom del cursore e clic animati sono disponibili nell’app per Windows, registrando uno schermo intero.' }, h('span', null, 'Schermo del cursore'), this.select), + cursoreDisponibile ? null : h('p', { class: 'nota' }, 'Zoom e clic animati: solo nell’app per Windows, con uno schermo intero.')); + + constructor() { + this.select.append(h('option', { value: '' }, 'Scegli lo schermo…')); + this.select.addEventListener('focus', () => void this.carica()); + void this.carica(); + } + + private async carica() { + try { + this.schermi = await schermiCursore(); + const prima = this.select.value; + this.select.replaceChildren(h('option', { value: '' }, 'Scegli lo schermo…'), ...this.schermi.map((s, i) => + h('option', { value: s.id }, `Schermo ${i + 1} · ${s.width}×${s.height} (${s.left}, ${s.top})`))); + this.select.value = prima; + } catch { this.select.disabled = true; } + } + + get scelto() { return this.schermi.find((s) => s.id === this.select.value); } +} diff --git a/src/ui/maschereMonitor.ts b/src/ui/maschereMonitor.ts new file mode 100644 index 0000000..55fbf1f --- /dev/null +++ b/src/ui/maschereMonitor.ts @@ -0,0 +1,286 @@ +// Le maschere a forma sul monitor: la modalità che Posiziona (src/ui/posiziona.ts) accende quando dal pannello si preme +// «Sul monitor» (evento dpv:maschera). Disegna il contorno della maschera scelta e le sue maniglie; si trascina la forma, +// i lati (larghezza e altezza), il pallino che gira e i punti della Bézier; con «disegna» ogni clic aggiunge un punto, +// il tasto destro ne toglie uno, Invio o Esc finisce. Se un parametro ha i keyframe, trascinare scrive la chiave sotto +// il cursore (scriviParametro). Le altre modalità di Posiziona non cambiano: questa si fa da parte appena si clicca altrove. +import { store } from '../core/store'; +import type { Clip, MascheraForma, Project } from '../core/tipi'; +import { clipById, tfAl } from '../core/progetto'; +import { valutaClip } from '../core/automazioni'; +import { contornoMaschera, dentroMaschera, localeDa, puntoLocale } from '../core/maschereForma'; +import { motore } from '../motore'; +import type { Riquadro } from './posiziona'; +import { frameLocale, scriviParametro } from './keyframe'; + +type Riquadrare = (p: Project, c: Clip, tf: ReturnType, f: number) => Riquadro | null; + +/** dov'è la sorgente intera sul quadro (centro, misure, rotazione) e come si passa da frazioni dell'immagine a pixel del progetto */ +interface Mappa { + aSchermo: (u: number, v: number) => [number, number]; + daSchermo: (x: number, y: number) => [number, number]; + aspetto: number; + /** l'altezza della sorgente intera in pixel del progetto */ + alto: number; +} + +interface Contesto { p: Project; c: Clip; cv: Clip; m: MascheraForma; lf: number; mappa: Mappa } + +type Presa = { tipo: 'sposta' } | { tipo: 'punto'; i: number } | { tipo: 'larghezza' } | { tipo: 'altezza' } | { tipo: 'gira' }; + +export class EditorMaschere { + private att: { clip: string; mask: string; disegna: boolean } | null = null; + private trascina: { presa: Presa; mosso: boolean; u0: number; v0: number; m0: MascheraForma } | null = null; + + constructor(private schermo: HTMLElement, private sopra: HTMLCanvasElement, private ridisegna: () => void, private riquadro: Riquadrare) { + document.addEventListener('dpv:maschera', (e) => { + const d = (e as CustomEvent<{ clip: string; mask: string; disegna: boolean }>).detail; + this.att = d && d.clip && d.mask ? { clip: d.clip, mask: d.mask, disegna: !!d.disegna } : null; + this.ridisegna(); + }); + store.on('sel', () => { if (this.att && !store.sel.has(this.att.clip)) { this.att = null; this.ridisegna(); } }); + // Invio o Esc: finito + addEventListener('keydown', (e) => { + if (!this.attiva()) return; + const t = e.target as HTMLElement | null; + if (t && (t.tagName === 'INPUT' || t.tagName === 'TEXTAREA' || t.tagName === 'SELECT')) return; + if (e.key === 'Enter' || e.key === 'Escape') { e.preventDefault(); e.stopPropagation(); this.att = null; this.ridisegna(); } + }, true); + // tasto destro su un punto della Bézier: lo toglie + schermo.addEventListener('contextmenu', (e) => { if (this.attiva() && this.puntoSotto(e as PointerEvent) !== null) e.preventDefault(); }); + schermo.addEventListener('pointerdown', (e) => { + if (e.button !== 2 || !this.attiva()) return; + const i = this.puntoSotto(e); + if (i === null) return; + e.preventDefault(); e.stopPropagation(); + this.togliPunto(i); + }, true); + } + + private k() { return this.sopra.getBoundingClientRect().width / store.doc.w; } + private punto(e: PointerEvent) { + const r = this.sopra.getBoundingClientRect(), p = store.doc; + return { x: ((e.clientX - r.left) / Math.max(1, r.width)) * p.w, y: ((e.clientY - r.top) / Math.max(1, r.height)) * p.h }; + } + + /** c'è una maschera da mostrare sul monitor adesso? */ + attiva(): boolean { return this.contesto() !== null; } + + private contesto(): Contesto | null { + if (!this.att || motore.attivo !== 'recorder') return null; + const p = store.doc, c = clipById(p, this.att.clip); + if (!c || !store.sel.has(c.id)) return null; + const lf = frameLocale(c); + if (lf === null) return null; + const cv = valutaClip(c, lf); + const m = cv.maschere?.find((x) => x.id === this.att!.mask); + if (!m) return null; + const f = c.start + lf; + const tf = tfAl(cv, lf); + const q = this.riquadro(p, cv, tf, f); + if (!q) return null; + // la sorgente intera: il riquadro visibile è già ritagliato + const Wf = q.w / Math.max(0.01, 1 - tf.cropL - tf.cropR), Hf = q.h / Math.max(0.01, 1 - tf.cropT - tf.cropB); + const co = Math.cos(q.rot), si = Math.sin(q.rot); + const ux = ((tf.cropL - tf.cropR) / 2) * Wf, uy = ((tf.cropT - tf.cropB) / 2) * Hf; + const cx = q.cx - (co * ux - si * uy), cy = q.cy - (si * ux + co * uy); + const mappa: Mappa = { + aspetto: Wf / Hf / (tf.sx ?? 1), alto: Hf, + aSchermo: (u, v) => { const lx = (u - 0.5) * Wf, ly = (v - 0.5) * Hf; return [cx + co * lx - si * ly, cy + si * lx + co * ly]; }, + daSchermo: (x, y) => { const dx = x - cx, dy = y - cy; return [(co * dx + si * dy) / Wf + 0.5, (-si * dx + co * dy) / Hf + 0.5]; }, + }; + return { p, c, cv, m, lf, mappa }; + } + + /** le maniglie di una forma: i lati e il pallino sopra, in pixel del progetto */ + private maniglie(x: Contesto): { larg: [number, number]; alt: [number, number]; gira: [number, number]; centro: [number, number] } | null { + const { m, mappa } = x; + if (m.forma === 'bezier') return null; + const s = (lx: number, ly: number) => mappa.aSchermo(...puntoLocale(m, mappa.aspetto, lx, ly)); + // il pallino sta sopra il lato alto, un po' fuori + const fuori = 26 / Math.max(0.001, this.k()) / Math.max(1, mappa.alto); + return { larg: s(m.w / 2, 0), alt: s(0, m.h / 2), gira: s(0, -m.h / 2 - fuori), centro: s(0, 0) }; + } + + private presa(x: Contesto, px: number, py: number): Presa | null { + const tol = 12 / Math.max(0.001, this.k()); + const { m, mappa } = x; + if (m.forma === 'bezier') { + const P = m.punti ?? []; + for (let i = P.length - 1; i >= 0; i--) { + const [sx, sy] = mappa.aSchermo(P[i].x, P[i].y); + if (Math.hypot(px - sx, py - sy) < tol) return { tipo: 'punto', i }; + } + } else { + const mn = this.maniglie(x)!; + if (Math.hypot(px - mn.gira[0], py - mn.gira[1]) < tol) return { tipo: 'gira' }; + if (Math.hypot(px - mn.larg[0], py - mn.larg[1]) < tol) return { tipo: 'larghezza' }; + if (Math.hypot(px - mn.alt[0], py - mn.alt[1]) < tol) return { tipo: 'altezza' }; + } + const [u, v] = mappa.daSchermo(px, py); + if (dentroMaschera(m, u, v, mappa.aspetto)) return { tipo: 'sposta' }; + return null; + } + + private puntoSotto(e: PointerEvent): number | null { + const x = this.contesto(); + if (!x || x.m.forma !== 'bezier') return null; + const { x: px, y: py } = this.punto(e); + const pr = this.presa(x, px, py); + return pr && pr.tipo === 'punto' ? pr.i : null; + } + + cursoreSu(e: PointerEvent): string { + const x = this.contesto(); + if (!x) return ''; + if (this.att?.disegna) return 'crosshair'; + const { x: px, y: py } = this.punto(e); + const pr = this.presa(x, px, py); + return !pr ? '' : pr.tipo === 'gira' ? 'grab' : pr.tipo === 'larghezza' ? 'ew-resize' : pr.tipo === 'altezza' ? 'ns-resize' : 'move'; + } + + /** disegna il contorno e le maniglie; ritorna true se ha disegnato (Posiziona allora non disegna le sue) */ + disegna(ctx: CanvasRenderingContext2D, W: number): boolean { + const x = this.contesto(); + if (!x) return false; + const k = W / x.p.w; + const dpr = W / Math.max(1, this.sopra.getBoundingClientRect().width); + const { m, mappa } = x; + ctx.save(); + ctx.lineWidth = 1.5 * dpr; + ctx.strokeStyle = '#ff3df2'; + ctx.fillStyle = 'rgba(255,61,242,.10)'; + const poly = contornoMaschera(m, mappa.aspetto); + if (poly.length > 1) { + ctx.beginPath(); + poly.forEach(([u, v], i) => { const [sx, sy] = mappa.aSchermo(u, v); if (i) ctx.lineTo(sx * k, sy * k); else ctx.moveTo(sx * k, sy * k); }); + if (m.forma !== 'bezier' || poly.length >= 3) ctx.closePath(); + ctx.fill(); ctx.stroke(); + } + const quadro = (px: number, py: number, pieno: boolean, r = 5) => { + ctx.fillStyle = pieno ? '#ffd54a' : '#1a1206'; ctx.strokeStyle = '#ffd54a'; + ctx.beginPath(); ctx.rect(px * k - r * dpr, py * k - r * dpr, 2 * r * dpr, 2 * r * dpr); ctx.fill(); ctx.stroke(); + }; + if (m.forma === 'bezier') { + // la linea tra i punti, anche prima di averne tre (si vede dove si sta andando) + const P = m.punti ?? []; + if (P.length && P.length < 3) { + ctx.beginPath(); + P.forEach((q, i) => { const [sx, sy] = mappa.aSchermo(q.x, q.y); if (i) ctx.lineTo(sx * k, sy * k); else ctx.moveTo(sx * k, sy * k); }); + ctx.stroke(); + } + P.forEach((q, i) => { const [sx, sy] = mappa.aSchermo(q.x, q.y); quadro(sx, sy, i === 0); }); + } else { + const mn = this.maniglie(x)!; + quadro(mn.larg[0], mn.larg[1], false); + quadro(mn.alt[0], mn.alt[1], false); + const cima = mappa.aSchermo(...puntoLocale(m, mappa.aspetto, 0, -m.h / 2)); + ctx.strokeStyle = '#ffd54a'; + ctx.beginPath(); ctx.moveTo(cima[0] * k, cima[1] * k); ctx.lineTo(mn.gira[0] * k, mn.gira[1] * k); ctx.stroke(); + ctx.fillStyle = '#ffd54a'; + ctx.beginPath(); ctx.arc(mn.gira[0] * k, mn.gira[1] * k, 6 * dpr, 0, Math.PI * 2); ctx.fill(); + const c = mn.centro; + ctx.strokeStyle = '#ff3df2'; + ctx.beginPath(); ctx.moveTo(c[0] * k - 7 * dpr, c[1] * k); ctx.lineTo(c[0] * k + 7 * dpr, c[1] * k); ctx.moveTo(c[0] * k, c[1] * k - 7 * dpr); ctx.lineTo(c[0] * k, c[1] * k + 7 * dpr); ctx.stroke(); + } + ctx.font = `700 ${11 * dpr}px Rajdhani, sans-serif`; + ctx.fillStyle = '#ff3df2'; + ctx.textAlign = 'left'; + const frase = this.att!.disegna ? 'Maschera: clic = nuovo punto · trascina = sposta · tasto destro = toglie · Invio = finito' + : m.forma === 'bezier' ? 'Maschera: trascina i punti o la forma · Invio = finito' : 'Maschera: trascina la forma, i lati e il pallino · Invio = finito'; + ctx.fillText(frase, 10 * dpr, 18 * dpr); + ctx.restore(); + return true; + } + + /** un clic sull'immagine: ritorna true se l'ha preso lui (se no la maschera si spegne e il resto funziona come sempre) */ + giu(e: PointerEvent): boolean { + const x = this.contesto(); + if (!x) return false; + const { x: px, y: py } = this.punto(e); + const presa = this.presa(x, px, py); + const [u, v] = x.mappa.daSchermo(px, py); + if ((!presa || presa.tipo === 'sposta') && x.m.forma === 'bezier' && this.att!.disegna) { + // un punto nuovo (in fondo alla fila) + const mid = x.m.id, cid = x.c.id; + const uu = Math.max(0, Math.min(1, u)), vv = Math.max(0, Math.min(1, v)); + store.edit('Punto della maschera', (pp) => { const m = clipById(pp, cid)?.maschere?.find((z) => z.id === mid); if (m) (m.punti ??= []).push({ x: uu, y: vv }); }); + e.preventDefault(); e.stopPropagation(); + this.ridisegna(); + return true; + } + if (!presa) { this.att = null; this.ridisegna(); return false; } + e.preventDefault(); + e.stopPropagation(); + if (motore.playing) motore.stop(); + store.begin(presa.tipo === 'sposta' ? 'Sposta la maschera' : presa.tipo === 'punto' ? 'Sposta il punto' : presa.tipo === 'gira' ? 'Gira la maschera' : 'Ridimensiona la maschera'); + this.trascina = { presa, mosso: false, u0: u, v0: v, m0: structuredClone(x.m) }; + const id = x.c.id; + this.schermo.setPointerCapture(e.pointerId); + const muovi = (ev: PointerEvent) => this.muovi(ev, id); + const su = () => { + this.schermo.removeEventListener('pointermove', muovi); + this.schermo.removeEventListener('pointerup', su); + this.schermo.removeEventListener('pointercancel', su); + store.commit(!!this.trascina?.mosso); + this.trascina = null; + }; + this.schermo.addEventListener('pointermove', muovi); + this.schermo.addEventListener('pointerup', su); + this.schermo.addEventListener('pointercancel', su); + return true; + } + + private muovi(e: PointerEvent, id: string) { + const t = this.trascina; + const x = this.contesto(); + if (!t || !x || x.c.id !== id) return; + const { x: px, y: py } = this.punto(e); + const [u, v] = x.mappa.daSchermo(px, py); + const { m0 } = t; + const c = clipById(store.doc, id)!; + const lf = x.lf, base = `mask.${m0.id}.`; + const scrivi = (campo: string, val: number) => scriviParametro(c, base + campo, lf, val); + const asp = x.mappa.aspetto; + switch (t.presa.tipo) { + case 'sposta': + if (m0.forma === 'bezier') (m0.punti ?? []).forEach((q, i) => { scrivi(`p${i}.x`, q.x + (u - t.u0)); scrivi(`p${i}.y`, q.y + (v - t.v0)); }); + else { scrivi('x', m0.x + (u - t.u0)); scrivi('y', m0.y + (v - t.v0)); } + break; + case 'punto': + scrivi(`p${t.presa.i}.x`, Math.max(-0.5, Math.min(1.5, u))); + scrivi(`p${t.presa.i}.y`, Math.max(-0.5, Math.min(1.5, v))); + break; + case 'larghezza': scrivi('w', Math.max(0.01, Math.min(2, 2 * Math.abs(localeDa(m0, asp, u, v)[0])))); break; + case 'altezza': scrivi('h', Math.max(0.01, Math.min(2, 2 * Math.abs(localeDa(m0, asp, u, v)[1])))); break; + case 'gira': { + let g = (Math.atan2(v - m0.y, (u - m0.x) * asp) * 180) / Math.PI + 90; + g = ((g + 540) % 360) - 180; + if (!e.altKey) for (const s of [-180, -90, 0, 90, 180]) if (Math.abs(g - s) < 4) g = s; + scrivi('rot', Math.round(g * 10) / 10); + break; + } + } + t.mosso = true; + store.liveChange(); + } + + private togliPunto(i: number) { + const x = this.contesto(); + if (!x) return; + const mid = x.m.id, cid = x.c.id, lf = x.lf; + store.edit('Toglie un punto', (pp) => { + const c = clipById(pp, cid), m = c?.maschere?.find((z) => z.id === mid); + if (!c || !m?.punti) return; + // le linee dei punti seguono gli indici: prima si fissano i valori di adesso, poi si tolgono + const anim = c.anim; + if (anim) { + const cv = valutaClip(c, lf), mv = cv.maschere?.find((z) => z.id === mid); + if (mv?.punti) m.punti = mv.punti.map((q) => ({ ...q })); + for (const k of Object.keys(anim)) if (new RegExp(`^mask\\.${mid}\\.p\\d+\\.`).test(k)) delete anim[k]; + if (!Object.keys(anim).length) delete c.anim; + } + m.punti.splice(i, 1); + }); + this.ridisegna(); + } +} diff --git a/src/ui/menuBanco.ts b/src/ui/menuBanco.ts index 2320e69..64f6501 100644 --- a/src/ui/menuBanco.ts +++ b/src/ui/menuBanco.ts @@ -15,7 +15,7 @@ import { finestraAggiornamenti, finestraNovita } from './aggiornamenti'; import { montaggioDimostrativo } from '../demo'; import { finestraGuida } from './guida'; import { finestraCentroAI, FUNZIONI_AI } from './centroAI'; -import { modoProxy, impostaModoProxy, svuotaProxy } from '../media/proxy'; +import { copieLeggereAutomatiche, impostaCopieLeggereAutomatiche, modoProxy, impostaModoProxy, svuotaProxy } from '../media/proxy'; import { svuotaCache } from '../media/cache'; export type Pagina = 'montaggio' | 'finale' | 'live' | 'montage'; @@ -64,6 +64,7 @@ export function menuBanco(b: ContestoMenu): MenuBanco[] { { sep: true }, voce('tagliaAppunti'), voce('copia'), voce('incolla'), { sep: true }, voce('tutto'), voce('selezionaDopo'), voce('deseleziona'), ]], ['Montaggio', () => [ + voce('montaggioTesto'), { sep: true }, voce('taglia'), voce('elimina'), voce('eliminaChiudi'), voce('separa'), { sep: true }, voce('dissolvenza'), voce('tendina'), voce('passaggioNero'), voce('dissolviInOut'), { sep: true }, voce('inserisci'), voce('sovrascrivi'), voce('solleva'), voce('estrai'), voce('rivedi'), voce('abbina'), voce('estendi'), { sep: true }, @@ -119,9 +120,10 @@ export function menuBanco(b: ContestoMenu): MenuBanco[] { { nome: 'Mixer', fn: () => { b.pagina('montaggio'); b.mostraLato('mixer'); } }, { sep: true }, { nome: 'Copie leggere per il monitor (proxy)', sotto: [ - // dalla 1.5.8 nessuna copia si fa da sola: la scelta dice solo per quali file si offre «Prepara copia leggera» - { nome: 'Offrile per le riprese pesanti (consigliato)', spunta: modoProxy() === 'auto', fn: () => { impostaModoProxy('auto'); avviso('Copie leggere: si offrono per le riprese pesanti (le prepari tu, non partono da sole)', 'info'); } }, - { nome: 'Offrile per tutti i video', spunta: modoProxy() === 'sempre', fn: () => { impostaModoProxy('sempre'); avviso('Copie leggere: si offrono per tutti i video (le prepari tu, non partono da sole)', 'info'); } }, + { nome: 'Copie leggere automatiche', spunta: copieLeggereAutomatiche(), fn: () => { impostaCopieLeggereAutomatiche(!copieLeggereAutomatiche()); avviso(copieLeggereAutomatiche() ? 'Ai prossimi import le riprese pesanti avranno una copia leggera in fondo alla coda (se non hai scelto Mai)' : 'Copie automatiche spente: resta «Prepara copia leggera» nel Centro attività', 'info'); } }, + { sep: true }, + { nome: 'Usale per le riprese pesanti (consigliato)', spunta: modoProxy() === 'auto', fn: () => { impostaModoProxy('auto'); avviso('Il monitor usa le copie pronte; le nuove seguono la scelta «Copie leggere automatiche»', 'info'); } }, + { nome: 'Offri la preparazione anche per i video leggeri', spunta: modoProxy() === 'sempre', fn: () => { impostaModoProxy('sempre'); avviso('Puoi preparare a mano anche i video leggeri; in automatico partono solo quelli pesanti', 'info'); } }, { nome: 'Mai (il monitor legge gli originali)', spunta: modoProxy() === 'mai', fn: () => { impostaModoProxy('mai'); avviso('Copie leggere spente: il monitor legge gli originali', 'info'); } }, { sep: true }, { nome: 'Svuota le copie leggere (si rifanno a mano)', fn: async () => { await svuotaProxy(); avviso('Copie leggere tolte dal disco: per rifarle, «Prepara copia leggera»', 'ok', 2600); } }, @@ -136,7 +138,7 @@ export function menuBanco(b: ContestoMenu): MenuBanco[] { { nome: `Novità della ${VERSIONE}`, fn: () => finestraNovita() }, ...(isTauri ? [{ nome: 'Aggiornamenti…', fn: () => void finestraAggiornamenti() }] : []), { nome: 'Scarica le app (Windows, Mac, Android)', fn: () => apriLink('https://github.com/cammo22/DaProdVideo/releases/latest') }, - { nome: 'Informazioni su DaProd Video', fn: () => finestraInfo() }, + { nome: 'Informazioni su DaProd Editor Video', fn: () => finestraInfo() }, ]], ]; } diff --git a/src/ui/mixer.ts b/src/ui/mixer.ts index 8ad0649..3a95cff 100644 --- a/src/ui/mixer.ts +++ b/src/ui/mixer.ts @@ -3,6 +3,7 @@ import { store } from '../core/store'; import { motore } from '../motore'; import { banco } from '../media/audio'; +import { segnaTracciaVoce } from './duckingClip'; import { h, clamp } from './dom'; /** i due livelli dell'uscita (sinistro e destro) a barra: solo le barre a LED, con l'indicatore di picco che resta un attimo */ @@ -95,7 +96,7 @@ export class Mixer { private firma = ''; private costruisci() { const p = store.doc; - const firma = p.tracks.map((t) => [t.id, t.name, t.mute, t.solo, t.opacity, t.volume, t.pan].join(',')).join(';'); + const firma = p.tracks.map((t) => [t.id, t.name, t.mute, t.solo, t.opacity, t.volume, t.pan, t.ruoloAudio].join(',')).join(';'); if (firma === this.firma) return; this.firma = firma; this.misure.clear(); @@ -138,7 +139,8 @@ export class Mixer { val, h('div', { class: 'striscia-btn' }, bt(video ? 'OFF' : 'M', t.mute, 'on-rosso', () => store.edit('Muto', (pp) => { const tr = pp.tracks.find((x) => x.id === t.id)!; tr.mute = !tr.mute; }), video ? 'Spegni la traccia' : 'Muto'), - video ? null : bt('S', t.solo, 'on-oro', () => store.edit('Solo', (pp) => { const tr = pp.tracks.find((x) => x.id === t.id)!; tr.solo = !tr.solo; }), 'Solo')))); + video ? null : bt('S', t.solo, 'on-oro', () => store.edit('Solo', (pp) => { const tr = pp.tracks.find((x) => x.id === t.id)!; tr.solo = !tr.solo; }), 'Solo'), + video ? null : bt('V', t.ruoloAudio === 'voce', 'on-oro', () => segnaTracciaVoce(t.id, t.ruoloAudio !== 'voce'), 'Questa traccia è la voce: la musica con «Abbassa sotto la voce» si abbassa quando parla')))); } // master const mf = h('input', { type: 'range', class: 'fader-v', min: 0, max: 150, step: 1, value: String(Math.round(banco.volumeMaster * 100)), orient: 'vertical' }) as HTMLInputElement; diff --git a/src/ui/montaggioTesto.ts b/src/ui/montaggioTesto.ts new file mode 100644 index 0000000..9c35b2a --- /dev/null +++ b/src/ui/montaggioTesto.ts @@ -0,0 +1,188 @@ +// Un pannello del banco: il parlato si sceglie come testo, ma le modifiche sono veri tagli nella timeline. +import '../stile/montaggioTesto.css'; +import { store } from '../core/store'; +import type { Clip } from '../core/tipi'; +import { end } from '../core/progetto'; +import { fps, frameToTc } from '../core/timecode'; +import { applicaTagli, controllaTagli, intervalliIntercalari, intervalliParole, intervalliSilenzi, paroleInClip, pianoTagli, tempoDopoTagli, type Intervallo, type ParolaTimeline, type PianoTagli } from '../core/montaggioTesto'; +import { fermaVoce, MODELLI, testoDellaClip } from '../media/voce'; +import { nuova, progettoAttuale } from '../media/attivita'; +import { spiegaErroreAI } from '../media/erroriAI'; +import { motore } from '../motore'; +import { opzioniAI } from './sottotitoliRapidi'; +import { avviso, dialogo, h } from './dom'; + +let aperto: (() => void) | null = null; +const gruppo = (c: Clip) => c.track + ':' + (c.parlato && c.parlato.media === c.media ? c.parlato.id : c.id); + +export function finestraMontaggioTesto() { + if (aperto) { aperto(); return; } + motore.stop(); + motore.setMonitor('recorder'); + const iniziale = store.doc.clips.find((c) => store.sel.has(c.id) && c.kind === 'media') + ?? store.doc.clips.find((c) => c.kind === 'media' && c.start <= store.head && end(c) > store.head); + let scelta = iniziale ? gruppo(iniziale) : ''; + let parole: ParolaTimeline[] = [], scelte = new Set(), ancora = 0; + let piano: PianoTagli | null = null, revisione = -1, ctrl: AbortController | null = null, chiuso = false; + const pulisci: (() => void)[] = []; + const ferma = () => { if (ctrl) { ctrl.abort(); fermaVoce(); } }; + const d = dialogo('Testo · monta dal parlato', { largo: true, onChiudi: () => { + chiuso = true; ferma(); pulisci.forEach((fn) => fn()); aperto = null; + } }); + d.el.classList.add('montaggio-testo'); + aperto = () => d.el.focus(); + d.el.tabIndex = -1; + const clip = h('select', { class: 'mini-select', 'aria-label': 'Clip da montare dal testo' }); + const o = opzioniAI(); + const lingua = h('select', { class: 'mini-select', 'aria-label': 'Lingua del parlato' }, + ['it:Italiano', 'auto:Automatica', 'en:Inglese', 'fr:Francese', 'es:Spagnolo', 'de:Tedesco', 'pt:Portoghese'].map((x) => { + const [value, nome] = x.split(':'); return h('option', { value }, nome); + })); + lingua.value = o.lingua; + if (!lingua.value) lingua.value = 'it'; + const modello = h('select', { class: 'mini-select', 'aria-label': 'Modello Whisper' }, MODELLI.map((m) => h('option', { value: m.id }, m.nome))); + modello.value = o.modello; + if (!modello.value) modello.value = MODELLI[1].id; + const stato = h('p', { class: 'nota', role: 'status', 'aria-live': 'polite' }); + const testo = h('div', { class: 'testo-parlato', tabIndex: 0, role: 'group', 'aria-label': 'Parole: trascina o usa Maiusc e clic per scegliere, Canc per tagliare' }); + const soglia = h('input', { class: 'num', type: 'number', min: '0.1', max: '60', step: '0.1', value: '0.7', 'aria-label': 'Silenzio minimo in secondi' }); + const elenco = h('input', { type: 'text', value: 'ehm, uhm, allora', 'aria-label': 'Intercalari separati da virgole' }); + const anteprima = h('p', { class: 'testo-anteprima', role: 'status', 'aria-live': 'polite' }); + const trascrivi = h('button', { class: 'btn primario', on: { click: () => void ascolta() } }, 'Trascrivi la clip'); + const togli = h('button', { class: 'btn', on: { click: () => eliminaParole() } }, 'Togli le parole scelte (Canc)'); + const silenzi = h('button', { class: 'btn', on: { click: () => { + if (!soglia.checkValidity() || !Number.isFinite(soglia.valueAsNumber)) { soglia.reportValidity(); return; } + const r = fps(store.doc.rate); + prepara(pezzi().flatMap((c) => intervalliSilenzi(parole.filter((w) => w.clip === c.id), { da: c.start, a: end(c) }, soglia.valueAsNumber * r, Math.round(0.08 * r)))); + } } }, 'Togli i silenzi più lunghi di'); + const intercalari = h('button', { class: 'btn', on: { click: () => prepara(intervalliIntercalari(parole, elenco.value, fps(store.doc.rate) * 3)) } }, 'Togli ehm/uhm/allora ripetuti'); + const applica = h('button', { class: 'btn primario', on: { click: () => esegui('Testo · pulisci il parlato') } }, 'Applica i tagli'); + const indietro = h('button', { class: 'btn', on: { click: () => store.doUndo() } }, 'Annulla'); + const pezzi = () => store.doc.clips.filter((c) => gruppo(c) === scelta && c.kind === 'media'); + const azzera = () => { piano = null; anteprima.textContent = ''; applica.disabled = true; testo.querySelectorAll('.taglio').forEach((n) => n.classList.remove('taglio')); }; + const evidenzia = () => { + testo.querySelectorAll('[data-parola]').forEach((n) => n.classList.toggle('scelta', scelte.has(Number(n.dataset.parola)))); + togli.disabled = !!ctrl || !scelte.size; + togli.textContent = scelte.size ? `Togli ${scelte.size} ${scelte.size === 1 ? 'parola' : 'parole'} (Canc)` : 'Togli le parole scelte (Canc)'; + }; + const leggiSelezione = () => { + const s = window.getSelection(); + if (!s || s.isCollapsed || !s.rangeCount || !testo.contains(s.anchorNode) || !testo.contains(s.focusNode)) return; + const r = s.getRangeAt(0); + scelte = new Set([...testo.querySelectorAll('[data-parola]')].filter((n) => r.intersectsNode(n)).map((n) => Number(n.dataset.parola))); + azzera(); evidenzia(); + }; + const vaiAlla = (i: number, estendi: boolean) => { + const w = parole[i]; if (!w) return; + motore.stop(); store.setHead(w.da); + scelte = estendi ? new Set(parole.map((_, k) => k).filter((k) => k >= Math.min(ancora, i) && k <= Math.max(ancora, i))) : new Set([i]); + if (!estendi) ancora = i; + azzera(); evidenzia(); + }; + const aggiorna = () => { + if (chiuso) return; + azzera(); scelte.clear(); + const lista = store.doc.clips.filter((c) => c.kind === 'media' && store.doc.media.some((m) => m.id === c.media && m.type !== 'image')); + const gruppi = [...new Map(lista.map((c) => [gruppo(c), c])).entries()]; + if (!gruppi.some(([k]) => k === scelta)) scelta = gruppi[0]?.[0] ?? ''; + clip.replaceChildren(...gruppi.map(([value, c]) => h('option', { value }, `${c.name} · ${frameToTc(c.start, store.doc.rate, store.doc.drop)}`))); + clip.value = scelta; + parole = pezzi().flatMap((c) => paroleInClip(store.doc, c)).sort((a, b) => a.da - b.da); + testo.replaceChildren(...parole.flatMap((w, i) => [h('span', { class: 'testo-parola', 'data-parola': i, tabIndex: 0, role: 'button', title: frameToTc(w.da, store.doc.rate, store.doc.drop), on: { + click: (e: MouseEvent) => { if (!window.getSelection()?.isCollapsed) { leggiSelezione(); return; } vaiAlla(i, e.shiftKey); }, + keydown: (e: KeyboardEvent) => { if (e.key === 'Enter' || e.key === ' ') { e.preventDefault(); vaiAlla(i, e.shiftKey); } }, + } }, w.testo), ' '])); + if (!parole.length) testo.textContent = lista.length ? 'Premi «Trascrivi la clip» per vedere il parlato con i tempi per parola.' : 'Metti una clip video o audio nella timeline, poi riapri Testo.'; + trascrivi.disabled = !!ctrl || !pezzi().length; + trascrivi.textContent = parole.length ? 'Rifai il testo della clip' : 'Trascrivi la clip'; + silenzi.disabled = intercalari.disabled = !!ctrl || !parole.length; + clip.disabled = lingua.disabled = modello.disabled = !!ctrl; + indietro.disabled = !!ctrl || !store.canUndo(); + evidenzia(); + }; + function prepara(intervalli: Intervallo[]) { + if (ctrl) return; + piano = pianoTagli(intervalli, store.doc); revisione = store.revisione; + anteprima.textContent = `${piano.intervalli.length} tagli · risparmi ${piano.secondi.toFixed(2).replace('.', ',')} s. Chiudo il tempo su tutte le tracce.`; + let errore = ''; + try { controllaTagli(store.doc, piano); } catch (e) { errore = (e as Error).message; } + if (errore) anteprima.textContent += ' ' + errore; + applica.disabled = !piano.intervalli.length || !!errore; + testo.querySelectorAll('[data-parola]').forEach((n) => { + const w = parole[Number(n.dataset.parola)]; + n.classList.toggle('taglio', !!piano?.intervalli.some((x) => x.da < w.a && x.a > w.da)); + }); + } + function esegui(label: string) { + if (!piano?.intervalli.length || ctrl) return; + if (revisione !== store.revisione) { azzera(); avviso('Il montaggio è cambiato: rifai l\'anteprima', 'info'); return; } + try { + const tagli = piano; + controllaTagli(store.doc, tagli); motore.stop(); + const head = tempoDopoTagli(store.head, tagli.intervalli); + store.edit(label, (p) => applicaTagli(p, tagli)); + store.setHead(head); + window.getSelection()?.removeAllRanges(); + aggiorna(); + } catch (e) { avviso((e as Error).message, 'info'); } + } + function eliminaParole() { + leggiSelezione(); + if (!scelte.size || ctrl) return; + prepara(intervalliParole(parole, scelte)); + esegui('Testo · togli parole'); + } + async function ascolta() { + if (ctrl) return; + const prima = pezzi()[0]; if (!prima) return; + // Una trascrizione nuova riguarda il pezzo scelto. Gli altri pezzi già tagliati conservano la loro. + const p0 = store.doc, rev = store.revisione, progetto = progettoAttuale(), seq = p0.seqAttiva; + const copia = structuredClone(p0); + const segnale = new AbortController(); ctrl = segnale; + const lavoro = nuova({ titolo: 'Testo della clip', categoria: 'ai', alAnnulla: () => { segnale.abort(); fermaVoce(); } }); + aggiorna(); + try { + const parlato = await testoDellaClip(copia, prima.id, { ...o, lingua: lingua.value, modello: modello.value, motore: 'whisper', traduci: false }, (fase, k) => { + if (!chiuso) stato.textContent = fase; lavoro.imposta(k, fase); + }, segnale.signal); + if (segnale.signal.aborted || chiuso || store.doc !== p0 || store.revisione !== rev || progetto !== progettoAttuale() || store.doc.seqAttiva !== seq) throw new Error('fermato'); + store.edit('Testo · trascrivi la clip', (p) => { p.clips.find((c) => c.id === prima.id)!.parlato = parlato; }); + scelta = prima.track + ':' + parlato.id; + lavoro.fine('Testo pronto'); stato.textContent = 'Testo pronto. Scegli le parole e premi Canc.'; + } catch (e) { + const msg = (e as Error).message; + if (segnale.signal.aborted || msg === 'fermato') { lavoro.annullata(); if (!chiuso) stato.textContent = 'Trascrizione fermata. Il montaggio è rimasto com\'era.'; } + else { const motivo = spiegaErroreAI(msg); lavoro.errore(motivo); if (!chiuso) stato.textContent = motivo; } + } finally { ctrl = null; aggiorna(); } + } + clip.addEventListener('change', () => { scelta = clip.value; aggiorna(); }); + soglia.addEventListener('input', azzera); elenco.addEventListener('input', azzera); + const selezione = () => leggiSelezione(); + document.addEventListener('selectionchange', selezione); + pulisci.push(() => document.removeEventListener('selectionchange', selezione)); + pulisci.push(store.on('doc', aggiorna)); + testo.addEventListener('keydown', (e) => { + if (e.key === 'Delete') { e.preventDefault(); e.stopPropagation(); eliminaParole(); } + if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === 'a') { + e.preventDefault(); window.getSelection()?.removeAllRanges(); scelte = new Set(parole.map((_, i) => i)); azzera(); evidenzia(); + } + }); + d.el.addEventListener('keydown', (e) => { + if ((e.target as HTMLElement).closest('input, select, textarea') || ctrl) return; + if ((e.ctrlKey || e.metaKey) && ['z', 'y'].includes(e.key.toLowerCase())) { + e.preventDefault(); e.stopPropagation(); + if (e.key.toLowerCase() === 'y' || e.shiftKey) store.doRedo(); else store.doUndo(); + } + }); + d.corpo.append( + h('div', { class: 'testo-riga' }, h('label', null, 'Clip ', clip)), + h('div', { class: 'testo-riga' }, h('label', null, 'Lingua ', lingua), h('label', null, 'Whisper ', modello), trascrivi), + h('p', { class: 'nota' }, 'Tutto sul computer. Il modello si scarica solo la prima volta. Clic su una parola: cursore lì. Trascina sul testo o usa Maiusc e clic per scegliere più parole; Canc le taglia e chiude il buco su tutte le tracce. Ctrl+Z annulla il gruppo di tagli.'), + stato, testo, togli, + h('div', { class: 'testo-riga' }, silenzi, soglia, 's'), + h('div', { class: 'testo-riga' }, intercalari, elenco), + h('p', { class: 'nota' }, 'I silenzi sono le pause indicate dai tempi di Whisper: resta un piccolo respiro ai bordi. Controlla i tagli prima di applicare. Gli intercalari dell\'elenco si tolgono interi; di «allora» ripetuto resta il primo. Cambia l\'elenco con le virgole.'), + anteprima, applica); + d.piede.append(indietro, h('button', { class: 'btn', on: { click: d.chiudi } }, 'Chiudi')); + aggiorna(); testo.focus(); +} diff --git a/src/ui/posiziona.ts b/src/ui/posiziona.ts index d6fa324..d41b05c 100644 --- a/src/ui/posiziona.ts +++ b/src/ui/posiziona.ts @@ -16,6 +16,10 @@ import { motoTitolo, specAlTempo, telaTitolo } from '../render/grafica'; import { f2s, fps } from '../core/timecode'; import { motore } from '../motore'; import { avviso, h } from './dom'; +import { haLinea, mettiChiave, valoreAl } from '../core/automazioni'; +import { EditorMaschere } from './maschereMonitor'; + +const CAMPI_ANIM_TF = ['x', 'y', 'scale', 'rot', 'cropL', 'cropR', 'cropT', 'cropB', 'angoli', 'ombra', 'sx'] as const; /** un rettangolo sul quadro, in pixel del progetto: centro, misure, rotazione in radianti */ export interface Riquadro { cx: number; cy: number; w: number; h: number; rot: number } @@ -38,7 +42,7 @@ export function riquadroClip(p: Project, c: Clip, tf: Transform, f: number): Riq // i titoli stanno su una tela grande: il riquadro si stringe attorno alle lettere let bx0 = tf.cropL, by0 = tf.cropT, bx1 = 1 - tf.cropR, by1 = 1 - tf.cropB; // le animazioni del catalogo riempiono il quadro: il riquadro è tutto il quadro (si sposta e si ingrandisce intera) - if (c.kind === 'title' && !c.gen?.anim) { + if (c.kind === 'title' && !c.gen?.anim && !c.gen?.html) { const t = f2s(Math.max(0, f - c.start), p.rate); const spec = specAlTempo(c.gen?.title ?? TITLE0, t); const tt = telaTitolo(spec, W, H); @@ -178,6 +182,8 @@ export class Posiziona { private tintaScelta: { dati: Uint8Array; tela: HTMLCanvasElement } | null = null; private ferma = false; private firmaTappe = ''; + /** la modalità «maschera a forma»: contorno, maniglie e punti della Bézier (src/ui/maschereMonitor.ts) */ + private maschere: EditorMaschere; constructor(private schermo: HTMLElement, private sopra: HTMLCanvasElement, private ridisegna: () => void) { const btn = (testo: string, title: string, fn: () => void, extra = '') => h('button', { class: 'pos-btn ' + extra, title, on: { click: fn } }, testo) as HTMLButtonElement; @@ -206,6 +212,7 @@ export class Posiziona { btn('✕', 'Lascia stare (Esc)', () => this.esciScelta())); this.barra = h('div', { class: 'pos-barra' }, this.nome, this.bMoto, this.bInizio, this.tappeEl, this.bFine, this.bPiu, this.bMeno, this.bRitaglia, this.bSegui, this.bAdatta, this.bMira, this.bScelta); schermo.append(this.barra); + this.maschere = new EditorMaschere(schermo, sopra, ridisegna, riquadroClip); schermo.addEventListener('pointerdown', (e) => this.giu(e)); // la ricerca finisce (o cambia un modo): la barra e la selezione si aggiornano document.addEventListener('dpv:scegli-aggiorna', () => { if (this.scelta) { this.aggiornaScelta(); this.ridisegna(); } }); @@ -328,6 +335,7 @@ export class Posiziona { this.aggiornaBarra(b); if (this.scelta) { this.disegnaScelta(ctx, W, H); return; } if (this.mira) { this.disegnaMira(ctx, W, H); return; } + if (this.maschere.disegna(ctx, W)) return; if (!b) return; if (motore.playing) return; const p = store.doc, k = W / p.w, f = Math.floor(store.head + 1e-6); @@ -531,7 +539,8 @@ export class Posiziona { const q = riquadroClip(p, s.clip, tfAl(s.clip, s.lf), f); if (!q) continue; const l = locale(q, x, y); - if (Math.abs(l.x) <= q.w / 2 && Math.abs(l.y) <= q.h / 2) trovate.push(s.clip); + // la clip vera del progetto, non la copia con i keyframe già calcolati + if (Math.abs(l.x) <= q.w / 2 && Math.abs(l.y) <= q.h / 2) trovate.push(store.doc.clips.find((z) => z.id === s.clip.id) ?? s.clip); } if (!trovate.length) return null; if (sotto) { @@ -545,6 +554,7 @@ export class Posiziona { private cursore(e: PointerEvent) { if (motore.attivo !== 'recorder') { this.schermo.style.cursor = ''; return; } if (this.mira || this.scelta) { this.schermo.style.cursor = 'crosshair'; return; } + if (this.maschere.attiva()) { this.schermo.style.cursor = this.maschere.cursoreSu(e); return; } const b = this.bersaglio(); const { x, y } = this.punto(e); const presa = b ? this.presaSotto(b, x, y) : null; @@ -561,6 +571,7 @@ export class Posiziona { const { x, y } = this.punto(e); if (this.scelta) { this.giuScelta(e, x, y); return; } if (this.mira) { this.giuMira(e, x, y); return; } + if (this.maschere.giu(e)) return; let b = this.bersaglio(); let presa = b ? this.presaSotto(b, x, y) : null; if (!presa || (presa.tipo === 'sposta' && (e.ctrlKey || e.metaKey))) { @@ -593,6 +604,8 @@ export class Posiziona { const doc = store.doc; const c = doc.clips.find((z) => z.id === b.c.id) ?? b.c; const bl = c.fxb; + // con i keyframe sulla posizione si parte dal valore di adesso (se no la prima mossa salterebbe) + if (!b.fx && c.anim) { const dest = tappeTf(c)[chiave]?.tf ?? c.tf; for (const k of CAMPI_ANIM_TF) if (haLinea(c, 'tf.' + k)) (dest as unknown as Record)[k] = valoreAl(c, 'tf.' + k, f - c.start); } if (b.fx && bl) bl.pos ??= [0.5, 0.5]; const tf0 = structuredClone(b.fx ? c.tf : tappeTf(c)[chiave]?.tf ?? c.tf); const pos0 = (bl ? [...(tappePos(bl)[chiave]?.pos ?? bl.pos ?? [0.5, 0.5])] : [0.5, 0.5]) as [number, number]; @@ -672,6 +685,11 @@ export class Posiziona { tf.rot = Math.round(g * 10) / 10; } } + // i campi della posizione che hanno i keyframe scrivono la chiave sotto il cursore + if (!(t.presa.tipo === 'centro' && c.fxb) && c.anim) { + const tf2 = (tappeTf(c)[t.chiave]?.tf ?? c.tf) as unknown as Record; + for (const k of CAMPI_ANIM_TF) if (haLinea(c, 'tf.' + k)) mettiChiave(c, 'tf.' + k, t.f - c.start, tf2[k] ?? (k === 'sx' || k === 'scale' ? 1 : 0)); + } t.mosso = true; store.liveChange(); } diff --git a/src/ui/timeline.ts b/src/ui/timeline.ts index e1c0b06..013b27b 100644 --- a/src/ui/timeline.ts +++ b/src/ui/timeline.ts @@ -8,6 +8,7 @@ import { leggiGeneratore } from '../core/generatori'; import { store } from '../core/store'; import { motore } from '../motore'; import * as M from '../core/montaggio'; +import { fotogrammiChiave } from '../core/automazioni'; import { CURVE, curvaFade, nomeCurva, clipById, dbToGain, end, isVideoClip, keyValue, mediaOf, newTrack, newTransition, nextTrackName, projectEnd, srcTimeAt, trackOf, ALTEZZA } from '../core/progetto'; import type { Clip, Key, MediaItem, Project, Sottotitolo, Track, TrackKind } from '../core/tipi'; import { SOTTO0, bordoRiga, dividiRiga, limitiRiga, rigaAl, rigaVicina, sottotitoliDi, unisciRighe } from '../core/sottotitoli'; @@ -1214,6 +1215,22 @@ export class Timeline { private contorniScelte: { x: number; y: number; w: number; h: number; r: number }[] = []; private scarto = new Set(); + /** i keyframe della clip scelta: un rombo per ogni fotogramma con almeno una chiave, sul bordo basso */ + private rombiChiavi(ctx: CanvasRenderingContext2D, c: Clip, fondo: number) { + const sotto = Math.floor(store.head + 1e-6) - c.start; + for (const f of fotogrammiChiave(c)) { + if (f < 0 || f > c.len) continue; + const x = this.fX(c.start + f), y = fondo - 5; + if (x < -6 || x > this.W + 6) continue; + ctx.beginPath(); + ctx.moveTo(x, y - 4); ctx.lineTo(x + 4, y); ctx.lineTo(x, y + 4); ctx.lineTo(x - 4, y); ctx.closePath(); + ctx.fillStyle = f === sotto ? '#ffffff' : '#ffd54a'; + ctx.strokeStyle = 'rgba(0,0,0,.85)'; + ctx.lineWidth = 1; + ctx.fill(); ctx.stroke(); + } + } + private disegnaClip(ctx: CanvasRenderingContext2D, p: Project, c: Clip, t: Track, y: number, hh: number, r: number) { const x = this.fX(c.start), w = Math.max(1, c.len * this.ppf); const { top, alt, testa, corpoY, corpoH } = this.geo(y, hh); @@ -1349,6 +1366,8 @@ export class Timeline { ctx.roundRect(x + 0.5, top + 0.5, w - 1, alt - 1, Math.min(4, w / 3)); ctx.stroke(); if (sel) this.contorniScelte.push({ x, y: top, w, h: alt, r: Math.min(4, w / 3) }); + // i keyframe come piccoli rombi sul bordo basso, solo se la clip è scelta (niente cambia nell'impaginazione) + if (sel && c.anim) this.rombiChiavi(ctx, c, top + alt); // le maniglie delle dissolvenze (quadratini in alto): si trascinano verso l'interno if (w >= 40) { const [xi, xo] = this.maniglieFade(c); @@ -2342,7 +2361,7 @@ export class Timeline { avviso(store.doc.tracks.length > n0 ? `${nome}: lì era occupato, ho usato una traccia nuova` : `${nome} nella timeline`, 'ok', 1600); } else if (dato.startsWith('g:')) { const g = leggiGeneratore(dato); - inserisciGeneratore(g.kind, f, riga?.t.kind === 'video' ? riga.t.id : undefined, { titolo: g.titolo, conto: g.conto, anim: g.anim }); + inserisciGeneratore(g.kind, f, riga?.t.kind === 'video' ? riga.t.id : undefined, { titolo: g.titolo, conto: g.conto, anim: g.anim, html: g.html }); } else if (dato.startsWith('x:') || dato.startsWith('t:')) { const { tipo, id } = this.specBlocco(dato); const g = this.anteprimaBlocco(x, y, dato); diff --git a/test/prove-live.mjs b/test/prove-live.mjs index 3bcaa1b..2d7351d 100644 --- a/test/prove-live.mjs +++ b/test/prove-live.mjs @@ -140,7 +140,7 @@ export async function proveLive({ page: paginaDi, prova, OUT }) { prova('webcam con permesso negato: una richiesta sola e l\'avviso spiega dove dare il permesso', errW.negato.chiamate === 1 && /permesso/.test(errW.negato.avviso) && /NotAllowedError/.test(errW.negato.avviso), JSON.stringify(errW.negato)); // niente più filtri audio nella pagina - const senzaFiltri = await page.evaluate(() => ({ filtri: document.querySelectorAll('.la, [data-filtro], .la-presetvoce').length, barre: document.querySelectorAll('.live-regia .la-compatto canvas').length })); + const senzaFiltri = await page.evaluate(() => ({ filtri: document.querySelectorAll('.la, [data-filtro], .la-presetvoce').length, barre: document.querySelectorAll('.live-regia .live-sorgenti .la-misura').length })); prova('nella pagina LIVE non ci sono più i filtri audio (restano le barre dei livelli)', senzaFiltri.filtri === 0 && senzaFiltri.barre === 2, JSON.stringify(senzaFiltri)); await page.evaluate(() => { for (const i of window.__giri ?? []) clearInterval(i); }); diff --git a/test/prove-liveaudio.mjs b/test/prove-liveaudio.mjs index 4b0b17d..129283c 100644 --- a/test/prove-liveaudio.mjs +++ b/test/prove-liveaudio.mjs @@ -294,8 +294,8 @@ export async function proveLiveAudio({ page: paginaDi, prova, OUT }) { const s0 = await page.evaluate(() => { const q = (s) => document.querySelectorAll(s).length; return { - pannello: q('.la'), strisce: q('.la-striscia'), compatte: q('.la-compatto canvas'), prova: q('.la-prova'), preset: q('.la-presetvoce'), disturbi: q('[data-filtro]'), - sticky: !!document.querySelector('.live-regia .la-compatto'), + pannello: q('.la'), strisce: q('.la-striscia'), compatte: q('.live-sorgenti .la-misura'), prova: q('.la-prova'), preset: q('.la-presetvoce'), disturbi: q('[data-filtro]'), + sticky: !!document.querySelector('.live-regia .live-sorgenti'), }; }); prova('la pagina LIVE ha solo le due barre dei livelli in cima: niente filtri, preset, mixer né "Prova l\'audio"', s0.pannello === 0 && s0.strisce === 0 && s0.compatte === 2 && s0.prova === 0 && s0.preset === 0 && s0.disturbi === 0 && s0.sticky, JSON.stringify(s0)); @@ -434,8 +434,8 @@ export async function proveLiveAudio({ page: paginaDi, prova, OUT }) { await page.waitForFunction(() => document.querySelector('.live').classList.contains('in-onda'), null, { timeout: 12000 }); await page.waitForTimeout(1200); const sat = await page.evaluate(() => ({ - pc: document.querySelectorAll('.la-compatto .la-misura')[0].dataset.clip, voce: document.querySelectorAll('.la-compatto .la-misura')[1].dataset.clip, - picco: Number(document.querySelectorAll('.la-compatto .la-misura')[0].dataset.livello), + pc: document.querySelectorAll('.live-sorgenti .la-misura')[1].dataset.clip, voce: document.querySelectorAll('.live-sorgenti .la-misura')[0].dataset.clip, + picco: Number(document.querySelectorAll('.live-sorgenti .la-misura')[1].dataset.livello), })); await page.screenshot({ path: `${OUT}/live-audio-registra.png` }); await page.keyboard.press('f'); @@ -449,10 +449,10 @@ export async function proveLiveAudio({ page: paginaDi, prova, OUT }) { const piccola = await page.evaluate(() => { const col = document.querySelector('.live-comandi'); const fuori = [...document.querySelectorAll('.live-comandi *')].filter((e) => { const r = e.getBoundingClientRect(); const c = col.getBoundingClientRect(); return r.width > 0 && (r.right > c.right + 1 || r.left < c.left - 1); }).map((e) => e.className || e.tagName); - return { scrollX: col.scrollWidth > col.clientWidth + 1, fuori: fuori.slice(0, 5), compatto: document.querySelector('.live-regia .la-compatto').getBoundingClientRect().height }; + return { scrollX: col.scrollWidth > col.clientWidth + 1, fuori: fuori.slice(0, 5), compatto: document.querySelector('.live-regia .live-sorgenti .la-misura').getBoundingClientRect().height }; }); await page.screenshot({ path: `${OUT}/live-audio-piccola.png` }); - prova('a 1000×640 niente esce dalla colonna dei comandi e le barre piccole restano in cima', !piccola.scrollX && piccola.fuori.length === 0 && piccola.compatto > 10 && piccola.compatto < 40, JSON.stringify(piccola)); + prova('a 1000×640 niente esce dalla colonna dei comandi e le barre piccole restano in cima', !piccola.scrollX && piccola.fuori.length === 0 && piccola.compatto > 8 && piccola.compatto < 20, JSON.stringify(piccola)); await page.setViewportSize({ width: 1600, height: 950 }); await page.evaluate(() => { clearInterval(window.__giroLive); document.querySelectorAll('.tela-live-prova').forEach((e) => e.remove()); }); diff --git a/test/unit/ai-opzionale.test.mjs b/test/unit/ai-opzionale.test.mjs new file mode 100644 index 0000000..d4a63cb --- /dev/null +++ b/test/unit/ai-opzionale.test.mjs @@ -0,0 +1,60 @@ +import { test } from 'node:test'; +import assert from 'node:assert/strict'; +import { ambienteBrowser, carica, memoriaFinta } from './_aiuti.mjs'; +ambienteBrowser(); memoriaFinta(); +globalThis.requestAnimationFrame = () => 0; +globalThis.cancelAnimationFrame = () => {}; +const intervallo = globalThis.setInterval; +globalThis.setInterval = (...args) => { const timer = intervallo(...args); timer.unref(); return timer; }; +const { idoneitaAI } = await carica('idoneitaAI'); +const { modelliHub } = await carica('modelliAI'); +const { riparaAI } = await carica('centroAI'); +const scheda = { prova: 'si', guasta: false, software: false }; +const macchina = { cpu: 12, ram: 16, gpuApi: true, scelta: 0, schede: [scheda] }; +const requisiti = { ramGB: 8, thread: 8 }; + +test('Ogni modello dichiara uso, peso e requisiti senza scaricare nulla', () => { + const lista = modelliHub(); + assert.ok(lista.length >= 6); + for (const m of lista) { + assert.ok(m.uso.length > 10, m.id); + assert.ok(m.mb > 0, m.id); + assert.ok(m.ramGB > 0 && m.thread > 0, m.id); + } + assert.equal(lista.find((m) => m.id === 'nllb').processore, true); +}); + +test('WebGPU provata: scheda adatta, velocità e VRAM restano da verificare', () => { + const esito = idoneitaAI(requisiti, macchina, true); + assert.match(esito.dove, /Scheda video/); + assert.match(esito.testo, /WebGPU superata/); + assert.match(esito.testo, /VRAM libera non rilevabile/); + assert.notEqual(esito.ok, true, 'non è una misura della velocità del modello'); +}); + +test('Scheda spenta, guasta, software o assente: processore; NLLB resta sempre sul processore', () => { + for (const [h, on] of [[macchina, false], [{ ...macchina, gpuApi: false }, true], [{ ...macchina, scelta: -1 }, true], [{ ...macchina, schede: [{ ...scheda, guasta: true }] }, true], [{ ...macchina, schede: [{ ...scheda, software: true }] }, true], [{ ...macchina, schede: [{ ...scheda, prova: 'no' }] }, true]]) { + assert.equal(idoneitaAI(requisiti, h, on).dove, 'Processore'); + } + assert.equal(idoneitaAI({ ...requisiti, processore: true }, macchina, true).dove, 'Processore'); + assert.match(idoneitaAI(requisiti, { ...macchina, cpu: 2, ram: 2 }, false).testo, /Può essere lento/); + assert.match(idoneitaAI(requisiti, { ...macchina, ram: null }, false).testo, /Memoria non rilevata/); + assert.equal(idoneitaAI(requisiti, null, true).ok, null); +}); + +test('Il controllo AI non scarica modelli, neppure se consigliati e tutti mancanti', async () => { + // Worker e connessione finti: nessuna rete o modello vero nelle prove. + globalThis.self = globalThis; + globalThis.fetch = async () => ({ ok: true }); + globalThis.Worker = class { + postMessage() { queueMicrotask(() => this.onmessage({ data: { ok: true, dove: 'locale', ms: 1, msg: '' } })); } + terminate() {} + }; + let scaricati = 0; + const lista = modelliHub().map((m) => ({ ...m, consigliato: true, scarica: async () => { scaricati++; } })); + const r = await riparaAI({ lista }); + assert.equal(r.ok, true); + assert.equal(scaricati, 0); + assert.match(r.testo, /opzionali/); + assert.match(r.testo, /Nessun modello scaricato/); +}); diff --git a/test/unit/colore-avanzato.test.mjs b/test/unit/colore-avanzato.test.mjs new file mode 100644 index 0000000..2ee4905 --- /dev/null +++ b/test/unit/colore-avanzato.test.mjs @@ -0,0 +1,95 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { carica } from './_aiuti.mjs'; +const L = await carica('lut'), C = await carica('curve'), G = await carica('colore'); +const P = await carica('progetto'), M = await carica('coloreAudioProgetto'); +const fmt = { w: 1920, h: 1080, rate: { num: 25, den: 1 }, drop: false }; +const vicino = (a, b, eps = 1e-6) => assert.ok(Math.abs(a - b) < eps, `${a} ≈ ${b}`); +function cube(n, fn = (r, g, b) => [r, g, b], dominio = '') { + const righe = ['# LUT di prova', 'TITLE "Una prova"', `LUT_3D_SIZE ${n}`, dominio]; + for (let b = 0; b < n; b++) for (let g = 0; g < n; g++) for (let r = 0; r < n; r++) righe.push(fn(r / (n - 1), g / (n - 1), b / (n - 1)).join(' ')); + return righe.join('\n'); +} + +test('LUT 2³/33³: identità, dominio, ordine RGB e intensità 0/50/100%', () => { + for (const n of [2, 33]) { + const lut = L.parseCube(cube(n)); + assert.equal(lut.dati.length, n ** 3 * 3); + for (const rgb of [[0, 0, 0], [1, 1, 1], [.123, .789, .456]]) L.campionaLut(lut, rgb).forEach((v, i) => vicino(v, rgb[i])); + } + const scambio = L.parseCube(cube(2, (r, g, b) => [b, r, g])); + assert.deepEqual(L.campionaLut(scambio, [.2, .4, .8], 0), [.2, .4, .8]); + L.campionaLut(scambio, [.2, .4, .8], .5).forEach((v, i) => vicino(v, [.5, .3, .6][i])); + L.campionaLut(scambio, [.2, .4, .8], 1).forEach((v, i) => vicino(v, [.8, .2, .4][i])); + const dominio = L.parseCube(cube(2, undefined, 'DOMAIN_MIN -1 -2 -3\nDOMAIN_MAX 1 2 3')); + L.campionaLut(dominio, [0, 0, 0]).forEach((v) => vicino(v, .5)); + const fuori = L.parseCube(cube(2, (r, g, b) => [r * 2 - .5, g, b])); + assert.equal(fuori.dati[0], -.5); assert.equal(fuori.dati[3], 1.5); +}); + +test('LUT: rifiuta file incompleti, 1D, misti, righe spurie, NaN, domini e dimensioni errate', () => { + const buona = cube(2); + for (const testo of [buona.split('\n').slice(0, -1).join('\n'), buona + '\n0 0 0', buona.replace('LUT_3D_SIZE 2', 'LUT_3D_SIZE 66'), + buona.replace('LUT_3D_SIZE 2', 'LUT_1D_SIZE 2'), buona.replace('LUT_3D_SIZE 2', 'LUT_1D_SIZE 2\nLUT_3D_SIZE 2'), + buona + '\nBOH 1', buona.replace('0 0 0', 'NaN 0 0'), buona.replace('0 0 0', '1e999 0 0'), + cube(2, undefined, 'DOMAIN_MIN 1 0 0\nDOMAIN_MAX 1 1 1'), cube(2, undefined, 'DOMAIN_MAX 1e300 1 1'), + buona.replace('LUT_3D_SIZE 2', 'LUT_3D_SIZE 2\nLUT_3D_SIZE 2'), '0 0 0']) assert.throws(() => L.parseCube(testo)); + assert.throws(() => L.parseCube(' '.repeat(L.MAX_CUBE_BYTE + 1)), /32 MB/); +}); + +test('Lettura File: hash sul contenuto, risorsa JSON riapribile e niente quantizzazione', async () => { + assert.equal(L.parseCube(cube(2).replace('TITLE "Una prova"', 'TITLE "Look #1" # commento')).nome, 'Look #1'); + const a = await L.leggiLut(new File([cube(2)], 'uno.cube')); + const b = await L.leggiLut(new File([cube(2).replace('Una prova', 'Altro nome')], 'due.cube')); + assert.equal(a.hash, b.hash); assert.equal(a.id, b.id); + assert.equal(L.validaLut(JSON.parse(JSON.stringify(a))), true); + await assert.rejects(() => L.leggiLut(new File(['abc'], 'no.txt')), /\.cube/); +}); + +test('Curve: identità precisa, duplicati con ultima modifica, spline senza overshoot', () => { + assert.equal(C.curveNeutre(), true); + const t = C.tabellaCurve(); + for (let r = 0; r < 5; r++) for (let i = 0; i < C.CAMPIONI_CURVA; i++) vicino(t[(r * C.CAMPIONI_CURVA + i) * 4], i / (C.CAMPIONI_CURVA - 1)); + const p = C.normalizzaCurva([{ id: 'a', x: .3, y: .2 }, { id: 'b', x: .3, y: .6 }, { id: 'c', x: .7, y: .4 }]); + assert.equal(p.length, 4); assert.equal(p[1].id, 'b'); assert.equal(p[0].x, 0); assert.equal(p.at(-1).x, 1); + for (let i = 0; i < p.length - 1; i++) for (let j = 0; j <= 100; j++) { + const y = C.valutaCurva(p, p[i].x + (p[i + 1].x - p[i].x) * j / 100); + assert.ok(y >= Math.min(p[i].y, p[i + 1].y) - 1e-9 && y <= Math.max(p[i].y, p[i + 1].y) + 1e-9); + } + assert.equal(C.curveNeutre({ red: p }), false); +}); + +test('Luma Rec.709: conserva i rapporti RGB e gestisce il nero senza NaN', () => { + const p = [{ id: 'a', x: 0, y: 0 }, { id: 'b', x: 1, y: .5 }]; + const rgb = [.2, .4, .1], out = C.curvaLuma(rgb, p); + out.forEach((v, i) => vicino(v, rgb[i] / 2)); + assert.deepEqual(C.curvaLuma([0, 0, 0], [{ id: 'a', x: 0, y: .1 }, { id: 'b', x: 1, y: 1 }]), [.1, .1, .1]); +}); + +test('Grade legacy neutro, lift/gamma/gain aggiuntivi e LUT/curve non saltate', () => { + assert.equal(G.gradeNeutro(G.gradeDi(P.MASTER0)), true); + for (const look of G.LOOKS) { + const m = { ...P.MASTER0, look: look.id }; + assert.deepEqual(G.gradeDi(m), G.gradeDi({ ...m, colore: { lift: [0, 0, 0], gamma: [1, 1, 1], gain: [1, 1, 1] } })); + } + const g = G.gradeClip({ lift: [.1, 0, 0], gamma: [0, 1, 1], gain: [1, 1.2, 1] }); + assert.equal(g.lift[0], .1); assert.equal(g.gamma[0], .1); assert.equal(g.gain[1], 1.2); + assert.equal(G.gradeNeutro(G.gradeClip({ lut: { id: 'x', intensita: 1 } })), false); + assert.equal(G.gradeNeutro(G.gradeClip({ lut: { id: 'x', intensita: 0 } })), true); + assert.equal(G.gradeNeutro(G.gradeClip({ curve: { luma: [{ id: 'a', x: .5, y: .4 }] } })), false); +}); + +test('Migrazione aggiuntiva idempotente: vecchie clip identiche, nuova risorsa una volta e undo/redo', async () => { + const p = P.newProject(fmt), c = P.newClip('media', p.tracks[0].id, 0, 100); p.clips.push(c); + const prima = structuredClone(c); + M.migraColoreAudio(p); assert.deepEqual(c, prima); assert.deepEqual(p.luts, []); + const uno = JSON.stringify(p); M.migraColoreAudio(p); assert.equal(JSON.stringify(p), uno); + globalThis.requestAnimationFrame = () => 1; globalThis.cancelAnimationFrame = () => {}; + const { store } = await carica('store'); store.load(p); + const lut = await L.leggiLut(new File([cube(2)], 'uno.cube')); + store.edit('Colore', (p) => { p.luts.push(lut); p.clips[0].fx.colore = { lut: { id: lut.id, intensita: .5 }, curve: { luma: C.identitaCurva() } }; }); + const salvato = JSON.stringify(store.doc); + store.doUndo(); assert.deepEqual(store.doc.luts, []); assert.equal(store.doc.clips[0].fx.colore, undefined); + store.doRedo(); assert.equal(JSON.stringify(store.doc), salvato); + const aperto = JSON.parse(salvato); M.migraColoreAudio(aperto); assert.equal(aperto.luts[0].id, aperto.clips[0].fx.colore.lut.id); +}); diff --git a/test/unit/colore-gpu.test.mjs b/test/unit/colore-gpu.test.mjs new file mode 100644 index 0000000..488300c --- /dev/null +++ b/test/unit/colore-gpu.test.mjs @@ -0,0 +1,59 @@ +// Registriamo upload/uniform e ciclo di vita. Queste prove NON confrontano pixel di una GPU vera. +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { carica } from './_aiuti.mjs'; +const { ColoreGpu, UNIFORM_COLORE } = await carica('coloreGpu'), G = await carica('colore'), L = await carica('lut'); +const lut = { ...L.parseCube('LUT_3D_SIZE 2\nDOMAIN_MIN -1 -1 -1\nDOMAIN_MAX 2 2 2\n0 0 0\n1 0 0\n0 1 0\n1 1 0\n0 0 1\n1 0 1\n0 1 1\n1 1 1'), id: 'prova', hash: 'abc' }; +function glFinto(fallisceFloat = false) { + const gl = {}, caricamenti = [], uniform = new Map(), cancellate = [], binding = new Map(), flags = new Map(); + const nomi = ['TEXTURE_2D', 'TEXTURE_3D', 'TEXTURE_BINDING_2D', 'TEXTURE_BINDING_3D', 'ACTIVE_TEXTURE', 'MAX_3D_TEXTURE_SIZE', 'UNPACK_FLIP_Y_WEBGL', 'UNPACK_PREMULTIPLY_ALPHA_WEBGL', 'TEXTURE_MIN_FILTER', 'TEXTURE_MAG_FILTER', 'TEXTURE_WRAP_S', 'TEXTURE_WRAP_T', 'TEXTURE_WRAP_R', 'LINEAR', 'CLAMP_TO_EDGE', 'RGBA16F', 'RGBA8', 'RGBA', 'FLOAT', 'UNSIGNED_BYTE']; + nomi.forEach((n, i) => { gl[n] = i + 1; }); gl.TEXTURE4 = 104; gl.TEXTURE5 = 105; gl.NO_ERROR = 0; + let active = 100, seq = 0, errore = 0; + flags.set(gl.UNPACK_FLIP_Y_WEBGL, true); flags.set(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, true); + gl.getParameter = (p) => p === gl.ACTIVE_TEXTURE ? active : p === gl.MAX_3D_TEXTURE_SIZE ? 65 : flags.has(p) ? flags.get(p) : binding.get(active + ':' + (p === gl.TEXTURE_BINDING_2D ? gl.TEXTURE_2D : gl.TEXTURE_3D)) ?? null; + gl.activeTexture = (v) => { active = v; }; + gl.createTexture = () => ({ id: ++seq }); gl.deleteTexture = (t) => cancellate.push(t); + gl.bindTexture = (target, t) => binding.set(active + ':' + target, t); + gl.pixelStorei = (k, v) => flags.set(k, v); gl.texParameteri = () => {}; + gl.texImage2D = (...args) => upload(2, args); gl.texImage3D = (...args) => upload(3, args); + function upload(dim, args) { + assert.equal(flags.get(gl.UNPACK_FLIP_Y_WEBGL), false); assert.equal(flags.get(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL), false); + caricamenti.push({ dim, args, active }); + if (fallisceFloat && args[2] === gl.RGBA16F) errore = 999; + } + gl.getError = () => { const e = errore; errore = 0; return e; }; + gl.uniform1i = gl.uniform1f = (k, v) => uniform.set(k, v); gl.uniform3f = (k, ...v) => uniform.set(k, v); + return { gl, caricamenti, uniform, cancellate, flags }; +} +const u = Object.fromEntries(UNIFORM_COLORE.map((n) => [n, n])); + +test('GPU registrata: texture 3D float RGB ordinato, domini, intensità, sampler distinti e riuso per hash', () => { + const { gl, caricamenti, uniform, flags, cancellate } = glFinto(); + const gpu = new ColoreGpu(gl), p = { luts: [lut] }, grade = G.gradeClip({ lut: { id: lut.id, intensita: .5 } }); + gpu.inizia(); gpu.imposta(p, grade, u, true); gpu.finisce(); + const cubi = caricamenti.filter((c) => c.dim === 3); + assert.equal(cubi.length, 1); assert.equal(cubi[0].args[2], gl.RGBA16F); + assert.deepEqual(cubi[0].args.slice(3, 6), [2, 2, 2]); + const rgba = cubi[0].args.at(-1); + for (let i = 0; i < 8; i++) { assert.deepEqual([...rgba.slice(i * 4, i * 4 + 3)], lut.dati.slice(i * 3, i * 3 + 3)); assert.equal(rgba[i * 4 + 3], 1); } + assert.equal(uniform.get('u_caIntensity'), .5); assert.deepEqual(uniform.get('u_caMin'), [-1, -1, -1]); assert.deepEqual(uniform.get('u_caMax'), [2, 2, 2]); + assert.equal(uniform.get('u_caLut'), 5); assert.equal(uniform.get('u_caCurve'), 4); + assert.equal(gl.getParameter(gl.ACTIVE_TEXTURE), 100); assert.equal(flags.get(gl.UNPACK_FLIP_Y_WEBGL), true); assert.equal(flags.get(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL), true); + gpu.inizia(); gpu.imposta(structuredClone(p), grade, u, false); gpu.finisce(); assert.equal(caricamenti.length, 2); + gpu.inizia(); gpu.finisce(); assert.equal(cancellate.length, 2); + gpu.inizia(); gpu.imposta(p, grade, u, true); gpu.finisce(); assert.equal(caricamenti.length, 4); // risorse ricreate dopo pulizia + gpu.distruggi(); assert.equal(cancellate.length, 4); +}); + +test('GPU registrata: ripiego RGBA8 dichiarato e limiti dispositivo prima dell’upload LUT', () => { + const { gl, caricamenti } = glFinto(true), gpu = new ColoreGpu(gl); + const warn = console.warn; console.warn = () => {}; + try { gpu.imposta({ luts: [lut] }, G.gradeClip({ lut: { id: lut.id, intensita: 1 } }), u, false); } + finally { console.warn = warn; } + assert.equal(gpu.avvisi.size, 1); assert.equal(caricamenti.filter((c) => c.args[2] === gl.RGBA8).length, 2); + const piccolo = glFinto(), get = piccolo.gl.getParameter; + piccolo.gl.getParameter = (p) => p === piccolo.gl.MAX_3D_TEXTURE_SIZE ? 1 : get(p); + const g2 = new ColoreGpu(piccolo.gl); + assert.throws(() => g2.imposta({ luts: [lut] }, G.gradeClip({ lut: { id: lut.id, intensita: 1 } }), u, false), /troppo grande/); + assert.equal(piccolo.caricamenti.some((c) => c.dim === 3), false); assert.equal(piccolo.gl.getParameter(piccolo.gl.ACTIVE_TEXTURE), 100); +}); diff --git a/test/unit/ducking.test.mjs b/test/unit/ducking.test.mjs new file mode 100644 index 0000000..5dc9b45 --- /dev/null +++ b/test/unit/ducking.test.mjs @@ -0,0 +1,125 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { ambienteBrowser, carica } from './_aiuti.mjs'; +ambienteBrowser(); +const D = await carica('ducking'), P = await carica('progetto'), A = await carica('audio'), Mont = await carica('montaggio'); +const vicino = (a, b, eps = 1e-6) => assert.ok(Math.abs(a - b) < eps, `${a} ≈ ${b}`); +function scena() { + const p = P.newProject({ w: 1920, h: 1080, rate: { num: 25, den: 1 }, drop: false }); + const voce = P.newClip('media', p.tracks[2].id, 25, 100, { media: 'v', ruoloAudio: 'voce' }); + const musica = P.newClip('media', p.tracks[3].id, 0, 500, { media: 'm', ruoloAudio: 'musica', ducking: { ...D.DUCKING0, attivo: true } }); + p.clips.push(voce, musica); p.media.push({ id: 'v', size: 1000, lastModified: 1 }); + return { p, voce, musica }; +} +function energia(canali, sr = 1000, tagli = []) { + const a = new D.AnalizzatoreRms(), out = []; + let da = 0; + for (const fine of [...tagli, canali[0].length]) { out.push(...a.push(canali.map((c) => c.slice(da, fine)), sr, da / sr)); da = fine; } + const ultimo = a.fine(); if (ultimo) out.push(ultimo); + return out; +} +test('RMS: silenzio, solo destro, controfase; stessi valori attraverso i chunk', () => { + const sil = new Float32Array(1000), dx = Float32Array.from({ length: 1000 }, (_, i) => i >= 200 && i < 800 ? .5 : 0); + const lettura = energia([sil, dx]), spezzata = energia([sil, dx], 1000, [13, 201, 444, 799]); + assert.deepEqual(lettura, spezzata); + vicino(lettura[10].db, 10 * Math.log10(.125)); + const controfase = energia([dx, dx.map((x) => -x)]); + vicino(controfase[10].db, 20 * Math.log10(.5)); + assert.ok(energia([sil]).every((w) => w.db <= -100)); + const { p, voce } = scena(); + assert.deepEqual(D.presenzaVoce(p, voce, energia([sil]), D.DUCKING0), []); + const ranges = D.presenzaVoce(p, voce, lettura, D.DUCKING0); + vicino(ranges[0].da, 1.2); vicino(ranges[0].a, 2); +}); + +test('Presenza: trim, velocità, soglia con isteresi, minimo, hold e volume', () => { + const { p, voce } = scena(); voce.srcIn = 2; voce.speed = 2; + const d = { ...D.DUCKING0, minimo: .05, hold: .1 }; + const finestre = [{ da: 1, a: 2, db: 0 }, { da: 2, a: 2.2, db: -30 }, { da: 2.2, a: 2.4, db: -34 }, { da: 2.4, a: 2.6, db: -50 }, { da: 2.6, a: 2.62, db: -10 }]; + const ranges = D.presenzaVoce(p, voce, finestre, d); + assert.equal(ranges.length, 1); vicino(ranges[0].da, 1); vicino(ranges[0].a, 1.3); + voce.gain = -60; assert.deepEqual(D.presenzaVoce(p, voce, finestre, d), []); +}); + +test('Ruoli clip/traccia, mute e solo: solo le sorgenti in ascolto attivano il ducking', () => { + const { p, voce } = scena(); const t = p.tracks[2]; + assert.equal(D.vociDucking(p).length, 1); + delete voce.ruoloAudio; t.ruoloAudio = 'voce'; assert.equal(D.vociDucking(p).length, 1); + voce.ruoloAudio = 'nessuno'; assert.equal(D.vociDucking(p).length, 0); + delete voce.ruoloAudio; t.mute = true; assert.equal(D.vociDucking(p).length, 0); + t.mute = false; p.tracks[3].solo = true; assert.equal(D.vociDucking(p).length, 0); + t.solo = true; assert.equal(D.vociDucking(p).length, 1); +}); + +test('La coda della voce negli incroci partecipa all’analisi e alla firma', () => { + const { p, voce, musica } = scena(); + const dopo = P.newClip('media', voce.track, voce.start + voce.len, 100, { trIn: P.newTransition('mix', 25) }); + p.clips.push(dopo); + assert.equal(D.codaVoce(p, voce), 25); + const d = { ...D.DUCKING0, hold: 0, minimo: 0 }; + const ranges = D.presenzaVoce(p, voce, [{ da: 3.8, a: 4, db: -10 }, { da: 4, a: 4.4, db: -10 }], d); + vicino(ranges[0].da, 4.8); vicino(ranges[0].a, 5.4); + const firma = D.firmaDucking(p, musica); dopo.trIn.len = 10; + assert.notEqual(D.firmaDucking(p, musica), firma); +}); + +test('Inviluppo: attacco prima della voce, rilascio, sovrapposizioni e inizio/fine musica', () => { + const { p, musica } = scena(); const d = { ...D.DUCKING0, attacco: .2, rilascio: .4, quantita: 12 }; + const keys = D.generaDuckKeys(p, musica, [{ da: 2, a: 3 }, { da: 2.5, a: 4 }, { da: 4.1, a: 5 }], d); + vicino(P.keyValue(keys, 1.8 * 25, 0), 0); vicino(P.keyValue(keys, 1.9 * 25, 0), -6); + vicino(P.keyValue(keys, 4.05 * 25, 0), -12); vicino(P.keyValue(keys, 5.2 * 25, 0), -6); + const bordo = D.generaDuckKeys(p, musica, [{ da: 0, a: 1 }, { da: 19, a: 21 }], d); + assert.equal(bordo[0].v, -12); assert.equal(bordo.at(-1).v, -12); + assert.ok(bordo.every((k, i) => k.f >= 0 && k.f <= musica.len && (!i || k.f > bordo[i - 1].f))); + assert.deepEqual(D.generaDuckKeys(p, musica, [], d), []); +}); + +test('Volume: duck dB separati da gainKeys/fade, punti anche frazionari, riapertura', () => { + const { p, musica } = scena(); + musica.gainKeys = [{ f: 0, v: -6 }, { f: 100, v: 0 }]; musica.fadeIn = 25; + const manuali = structuredClone(musica.gainKeys), senza = A.guadagnoClip(musica, 12.5, 0); + musica.duckKeys = [{ f: 0, v: -12 }, { f: 50.3, v: -12 }, { f: 60.8, v: 0 }]; musica.duckFirma = D.firmaDucking(p, musica); + vicino(A.guadagnoClip(musica, 12.5, 0), senza * 10 ** (-12 / 20)); + assert.deepEqual(musica.gainKeys, manuali); assert.ok(A.puntiInviluppo(musica, 0).includes(50.3)); + assert.ok(A.puntiInviluppo(musica, 0).some((f) => f > 50.3 && f < 60.8)); + const aperto = JSON.parse(JSON.stringify(p)); assert.equal(D.duckingValido(aperto, aperto.clips[1]), true); + const fine = A.guadagnoClip(musica, musica.len, 0); assert.ok(fine > 0); +}); + +test('Firma: invalida su montaggio e trattamento, non sul volume manuale della musica; disattiva senza distruggere', () => { + const { p, voce, musica } = scena(); musica.duckKeys = [{ f: 0, v: -12 }, { f: 500, v: -12 }]; + musica.duckFirma = D.firmaDucking(p, musica); + assert.equal(D.duckingValido(p, musica), true); musica.gain = -3; assert.equal(D.duckingValido(p, musica), true); + const copia = structuredClone(p); + for (const modifica of [(p) => p.clips[0].start++, (p) => p.clips[0].srcIn++, (p) => p.clips[0].speed = 2, + (p) => p.clips[0].afx = { voce: true }, (p) => p.tracks[2].mute = true, (p) => p.media[0].lastModified++, + (p) => p.clips[1].len--, (p) => p.clips[1].ducking.quantita = 18]) { + const q = structuredClone(copia); modifica(q); assert.equal(D.duckingValido(q, q.clips[1]), false); + assert.equal(D.conDucking(q).clips[1].duckKeys, undefined); assert.ok(q.clips[1].duckKeys.length); + } + musica.ducking.attivo = false; assert.equal(A.conIncroci(p).clips[1].duckKeys, undefined); + musica.ducking.attivo = true; assert.deepEqual(A.conIncroci(p).clips[1].duckKeys, musica.duckKeys); + const right = Mont.splitClip(p, voce, 75); assert.ok(right); assert.equal(D.duckingValido(p, musica), false); +}); + +test('Gain programmato: seek e cucitura offline a 10 s hanno lo stesso inviluppo', () => { + const { p, musica } = scena(); + musica.duckKeys = D.generaDuckKeys(p, musica, [{ da: 10.05, a: 10.3 }], D.DUCKING0); + const programma = (t0, inizio, now) => { + const eventi = []; + const g = { gain: { cancelScheduledValues: () => {}, setValueAtTime: (v, t) => eventi.push({ v, t }), linearRampToValueAtTime: (v, t) => eventi.push({ v, t }) } }; + A.applicaInviluppo(g, p, musica, 0, t0, inizio, now); + assert.ok(eventi.every((x, i) => x.t >= now && (!i || x.t > eventi[i - 1].t))); + return eventi.map((e) => ({ v: e.v, t: e.t - t0 + inizio })); + }; + const completo = programma(50, 0, 50), pezzo = programma(0, 8.5, 0), seek = programma(20, 10, 20); + vicino(seek[0].v, 10 ** (-8 / 20)); // a 10 s: due terzi della discesa da 0 a -12 dB + const al = (ev, t) => { + const i = ev.findIndex((e) => e.t >= t); if (i <= 0) return ev[Math.max(0, i)].v; + const a = ev[i - 1], b = ev[i]; return a.v + (b.v - a.v) * (t - a.t) / (b.t - a.t); + }; + for (const sec of [10, 10.001, 10.025, 10.3, 10.6]) { + vicino(al(completo, sec), al(pezzo, sec), 1e-9); + vicino(al(completo, sec), al(seek, sec), .001); + } +}); diff --git a/test/unit/esegui.mjs b/test/unit/esegui.mjs index 1bddfa6..ff23227 100644 --- a/test/unit/esegui.mjs +++ b/test/unit/esegui.mjs @@ -20,8 +20,10 @@ await build({ logLevel: 'warn', // Esponiamo solo nel bundle di prova un confine asincrono privato; nessun hook nell'app. plugins: [{ name: 'confini-progetti-test', enforce: 'pre', transform(code, id) { - if (id.replaceAll('\\', '/').endsWith('/src/progetti.ts')) return { code: code + '\nexport { mettiCopia as _testMettiCopia };', map: null }; + if (id.replaceAll('\\', '/').endsWith('/src/progetti.ts')) return { code: code + '\nexport { mettiCopia as _testMettiCopia, valida as _testValida };', map: null }; if (id.replaceAll('\\', '/').endsWith('/src/media/proxy.ts')) return { code: code + '\nexport { scriviProxy as _testScriviProxy };', map: null }; + if (id.replaceAll('\\', '/').endsWith('/src/ui/live.ts')) return { code: code + '\nexport { avvisaErroreSchermo as _testAvvisaErroreSchermo };', map: null }; + if (id.replaceAll('\\', '/').endsWith('/src/pacchetto.ts')) return { code: code + '\nexport { progettoDentro as _testProgettoDentro };', map: null }; } }], define: { __VERSIONE__: JSON.stringify('prova') }, build: { @@ -36,6 +38,9 @@ await build({ attivita: path.join(radice, 'src/media/attivita.ts'), libreria: path.join(radice, 'src/media/libreria.ts'), proxy: path.join(radice, 'src/media/proxy.ts'), + idoneitaAI: path.join(radice, 'src/media/idoneitaAI.ts'), + modelliAI: path.join(radice, 'src/media/modelliAI.ts'), + centroAI: path.join(radice, 'src/ui/centroAI.ts'), normalizza: path.join(radice, 'src/media/normalizza.ts'), blocchi: path.join(radice, 'src/core/blocchi.ts'), effetti: path.join(radice, 'src/effetti.ts'), @@ -43,8 +48,31 @@ await build({ compositore: path.join(radice, 'src/render/compositore.ts'), progetto: path.join(radice, 'src/core/progetto.ts'), progetti: path.join(radice, 'src/progetti.ts'), + traduci: path.join(radice, 'src/media/traduci.ts'), + voce: path.join(radice, 'src/media/voce.ts'), + ritaglio: path.join(radice, 'src/media/ritaglio.ts'), + vram: path.join(radice, 'src/media/vram.ts'), + live: path.join(radice, 'src/ui/live.ts'), store: path.join(radice, 'src/core/store.ts'), mossformer: path.join(radice, 'src/core/mossformer.ts'), + esportazione: path.join(radice, 'src/core/esportazione.ts'), + codaExport: path.join(radice, 'src/core/codaExport.ts'), + lut: path.join(radice, 'src/render/lut.ts'), + curve: path.join(radice, 'src/render/curve.ts'), + colore: path.join(radice, 'src/render/colore.ts'), + coloreGpu: path.join(radice, 'src/render/coloreGpu.ts'), + ducking: path.join(radice, 'src/core/ducking.ts'), + audio: path.join(radice, 'src/media/audio.ts'), + montaggio: path.join(radice, 'src/core/montaggio.ts'), + montaggioTesto: path.join(radice, 'src/core/montaggioTesto.ts'), + coloreAudioProgetto: path.join(radice, 'src/core/coloreAudioProgetto.ts'), + zoomCursore: path.join(radice, 'src/core/zoomCursore.ts'), + cursoreLive: path.join(radice, 'src/media/cursoreLive.ts'), + anelliClic: path.join(radice, 'src/render/cursore.ts'), + pacchetto: path.join(radice, 'src/pacchetto.ts'), + automazioni: path.join(radice, 'src/core/automazioni.ts'), + maschereForma: path.join(radice, 'src/core/maschereForma.ts'), + titoliHtml: path.join(radice, 'src/core/titoliHtml.ts'), }, output: { format: 'es', entryFileNames: '[name].mjs', chunkFileNames: 'pezzi/[name]-[hash].mjs' }, }, diff --git a/test/unit/esportazione.test.mjs b/test/unit/esportazione.test.mjs new file mode 100644 index 0000000..0754507 --- /dev/null +++ b/test/unit/esportazione.test.mjs @@ -0,0 +1,149 @@ +// L'esportazione, la parte pura: da preset a impostazioni, adattamento della forma, stima del peso, e l'ordine della coda. +import { test } from 'node:test'; +import assert from 'node:assert/strict'; +import { carica } from './_aiuti.mjs'; + +const E = await carica('esportazione'); +const C = await carica('codaExport'); +const TUTTI = ['avc', 'hevc', 'vp9', 'av1', 'vp8']; +const FHD25 = { w: 1920, h: 1080, fps: 25 }; + +test('preset YouTube 1080p: 1920x1080, MP4 H.264, i fotogrammi del progetto', () => { + const i = E.impostazioni({ preset: 'yt1080' }, FHD25, TUTTI); + assert.deepEqual([i.formato, i.w, i.h, i.fps, i.passo, i.codec], ['mp4', 1920, 1080, 25, 1, 'avc']); + assert.equal(i.geometria, null, 'stessa forma del progetto: niente bande'); + assert.equal(i.adatta, null); + assert.equal(i.audioBps, 192000); +}); + +test('i fotogrammi non salgono oltre il tetto del preset, solo saltandone di interi (60 -> 30), mai inventati', () => { + assert.equal(E.passoFps(60, 30), 2); + assert.equal(E.passoFps(50, 30), 1, '50 fps non e multiplo di 30: si lasciano come sono'); + assert.equal(E.passoFps(25, 30), 1); + assert.equal(E.passoFps(120, 30), 4); + const i = E.impostazioni({ preset: 'verticale' }, { w: 1920, h: 1080, fps: 60 }, TUTTI); + assert.equal(i.passo, 2); + assert.equal(i.fps, 30); +}); + +test('verticale 9:16 da un progetto 16:9: bande di partenza, ritaglio se lo chiede', () => { + const b = E.impostazioni({ preset: 'verticale' }, FHD25, TUTTI); + assert.deepEqual([b.w, b.h, b.adatta], [1080, 1920, 'bande']); + // l'immagine intera (1080 di larghezza) al centro, bande sopra e sotto + assert.equal(b.geometria.cw, 1080); + assert.equal(b.geometria.ch, 608); + assert.equal(b.geometria.dx, 0); + assert.equal(b.geometria.dy, Math.round((1920 - 608) / 2)); + const r = E.impostazioni({ preset: 'verticale', adatta: 'ritaglio' }, FHD25, TUTTI); + assert.equal(r.adatta, 'ritaglio'); + assert.equal(r.geometria.ch, 1920, 'riempie l\'altezza'); + assert.equal(r.geometria.cw, 3414); + assert.ok(r.geometria.dx < 0, 'si taglia ai lati'); + assert.equal(r.geometria.dx, Math.round((1080 - 3414) / 2)); +}); + +test('quadrato 1:1, forme uguali e il testo che spiega cosa succede', () => { + const g = E.adattamento(1920, 1080, 1080, 1080, 'ritaglio'); + assert.equal(g.ch, 1080); + assert.equal(g.cw, 1920); + assert.equal(E.adattamento(1920, 1080, 3840, 2160, 'bande'), null); + assert.match(E.testoAdattamento(1920, 1080, 1080, 1920, 'bande'), /16:9.*9:16.*bande nere sopra e sotto/); + assert.match(E.testoAdattamento(1920, 1080, 1080, 1080, 'ritaglio'), /si taglia ai lati.*56%/); + assert.match(E.testoAdattamento(1920, 1080, 3840, 2160, 'bande'), /già questa forma/); + assert.equal(E.proporzioneTesto(1080, 1920), '9:16'); + assert.equal(E.proporzioneTesto(1000, 1000), '1:1'); +}); + +test('WhatsApp: il lato lungo non supera 1280 e la forma resta quella del progetto; master: come il progetto', () => { + const w = E.impostazioni({ preset: 'whatsapp' }, FHD25, TUTTI); + assert.deepEqual([w.w, w.h, w.codec, w.geometria], [1280, 720, 'avc', null]); + const v = E.impostazioni({ preset: 'whatsapp' }, { w: 1080, h: 1920, fps: 30 }, TUTTI); + assert.deepEqual([v.w, v.h], [720, 1280]); + const m = E.impostazioni({ preset: 'master' }, { w: 2560, h: 1440, fps: 24 }, TUTTI); + assert.deepEqual([m.w, m.h], [2560, 1440]); +}); + +test('solo audio: WAV, niente video ne codec, peso = 192 KB al secondo', () => { + const i = E.impostazioni({ preset: 'audio' }, FHD25, TUTTI); + assert.deepEqual([i.formato, i.codec, i.bitrate, i.geometria], ['wav', null, 0, null]); + assert.equal(E.pesoStimato(i, 10), 10 * 192000 + 44); +}); + +test('il codec: si prende il primo del preset che la macchina sa fare; se non c\'è si ripiega; se nessuno, null', () => { + assert.equal(E.impostazioni({ preset: 'yt1080' }, FHD25, ['hevc', 'vp9']).codec, 'hevc', 'H.264 non c\'è: HEVC'); + assert.equal(E.impostazioni({ preset: 'yt1080', codec: 'hevc' }, FHD25, TUTTI).codec, 'hevc'); + assert.equal(E.impostazioni({ preset: 'yt1080', codec: 'vp9' }, FHD25, TUTTI).codec, 'avc', 'VP9 non è fra quelli del preset'); + assert.equal(E.impostazioni({ preset: 'whatsapp' }, FHD25, ['vp9']).codec, null); + // Personalizzato: sceglie tutto lui, il contenitore limita i codec + assert.equal(E.impostazioni({ preset: 'libero', formato: 'webm', codec: 'av1' }, FHD25, TUTTI).codec, 'av1'); + assert.equal(E.impostazioni({ preset: 'libero', formato: 'webm', codec: 'avc' }, FHD25, TUTTI).codec, 'vp9', 'H.264 non sta in WebM'); + assert.deepEqual(E.codecPossibili(E.presetDi('libero'), 'mov', TUTTI), ['avc', 'hevc']); +}); + +test('Personalizzato: la misura sceglie l\'altezza con la forma del progetto', () => { + const m = (misura) => { const i = E.impostazioni({ preset: 'libero', misura }, { w: 1920, h: 1080, fps: 25 }, TUTTI); return [i.w, i.h]; }; + assert.deepEqual(m('progetto'), [1920, 1080]); + assert.deepEqual(m('meta'), [960, 540]); + assert.deepEqual(m('720'), [1280, 720]); + assert.deepEqual(m('2160'), [3840, 2160]); +}); + +test('stima del peso: cresce con la qualità, cala coi codec più bravi, scala con la durata', () => { + const peso = (sc, sec = 60) => E.pesoStimato(E.impostazioni(sc, FHD25, TUTTI), sec); + assert.ok(peso({ preset: 'yt1080', qualita: 80 }) > peso({ preset: 'yt1080', qualita: 40 })); + assert.ok(peso({ preset: 'yt1080', codec: 'hevc' }) < peso({ preset: 'yt1080', codec: 'avc' })); + const un = peso({ preset: 'yt1080' }, 60); + assert.ok(Math.abs(peso({ preset: 'yt1080' }, 120) / un - 2) < 0.01); + assert.equal(peso({ preset: 'yt1080' }, 0), 0); + // un ordine di grandezza sensato: 1080p25 «alto» per un minuto sta fra 20 e 200 MB + assert.ok(un > 20e6 && un < 200e6, String(un)); + // WhatsApp è molto più leggero della versione master + assert.ok(peso({ preset: 'whatsapp' }) * 10 < peso({ preset: 'master' })); +}); + +test('testi: peso e qualità a parole, nome del file', () => { + assert.equal(E.pesoTesto(820), '820 B'); + assert.equal(E.pesoTesto(48_000_000), '48 MB'); + assert.equal(E.pesoTesto(2_400_000), '2,4 MB'); + assert.equal(E.pesoTesto(1_200_000_000), '1,2 GB'); + assert.match(E.descriviQualita(10), /Molto leggero/); + assert.match(E.descriviQualita(100), /Massimo/); + assert.equal(E.nomeFile('Mio: film', E.presetDi('verticale'), 'mp4'), 'Mio_ film - Reel TikTok Shorts.mp4'); + assert.equal(E.nomeFile('', E.presetDi('libero'), 'webm'), 'montaggio.webm'); +}); + +test('coda: una dopo l\'altra, parte la prima che aspetta, mai due insieme', () => { + const c = new C.Coda(); + const a = c.aggiungi('A'), b = c.aggiungi('B'), d = c.aggiungi('C'); + assert.equal(c.prossimo().id, a.id); + c.segna(a.id, 'lavoro'); + assert.equal(c.prossimo(), undefined, 'una sta lavorando: le altre aspettano'); + assert.equal(c.inLavoro().id, a.id); + c.segna(a.id, 'fatta', 'A.mp4'); + assert.equal(c.prossimo().id, b.id); + c.segna(b.id, 'errore', 'boom'); + assert.equal(c.prossimo().id, d.id, 'una sbagliata non ferma la coda'); + assert.equal(c.riepilogo(), '1 in coda · 2 finite'); +}); + +test('coda: sposta solo fra quelle che aspettano, in cima, togli e svuota le finite', () => { + const c = new C.Coda(); + const a = c.aggiungi('A'), b = c.aggiungi('B'), d = c.aggiungi('C'); + c.segna(a.id, 'lavoro'); + assert.equal(c.sposta(a.id, 1), false, 'quella al lavoro non si sposta'); + assert.equal(c.sposta(b.id, -1), false, 'B è già la prima che aspetta'); + assert.equal(c.sposta(d.id, -1), true); + assert.deepEqual(c.voci.map((v) => v.dato), ['A', 'C', 'B']); + assert.equal(c.sposta(b.id, 1), false, 'l\'ultima non scende'); + const z = c.aggiungi('Z', true); + assert.deepEqual(c.voci.map((v) => v.dato), ['A', 'Z', 'C', 'B'], 'in cima a quelle che aspettano, dopo quella al lavoro'); + assert.equal(c.togli(a.id), false, 'non si toglie quella al lavoro'); + assert.equal(c.togli(z.id), true); + c.segna(a.id, 'fatta'); + c.segna(d.id, 'annullata'); + assert.equal(c.pulisciFinite(), 2); + assert.deepEqual(c.voci.map((v) => v.dato), ['B']); + assert.equal(c.riepilogo(), '1 in coda'); + c.togli(b.id); + assert.equal(c.riepilogo(), 'La coda è vuota'); +}); diff --git a/test/unit/import-minimo.test.mjs b/test/unit/import-minimo.test.mjs index 474c412..681e176 100644 --- a/test/unit/import-minimo.test.mjs +++ b/test/unit/import-minimo.test.mjs @@ -15,6 +15,7 @@ const AT = await carica('attivita'); const L = await carica('libreria'); L.impostaPreparazioneAutomatica(false); // questo file prova l'import minimo: la preparazione automatica (1.6.0) ha le sue prove const PX = await carica('proxy'); +PX.impostaCopieLeggereAutomatiche(false); // qui si provano le preparazioni manuali; l'automatismo ha prove proprie const video = videoDiProva(); const doc = { media: [], clips: [] }; diff --git a/test/unit/keyframe.test.mjs b/test/unit/keyframe.test.mjs new file mode 100644 index 0000000..6431217 --- /dev/null +++ b/test/unit/keyframe.test.mjs @@ -0,0 +1,377 @@ +// Prove dei keyframe e delle maschere a forma: interpolazione, progetti vecchi che restano identici, valutazione per +// fotogramma (clip ed effetti), operazioni di montaggio e copertura geometrica delle maschere. Tutto in Node, senza browser. +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { carica, ambienteBrowser, memoriaFinta } from './_aiuti.mjs'; +import { scena } from './scena-effetti.mjs'; +const A = await carica('automazioni'), P = await carica('progetto'), B = await carica('blocchi'), M = await carica('maschereForma'); +const MO = await carica('montaggio'); +const vicino = (a, b, eps = 1e-6) => assert.ok(Math.abs(a - b) < eps, `${a} ≈ ${b}`); +const fmt = { w: 1920, h: 1080, rate: { num: 25, den: 1 }, drop: false }; +const clip = (extra = {}) => { const p = P.newProject(fmt); const t = p.tracks.find((x) => x.kind === 'video').id; const c = P.newClip('bars', t, 0, 100, extra); p.clips = [c]; return { p, c, t }; }; + +// ——— interpolazione ——— + +test('interpolazione: dritta, morbida e a gradino; prima, dopo e senza chiavi', () => { + const k = (modo) => [{ f: 10, v: 0, ...(modo ? { modo } : {}) }, { f: 30, v: 100 }]; + assert.equal(A.valoreAnim(undefined, 5, 7), 7); + assert.equal(A.valoreAnim([], 5, 7), 7); + assert.equal(A.valoreAnim(k(), 0, 7), 0, 'prima della prima chiave vale la prima'); + assert.equal(A.valoreAnim(k(), 99, 7), 100, 'dopo l\'ultima vale l\'ultima'); + vicino(A.valoreAnim(k(), 20, 0), 50); + vicino(A.valoreAnim(k(), 15, 0), 25); + // morbida: nel mezzo è metà, ai quarti è meno del dritto (parte piano) e simmetrica + vicino(A.valoreAnim(k('morbida'), 20, 0), 50); + assert.ok(A.valoreAnim(k('morbida'), 15, 0) < 25); + vicino(A.valoreAnim(k('morbida'), 15, 0) + A.valoreAnim(k('morbida'), 25, 0), 100); + // a gradino: resta fino alla chiave dopo + assert.equal(A.valoreAnim(k('gradino'), 29.9, 0), 0); + assert.equal(A.valoreAnim(k('gradino'), 30, 0), 100); + // più tratti con modi diversi, continuo sulle chiavi + const m = [{ f: 0, v: 0 }, { f: 10, v: 10, modo: 'gradino' }, { f: 20, v: 50, modo: 'morbida' }, { f: 30, v: 0 }]; + assert.equal(A.valoreAnim(m, 10, 0), 10); + assert.equal(A.valoreAnim(m, 15, 0), 10); + assert.equal(A.valoreAnim(m, 20, 0), 50); + vicino(A.valoreAnim(m, 25, 0), 25); + // il tempo è per fotogramma: anche frazionario + vicino(A.valoreAnim(k(), 20.5, 0), 52.5); +}); + +// ——— compatibilità con i progetti vecchi ——— + +test('senza animazioni niente cambia: valutaClip è la clip stessa, tfAl e clipOpacity come prima', () => { + const { c } = clip(); + assert.equal(A.valutaClip(c, 10), c); + assert.equal(P.tfAl(c, 10), c.tf, 'ferma: è proprio il Transform della clip'); + c.opKeys = [{ f: 0, v: 0 }, { f: 50, v: 1 }]; + vicino(P.clipOpacity(c, 25), 0.5); + // movimento con tappe frazionarie: è ancora la Hermite di prima + c.tf = { ...c.tf, x: 0, sx: undefined }; + c.tfFine = { ...c.tf, x: 100 }; + c.via = [{ t: 0.123456789, tf: { ...c.tf, x: 42 } }]; + const atteso = [0, 10, 50, 99].map((f) => P.passaPer([0, 0.123456789, 1], [0, 42, 100], f / 99)); + [0, 10, 50, 99].forEach((f, i) => vicino(P.tfAl(c, f).x, atteso[i], 1e-9)); + assert.equal(P.tfAl(c, 10).sx, 1, 'sx assente = 1 anche nel movimento'); +}); + +test('apertura di un progetto vecchio: identico; uno con keyframe scritti male si rimette in ordine', async () => { + ambienteBrowser(); memoriaFinta(); globalThis.window = globalThis; + globalThis.requestAnimationFrame = () => 0; globalThis.cancelAnimationFrame = () => {}; + const intervalli = [], originale = globalThis.setInterval; + globalThis.setInterval = (...a) => { const h = originale(...a); intervalli.push(h); return h; }; + let PR; + try { PR = await carica('progetti'); } finally { globalThis.setInterval = originale; for (const h of intervalli) clearInterval(h); } + const { p, c } = clip({ opKeys: [{ f: 0, v: 0.2 }, { f: 40, v: 1 }], gainKeys: [{ f: 0, v: -6 }, { f: 40, v: 0 }] }); + c.tfFine = { ...c.tf, x: 200 }; + const vecchio = JSON.parse(JSON.stringify(p)); + const aperto = PR._testValida(JSON.parse(JSON.stringify(vecchio))); + assert.equal('anim' in aperto.clips[0], false, 'nessun campo nuovo nelle clip vecchie'); + assert.equal('maschere' in aperto.clips[0], false); + assert.deepEqual(aperto.clips[0].opKeys, vecchio.clips[0].opKeys); + assert.deepEqual(aperto.clips[0].gainKeys, vecchio.clips[0].gainKeys); + assert.deepEqual([0, 30, 99].map((f) => P.tfAl(aperto.clips[0], f)), [0, 30, 99].map((f) => P.tfAl(c, f))); + assert.deepEqual(PR._testValida(structuredClone(aperto)), aperto, 'aprirlo due volte non cambia niente'); + // keyframe sporchi: fuori ordine, doppi, non finiti, percorso che non esiste + const sporco = JSON.parse(JSON.stringify(vecchio)); + sporco.clips[0].anim = { + 'tf.x': [{ f: 30, v: 5 }, { f: 10, v: 1 }, { f: 10, v: 2 }, { f: NaN, v: 3 }, { f: 40, v: Infinity }, { f: 50, v: 9, modo: 'strano' }], + 'tf.finto': [{ f: 1, v: 1 }], opacity: [], + }; + const pulito = PR._testValida(sporco).clips[0].anim; + assert.deepEqual(Object.keys(pulito), ['tf.x']); + assert.deepEqual(pulito['tf.x'], [{ f: 10, v: 2 }, { f: 30, v: 5 }, { f: 50, v: 9 }], 'in ordine, l\'ultima scritta vince, niente valori strani'); +}); + +// ——— valutazione per fotogramma ——— + +test('valutaClip e tfAl: il valore di ogni parametro al fotogramma, senza toccare il progetto', () => { + const { c } = clip(); + c.anim = { + opacity: [{ f: 0, v: 0 }, { f: 50, v: 1 }], + 'tf.x': [{ f: 0, v: 0 }, { f: 100, v: 200 }], + 'tf.rot': [{ f: 0, v: 0, modo: 'gradino' }, { f: 50, v: 90 }], + 'fx.sat': [{ f: 0, v: 1 }, { f: 100, v: 0 }], + 'fx.colore.gain.r': [{ f: 0, v: 1 }, { f: 100, v: 2 }], + }; + const prima = structuredClone(c); + const v = A.valutaClip(c, 25); + vicino(v.opacity, 0.5); + vicino(v.tf.x, 50); + assert.equal(v.tf.rot, 0); + vicino(v.fx.sat, 0.75); + vicino(v.fx.colore.gain[0], 1.25); + assert.deepEqual(v.fx.colore.gain.slice(1), [1, 1], 'gli altri canali restano neutri'); + assert.deepEqual(c, prima, 'il progetto non si tocca'); + vicino(P.tfAl(c, 50).x, 100); + vicino(P.tfAl(v, 25).x, 50, 1e-9); + vicino(P.clipOpacity(c, 25), 0.5); + assert.equal(A.valoreAl(c, 'tf.x', 100), 200); + // la linea nuova prende il posto della vecchia linea elastica + c.opKeys = [{ f: 0, v: 1 }, { f: 100, v: 1 }]; + vicino(P.clipOpacity(c, 25), 0.5); + // un campo col keyframe vince sul movimento, gli altri restano in movimento + c.tfFine = { ...c.tf, x: 1000, y: 100 }; + const t = P.tfAl(c, 50); + vicino(t.x, 100, 1e-9); + vicino(t.y, 100 * P.passaPer([0, 1], [0, 1], 50 / 99), 1e-9); +}); + +test('effetti a tempo: forza e parametri con i keyframe si valutano prima di somma e inviluppo', () => { + const p = scena(P, B, ['flash'], 1); + const bl = p.clips.find((c) => c.fxb); + const fisso = (forza) => { const q = scena(P, B, ['flash'], forza); return B.statoEffetti(q, 0).flash; }; + bl.anim = { 'fxb.forza': [{ f: 0, v: 0.2 }, { f: 250, v: 1 }] }; + const st0 = B.statoEffetti(p, 0).flash; + vicino(st0, fisso(0.2), 1e-9); + // a metà il blocco usa la forza di lì (stessa curva dell'inviluppo, forza interpolata) + const f = 125, forza = A.valoreAnim(bl.anim['fxb.forza'], f, 1); + vicino(B.statoEffetti(p, f).flash, B.statoEffetti(scena(P, B, ['flash'], forza), f).flash, 1e-9); + // senza animazioni il blocco dà lo stesso risultato di prima + delete bl.anim; bl.fxb.forza = 1; + assert.deepEqual(B.statoEffetti(p, 40), B.statoEffetti(scena(P, B, ['flash'], 1), 40)); + // un parametro del catalogo (censura: larghezza) + const q = scena(P, B, ['censura']); + const cb = q.clips.find((c) => c.fxb); + cb.anim = { 'fxb.parametri.larghezza': [{ f: 0, v: 0.1 }, { f: 250, v: 0.5 }] }; + vicino(B.statoEffetti(q, 125).censure[0].w, 0.1 + (0.4 * 125) / 250, 1e-9); +}); + +// ——— modificare le chiavi ——— + +test('mettere, cambiare, togliere chiavi; la vecchia linea elastica diventa chiavi equivalenti', () => { + const { c } = clip({ opKeys: [{ f: 0, v: 0 }, { f: 50, v: 1 }, { f: 100, v: 0.5 }] }); + const prima = [0, 10, 25, 50, 75, 100].map((f) => P.clipOpacity(c, f)); + A.mettiChiave(c, 'opacity', 25, P.clipOpacity(c, 25)); + assert.deepEqual(c.opKeys, [], 'ora comanda la linea nuova'); + assert.deepEqual([0, 10, 25, 50, 75, 100].map((f) => P.clipOpacity(c, f)), prima, 'il disegno non cambia'); + assert.deepEqual(c.anim.opacity.map((k) => k.f), [0, 25, 50, 100]); + A.mettiChiave(c, 'opacity', 25, 0.9); + assert.equal(c.anim.opacity.length, 4); + assert.equal(A.valoreAl(c, 'opacity', 25), 0.9); + A.impostaModoChiave(c, 'opacity', 25, 'gradino'); + assert.equal(c.anim.opacity[1].modo, 'gradino'); + A.impostaModoChiave(c, 'opacity', 25, 'lineare'); + assert.equal('modo' in c.anim.opacity[1], false); + assert.equal(A.chiaveVicina(c, 'opacity', 25, 1), 50); + assert.equal(A.chiaveVicina(c, 'opacity', 25, -1), 0); + assert.equal(A.chiaveVicina(c, 'opacity', 100, 1), null); + assert.deepEqual(A.fotogrammiChiave(c), [0, 25, 50, 100]); + // togliere l'ultima chiave lascia il valore dov'era (nessun salto) + const solo = clip().c; + A.mettiChiave(solo, 'tf.x', 10, 77); + A.togliChiave(solo, 'tf.x', 10); + assert.equal(solo.anim, undefined); + assert.equal(solo.tf.x, 77); + // togliere tutta la linea: resta il valore del punto scelto + const due = clip().c; + A.mettiChiave(due, 'fx.sat', 0, 1); A.mettiChiave(due, 'fx.sat', 100, 0); + A.togliLinea(due, 'fx.sat', 50); + vicino(due.fx.sat, 0.5); + assert.equal(due.anim, undefined); +}); + +test('taglio, bordi, velocità: le chiavi seguono la clip', () => { + const { p, c } = clip(); + c.anim = { 'tf.x': [{ f: 0, v: 0 }, { f: 100, v: 100 }], 'fx.sat': [{ f: 20, v: 1, modo: 'gradino' }, { f: 80, v: 0 }] }; + const originale = (f) => A.valoreAl(c, 'tf.x', f); + const destra = MO.splitClip(p, c, 40); + assert.equal(c.len, 40); + // il valore del taglio sta da tutte e due le parti, e i due pezzi danno gli stessi valori di prima + vicino(A.valoreAl(c, 'tf.x', 40), 40); + vicino(A.valoreAl(destra, 'tf.x', 0), 40); + for (const f of [0, 10, 39]) vicino(A.valoreAl(c, 'tf.x', f), f); + for (const f of [0, 10, 59]) vicino(A.valoreAl(destra, 'tf.x', f), 40 + f); + void originale; + assert.equal(A.valoreAl(destra, 'fx.sat', 0), 1, 'il gradino continua a destra'); + // taglio sul bordo di una chiave: nessuna chiave doppia + assert.deepEqual(destra.anim['tf.x'].map((k) => k.f), [0, 60]); + // bordo che si mangia d fotogrammi: stesso istante del contenuto + const e = clip().c; + e.anim = { 'tf.y': [{ f: 10, v: 5 }, { f: 90, v: 85 }] }; + const prima = A.valoreAl(e, 'tf.y', 50); + A.spostaAnim(e, 20); + vicino(A.valoreAl(e, 'tf.y', 30), prima); + // velocità/frequenza: le chiavi si rimettono in proporzione + const s = clip().c; + s.anim = { pan: [{ f: 10, v: -1 }, { f: 50, v: 1 }, { f: 51, v: 0.5 }] }; + A.scalaAnim(s, 0.5); + assert.deepEqual(s.anim.pan.map((k) => k.f), [5, 25, 26].map((x) => Math.round(x))); + A.scalaAnim(s, 0.1); + assert.ok(s.anim.pan.every((k, i, a) => !i || a[i - 1].f < k.f), 'mai due chiavi sullo stesso fotogramma'); +}); + +test('audio: volume e panorama con i keyframe', async () => { + ambienteBrowser(); memoriaFinta(); + const AU = await carica('audio'); + const { c } = clip({ kind: 'media', gain: -3 }); + assert.equal(AU.guadagnoClip(c, 10, 0), P.dbToGain(-3), 'senza animazioni com\'è sempre stato'); + c.anim = { gain: [{ f: 0, v: -60 }, { f: 100, v: 0 }] }; + vicino(AU.guadagnoClip(c, 50, 0), P.dbToGain(-30), 1e-9); + const pti = AU.puntiInviluppo(c, 0); + assert.ok(pti.includes(0) && pti.includes(100)); + // la curva morbida e il gradino hanno più punti: la rampa dritta fra i punti segue la curva + c.anim.gain[0].modo = 'morbida'; + assert.ok(AU.puntiInviluppo(c, 0).length > pti.length); + c.anim.gain[0].modo = 'gradino'; + assert.ok(AU.puntiInviluppo(c, 0).some((f) => f > 99.9 && f < 100), 'il gradino salta subito prima della chiave dopo'); +}); + +// ——— le maschere ——— + +const asp = 16 / 9; +const area = (maschere, a = asp) => { const { w, h } = M.misureForma(a); return M.areaVisibile(M.coperturaMaschere(maschere, w, h)); }; +const maschera = (forma, extra) => M.nuovaMaschera(forma, 'm1', extra); + +test('maschere: nessuna maschera = si vede tutto; copertura di rettangolo ed ellisse', () => { + assert.equal(M.coperturaMaschere(undefined, 10, 10), null); + assert.equal(M.coperturaMaschere([], 10, 10), null); + assert.equal(M.coperturaMaschere([maschera('rettangolo', { spenta: true })], 10, 10), null); + assert.equal(M.rasterizzaMaschere(undefined, asp), null); + vicino(area([maschera('rettangolo', { w: 0.5, h: 0.5 })]), 0.25, 0.005); + vicino(area([maschera('rettangolo', { w: 0.4, h: 0.8, x: 0.3, y: 0.5 })]), 0.32, 0.005); + vicino(area([maschera('ellisse', { w: 0.5, h: 0.5 })]), (Math.PI / 4) * 0.25, 0.005); + vicino(area([maschera('ellisse', { w: 1, h: 1 })]), Math.PI / 4, 0.005); + // girata, l'area resta la stessa (la forma è girata nei pixel, non nelle frazioni) + vicino(area([maschera('rettangolo', { w: 0.3, h: 0.3, rot: 33 })]), 0.09, 0.006); + vicino(area([maschera('ellisse', { w: 0.4, h: 0.6, rot: 70 })]), (Math.PI / 4) * 0.24, 0.006); + // fuori dal quadro: parte della forma non conta + vicino(area([maschera('rettangolo', { w: 0.5, h: 0.5, x: 1, y: 0.5 })]), 0.125, 0.005); + // la copertura nel centro è piena e fuori è zero + const { w, h } = M.misureForma(asp); + const c = M.coperturaMaschere([maschera('rettangolo', { w: 0.5, h: 0.5 })], w, h); + assert.equal(c[Math.floor(h / 2) * w + Math.floor(w / 2)], 1); + assert.equal(c[0], 0); +}); + +test('maschere: inversione, espansione, sfumatura, quanto conta', () => { + const base = { w: 0.4, h: 0.4 }; + vicino(area([maschera('rettangolo', base)]) + area([maschera('rettangolo', { ...base, inverti: true })]), 1, 1e-6); + vicino(area([maschera('rettangolo', { ...base, opacita: 0.5 })]), 0.08, 0.004); + // espandere allarga, stringere restringe (frazione del lato corto) + assert.ok(area([maschera('rettangolo', { ...base, espandi: 0.05 })]) > area([maschera('rettangolo', base)])); + assert.ok(area([maschera('rettangolo', { ...base, espandi: -0.05 })]) < area([maschera('rettangolo', base)])); + // l'espansione di un rettangolo di +e per lato (angoli tondi): l'area cresce di circa 2e·(perimetro/2) + πe² + const { w, h } = M.misureForma(asp); + const e = 0.05, u = Math.min(w, h); + const A0 = 0.4 * w * 0.4 * h, P0 = 2 * (0.4 * w + 0.4 * h); + vicino(area([maschera('rettangolo', { ...base, espandi: e })]) * w * h, A0 + P0 * e * u + Math.PI * (e * u) ** 2, w * h * 0.004); + // sfumatura: sul bordo vale la metà, dentro piena, fuori zero; l'area quasi non cambia + const sf = M.coperturaMaschere([maschera('rettangolo', { ...base, sfuma: 0.1 })], w, h); + const riga = Math.floor(h / 2), bordo = Math.round(w / 2 + (0.4 * w) / 2); + vicino(sf[riga * w + bordo], 0.5, 0.05); + assert.equal(sf[riga * w + Math.floor(w / 2)], 1); + assert.equal(sf[riga * w + w - 1], 0); + assert.ok(sf[riga * w + bordo - 20] > 0.5 && sf[riga * w + bordo - 20] < 1, 'dentro il bordo sfumato'); + vicino(area([maschera('rettangolo', { ...base, sfuma: 0.1 })]), area([maschera('rettangolo', base)]), 0.01); +}); + +test('maschere: più maschere sommate e sottratte, in ordine', () => { + const a = maschera('rettangolo', { id: 'a', x: 0.25, y: 0.5, w: 0.4, h: 0.4 }); + const b = maschera('rettangolo', { id: 'b', x: 0.75, y: 0.5, w: 0.4, h: 0.4 }); + vicino(area([a, b]), 0.32, 0.006, 'due forme staccate si sommano'); + // sovrapposte: l'unione, non il doppio + const c = maschera('rettangolo', { id: 'c', x: 0.35, y: 0.5, w: 0.4, h: 0.4 }); + vicino(area([a, c]), 0.4 * 0.4 + 0.1 * 0.4, 0.006); + // sottrarre un buco dentro un rettangolo grande + const grande = maschera('rettangolo', { id: 'g', w: 0.8, h: 0.8 }); + const buco = maschera('ellisse', { id: 'e', w: 0.4, h: 0.4, op: 'sottrai' }); + vicino(area([grande, buco]), 0.64 - (Math.PI / 4) * 0.16, 0.006); + // se la prima è una sottrazione si parte da tutto: l'inverso della forma + vicino(area([maschera('rettangolo', { w: 0.5, h: 0.5, op: 'sottrai' })]), 0.75, 0.005); + // l'ordine conta: sottrarre prima e sommare dopo rimette la forma + vicino(area([maschera('rettangolo', { id: 'x', w: 0.5, h: 0.5, op: 'sottrai' }), maschera('rettangolo', { id: 'y', w: 0.5, h: 0.5 })]), 1, 0.01); + // una maschera spenta non conta + vicino(area([grande, { ...buco, spenta: true }]), 0.64, 0.005); +}); + +test('maschere Bézier: spigoli, curve morbide, punti a mano', () => { + const quadrato = [{ x: 0.25, y: 0.25 }, { x: 0.75, y: 0.25 }, { x: 0.75, y: 0.75 }, { x: 0.25, y: 0.75 }]; + vicino(area([maschera('bezier', { punti: quadrato, morbida: false })]), 0.25, 0.005); + assert.equal(area([maschera('bezier', { punti: quadrato.slice(0, 2), morbida: false })]), 0, 'con meno di tre punti non c\'è forma'); + // otto punti su un cerchio con le curve morbide: quasi un cerchio (in frazioni, quindi un'ellisse nei pixel) + const r = 0.3, pts = Array.from({ length: 8 }, (_, i) => ({ x: 0.5 + r * Math.cos((i * Math.PI) / 4) / asp, y: 0.5 + r * Math.sin((i * Math.PI) / 4) })); + const cerchio = area([maschera('bezier', { punti: pts, morbida: true })]); + vicino(cerchio, (Math.PI * r * r) / asp, 0.01); + assert.ok(cerchio > area([maschera('bezier', { punti: pts, morbida: false })]), 'le curve gonfiano l\'ottagono'); + // maniglie a mano: stesso punto, forma diversa; un orientamento e l'altro + const manuali = quadrato.map((p, i) => ({ ...p, hx: [0.1, 0, -0.1, 0][i], hy: [0, 0.1, 0, -0.1][i] })); + const poly = M.poligonoBezier(maschera('bezier', { punti: manuali, morbida: false })); + assert.ok(poly.length > 8, 'le curve si spezzano in tratti'); + assert.ok(area([maschera('bezier', { punti: manuali })]) > 0.2); + // un punto fuori e un triangolo: area del triangolo + vicino(area([maschera('bezier', { punti: [{ x: 0, y: 0 }, { x: 1, y: 0 }, { x: 0, y: 1 }], morbida: false })]), 0.5, 0.005); + // con sfumatura e inversione funziona uguale + vicino(area([maschera('bezier', { punti: quadrato, morbida: false, inverti: true })]), 0.75, 0.005); + assert.ok(M.dentroMaschera(maschera('bezier', { punti: quadrato, morbida: false }), 0.5, 0.5, asp)); + assert.ok(!M.dentroMaschera(maschera('bezier', { punti: quadrato, morbida: false }), 0.1, 0.1, asp)); +}); + +test('maschere animate dai keyframe, firma e raster', () => { + const { c } = clip(); + c.maschere = [maschera('rettangolo', { x: 0.25, w: 0.3, h: 0.3 })]; + c.anim = { 'mask.m1.x': [{ f: 0, v: 0.25 }, { f: 100, v: 0.75 }], 'mask.m1.sfuma': [{ f: 0, v: 0 }, { f: 100, v: 0.1 }] }; + const m50 = A.valutaClip(c, 50).maschere[0]; + vicino(m50.x, 0.5); + vicino(m50.sfuma, 0.05); + assert.equal(c.maschere[0].x, 0.25, 'l\'originale non si tocca'); + // il centro della copertura si sposta con la maschera + const { w, h } = M.misureForma(asp); + const cx = (cov) => { let s = 0, t = 0; for (let j = 0; j < h; j++) for (let i = 0; i < w; i++) { s += cov[j * w + i] * i; t += cov[j * w + i]; } return s / t / w; }; + vicino(cx(M.coperturaMaschere(A.valutaClip(c, 0).maschere, w, h)), 0.25, 0.01); + vicino(cx(M.coperturaMaschere(A.valutaClip(c, 100).maschere, w, h)), 0.75, 0.01); + // punti della Bézier animati + c.maschere = [maschera('bezier', { punti: [{ x: 0.2, y: 0.2 }, { x: 0.4, y: 0.2 }, { x: 0.4, y: 0.4 }], morbida: false })]; + c.anim = { 'mask.m1.p1.x': [{ f: 0, v: 0.4 }, { f: 10, v: 0.8 }] }; + vicino(A.valutaClip(c, 10).maschere[0].punti[1].x, 0.8); + // la firma cambia se la forma cambia, non se cambiano cose che non contano + const f1 = M.firmaMaschere([maschera('rettangolo', {})], asp); + assert.notEqual(f1, M.firmaMaschere([maschera('rettangolo', { x: 0.51 })], asp)); + assert.notEqual(f1, M.firmaMaschere([maschera('rettangolo', {})], 1)); + assert.equal(f1, M.firmaMaschere([maschera('rettangolo', { nome: 'altro' })], asp)); + assert.equal(M.firmaMaschere([], asp), ''); + const r = M.rasterizzaMaschere([maschera('rettangolo', { w: 0.5, h: 0.5 })], asp); + assert.equal(r.dati.length, r.w * r.h); + assert.equal(r.dati[Math.floor(r.h / 2) * r.w + Math.floor(r.w / 2)], 255); + assert.equal(r.dati[0], 0); +}); + +test('annulla e ripeti: una chiave e una maschera tornano come prima', async () => { + ambienteBrowser(); memoriaFinta(); globalThis.window = globalThis; + globalThis.requestAnimationFrame = () => 0; globalThis.cancelAnimationFrame = () => {}; + const { store } = await carica('store'); + const { p, c } = clip(); + store.load(p); + store.edit('Keyframe', (pp) => { A.mettiChiave(pp.clips[0], 'tf.x', 10, 50); pp.clips[0].maschere = [maschera('ellisse', {})]; }); + assert.equal(store.doc.clips[0].anim['tf.x'][0].v, 50); + assert.equal(store.doc.clips[0].maschere.length, 1); + store.doUndo(); + assert.equal(store.doc.clips[0].anim, undefined); + assert.equal(store.doc.clips[0].maschere, undefined); + store.doRedo(); + assert.equal(store.doc.clips[0].anim['tf.x'][0].v, 50); + assert.equal(store.doc.clips[0].maschere[0].forma, 'ellisse'); + void c; +}); + +// ——— revisione ——— + +test('togliAnimazione: toglie la linea (o il gruppo) e pulisce anim; percorsi strani non passano', () => { + const { c } = clip(); + A.mettiChiave(c, 'gain', 5, -10); + A.mettiChiave(c, 'tf.x', 5, 20); + A.mettiChiave(c, 'tf.scale', 5, 1.5); + A.togliAnimazione(c, 'tf'); + assert.deepEqual(Object.keys(c.anim), ['gain']); + A.togliAnimazione(c, 'gain'); + assert.equal(c.anim, undefined); + assert.equal(A.descrittore('tf.constructor'), null); + assert.equal(A.descrittore('fx.toString'), null); +}); + +test('prima chiave su un\'opacità con la vecchia linea elastica: il valore di partenza non salta', () => { + const { c } = clip({ opacity: 1 }); + c.opKeys = [{ f: 0, v: 1 }, { f: 40, v: 0 }]; + const prima = P.clipOpacity(c, 20); + A.mettiChiave(c, 'opacity', 20, P.keyValue(c.opKeys.length ? c.opKeys : [{ f: 0, v: 1 }, { f: 40, v: 0 }], 20, 1)); + vicino(P.clipOpacity(c, 20), prima); +}); diff --git a/test/unit/live-cursore.test.mjs b/test/unit/live-cursore.test.mjs new file mode 100644 index 0000000..d8cc1b8 --- /dev/null +++ b/test/unit/live-cursore.test.mjs @@ -0,0 +1,232 @@ +import { test } from 'node:test'; +import assert from 'node:assert/strict'; +import { carica, ambienteBrowser, memoriaFinta } from './_aiuti.mjs'; + +const Z = await carica('zoomCursore'), P = await carica('progetto'), B = await carica('blocchi'), M = await carica('montaggio'); +const schermo = { id: '-1920:0:0:1080', left: -1920, top: 0, width: 1920, height: 1080 }; +const punto = (tMs, cx = 0.8, cy = 0.3, clicks = 0, visible = true) => ({ tMs, cx, cy, clicks, visible }); + +function scena() { + const p = P.newProject({ w: 1920, h: 1080, rate: { num: 30, den: 1 }, drop: false }); + p.master.auto = false; + const m = { id: 'schermo', width: 1920, height: 1080, t0: 0, duration: 10 }; + const raw = Array.from({ length: 600 }, (_, i) => punto(i * 1000 / 60, 0.5 + i / 3000, 0.3, i === 120 || i === 150 ? 1 : 0)); + m.cursoreLive = Z.rimappaCursore(raw, schermo, [{ da: 0, fine: 10000, videoMs: 0, durataMs: 10000 }], 10000); + p.media.push(m); + const c = P.newClip('media', p.tracks[1].id, 300, 300, { media: m.id, link: 'registrazione' }); + p.clips.push(c); + return { p, c, m }; +} + +test('pause, countdown e grazia spariscono; la cucitura usa gli offset effettivi dei pacchetti', () => { + const raw = [punto(50), punto(100, .2, .4, 1), punto(115, .2, .4, 0), punto(135, .2, .4, 1), + punto(300, .3, .3, 2), punto(900, .7, .7, 1), punto(1000, .7, .7, 2), punto(1016, .7, .7, 0), punto(1400, .9, .9, 1)]; + const d = Z.rimappaCursore(raw, schermo, [{ da: 100, fine: 300, videoMs: 0, durataMs: 220 }, + { da: 1000, fine: 1200, videoMs: 220, durataMs: 200 }], 420); + assert.deepEqual(d.campioni.map(s => s.tMs), [0, 15, 35, 220, 236]); + assert.deepEqual(d.clic.map(s => [s.tMs, s.button]), [[0, 0], [35, 0], [220, 1]]); + assert.equal(d.schermo.left, -1920); + assert.equal(d.segmenti[1].daMs, 220); +}); + +test('se la cucitura fallisce ciascun file riparte da zero, senza clic della pausa o della grazia', () => { + const raw = [punto(110, .1, .2, 1), punto(900, .4, .5, 1), punto(1110, .8, .9, 4), punto(1300, .5, .5, 1)]; + const a = Z.rimappaCursore(raw, schermo, [{ da: 100, fine: 300, videoMs: 0, durataMs: 200 }], 800); + const b = Z.rimappaCursore(raw, schermo, [{ da: 1100, fine: 1300, videoMs: 0, durataMs: 200 }], 800); + assert.deepEqual(a.clic.map(s => [s.tMs, s.button]), [[10, 0]]); + assert.deepEqual(b.clic.map(s => [s.tMs, s.button]), [[10, 2]]); +}); + +test('coordinate fuori monitor, nascoste o non finite non generano clic né valori JSON impossibili', () => { + const d = Z.rimappaCursore([punto(0, -.2, .5, 1), punto(20, .2, .5, 1, false), punto(40, NaN, Infinity, 7), punto(60, .2, .5, 7)], schermo, + [{ da: 0, fine: 100, videoMs: 0, durataMs: 100 }], 100); + assert.equal(d.clic.length, 3); + assert.deepEqual(d.clic.map(s => s.button), [0, 1, 2]); + assert.equal(d.campioni[2].visible, false); + assert.deepEqual(JSON.parse(JSON.stringify(d)), d); + assert.equal(Z.puntoCursoreAl(d.campioni, 45), null); +}); + +test('il focus usa fit, scala e rotazione; ai bordi non scopre il fondo della ripresa', () => { + const base = { ...P.TF0, x: 10, y: 20, scale: .8, rot: 90 }; + const tf = Z.trasformazioneFocus(base, 1, 0, 2, 1000, 500); + assert.equal(tf.scale, 1.6); + assert.ok(Math.abs(tf.x - (10 - 200)) < 1e-8); + assert.ok(Math.abs(tf.y - (20 - 400)) < 1e-8); + assert.deepEqual(Z.trasformazioneFocus(base, .8, .2, 1, 1000, 500), base); +}); + +test('zoom a tappe modificabili: segue il cursore, riparte a quadro intero, è deterministico e non sovrascrive il lavoro manuale', () => { + const { p, c, m } = scena(); + const gemella = structuredClone(c); + assert.equal(Z.applicaZoomCursore(p, c, m), true); + assert.equal(Z.applicaZoomCursore(p, gemella, m), true); + assert.deepEqual(c, gemella); + assert.ok(c.via.length > 4); + assert.equal(c.tf.scale, 1); assert.equal(c.tfFine.scale, 1); + assert.ok(c.via.some(v => v.tf.scale > 1.6)); + const spostamenti = c.via.filter(v => v.tf.scale > 1.6).map(v => v.tf.x); + assert.ok(Math.max(...spostamenti) - Math.min(...spostamenti) > 3); + assert.ok(c.via.every((v, i, a) => v.t > 0 && v.t < 1 && (!i || v.t > a[i - 1].t))); + const prima = structuredClone(c); + assert.equal(Z.applicaZoomCursore(p, c, m), false); + assert.deepEqual(c, prima); + const a = P.tfAl(c, 75), b = P.tfAl(c, 200); + assert.deepEqual(P.tfAl(c, 75), a); assert.deepEqual(P.tfAl(c, 200), b); +}); + +test('progetti senza telemetria e movimenti vecchi restano uguali; il roundtrip conserva dati, tappe e blocco', () => { + const { p, c, m } = scena(); + const vecchio = structuredClone(m); delete vecchio.cursoreLive; + const prima = structuredClone(c); + assert.equal(Z.applicaZoomCursore(p, c, vecchio), false); + assert.deepEqual(c, prima); + c.tfFine = { ...c.tf, x: 320, scale: 1.2 }; + c.via = [{ t: .123456789, tf: { ...c.tf, x: 42 } }]; + const frame = [0, 17, 150, 299].map(f => P.tfAl(c, f)); + const riaperto = JSON.parse(JSON.stringify(p)); + assert.deepEqual([0, 17, 150, 299].map(f => P.tfAl(riaperto.clips[0], f)), frame); + assert.equal(Z.applicaZoomCursore(p, c, m), false); + const fx = Z.bloccoClicLive(c); p.clips.push(fx); + assert.equal(B.nomeBlocco(fx.fxb), 'Clic animati'); + assert.equal(B.statoEffetti(p, 375), null); // la webcam non riceve un effetto di traccia + assert.deepEqual(JSON.parse(JSON.stringify(p)), p); +}); + +test('gli anelli seguono il tempo sorgente anche dopo split, slip, velocità e seek; eliminare il blocco li spegne', async () => { + const A = await carica('anelliClic'); + const { p, c } = scena(); + p.clips.push(Z.bloccoClicLive(c)); + const anello = A.anelliClic(p, c, 2.1, 63); + assert.equal(anello.n, 1); + const destra = M.splitClip(p, c, 345); + assert.equal(A.anelliClic(p, destra, P.srcTimeAt(p, destra, 363), 18).n, 1); + destra.srcIn = 2; destra.speed = 2; + assert.equal(A.anelliClic(p, destra, P.srcTimeAt(p, destra, destra.start + 3), 3).n, 1); + A.anelliClic(p, destra, 8, 100); + assert.deepEqual(A.anelliClic(p, c, 2.1, 63), anello); + const cam = { ...c, media: 'webcam' }; + assert.equal(A.anelliClic(p, cam, 2.1, 63).n, 0); + const fx = p.clips.find(c => c.kind === 'fx'); fx.len = 5; + assert.equal(A.anelliClic(p, c, 2.1, 63).n, 0); + p.clips = p.clips.filter(c => c.kind !== 'fx'); + assert.equal(A.anelliClic(p, c, 2.1, 63).n, 0); +}); + +test('il blocco segue lo schermo quando si sposta; cancellarlo col comando normale lascia video e audio legati', () => { + const { p, c } = scena(); + const audio = P.newClip('media', p.tracks[2].id, c.start, c.len, { media: c.media, link: c.link }); + const fx = Z.bloccoClicLive(c); p.clips.push(audio, fx); + assert.equal(B.effettoTempo('clicLive').nome, 'Clic animati'); + assert.equal(fx.link, undefined); + const df = M.moveClips(p, M.withLinked(p, [c.id]), 100, 0, 'video', 'libero'); + assert.equal(df.df, 100); assert.equal(fx.start, c.start); assert.equal(audio.start, c.start); + assert.deepEqual([...M.withLinked(p, [fx.id])], [fx.id]); + M.deleteClips(p, M.withLinked(p, [fx.id]), false); + assert.deepEqual(p.clips.map(c => c.id), [c.id, audio.id]); +}); + +test('il layer integra LUT, curve, zoom e clic in monitor ed export; ombra e webcam non li ereditano (GL registrato)', async () => { + ambienteBrowser(); memoriaFinta(); globalThis.window = globalThis; + globalThis.ImageBitmap = class {}; + const intervalli = [], originale = globalThis.setInterval; + globalThis.setInterval = (...args) => { const h = originale(...args); intervalli.push(h); return h; }; + let Compositore; + try { ({ Compositore } = await carica('compositore')); } + finally { globalThis.setInterval = originale; for (const h of intervalli) clearInterval(h); } + const valori = new Map(), disegni = []; + const gl = new Proxy({}, { get(_t, k) { + if (k === 'NO_ERROR') return 0; + if (/^[A-Z0-9_]+$/.test(String(k))) return k; + if (k === 'getShaderParameter' || k === 'getProgramParameter') return () => true; + if (k === 'getUniformLocation') return (_programma, nome) => nome; + if (k === 'getParameter') return p => p === 'MAX_3D_TEXTURE_SIZE' ? 65 : null; + if (k === 'getError' || k === 'getAttribLocation') return () => 0; + if (String(k).startsWith('create')) return () => ({}); + if (k === 'drawArrays') return () => disegni.push(new Map(valori)); + if (String(k).startsWith('uniform')) return (nome, ...v) => valori.set(nome, v.map(x => ArrayBuffer.isView(x) ? [...x] : x)); + return () => {}; + } }); + const cp = new Compositore({ width: 1920, height: 1080, getContext: () => gl }); + cp.fbo = [{ fb: {}, tex: {} }, { fb: {}, tex: {} }]; cp.fbW = 1920; cp.fbH = 1080; + const { UNIFORM_COLORE } = await carica('coloreGpu'); + for (const nome of UNIFORM_COLORE) { + assert.equal(cp.uL[nome], nome); assert.equal(cp.uM[nome], nome); + } + cp.upload = () => ({ tex: {} }); + cp.fornitore = () => ({ displayWidth: 1920, displayHeight: 1080, rotation: 0, toCanvasImageSource: () => ({}) }); + const { p, c, m } = scena(); c.tf.ombra = .5; + const { parseCube } = await carica('lut'); + const lut = { ...parseCube('LUT_3D_SIZE 2\n0 0 0\n1 0 0\n0 1 0\n1 1 0\n0 0 1\n1 0 1\n0 1 1\n1 1 1'), id: 'live', hash: 'live' }; + p.luts = [lut]; + c.fx.colore = { lut: { id: lut.id, intensita: .5 }, curve: { luma: [{ id: 'centro', x: .5, y: .4 }] } }; + Z.applicaZoomCursore(p, c, m); p.clips.push(Z.bloccoClicLive(c)); + const s = { clip: c, t: 2.1, local: 2.1, lf: 63 }; + assert.equal(cp.layer(p, s, 0, true, 363), true); + const monitor = disegni.at(-1); + assert.deepEqual(disegni[0].get('u_numClic'), [0]); // ombra + assert.deepEqual(disegni[0].get('u_caIntensity'), [0]); + assert.deepEqual(disegni[0].get('u_caCurveOn'), [0]); + assert.deepEqual(monitor.get('u_numClic'), [1]); + assert.deepEqual(monitor.get('u_caIntensity'), [.5]); + assert.deepEqual(monitor.get('u_caCurveOn'), [1]); + assert.deepEqual(monitor.get('u_caLut'), [5]); + assert.deepEqual(monitor.get('u_caCurve'), [4]); + assert.ok(monitor.get('u_scale')[0] > 1); + const x = monitor.get('u_clic')[0]; + assert.ok(Math.abs(x[0] - m.cursoreLive.clic[0].cx) < 1e-6); // coordinate nella ripresa, prima dello zoom + cp.layer(p, s, 0, false, 363); + assert.deepEqual(disegni.at(-1).get('u_clic'), monitor.get('u_clic')); + for (const nome of UNIFORM_COLORE) assert.deepEqual(disegni.at(-1).get(nome), monitor.get(nome)); + p.media.push({ ...m, id: 'webcam', cursoreLive: undefined }); + cp.layer(p, { ...s, clip: { ...c, media: 'webcam', fx: { ...c.fx, colore: undefined } } }, 0, false, 363); + assert.deepEqual(disegni.at(-1).get('u_numClic'), [0]); + assert.deepEqual(disegni.at(-1).get('u_caIntensity'), [0]); + assert.deepEqual(disegni.at(-1).get('u_caCurveOn'), [0]); +}); + +test('annulla/ripeti e salvataggio .daprod reali conservano i dati; la migrazione vecchia è idempotente e non cambia i movimenti', async () => { + ambienteBrowser(); memoriaFinta(); globalThis.window = globalThis; + globalThis.requestAnimationFrame = () => 0; globalThis.cancelAnimationFrame = () => {}; + const intervalli = [], originale = globalThis.setInterval; + globalThis.setInterval = (...a) => { const h = originale(...a); intervalli.push(h); return h; }; + let PR, PK, store; + try { PR = await carica('progetti'); PK = await carica('pacchetto'); ({ store } = await carica('store')); } + finally { globalThis.setInterval = originale; for (const h of intervalli) clearInterval(h); } + const { p, c, m } = scena(); store.load(p); + store.edit('Zoom e clic LIVE', p => { Z.applicaZoomCursore(p, p.clips[0], p.media[0]); p.clips.push(Z.bloccoClicLive(p.clips[0])); }); + const dopo = structuredClone(store.doc); + assert.equal(store.doUndo(), 'Zoom e clic LIVE'); + assert.equal(store.doc.clips.length, 1); assert.equal(store.doc.clips[0].tfFine, undefined); + assert.equal(store.doRedo(), 'Zoom e clic LIVE'); assert.deepEqual(JSON.parse(JSON.stringify(store.doc)), dopo); + const nelPacchetto = JSON.parse(PK._testProgettoDentro({ voci: [{ m, nome: 'media/schermo.webm' }] }, false)); + assert.deepEqual(nelPacchetto.media[0].cursoreLive, m.cursoreLive); + assert.equal(nelPacchetto.media[0].pacchetto, 'media/schermo.webm'); + assert.deepEqual(PR._testValida(nelPacchetto).clips, dopo.clips); + const vecchio = structuredClone(dopo); delete vecchio.media[0].cursoreLive; + vecchio.clips = [structuredClone(c)]; vecchio.clips[0].tfFine = { ...c.tf, x: 100, scale: 1.2 }; + vecchio.clips[0].via = [{ t: .123456789, tf: { ...c.tf, x: 42 } }]; + const frame = [0, 23, 170, 299].map(f => P.tfAl(vecchio.clips[0], f)); + const a = PR._testValida(JSON.parse(JSON.stringify(vecchio))), b = PR._testValida(structuredClone(a)); + assert.deepEqual(a, b); assert.equal('cursoreLive' in a.media[0], false); + assert.deepEqual([0, 23, 170, 299].map(f => P.tfAl(a.clips[0], f)), frame); +}); + +test('ponte nativo: origini dei pezzi prima di MediaRecorder, pause escluse e una sola chiusura', async () => { + ambienteBrowser(); memoriaFinta(); + const chiamate = []; + globalThis.window = { __TAURI_INTERNALS__: { invoke: async (cmd, args) => { + chiamate.push([cmd, args]); + if (cmd === 'cursore_avvia') return { id: 42, trascorsiMs: 0 }; + if (cmd === 'cursore_ferma') return [punto(110, .2, .3, 1), punto(400, .4, .5, 1), punto(710, .8, .9, 2)].map(s => JSON.stringify(s)).join('\n'); + } } }; + const { CursoreLive } = await carica('cursoreLive'); + const r = await CursoreLive.avvia(schermo); + // Il costruttore TS non usa campi #privati: fissiamo l'orologio per verificare la rimappatura. + r.origine = 1000; + r.pezzo(1100); r.pausa(1300); r.pezzo(1700); r.pausa(1900); + const fine = await r.ferma(); + const d = fine.perVideo([{ indice: 0, daMs: 0, durataMs: 200 }, { indice: 1, daMs: 220, durataMs: 200 }], 420); + assert.deepEqual(d.clic.map(s => [s.tMs, s.button]), [[10, 0], [230, 1]]); + assert.deepEqual(chiamate.map(s => s[0]), ['cursore_avvia', 'cursore_ferma']); +}); diff --git a/test/unit/lut-partenza.test.mjs b/test/unit/lut-partenza.test.mjs new file mode 100644 index 0000000..d824acf --- /dev/null +++ b/test/unit/lut-partenza.test.mjs @@ -0,0 +1,70 @@ +// Le LUT di partenza (src/assets/lut/*.cube) nascono da scripts/genera-lut.mjs: devono essere valide per il parser, +// uguali a quello che lo script scrive adesso e fare quello che promette il nome. +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { readFileSync, readdirSync } from 'node:fs'; +import path from 'node:path'; +import { fileURLToPath, pathToFileURL } from 'node:url'; +import { carica } from './_aiuti.mjs'; + +const radice = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../..'); +const L = await carica('lut'); +const { LUT, testoCube, PUNTI } = await import(pathToFileURL(path.join(radice, 'scripts/genera-lut.mjs')).href); +const cartella = path.join(radice, 'src/assets/lut'); +const leggi = (f) => readFileSync(path.join(cartella, f + '.cube'), 'utf8'); +const lut = (f) => L.parseCube(leggi(f), f); +const luma = ([r, g, b]) => 0.2126 * r + 0.7152 * g + 0.0722 * b; + +test('LUT di partenza: i file sono quelli dello script, senza altri', () => { + assert.deepEqual(readdirSync(cartella).filter((f) => f.endsWith('.cube')).sort(), LUT.map((l) => l.file + '.cube').sort()); + for (const l of LUT) assert.equal(leggi(l.file).replace(/\r\n/g, '\n'), testoCube(l), `${l.file}: rigenera con node scripts/genera-lut.mjs`); +}); + +test('LUT di partenza: il parser le accetta, 3D, dominio 0..1, tutti i valori nel campo', () => { + for (const l of LUT) { + const r = lut(l.file); + assert.equal(r.n, PUNTI); + assert.equal(r.nome, l.nome); + assert.deepEqual(r.domainMin, [0, 0, 0]); assert.deepEqual(r.domainMax, [1, 1, 1]); + assert.equal(r.dati.length, PUNTI ** 3 * 3); + assert.ok(r.dati.every((v) => v >= 0 && v <= 1), l.file); + assert.ok(L.validaLut({ ...r, id: 'x', hash: 'x' })); + assert.match(leggi(l.file), /licenza MIT/); + } +}); + +test('LUT di partenza: i grigi restano in ordine (niente inversioni) e il nero resta scuro', () => { + for (const l of LUT) { + const r = lut(l.file); + let prima = -1; + for (let i = 0; i <= 20; i++) { const y = luma(L.campionaLut(r, [i / 20, i / 20, i / 20])); assert.ok(y >= prima - 1e-6, `${l.file} @${i}`); prima = y; } + assert.ok(luma(L.campionaLut(r, [0, 0, 0])) < 0.1, l.file); + assert.ok(luma(L.campionaLut(r, [1, 1, 1])) > 0.85, l.file); + } +}); + +test('LUT di partenza: fanno quello che dice il nome', () => { + const grigio = [0.5, 0.5, 0.5]; + const caldo = L.campionaLut(lut('caldo'), grigio), freddo = L.campionaLut(lut('freddo'), grigio); + assert.ok(caldo[0] > caldo[2] + 0.04, 'caldo: più rosso che blu'); + assert.ok(freddo[2] > freddo[0] + 0.04, 'freddo: più blu che rosso'); + const bn = lut('bianco-e-nero-ricco'); + for (const c of [[0.9, 0.2, 0.1], [0.1, 0.4, 0.9], [0.3, 0.8, 0.3]]) { const o = L.campionaLut(bn, c); assert.ok(Math.abs(o[0] - o[1]) < 1e-6 && Math.abs(o[1] - o[2]) < 1e-6); } + const rosso = L.campionaLut(bn, [0.9, 0.1, 0.1])[0], blu = L.campionaLut(bn, [0.1, 0.1, 0.9])[0]; + assert.ok(rosso > blu + 0.15, 'il rosso esce più chiaro del blu'); + const mid = L.campionaLut(bn, [0.2, 0.2, 0.2])[0], alto = L.campionaLut(bn, [0.8, 0.8, 0.8])[0]; + assert.ok(mid < 0.15 && alto > 0.85, 'contrasto pieno'); + const teal = lut('teal-e-orange'); + const ombra = L.campionaLut(teal, [0.15, 0.15, 0.15]), pelle = L.campionaLut(teal, [0.85, 0.6, 0.5]); + assert.ok(ombra[2] > ombra[0], 'ombre verso il teal'); + assert.ok(pelle[0] > pelle[2] + 0.2, 'la pelle resta calda'); + const nero = L.campionaLut(lut('pellicola-anni-70'), [0, 0, 0]); + assert.ok(nero.every((v) => v > 0.03), 'neri alzati'); +}); + +test('LUT di partenza: lutDaTesto dà id e hash sul contenuto, uguali per lo stesso testo', async () => { + const a = await L.lutDaTesto(leggi('caldo'), 'Caldo'), b = await L.lutDaTesto(leggi('caldo'), 'Altro nome'); + assert.equal(a.id, b.id); assert.equal(a.id, 'lut-' + a.hash); + const f = await L.lutDaTesto(leggi('freddo'), 'Freddo'); + assert.notEqual(a.id, f.id); +}); diff --git a/test/unit/montaggioTesto.test.mjs b/test/unit/montaggioTesto.test.mjs new file mode 100644 index 0000000..94b6ee9 --- /dev/null +++ b/test/unit/montaggioTesto.test.mjs @@ -0,0 +1,36 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { carica } from './_aiuti.mjs'; +const T = await carica('montaggioTesto'), P = await carica('progetto'); +const progetto = () => P.newProject({ w: 1920, h: 1080, rate: { num: 25, den: 1 }, drop: false }); + +test('solo parole con tempi veri, e conversione dopo trim e velocità', () => { + assert.deepEqual(T.paroleDaPezzi([{ da: 0, a: 1, testo: ' due parole' }, { da: 1, a: 2, testo: ' ciao' }, { da: 2, a: null, testo: 'fine' }], 3), [{ da: 1, a: 2, testo: 'ciao' }]); + const p = progetto(), c = P.newClip('media', p.tracks[0].id, 100, 50, { media: 'm', srcIn: 2, speed: 2, parlato: { id: 'p', media: 'm', da: 0, a: 8, parole: [{ da: 2.4, a: 3.2, testo: 'ciao' }] } }); + assert.deepEqual(T.paroleInClip(p, c), [{ da: 105, a: 115, testo: 'ciao', clip: c.id }]); +}); + +test('selezione, pause e intercalari producono intervalli precisi', () => { + const w = [{ da: 10, a: 15, testo: 'ehm', clip: 'c' }, { da: 20, a: 25, testo: 'allora', clip: 'c' }, { da: 30, a: 35, testo: 'Allora!', clip: 'c' }]; + assert.deepEqual(T.intervalliParole(w, new Set([0, 1])), [{ da: 10, a: 25 }]); + assert.deepEqual(T.intervalliSilenzi(w, { da: 0, a: 50 }, 9, 1), [{ da: 1, a: 9 }, { da: 36, a: 49 }]); + assert.deepEqual(T.intervalliIntercalari(w, 'ehm, allora'), [{ da: 10, a: 15 }, { da: 30, a: 35 }]); +}); + +test('ripple su tutte le tracce, segni e sottotitoli; testo conservato', () => { + const p = progetto(), v = P.newClip('media', p.tracks[0].id, 0, 100, { media: 'm', link: 'l', parlato: { id: 'p', media: 'm', da: 0, a: 4, parole: [{ da: 0.4, a: 0.6, testo: 'uno' }, { da: 2.4, a: 2.6, testo: 'due' }] } }); + const a = P.newClip('media', p.tracks[2].id, 0, 100, { media: 'm', link: 'l' }); + p.clips = [v, a]; p.markers = [{ f: 80, name: 'segno' }]; p.inF = 15; p.outF = 90; + p.sottotitoli = { righe: [{ id: 's', da: 10, a: 80, testo: 'ciao' }] }; + const piano = T.pianoTagli([{ da: 20, a: 40 }, { da: 30, a: 50 }], p); + assert.equal(piano.secondi, 1.2); T.applicaTagli(p, piano); + assert.deepEqual(p.clips.filter(c => c.track === v.track).map(c => [c.start, c.len, c.srcIn]).sort((x,y) => x[0]-y[0]), [[0,20,0],[20,50,2]]); + assert.equal(p.markers[0].f, 50); assert.equal(p.outF, 60); assert.equal(p.sottotitoli.righe[0].a, 50); + assert.deepEqual(p.clips.filter(c => c.track === v.track).flatMap(c => T.paroleInClip(p,c)).map(w => w.testo), ['uno','due']); + assert.equal(p.clips.filter(c => c.track === a.track).length, 2); +}); + +test('una traccia bloccata impedisce modifiche parziali', () => { + const p = progetto(); p.clips = [P.newClip('media', p.tracks[0].id, 0, 100)]; p.tracks[0].lock = true; + const prima = structuredClone(p); assert.throws(() => T.applicaTagli(p, T.pianoTagli([{ da: 10, a: 20 }], p)), /Sblocca/); assert.deepEqual(p, prima); +}); diff --git a/test/unit/proxy-automatiche.test.mjs b/test/unit/proxy-automatiche.test.mjs new file mode 100644 index 0000000..4c7d138 --- /dev/null +++ b/test/unit/proxy-automatiche.test.mjs @@ -0,0 +1,135 @@ +// Metadati e code vere, senza aprire l'app, usare encoder o installare ffmpeg. +import { test, beforeEach, afterEach } from 'node:test'; +import assert from 'node:assert/strict'; +import { BufferTarget, EncodedPacket, EncodedVideoPacketSource, Output, WebMOutputFormat } from 'mediabunny'; +import { ambienteBrowser, carica, discoFinto, dormi, finche, memoriaFinta } from './_aiuti.mjs'; + +ambienteBrowser(); +const memoria = memoriaFinta(); +const disco = discoFinto(); +const PX = await carica('proxy'); +const L = await carica('libreria'); +const AT = await carica('attivita'); +L.impostaPreparazioneAutomatica(false); +const aperti = []; +assert.equal(PX.copieLeggereAutomatiche(), true, 'accesa al primo avvio'); + +beforeEach(() => { + AT.azzeraAttivita(); AT.pausaGlobale(true); + PX.impostaModoProxy('auto'); PX.impostaCopieLeggereAutomatiche(true); +}); +afterEach(() => { + for (const id of aperti.splice(0)) L.chiudi(id); + AT.azzeraAttivita(); +}); + +const normale = { type: 'video', width: 1920, height: 1080, vcodec: 'avc' }; +test('Soglie: Full HD orizzontale e verticale restano leggeri, oltre si prepara la copia', () => { + assert.equal(PX.videoPesante(normale), false); + assert.equal(PX.videoPesante({ ...normale, width: 1080, height: 1920 }), false); + for (const [width, height] of [[1921, 1080], [1920, 1081], [3840, 2160], [2160, 3840]]) { + assert.equal(PX.videoPesante({ ...normale, width, height }), true, `${width}×${height}`); + } + assert.equal(PX.videoPesante({ ...normale, type: 'image', width: 6000 }), false); +}); + +test('Soglie: 10 bit, HEVC, ProRes, AV1 e bitrate alto', () => { + assert.equal(PX.videoPesante(normale, { bit: 8 }), false); + assert.equal(PX.videoPesante(normale, { bit: 10 }), true); + assert.equal(PX.videoPesante(normale, { bit: 12 }), true); + for (const codec of ['hevc', 'hvc1.2.4.L153.B0', 'hev1', 'prores', 'apch', 'apcn', 'apcs', 'apco', 'ap4h', 'ap4x', 'av1', 'av01.0.08M.10', 'vp09.02.10.10', 'avc1.6e0033']) { + assert.equal(PX.videoPesante(normale, { codec }), true, codec); + } + assert.equal(PX.videoPesante(normale, { codec: 'vp09.00.10.08' }), false); + assert.equal(PX.videoPesante(normale, { bitrate: PX.SOGLIE_PROXY.bitrate }), false); + assert.equal(PX.videoPesante(normale, { bitrate: PX.SOGLIE_PROXY.bitrate + 1 }), true); + assert.equal(PX.videoPesante(normale, { distanzaChiavi: 2 }), false); + assert.equal(PX.videoPesante(normale, { distanzaChiavi: 2.01 }), true); +}); + +test('La preferenza automatica è separata dalla vecchia scelta e si conserva', () => { + PX.impostaModoProxy('sempre'); PX.impostaCopieLeggereAutomatiche(false); + assert.equal(PX.copieLeggereAutomatiche(), false); + assert.equal(memoria.get('dpv-proxy-automatiche'), 'no'); + assert.equal(memoria.get('dpv-proxy'), 'sempre'); + PX.impostaCopieLeggereAutomatiche(true); + assert.equal(memoria.get('dpv-proxy-automatiche'), 'si'); +}); + +// Un WebM con intestazioni e tempi veri: i pacchetti finti bastano per provare i metadati, non si decodificano. +async function video(width = 3840, height = 2160) { + const target = new BufferTarget(); + const output = new Output({ format: new WebMOutputFormat(), target }); + const source = new EncodedVideoPacketSource('vp8'); + output.addVideoTrack(source); + await output.start(); + const dati = new Uint8Array([0x10, 0, 0, 0x9d, 1, 0x2a, width & 255, width >> 8, height & 255, height >> 8]); + for (let i = 0; i < 90; i++) await source.add(new EncodedPacket(dati, 'key', i / 30, 1 / 30), i ? undefined : { decoderConfig: { codec: 'vp8', codedWidth: width, codedHeight: height } }); + await output.finalize(); + return new File([target.buffer], `ripresa-${width}.webm`, { type: 'video/webm' }); +} +async function importa(file) { + const r = await L.importa({ name: file.name, file }); + assert.ok(!('errore' in r), r.errore); + aperti.push(r.item.id); + return r; +} + +test('Import 4K: torna subito usabile, proxy in coda senza Avvia, nessun dato nel progetto', async () => { + const r = await importa(await video()); + const prima = JSON.stringify(r.item); + await finche(() => r.rt.proxyStato === 'coda'); + assert.equal(r.rt.stato, 'ok'); + assert.equal(r.rt.vDecodable, true); + assert.equal(r.rt.proxy, undefined); + assert.equal(AT.attivitaDaAvviare().length, 0); + assert.equal(AT.attivitaInCorso()[0].categoria, 'proxy'); + assert.equal(JSON.stringify(r.item), prima); + assert.equal(disco.scritti.length, 0); +}); + +test('Il proxy automatico lascia passare prima i lavori chiesti a mano', async () => { + const r = await importa(await video()); + await finche(() => r.rt.proxyStato === 'coda'); + const ordine = []; + const stacca = PX.quandoProxy(() => { if (r.rt.proxyStato === 'lavoro') ordine.push('proxy'); }); + const manuale = AT.inCoda({ corsia: 'pesante', titolo: 'Scelta dell’utente', categoria: 'altro', priorita: 0 }, async () => { ordine.push('manuale'); }); + try { + AT.pausaGlobale(false); + await manuale; + await finche(() => ordine.includes('proxy')); + assert.equal(ordine[0], 'manuale'); + } finally { stacca(); } +}); + +test('Automatiche spente, Mai, video leggero anche con Sempre: nessuna copia in coda', async () => { + PX.impostaCopieLeggereAutomatiche(false); + const a = await importa(await video()); + await dormi(20); + assert.equal(a.rt.proxyStato, undefined); + PX.impostaCopieLeggereAutomatiche(true); PX.impostaModoProxy('mai'); + const b = await importa(await video()); + await dormi(20); + assert.equal(b.rt.proxyStato, undefined); + PX.impostaModoProxy('sempre'); + const c = await importa(await video(640, 360)); + await dormi(20); + assert.equal(c.rt.proxyStato, undefined); + assert.equal(AT.attivitaInCorso().length, 0); +}); + +test('Riapertura e sola descrizione non avviano proxy, chiudere un import annulla la coda', async () => { + const file = await video(); + const descrizione = await L.importa({ name: file.name, file }, { soloDescrizione: true }); + assert.ok(!('errore' in descrizione), descrizione.errore); + const prima = JSON.stringify(descrizione.item); + const rt = await L.apri(descrizione.item, { file }); aperti.push(rt.id); + await dormi(20); + assert.equal(rt.proxyStato, undefined); + assert.equal(JSON.stringify(descrizione.item), prima); + assert.equal(AT.attivitaInCorso().length, 0); + const nuovo = await importa(file); + await finche(() => nuovo.rt.proxyStato === 'coda'); + L.chiudi(nuovo.item.id); + await finche(() => AT.attivitaInCorso().length === 0); +}); diff --git a/test/unit/salvataggio-caricamenti.test.mjs b/test/unit/salvataggio-caricamenti.test.mjs new file mode 100644 index 0000000..cdd0c8b --- /dev/null +++ b/test/unit/salvataggio-caricamenti.test.mjs @@ -0,0 +1,145 @@ +// Regressioni senza avviare l'app: disco che fallisce, worker lenti e timer controllato a mano. +import { test } from 'node:test'; +import assert from 'node:assert/strict'; +import { carica, ambienteBrowser, memoriaFinta } from './_aiuti.mjs'; + +ambienteBrowser(); memoriaFinta(); +globalThis.window = globalThis; +globalThis.requestAnimationFrame = () => 0; +globalThis.cancelAnimationFrame = () => {}; +const intervalli = new Map(); +let seq = 0; +globalThis.setInterval = (fn) => { const id = ++seq; intervalli.set(id, fn); return id; }; +globalThis.clearInterval = (id) => intervalli.delete(id); +globalThis.setTimeout = () => 0; +const avvisi = []; +const elemento = () => ({ + children: [], setAttribute() {}, addEventListener() {}, + get firstChild() { return this.children[0]; }, + appendChild(e) { e.remove = () => { this.children = this.children.filter((x) => x !== e); }; this.children.push(e); return e; }, +}); +globalThis.document = { + baseURI: 'https://prova.invalid/app/', dispatchEvent() {}, + createElement: elemento, createTextNode: (s) => { avvisi.push(s); return {}; }, body: elemento(), +}; + +const PR = await carica('progetti'); +const { store } = await carica('store'); +const TD = await carica('traduci'); +const V = await carica('voce'); +const RT = await carica('ritaglio'); +const VR = await carica('vram'); +const LV = await carica('live'); +intervalli.clear(); // Il battito delle attività non serve in queste prove. + +test('Autosalvataggio: apertura fallita e transazione abortita ritentano, un solo avviso', async () => { + store.dirty = true; + let tentativi = 0, modo = 'apertura'; + globalThis.indexedDB = { open() { + tentativi++; + const r = { error: new Error('spazio pieno'), result: { transaction() { + const richiesta = { result: undefined }; + const tx = { error: new Error('transazione abortita'), objectStore: () => ({ put: () => richiesta }) }; + queueMicrotask(() => { + richiesta.onsuccess?.(); + if (modo === 'abortita') tx.onabort(); else tx.oncomplete(); + }); + return tx; + } } }; + queueMicrotask(() => { if (modo === 'apertura') r.onerror(); else r.onsuccess(); }); + return r; + } }; + await PR.autosalva(); await PR.autosalva(); + assert.equal(tentativi, 2); + modo = 'abortita'; + await PR.autosalva(); await PR.autosalva(); + assert.equal(tentativi, 4, 'la riuscita della richiesta non basta: conta la transazione'); + assert.equal(avvisi.filter((s) => s.includes('copia automatica')).length, 1); + modo = 'riuscita'; + await PR.autosalva(); await PR.autosalva(); + assert.equal(tentativi, 5, 'dopo il successo la stessa revisione non si riscrive'); +}); + +const worker = []; +globalThis.Worker = class { + messaggi = []; + constructor() { worker.push(this); } + postMessage(m) { this.messaggi.push(m); } + terminate() { this.chiuso = true; } + rispondi(data) { this.onmessage({ data }); } +}; + +for (const [nome, caricaModello] of [ + ['traduzione', () => TD.caricaTraduttore(() => {})], + ['voce', () => V.caricaModelloVoce('prova', () => {})], + ['ritaglio', () => RT.segmentatoreAttuale().carica(RT.MODELLI_RITAGLIO[0], () => {})], +]) { + test(`${nome}: due chiamate condividono errore e nuovo caricamento`, async () => { + const prima = caricaModello(), seconda = caricaModello(); + const w = worker.at(-1); + assert.equal(w.messaggi.length, 1); + const esiti = Promise.allSettled([prima, seconda]); + w.rispondi({ tipo: 'errore', msg: 'prova fallita' }); + assert.deepEqual((await esiti).map((x) => x.status), ['rejected', 'rejected']); + const riprova = caricaModello(), insieme = caricaModello(); + assert.equal(w.messaggi.length, 2); + w.rispondi({ tipo: 'pronto', device: 'wasm' }); + await Promise.all([riprova, insieme]); + VR.liberaVram(); + }); +} + +test('Voce: un modello diverso aspetta il caricamento già in corso', async () => { + const prima = V.caricaModelloVoce('uno', () => {}); + const seconda = V.caricaModelloVoce('due', () => {}); + const w = worker.at(-1); + assert.equal(w.messaggi.length, 1); + w.rispondi({ tipo: 'pronto', device: 'wasm' }); + await prima; + assert.equal(w.messaggi.length, 2); + assert.equal(w.messaggi[1].modello, 'due'); + w.rispondi({ tipo: 'pronto', device: 'wasm' }); + await seconda; + VR.liberaVram(); +}); + +test('Libera memoria: il worker occupato si chiude al termine, anche dopo un nuovo uso', () => { + let occupato = true, caricato = true; + VR.registraVram('prova', { + occupato: () => occupato, + libera: () => { const prima = caricato; caricato = false; return prima; }, + }); + VR.segnaUsoAI(); + assert.equal(VR.liberaVram(), 0); + assert.equal(intervalli.size, 1); + const controlla = [...intervalli.values()][0]; + controlla(); + assert.equal(caricato, true); + VR.segnaUsoAI(); + occupato = false; + controlla(); + assert.equal(caricato, false); + assert.equal(intervalli.size, 0); +}); + +test('LIVE: chiudere il selettore non avvisa, permesso negato e API mancante sì', async () => { + const partenza = avvisi.length; + Object.defineProperty(navigator, 'mediaDevices', { configurable: true, value: { getDisplayMedia() {} } }); + let stato = 'prompt'; + Object.defineProperty(navigator, 'permissions', { configurable: true, value: { query: async () => ({ state: stato }) } }); + await LV._testAvvisaErroreSchermo(new DOMException('', 'NotAllowedError')); + await LV._testAvvisaErroreSchermo(new DOMException('', 'AbortError')); + assert.equal(avvisi.length, partenza); + stato = 'denied'; + await LV._testAvvisaErroreSchermo(new DOMException('', 'NotAllowedError')); + assert.match(avvisi.at(-1), /permessi/); + stato = 'prompt'; + await LV._testAvvisaErroreSchermo(new DOMException('Permission denied by system', 'NotAllowedError')); + assert.match(avvisi.at(-1), /permessi/); + await LV._testAvvisaErroreSchermo(new DOMException('schermo non leggibile', 'NotReadableError')); + assert.match(avvisi.at(-1), /schermo non leggibile/); + delete navigator.mediaDevices; + await LV._testAvvisaErroreSchermo(new TypeError('getDisplayMedia non disponibile')); + assert.match(avvisi.at(-1), /non si può condividere lo schermo/); + assert.equal(avvisi.length, partenza + 4); +}); diff --git a/test/unit/titoli-html.test.mjs b/test/unit/titoli-html.test.mjs new file mode 100644 index 0000000..26bdec7 --- /dev/null +++ b/test/unit/titoli-html.test.mjs @@ -0,0 +1,322 @@ +// I titoli animati HTML (src/core/titoliHtml.ts): il tempo deve dare sempre lo stesso stato e lo stesso HTML (è quello che +// fa uguali monitor ed esportazione), i testi non devono poter rompere il disegno, e i progetti vecchi si aprono identici. +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { ambienteBrowser, carica } from './_aiuti.mjs'; +ambienteBrowser(); +const H = await carica('titoliHtml'); + +const TEMPI = [0, 0.04, 0.3, 0.9, 1.7, 2.5, 3.33, 4.2, 4.8, 4.96]; +const costruisci = (m, t, d = m.durata) => H.costruisciHtml(H.nuovoHtml(m.id), 1920, 1080, t, d); + +test('catalogo: 24 modelli, campi completi, caratteri solo del programma', () => { + assert.equal(H.MODELLI_HTML.length, 24, `modelli: ${H.MODELLI_HTML.length}`); + assert.equal(new Set(H.MODELLI_HTML.map((m) => m.id)).size, H.MODELLI_HTML.length); + for (const m of H.MODELLI_HTML) { + const ids = m.campi.map((c) => c.id); + assert.equal(new Set(ids).size, ids.length, `${m.id}: campi doppi`); + assert.ok(ids.includes('ent') && ids.includes('usc'), `${m.id}: manca entrata/uscita`); + assert.ok(ids.some((i) => /colore/.test(i)), `${m.id}: manca un colore`); + assert.ok(m.campi.some((c) => c.tipo === 'testo' || c.tipo === 'lungo' || c.tipo === 'numero'), `${m.id}: manca un testo`); + const v = H.valoriHtmlDiPartenza(m); + for (const p of m.font(v)) assert.ok(H.FONT_HTML[p], `${m.id}: carattere sconosciuto ${p}`); + assert.ok(!/\$\{P\}/.test(costruisci(m, 1).css), `${m.id}: peso non risolto`); + assert.ok(!/[<&]/.test(m.css), `${m.id}: il CSS ha < o & (rompe l'XML)`); + assert.ok(m.durata >= 3 && m.durata <= 12); + } + for (const [k, f] of Object.entries(H.FONT_HTML)) assert.ok(f.famiglia && f.peso >= 400, k); +}); + +test('tempo → stato: sempre lo stesso, in qualunque ordine lo si chieda', () => { + for (const m of H.MODELLI_HTML) { + const spec = H.nuovoHtml(m.id); + const avanti = TEMPI.map((t) => JSON.stringify(H.statoHtml(spec, t, m.durata))); + const indietro = [...TEMPI].reverse().map((t) => JSON.stringify(H.statoHtml(spec, t, m.durata))).reverse(); + assert.deepEqual(avanti, indietro, m.id); + // anche dopo aver "giocato" con altri tempi e altri modelli + H.statoHtml(H.nuovoHtml(H.MODELLI_HTML[0].id), 99, 3); + assert.equal(JSON.stringify(H.statoHtml(spec, 1.7, m.durata)), avanti[4], m.id); + for (const s of avanti.map((x) => JSON.parse(x))) for (const [k, x] of Object.entries(s)) assert.ok(Number.isFinite(x), `${m.id}.${k}`); + } +}); + +test('entrata e uscita: sale da 0, resta a 1, torna a 0 alla fine', () => { + const spec = H.nuovoHtml('terzo'); + const d = 5; + const dentro = [0, 0.1, 0.2, 0.4, 0.6, 0.8, 1].map((t) => H.statoHtml(spec, t, d).in); + assert.equal(dentro[0], 0); + for (let i = 1; i < dentro.length; i++) assert.ok(dentro[i] >= dentro[i - 1], 'in non scende'); + assert.equal(dentro.at(-1), 1); + assert.equal(H.statoHtml(spec, 2.5, d).out, 1); + assert.equal(H.statoHtml(spec, d, d).out, 0); + const fuori = [4.4, 4.6, 4.8, 5].map((t) => H.statoHtml(spec, t, d).out); + for (let i = 1; i < fuori.length; i++) assert.ok(fuori[i] <= fuori[i - 1], 'out non sale'); + // fuori dai bordi: il tempo si ferma agli estremi + assert.equal(H.statoHtml(spec, -3, d).in, 0); + assert.equal(H.statoHtml(spec, 99, d).out, 0); + // una clip più corta di entrata + uscita: niente numeri strani + for (const t of [0, 0.1, 0.2, 0.3, 0.4]) { const s = H.statoHtml(spec, t, 0.4); assert.ok(s.in >= 0 && s.in <= 1 && s.out >= 0 && s.out <= 1, `corta t=${t}`); } +}); + +test('stesso (spec, misura, tempo) → stesso HTML e stessa chiave', () => { + for (const m of H.MODELLI_HTML) { + for (const t of TEMPI) { + const a = costruisci(m, t), b = costruisci(m, t); + assert.equal(a.corpo, b.corpo, `${m.id} t=${t}`); + assert.equal(a.chiave, b.chiave); + assert.equal(a.css, b.css); + } + } +}); + +test('cache: nella tenuta il fotogramma è lo stesso (si disegna una volta), quando si muove cambia', () => { + const chiave = (id, t, d = 6) => H.costruisciHtml(H.nuovoHtml(id), 1920, 1080, t, d).chiave; + assert.equal(chiave('terzo', 2.5), chiave('terzo', 3.5)); + assert.equal(chiave('cinema', 3.5), chiave('cinema', 4)); + assert.equal(chiave('neon', 3.2, 6), chiave('neon', 3.3, 6)); // acceso fermo (il guizzo è dopo) + assert.notEqual(chiave('terzo', 0.1), chiave('terzo', 0.2)); + assert.notEqual(chiave('ticker', 2), chiave('ticker', 2.04)); + assert.notEqual(chiave('rec', 2.2), chiave('rec', 3.2)); + // la misura e il modello fanno parte della chiave + assert.notEqual(H.costruisciHtml(H.nuovoHtml('terzo'), 1920, 1080, 2, 6).chiave, H.costruisciHtml(H.nuovoHtml('terzo'), 640, 360, 2, 6).chiave); + assert.notEqual(chiave('terzo', 2), chiave('cinema', 2)); + // un testo cambiato cambia il fotogramma + const x = H.nuovoHtml('terzo'), y = H.nuovoHtml('terzo', { nome: 'Anna Verdi' }); + assert.notEqual(H.costruisciHtml(x, 1920, 1080, 2, 6).chiave, H.costruisciHtml(y, 1920, 1080, 2, 6).chiave); +}); + +test('modelli con il tempo dentro: display, conto alla rovescia, tempo del REC, ticker', () => { + const d7 = H.nuovoHtml('display7', { da: 0, a: 1000, cifre: 4 }); + const val = (t) => H.statoHtml(d7, t, 5).valore; + assert.equal(val(0), 0); + assert.equal(val(5), 1000); + for (let t = 0.2; t <= 5; t += 0.2) assert.ok(val(t) >= val(t - 0.2), 'il contatore non scende'); + assert.match(H.costruisciHtml(d7, 1920, 1080, 5, 5).corpo, />1000 H.statoHtml(conto, t, 5).n), [5, 5, 4, 3, 1]); + assert.match(H.costruisciHtml(conto, 1920, 1080, 2.5, 5).corpo, />3 { + const brutto = H.nuovoHtml('terzo', { nome: ' & "x" \u0001\u0007', ruolo: '\'', colore: 'red;}', ent: 'abc', dim: 99999 }); + const f = H.costruisciHtml(brutto, 1920, 1080, 2, 5); + assert.ok(!/ & "x" \u0001 |'; + for (const id of NUOVI) { + const m = H.modelloHtml(id); + const v = {}; + for (const c of m.campi) if (c.tipo === 'testo' || c.tipo === 'lungo') v[c.id] = brutto; + const f = H.costruisciHtml(H.nuovoHtml(id, v), 1920, 1080, m.durata * 0.6, m.durata); + assert.ok(!/