Implement the rest of Beatmap, add Beat type alias

valentinegb · Aug 18, 2024 · d2f7140 · d2f7140
1 parent b2349d4
commit d2f7140
Show file tree

Hide file tree

Showing 11 changed files with 936 additions and 56 deletions.
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ Documentation can be found on [docs.rs](https://docs.rs/beat_saber_map).
 - [ ] Create structures for map files
   - [x] [`Info`](https://docs.rs/beat_saber_map/latest/beat_saber_map/info/struct.Info.html)
   - [x] [`Audio`](https://docs.rs/beat_saber_map/latest/beat_saber_map/audio/struct.Audio.html)
-  - [ ] [`Beatmap`](https://docs.rs/beat_saber_map/latest/beat_saber_map/beatmap/struct.Beatmap.html)
+  - [x] [`Beatmap`](https://docs.rs/beat_saber_map/latest/beat_saber_map/beatmap/struct.Beatmap.html)
   - [ ] `Lightshow`
 - [ ] Create utility methods for map file structures and [`BeatSaberMap`](https://docs.rs/beat_saber_map/latest/beat_saber_map/struct.BeatSaberMap.html)
   - [x] [`BeatSaberMap::from_dir()`](https://docs.rs/beat_saber_map/latest/beat_saber_map/struct.BeatSaberMap.html#method.from_dir)

diff --git a/sample/BPMInfo.dat b/sample/BPMInfo.dat
@@ -7,8 +7,8 @@
     {
       "si": 0,
       "ei": 1149214,
-      "sb": 0,
-      "eb": 26
+      "sb": 0.0,
+      "eb": 26.0
     }
   ],
   "lufsData": [

diff --git a/sample/Easy.dat b/sample/Easy.dat
@@ -0,0 +1,111 @@
+{
+  "version": "4.0.0",
+  "colorNotes": [
+    {
+      "b": 10.0,
+      "r": 0,
+      "i": 0
+    }
+  ],
+  "colorNotesData": [
+    {
+      "x": 1,
+      "y": 0,
+      "c": 0,
+      "d": 1,
+      "a": 0
+    },
+    {
+      "x": 2,
+      "y": 2,
+      "c": 0,
+      "d": 0,
+      "a": 0
+    }
+  ],
+  "bombNotes": [
+    {
+      "b": 10.0,
+      "r": 0,
+      "i": 0
+    }
+  ],
+  "bombNotesData": [
+    {
+      "x": 1,
+      "y": 0
+    }
+  ],
+  "obstacles": [
+    {
+      "b": 10.0,
+      "r": 0,
+      "i": 0
+    }
+  ],
+  "obstaclesData": [
+    {
+      "d": 5.0,
+      "x": 1,
+      "y": 0,
+      "w": 1,
+      "h": 5
+    }
+  ],
+  "arcs": [
+    {
+      "hb": 10.0,
+      "tb": 15.0,
+      "hr": 0,
+      "tr": 0,
+      "hi": 0,
+      "ti": 1,
+      "ai": 0
+    }
+  ],
+  "arcsData": [
+    {
+      "m": 1.0,
+      "tm": 1.0,
+      "a": 0
+    }
+  ],
+  "chains": [
+    {
+      "hb": 10.0,
+      "tb": 15.0,
+      "hr": 0,
+      "tr": 0,
+      "i": 0,
+      "ci": 0
+    }
+  ],
+  "chainsData": [
+    {
+      "tx": 2,
+      "ty": 2,
+      "c": 3,
+      "s": 0.5
+    }
+  ],
+  "spawnRotations": [
+    {
+      "b": 10.0,
+      "i": 0
+    },
+    {
+      "b": 15.0,
+      "i": 1
+    }
+  ],
+  "spawnRotationsData": [
+    {
+      "t": 0,
+      "r": 15.0
+    },
+    {
+      "t": 1,
+      "r": 15.0
+    }
+  ]
+}
diff --git a/sample/Expert.dat b/sample/Expert.dat
@@ -0,0 +1,111 @@
+{
+  "version": "4.0.0",
+  "colorNotes": [
+    {
+      "b": 10.0,
+      "r": 0,
+      "i": 0
+    }
+  ],
+  "colorNotesData": [
+    {
+      "x": 1,
+      "y": 0,
+      "c": 0,
+      "d": 1,
+      "a": 0
+    },
+    {
+      "x": 2,
+      "y": 2,
+      "c": 0,
+      "d": 0,
+      "a": 0
+    }
+  ],
+  "bombNotes": [
+    {
+      "b": 10.0,
+      "r": 0,
+      "i": 0
+    }
+  ],
+  "bombNotesData": [
+    {
+      "x": 1,
+      "y": 0
+    }
+  ],
+  "obstacles": [
+    {
+      "b": 10.0,
+      "r": 0,
+      "i": 0
+    }
+  ],
+  "obstaclesData": [
+    {
+      "d": 5.0,
+      "x": 1,
+      "y": 0,
+      "w": 1,
+      "h": 5
+    }
+  ],
+  "arcs": [
+    {
+      "hb": 10.0,
+      "tb": 15.0,
+      "hr": 0,
+      "tr": 0,
+      "hi": 0,
+      "ti": 1,
+      "ai": 0
+    }
+  ],
+  "arcsData": [
+    {
+      "m": 1.0,
+      "tm": 1.0,
+      "a": 0
+    }
+  ],
+  "chains": [
+    {
+      "hb": 10.0,
+      "tb": 15.0,
+      "hr": 0,
+      "tr": 0,
+      "i": 0,
+      "ci": 0
+    }
+  ],
+  "chainsData": [
+    {
+      "tx": 2,
+      "ty": 2,
+      "c": 3,
+      "s": 0.5
+    }
+  ],
+  "spawnRotations": [
+    {
+      "b": 10.0,
+      "i": 0
+    },
+    {
+      "b": 15.0,
+      "i": 1
+    }
+  ],
+  "spawnRotationsData": [
+    {
+      "t": 0,
+      "r": 15.0
+    },
+    {
+      "t": 1,
+      "r": 15.0
+    }
+  ]
+}
diff --git a/sample/ExpertPlus.dat b/sample/ExpertPlus.dat
@@ -0,0 +1,111 @@
+{
+  "version": "4.0.0",
+  "colorNotes": [
+    {
+      "b": 10.0,
+      "r": 0,
+      "i": 0
+    }
+  ],
+  "colorNotesData": [
+    {
+      "x": 1,
+      "y": 0,
+      "c": 0,
+      "d": 1,
+      "a": 0
+    },
+    {
+      "x": 2,
+      "y": 2,
+      "c": 0,
+      "d": 0,
+      "a": 0
+    }
+  ],
+  "bombNotes": [
+    {
+      "b": 10.0,
+      "r": 0,
+      "i": 0
+    }
+  ],
+  "bombNotesData": [
+    {
+      "x": 1,
+      "y": 0
+    }
+  ],
+  "obstacles": [
+    {
+      "b": 10.0,
+      "r": 0,
+      "i": 0
+    }
+  ],
+  "obstaclesData": [
+    {
+      "d": 5.0,
+      "x": 1,
+      "y": 0,
+      "w": 1,
+      "h": 5
+    }
+  ],
+  "arcs": [
+    {
+      "hb": 10.0,
+      "tb": 15.0,
+      "hr": 0,
+      "tr": 0,
+      "hi": 0,
+      "ti": 1,
+      "ai": 0
+    }
+  ],
+  "arcsData": [
+    {
+      "m": 1.0,
+      "tm": 1.0,
+      "a": 0
+    }
+  ],
+  "chains": [
+    {
+      "hb": 10.0,
+      "tb": 15.0,
+      "hr": 0,
+      "tr": 0,
+      "i": 0,
+      "ci": 0
+    }
+  ],
+  "chainsData": [
+    {
+      "tx": 2,
+      "ty": 2,
+      "c": 3,
+      "s": 0.5
+    }
+  ],
+  "spawnRotations": [
+    {
+      "b": 10.0,
+      "i": 0
+    },
+    {
+      "b": 15.0,
+      "i": 1
+    }
+  ],
+  "spawnRotationsData": [
+    {
+      "t": 0,
+      "r": 15.0
+    },
+    {
+      "t": 1,
+      "r": 15.0
+    }
+  ]
+}