fix black bars margin

This commit is contained in:
Alula 2022-01-11 16:50:51 +01:00
parent 0804fe86ce
commit 89771844cc
No known key found for this signature in database
GPG Key ID: 3E00485503A1D8BA
1 changed files with 19 additions and 9 deletions

View File

@ -272,12 +272,13 @@ impl GameScene {
let (x, y) = (x * state.scale, y * state.scale);
let canvas_w_scaled = state.canvas_size.0 as f32 * state.scale;
let canvas_h_scaled = state.canvas_size.1 as f32 * state.scale;
let level_width = (self.stage.map.width as f32 - 1.0) * self.stage.map.tile_size.as_float();
let level_height = (self.stage.map.height as f32 - 1.0) * self.stage.map.tile_size.as_float();
let left_side = -x;
let right_side = -x + level_width * state.scale;
let upper_side = -y;
let lower_side = -y + level_height * state.scale;
let half_block = self.stage.map.tile_size.as_float() * 0.5 * state.scale;
let level_width = (self.stage.map.width as f32) * self.stage.map.tile_size.as_float();
let level_height = (self.stage.map.height as f32) * self.stage.map.tile_size.as_float();
let left_side = -x - half_block;
let right_side = left_side + level_width * state.scale;
let upper_side = -y - half_block;
let lower_side = upper_side + level_height * state.scale;
if left_side > 0.0 {
let rect = Rect::new(0, 0, left_side as isize, canvas_h_scaled as isize);
@ -962,11 +963,20 @@ impl GameScene {
325 => {
let size = 0.5 * (npc.anim_num as f32 + 1.0);
self.draw_light(
interpolate_fix9_scale(npc.prev_x - self.frame.prev_x, npc.x - self.frame.x, state.frame_time),
interpolate_fix9_scale(npc.prev_y - self.frame.prev_y, npc.y - self.frame.y, state.frame_time),
interpolate_fix9_scale(
npc.prev_x - self.frame.prev_x,
npc.x - self.frame.x,
state.frame_time,
),
interpolate_fix9_scale(
npc.prev_y - self.frame.prev_y,
npc.y - self.frame.y,
state.frame_time,
),
size,
(255, 255, 255),
batch,)
batch,
)
}
_ => {}
}