a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-12-01 10:44:56 +03:00
Code Issues Projects Releases Wiki Activity

aha, fixed size problem, gotta update viewport

Browse Source
This commit is contained in:
Dustin Carlino 2020-02-10 19:41:15 -08:00
parent 34fdf6a5e5
commit 7267410ac0
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ezgui/src/backend_glium.rs
View File

@ -199,7 +199,7 @@ pub struct PrerenderInnards {
// Kind of a weird place for this, but ah well.
texture_arrays: RefCell<Vec<Texture2dArray>>,
pub(crate) texture_lookups: RefCell<HashMap<String, Color>>,
pub texture_lookups: RefCell<HashMap<String, Color>>,
}
impl PrerenderInnards {
@ -292,7 +292,7 @@ impl PrerenderInnards {
self.display.gl_window().window().request_redraw();
}
pub(crate) fn draw_new_frame<'a>(&self) -> GfxCtxInnards<'a> {
pub fn draw_new_frame<'a>(&self) -> GfxCtxInnards<'a> {
GfxCtxInnards {
target: self.display.draw(),
params: glium::DrawParameters {
@ -307,7 +307,7 @@ impl PrerenderInnards {
}
}
pub(crate) fn upload_textures(
pub fn upload_textures(
&self,
dims_to_textures: BTreeMap<(u32, u32), Vec<(String, Vec<u8>, TextureType)>>,
) {

18
ezgui/src/backend_glow.rs
View File

@ -157,7 +157,7 @@ pub struct PrerenderInnards {
pub total_bytes_uploaded: Cell<usize>,
// Kind of a weird place for this, but ah well.
pub(crate) texture_lookups: RefCell<HashMap<String, Color>>,
pub texture_lookups: RefCell<HashMap<String, Color>>,
}
impl PrerenderInnards {
@ -242,10 +242,11 @@ impl PrerenderInnards {
let stride = 6 * std::mem::size_of::<f32>() as i32;
// position is vec2
self.gl.enable_vertex_attrib_array(0);
self.gl
.vertex_attrib_pointer_f32(0, 2, glow::FLOAT, false, stride, 0);
self.gl.enable_vertex_attrib_array(0);
// style is vec4
self.gl.enable_vertex_attrib_array(1);
self.gl.vertex_attrib_pointer_f32(
1,
4,
@ -254,7 +255,6 @@ impl PrerenderInnards {
stride,
2 * std::mem::size_of::<f32>() as i32,
);
self.gl.enable_vertex_attrib_array(1);
// Safety?
self.gl.bind_vertex_array(None);
@ -285,7 +285,7 @@ impl PrerenderInnards {
self.windowed_context.window().request_redraw();
}
pub(crate) fn draw_new_frame(&self) -> GfxCtxInnards {
pub fn draw_new_frame(&self) -> GfxCtxInnards {
GfxCtxInnards {
gl: &self.gl,
windowed_context: &self.windowed_context,
@ -293,7 +293,7 @@ impl PrerenderInnards {
}
}
pub(crate) fn upload_textures(
pub fn upload_textures(
&self,
dims_to_textures: BTreeMap<(u32, u32), Vec<(String, Vec<u8>, TextureType)>>,
) {
@ -311,4 +311,12 @@ impl PrerenderInnards {
}
}
}
pub fn window_resized(&self, width: f64, height: f64) {
self.windowed_context
.resize(winit::dpi::PhysicalSize::new(width as u32, height as u32));
unsafe {
self.gl.viewport(0, 0, width as i32, height as i32);
}
}
}

1
ezgui/src/runner.rs
View File

@ -46,6 +46,7 @@ impl<G: GUI> State<G> {
self.canvas.button_tooltip = None;
if let Event::WindowResized(width, height) = input.event {
prerender.inner.window_resized(width, height);
self.canvas.window_width = width;
self.canvas.window_height = height;
}