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

use better glium buffer types

Browse Source
This commit is contained in:
Dustin Carlino 2019-02-11 14:01:17 -08:00
parent d655bdc588
commit 6a573dfbd0
2 changed files with 46 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ezgui/src/drawing.rs
View File

@ -116,12 +116,12 @@ impl<'a> GfxCtx<'a> {
}
pub fn draw_polygon(&mut self, color: Color, poly: &Polygon) {
let obj = self.prerender.upload_borrowed(vec![(color, poly)]);
let obj = self.prerender.upload_temporary(vec![(color, poly)]);
self.redraw(&obj);
}
pub fn draw_polygon_batch(&mut self, list: Vec<(Color, &Polygon)>) {
let obj = self.prerender.upload_borrowed(list);
let obj = self.prerender.upload_temporary(list);
self.redraw(&obj);
}

63
ezgui/src/event_ctx.rs
View File

@ -30,6 +30,23 @@ pub struct Prerender<'a> {
impl<'a> Prerender<'a> {
pub fn upload_borrowed(&self, list: Vec<(Color, &Polygon)>) -> Drawable {
self.actually_upload(true, list)
}
pub fn upload(&self, list: Vec<(Color, Polygon)>) -> Drawable {
let borrows = list.iter().map(|(c, p)| (*c, p)).collect();
self.actually_upload(true, borrows)
}
pub fn get_total_bytes_uploaded(&self) -> usize {
self.total_bytes_uploaded.get()
}
pub(crate) fn upload_temporary(&self, list: Vec<(Color, &Polygon)>) -> Drawable {
self.actually_upload(false, list)
}
fn actually_upload(&self, permanent: bool, list: Vec<(Color, &Polygon)>) -> Drawable {
self.num_uploads.set(self.num_uploads.get() + 1);
let mut vertices: Vec<Vertex> = Vec::new();
@ -54,32 +71,40 @@ impl<'a> Prerender<'a> {
}
}
let vertex_buffer = glium::VertexBuffer::new(self.display, &vertices).unwrap();
let index_buffer = glium::IndexBuffer::new(
self.display,
glium::index::PrimitiveType::TrianglesList,
&indices,
)
.unwrap();
let vertex_buffer = if permanent {
glium::VertexBuffer::immutable(self.display, &vertices).unwrap()
} else {
glium::VertexBuffer::new(self.display, &vertices).unwrap()
};
let index_buffer = if permanent {
glium::IndexBuffer::immutable(
self.display,
glium::index::PrimitiveType::TrianglesList,
&indices,
)
.unwrap()
} else {
glium::IndexBuffer::new(
self.display,
glium::index::PrimitiveType::TrianglesList,
&indices,
)
.unwrap()
};
self.total_bytes_uploaded.set(
self.total_bytes_uploaded.get() + vertex_buffer.get_size() + index_buffer.get_size(),
);
if permanent {
self.total_bytes_uploaded.set(
self.total_bytes_uploaded.get()
+ vertex_buffer.get_size()
+ index_buffer.get_size(),
);
}
Drawable {
vertex_buffer,
index_buffer,
}
}
pub fn upload(&self, list: Vec<(Color, Polygon)>) -> Drawable {
let borrows = list.iter().map(|(c, p)| (*c, p)).collect();
self.upload_borrowed(borrows)
}
pub fn get_total_bytes_uploaded(&self) -> usize {
self.total_bytes_uploaded.get()
}
}
pub struct EventCtx<'a> {