Update library and add title screen

Fixes the stupid wrong resolution which caused a
black bar at the bottom (unallocated memory).

Author: LinusCDE

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "doomarkable"
-version = "0.3.1"
+version = "0.3.2"
 edition = "2018"
 
 # Using build script to generate the dither cache
@@ -18,7 +18,7 @@ once_cell = "1"
 opt-level = 2
 
 [dependencies]
-doomgeneric = { git = "https://github.com/LinusCDE/doomgeneric-rs.git", tag = "0.3.0-beta.1" }
+doomgeneric = { git = "https://github.com/LinusCDE/doomgeneric-rs.git", tag = "0.3.0-beta.2" }
 libremarkable = "0.5.0"
 once_cell = "1"
 fxhash = "0.2"

Cargo.toml

@@ -10,7 +10,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     println!("cargo:rerun-if-changed=build/");
 
     //let start = std::time::Instant::now();
-    let dither_cache = blue_noise_calculator::calc_full_cache(320, 240);
+    let dither_cache = blue_noise_calculator::calc_full_cache(320, 200);
     //println!("cargo:warning=Calculation took {:?}", start.elapsed());
 
     let ref f_path = PathBuf::from(env::var("OUT_DIR")?).join("dither_cache.bin.zst");

build/main.rs

@@ -87,19 +87,64 @@ fn main() {
         0,
         true,
     );
+    fb.clear();
 
     // The dither_cache was calculated in build/main.rs and
     // this env is set to the file path containing this cache.
     let start = Instant::now();
     let dither_cache_compressed = include_bytes!(env!("OUT_DIR_DITHERCACHE_FILE"));
     let mut dither_cache_raw = Cursor::new(Vec::with_capacity(
-        blue_noise_dither::CachedDither2XTo4X::calc_dither_cache_len(320, 240) * 2,
+        blue_noise_dither::CachedDither2XTo4X::calc_dither_cache_len(
+            game::DOOMGENERIC_RESX as u32 / 2,
+            game::DOOMGENERIC_RESY as u32 / 2,
+        ) * 2,
     ));
     zstd::stream::copy_decode(Cursor::new(dither_cache_compressed), &mut dither_cache_raw).unwrap();
     let dither_cache_raw = dither_cache_raw.into_inner();
     let mut ditherer = blue_noise_dither::CachedDither2XTo4X::new(dither_cache_raw);
     info!("Loaded dither cache in {:?}", start.elapsed());
 
+    // Title
+    let title_text = concat!("DOOMarkable v", env!("CARGO_PKG_VERSION"));
+    let subtitle_text = "https://github.com/LinusCDE/doomarkable";
+    let title_size = 80;
+    let subtitle_size = 30;
+    let title_rect = fb.draw_text(
+        Point2 { x: 0f32, y: 0f32 },
+        title_text,
+        title_size as f32,
+        common::color::BLACK,
+        true,
+    );
+    let subtitle_rect = fb.draw_text(
+        Point2 { x: 0f32, y: 0f32 },
+        subtitle_text,
+        subtitle_size as f32,
+        common::color::BLACK,
+        true,
+    );
+
+    fb.draw_text(
+        Point2 {
+            x: (common::DISPLAYWIDTH as u32 - title_rect.width) as f32 / 2.0,
+            y: (62 - 20 + title_size) as f32,
+        },
+        title_text,
+        title_size as f32,
+        common::color::BLACK,
+        false,
+    );
+    fb.draw_text(
+        Point2 {
+            x: (common::DISPLAYWIDTH as u32 - subtitle_rect.width) as f32 / 2.0,
+            y: (62 - 20 + title_size + subtitle_size) as f32,
+        },
+        subtitle_text,
+        subtitle_size as f32,
+        common::color::BLACK,
+        false,
+    );
+
     // Keys
     let key_boxes = [
         (
@@ -196,7 +241,6 @@ fn main() {
     key_labels.insert(keys::KEY_ENTER, (25.0, "Enter"));
     key_labels.insert(*keys::KEY_USE, (25.0, "Use"));
 
-    fb.clear();
     for (boxx, key) in &key_boxes {
         fb.draw_rect(
             Point2 {
@@ -252,7 +296,7 @@ fn main() {
         let pos = Point2 {
             x: (common::DISPLAYWIDTH as i32 - width as i32) / 2,
             //y: (common::DISPLAYHEIGHT as i32 - height as i32) / 2,
-            y: 62,
+            y: 62 + 140,
         };
 
         loop {