Corrections diverses morceaux

Bludwarf · Apr 27, 2024 · 6deb259 · 6deb259
1 parent e30ec8e
commit 6deb259
Show file tree

Hide file tree

Showing 11 changed files with 82 additions and 74 deletions.
diff --git a/src/app/color.spec.ts b/src/app/color.spec.ts
@@ -91,10 +91,4 @@ describe('ColorResolver', () => {
         expect(colorResolver.getPatternColor(pattern)).toEqual(GREEN);
     });
 
-    /*
-     * TODO reprise des anciens styles de structure-map :
-     * Cf: #486400
-     * R': #d5854a
-     */
-
 });
diff --git a/src/app/color.ts b/src/app/color.ts
@@ -21,6 +21,7 @@ export const GREEN = new BaseColor('#3c6400')
 export const GREEN_CS = new BaseColor('#1c6400')
 export const GREEN_CF = new BaseColor('#486400')
 export const ORANGE = new BaseColor('chocolate')
+export const ORANGE_R_P = new BaseColor('#d5854a')
 export const RED = new BaseColor('#d21e1e')
 
 export class ColorResolver {
@@ -58,9 +59,18 @@ export class ColorResolver {
             if (initial.startsWith('C')) {
                 // const patternsInStructureWithSamePrefix = patternInStructure.structure.patternsInStructure.filter(p => p.initial.startsWith('C'))
                 // console.log(patternsInStructureWithSamePrefix.map(p => p.pattern.name))
+                if (initial.startsWith('Cs')) {
+                    return GREEN_CS
+                }
+                if (initial.startsWith('Cf')) {
+                    return GREEN_CF
+                }
                 return GREEN
             }
             if (initial.startsWith('R')) {
+                if (initial.startsWith('R\'')) {
+                    return ORANGE_R_P
+                }
                 return ORANGE
             }
         }

diff --git a/src/app/song/entries/Elle reve a quoi.ts b/src/app/song/entries/Elle reve a quoi.ts
@@ -1,11 +1,11 @@
 
-import { Key } from "../../notes";
 import recordingInitData from "../../../assets/recordings/ELLE REVE preview brut_01.json";
-import { Pattern } from "../../structure/pattern/pattern";
+import { Key } from "../../notes";
 import { Recording } from "../../recording/recording";
-import { Structure } from "../../structure/structure";
-import { Section } from "../../structure/section/section";
 import { Part } from "../../structure/part/part";
+import { Pattern } from "../../structure/pattern/pattern";
+import { Section } from "../../structure/section/section";
+import { Structure } from "../../structure/structure";
 
 const key = Key.Cm
 const fretboard = {

diff --git a/src/app/song/entries/La 4L.ts b/src/app/song/entries/La 4L.ts
@@ -1,12 +1,11 @@
 
-import { Key } from "../../notes";
 import recordingInitData from "../../../assets/recordings/LA 4L.json";
-import { Pattern } from "../../structure/pattern/pattern";
+import { Key } from "../../notes";
 import { Recording } from "../../recording/recording";
-import { Structure } from "../../structure/structure";
-import { Section } from "../../structure/section/section";
 import { Part } from "../../structure/part/part";
-import { GREEN_CS } from "../../color";
+import { Pattern } from "../../structure/pattern/pattern";
+import { Section } from "../../structure/section/section";
+import { Structure } from "../../structure/structure";
 
 const key = Key.Am
 const fretboard = {
@@ -40,7 +39,6 @@ const Cs = Pattern.fromData({
     ...CData,
     name: 'Couplet sautillant',
     initial: 'Cs',
-    color: GREEN_CS,
 })
 
 const Csp = Pattern.fromData({

diff --git a/src/app/song/entries/La femme dragon.ts b/src/app/song/entries/La femme dragon.ts
@@ -1,11 +1,10 @@
-import {Key} from "../../notes";
-import {Pattern} from "../../structure/pattern/pattern";
-import {Structure} from "../../structure/structure";
-import {Section} from "../../structure/section/section";
 import recordingInitData from "../../../assets/recordings/LA FEMME DRAGON MasterBrut_01.json";
-import {Recording} from "../../recording/recording";
-import {Part} from "../../structure/part/part";
-import { GREEN_CF, GREEN_CS } from "../../color";
+import { Key } from "../../notes";
+import { Recording } from "../../recording/recording";
+import { Part } from "../../structure/part/part";
+import { Pattern } from "../../structure/pattern/pattern";
+import { Section } from "../../structure/section/section";
+import { Structure } from "../../structure/structure";
 
 
 const fretboard = {
@@ -18,7 +17,6 @@ const coupletSansBasse = Pattern.fromData({
   name: 'Couplet (sans basse)',
   initial: 'Cs',
   duration: '4m',
-  color: GREEN_CS,
 })
 
 const couplet = Pattern.fromData({
@@ -71,7 +69,6 @@ const coupletFinal = Pattern.fromData({
   initial: 'Cf',
   chords: '| C | Eb | Bb | Ab |',
   fretboard: fretboardFinal,
-  color: GREEN_CF,
 })
 
 const refrainFinalData = {
@@ -90,6 +87,12 @@ const refrainPFinal = Pattern.fromData({
   chords: '| C | G | Ab | Ab |',
 })
 
+const fin = Pattern.fromData({
+  ...refrainFinalData,
+  name: 'Fin',
+  chords: '| C | C | C | C |',
+})
+
 const parts: Part[] = [
   new Part('1', [
     new Section('Intro', [coupletSansBasse]),
@@ -117,6 +120,7 @@ const parts: Part[] = [
     new Section('Couplet', [coupletFinal, coupletFinal]),
     new Section('Refrain', [refrainFinal, refrainPFinal]),
     new Section('Bombarde', [coupletFinal, coupletFinal]),
+    new Section('Fin', [fin]),
   ]),
 ]
 

diff --git a/src/app/song/entries/Le jour (le phare).ts b/src/app/song/entries/Le jour (le phare).ts
@@ -32,7 +32,7 @@ const Ceb = Pattern.fromData({
 const R = Pattern.fromData({
   key,
   name: 'Refrain',
-  chords: '| C | G | Bb | F |',
+  chords: '| C | C | G | G | Bb | Bb | F | F |',
   fretboard,
 })
 
@@ -51,7 +51,7 @@ const breakBatterie = Pattern.fromData({
 const fin = Pattern.fromData({
   key,
   name: 'Fin',
-  chords: '| G |',
+  chords: '| G | G | G |',
   fretboard,
 })
 

diff --git a/src/app/song/entries/Le résistant.ts b/src/app/song/entries/Le résistant.ts
@@ -22,16 +22,10 @@ const couplet = Pattern.fromData({
 const refrain = Pattern.fromData({
   key,
   name: 'Refrain',
-  chords: '| C | C | G | G | C | C | D |',
+  chords: '| C | C | G | G | C | C | D | D |',
   fretboard,
 })
 
-const silence = Pattern.fromData({
-  key,
-  name: 'Silence',
-  duration: '1m',
-})
-
 const fin = Pattern.fromData({
   key,
   name: 'Fin',
@@ -47,16 +41,16 @@ const parts: Part[] = [
     new Section(`Bombarde`, [couplet]),
     new Section(`Couplet`, [couplet, couplet]),
     new Section(`Bombarde`, [couplet]),
-    new Section(`Refrain`, [refrain, silence]),
+    new Section(`Refrain`, [refrain]),
   ]),
   new Part('2', [
     new Section(`Bombarde`, [couplet]),
     new Section(`Couplet`, [couplet, couplet]),
     new Section(`Bombarde`, [couplet]),
-    new Section(`Refrain`, [refrain, silence]),
+    new Section(`Refrain`, [refrain]),
   ]),
   new Part('Final', [
-    new Section(`Bombarde`, [couplet]),
+    new Section(`Bombarde`, [couplet]), // TODO notation pour marquer que le dernier F est sec (point en bas de la note en solfège)
     new Section(`Fin`, [fin]),
   ]),
 ]

diff --git a/src/app/song/entries/Nuages blancs.ts b/src/app/song/entries/Nuages blancs.ts
@@ -1,10 +1,10 @@
-import { FretboardData, Pattern } from "../../structure/pattern/pattern";
-import { Structure } from "../../structure/structure";
-import { Key } from "../../notes";
-import { Section } from "../../structure/section/section";
 import recordingInitData from "../../../assets/recordings/NUAGES BLANCS PréMaster Brut v2.02 SANS_01.json";
+import { Key } from "../../notes";
 import { Recording } from "../../recording/recording";
 import { Part } from "../../structure/part/part";
+import { FretboardData, Pattern } from "../../structure/pattern/pattern";
+import { Section } from "../../structure/section/section";
+import { Structure } from "../../structure/structure";
 
 const key = Key.Gm
 const fretboard: FretboardData = {

diff --git a/src/assets/recordings/LA FEMME DRAGON MasterBrut_01.json b/src/assets/recordings/LA FEMME DRAGON MasterBrut_01.json
@@ -218,6 +218,14 @@
     {
       "secTime": 249.0827228259598,
       "beatTime": 521.9665576610889
+    },
+    {
+      "secTime": 252,
+      "beatTime": 528
+    },
+    {
+      "secTime": 259.5,
+      "beatTime": 544
     }
   ]
 }
diff --git a/src/assets/recordings/LE PHARE Master Web 24bit 48Khz_v2_04.json b/src/assets/recordings/LE PHARE Master Web 24bit 48Khz_v2_04.json
@@ -85,59 +85,59 @@
     },
     {
       "secTime": 114.64177083333333,
-      "beatTime": 208
+      "beatTime": 224
     },
     {
       "secTime": 130.38116666666667,
-      "beatTime": 224
+      "beatTime": 256
     },
     {
       "secTime": 145.69397916666665,
-      "beatTime": 256
+      "beatTime": 288
     },
     {
       "secTime": 160.9465625,
-      "beatTime": 288
+      "beatTime": 320
     },
     {
       "secTime": 191.22304166666666,
-      "beatTime": 352
+      "beatTime": 384
     },
     {
       "secTime": 222.56958333333333,
-      "beatTime": 384
+      "beatTime": 448
     },
     {
       "secTime": 238.12291666666667,
-      "beatTime": 416
+      "beatTime": 480
     },
     {
       "secTime": 241.330625,
-      "beatTime": 420
+      "beatTime": 484
     },
     {
       "secTime": 243.34139583333334,
-      "beatTime": 424
+      "beatTime": 488
     },
     {
       "secTime": 251.14045833333333,
-      "beatTime": 440
+      "beatTime": 504
     },
     {
       "secTime": 258.7989166666667,
-      "beatTime": 456
+      "beatTime": 520
     },
     {
       "secTime": 266.45824999999996,
-      "beatTime": 472
+      "beatTime": 536
     },
     {
       "secTime": 274.1059583333333,
-      "beatTime": 488
+      "beatTime": 552
     },
     {
-      "secTime": 274.1134959310165,
-      "beatTime": 488.03125
+      "secTime": 280,
+      "beatTime": 564
     }
   ]
 }
diff --git a/src/assets/recordings/LE RESISTANT Pré-Masterbrut_02-01.json b/src/assets/recordings/LE RESISTANT Pré-Masterbrut_02-01.json
@@ -1,7 +1,7 @@
 {
   "name": "LE RESISTANT Pré-Masterbrut_02-01",
   "sampleDuration": 197,
-  "sampleBeatTimeDuration": 379.3883330211455,
+  "sampleBeatTimeDuration": 400.8124305382117882,
   "warpMarkers": [
     {
       "secTime": 0,
@@ -17,71 +17,71 @@
     },
     {
       "secTime": 48.40141666666666,
-      "beatTime": 64
+      "beatTime": 96
     },
     {
       "secTime": 64.38291666666666,
-      "beatTime": 96
+      "beatTime": 128
     },
     {
       "secTime": 80.41875,
-      "beatTime": 128
+      "beatTime": 160
     },
     {
       "secTime": 88.55091666666667,
-      "beatTime": 144
+      "beatTime": 176
     },
     {
       "secTime": 92.64445833333333,
-      "beatTime": 152
+      "beatTime": 184
     },
     {
       "secTime": 96.5581875,
-      "beatTime": 160
+      "beatTime": 192
     },
     {
       "secTime": 112.64314583333334,
-      "beatTime": 192
+      "beatTime": 224
     },
     {
       "secTime": 116.72545833333334,
-      "beatTime": 200
+      "beatTime": 232
     },
     {
       "secTime": 124.68491666666667,
-      "beatTime": 216
+      "beatTime": 248
     },
     {
       "secTime": 128.59675,
-      "beatTime": 224
+      "beatTime": 256
     },
     {
       "secTime": 144.51929166666667,
-      "beatTime": 256
+      "beatTime": 288
     },
     {
       "secTime": 160.56816666666666,
-      "beatTime": 288
+      "beatTime": 320
     },
     {
       "secTime": 168.65872916666666,
-      "beatTime": 304
+      "beatTime": 336
     },
     {
       "secTime": 176.70497916666667,
-      "beatTime": 320
+      "beatTime": 352
     },
     {
       "secTime": 190.65445833333334,
-      "beatTime": 348
+      "beatTime": 380
     },
     {
       "secTime": 192.58866666666665,
-      "beatTime": 352
+      "beatTime": 384
     },
     {
       "secTime": 192.60741666707017,
-      "beatTime": 352.03125
+      "beatTime": 384.03125
     }
   ]
 }