lew/rust-rl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

draw now uses a projection - log text still needs tweaking

Browse source 
notan::text doesn't seem to use projections, so the log will need to be converted to notan::draw, or a work-around will need to be found.
This commit is contained in:
Llywelwyn 2023-10-10 19:07:14 +01:00
parent 59f7e9a8f7
commit 074e2465d7
1 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/main.rs
View file

@ -1,5 +1,6 @@
use rust_rl::*; use rust_rl::*;
use notan::prelude::*; use notan::prelude::*;
use notan::math::{ vec2, vec3, Mat4, Vec2 };
use notan::draw::create_textures_from_atlas; use notan::draw::create_textures_from_atlas;
use notan::draw::{ CreateFont, CreateDraw, DrawImages, Draw, DrawTextSection, DrawShapes }; use notan::draw::{ CreateFont, CreateDraw, DrawImages, Draw, DrawTextSection, DrawShapes };
use specs::prelude::*; use specs::prelude::*;
@ -9,12 +10,17 @@ use std::collections::HashMap;
use crate::consts::{ DISPLAYHEIGHT, DISPLAYWIDTH, TILESIZE, FONTSIZE }; use crate::consts::{ DISPLAYHEIGHT, DISPLAYWIDTH, TILESIZE, FONTSIZE };
use crate::states::state::Fonts; use crate::states::state::Fonts;
const WORK_SIZE: Vec2 = vec2(
(DISPLAYWIDTH as f32) * TILESIZE.x,
(DISPLAYHEIGHT as f32) * TILESIZE.x
);
#[notan_main] #[notan_main]
fn main() -> Result<(), String> { fn main() -> Result<(), String> {
let win_config = WindowConfig::new() let win_config = WindowConfig::new()
.set_size(DISPLAYWIDTH * (TILESIZE.x as u32), DISPLAYHEIGHT * (TILESIZE.x as u32)) .set_size(DISPLAYWIDTH * (TILESIZE.x as u32), DISPLAYHEIGHT * (TILESIZE.x as u32))
.set_title("RUST-RL") .set_title("RUST-RL")
.set_resizable(false) .set_resizable(true)
.set_taskbar_icon_data(Some(include_bytes!("../resources/icon.png"))) .set_taskbar_icon_data(Some(include_bytes!("../resources/icon.png")))
.set_vsync(true); .set_vsync(true);
notan notan
@ -494,8 +500,12 @@ fn draw_bg(_ecs: &World, draw: &mut Draw, atlas: &HashMap<String, Texture>) {
} }
fn draw(app: &mut App, gfx: &mut Graphics, gs: &mut State) { fn draw(app: &mut App, gfx: &mut Graphics, gs: &mut State) {
let (width, height) = gfx.size();
let win_size = vec2(width as f32, height as f32);
let (projection, _) = calc_projection(win_size, WORK_SIZE);
let mut draw = gfx.create_draw(); let mut draw = gfx.create_draw();
draw.clear(Color::BLACK); draw.clear(Color::BLACK);
draw.set_projection(Some(projection));
let mut log = false; let mut log = false;
let runstate = *gs.ecs.fetch::<RunState>(); let runstate = *gs.ecs.fetch::<RunState>();
match runstate { match runstate {
@ -592,3 +602,16 @@ fn corner_text(text: &str, draw: &mut Draw, font: &Fonts) {
.position(((offset.x + 1) as f32) * TILESIZE.x, ((offset.y + 1) as f32) * TILESIZE.x) .position(((offset.x + 1) as f32) * TILESIZE.x, ((offset.y + 1) as f32) * TILESIZE.x)
.size(FONTSIZE); .size(FONTSIZE);
} }
fn calc_projection(win_size: Vec2, work_size: Vec2) -> (Mat4, f32) {
let ratio = (win_size.x / work_size.x).min(win_size.y / work_size.y);
let proj = Mat4::orthographic_rh_gl(0.0, win_size.x, win_size.y, 0.0, -1.0, 1.0);
let scale = Mat4::from_scale(vec3(ratio, ratio, 1.0));
let position = vec3(
(win_size.x - work_size.x * ratio) * 0.5,
(win_size.y - work_size.y * ratio) * 0.5,
1.0
);
let trans = Mat4::from_translation(position);
(proj * trans * scale, ratio)
}