Fix text position where the scrreen resolution was hardcoded

whatisaphone · Feb 14, 2021 · 794e5f1 · 794e5f1
1 parent eb9c31e
commit 794e5f1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/crates/aether/src/commands/fps.rs b/crates/aether/src/commands/fps.rs
@@ -20,6 +20,7 @@ pub fn run(_command: &str) -> &'static str {
     }
 }
 
+#[allow(clippy::cast_precision_loss)]
 pub fn draw(renderer: &gfc::UIRenderer) {
     let mut counter = COUNTER.lock();
     counter.tick(Instant::now());
@@ -28,16 +29,17 @@ pub fn draw(renderer: &gfc::UIRenderer) {
         return;
     }
 
-    let fps = match counter.fps() {
+    let text = match counter.fps() {
         Some(n) => format!("{} fps", n),
         None => return,
     };
 
+    let viewport = gfc::KGGraphics::get_instance().get_viewport();
+
     renderer.begin(true);
     renderer.set_material(renderer.solid_material());
 
-    // Assume a resolution of 1280x720
-    bitmap_font::draw_string(renderer, 1168.0, 10.0, 2, &fps);
+    bitmap_font::draw_string(renderer, (viewport.width() - 128) as f32, 10.0, 2, &text);
 
     renderer.end();
 }
diff --git a/crates/aether/src/commands/show_bird_kills.rs b/crates/aether/src/commands/show_bird_kills.rs
@@ -16,6 +16,7 @@ pub fn run(_command: &str) -> &'static str {
     }
 }
 
+#[allow(clippy::cast_precision_loss)]
 pub fn draw(renderer: &gfc::UIRenderer) {
     if !ENABLED.load(Ordering::SeqCst) {
         return;
@@ -43,13 +44,14 @@ pub fn draw(renderer: &gfc::UIRenderer) {
         return;
     }
 
+    let viewport = gfc::KGGraphics::get_instance().get_viewport();
+
     renderer.begin(true);
     renderer.set_material(renderer.solid_material());
 
-    // Assume a resolution of 1280x720
     bitmap_font::draw_string(
         renderer,
-        1000.0,
+        (viewport.width() - 320) as f32,
         120.0,
         2,
         &format!("Kills: {}", player.stat_tracker().number_of_kills_on_bird()),