|
|
@ -443,11 +443,13 @@ impl CanvasState {
|
|
|
|
{
|
|
|
|
{
|
|
|
|
let g = hprof::enter("Textured Vertex Buffer");
|
|
|
|
let g = hprof::enter("Textured Vertex Buffer");
|
|
|
|
for (k, v) in textured_drawables.drain() {
|
|
|
|
for (k, v) in textured_drawables.drain() {
|
|
|
|
let vertex_buffer = v.clone().iter()
|
|
|
|
let vertex_buffer = v.clone().get(0).unwrap().clone();
|
|
|
|
.fold(Vec::new(), |mut a: Vec<RuntimeVertexDef>, b| {
|
|
|
|
// TODO
|
|
|
|
a.extend(b);
|
|
|
|
// v.clone().iter()
|
|
|
|
a
|
|
|
|
// .fold(Vec::new(), |mut a: Vec<RuntimeVertexDef>, b| {
|
|
|
|
});
|
|
|
|
// a.extend(b);
|
|
|
|
|
|
|
|
// a
|
|
|
|
|
|
|
|
// });
|
|
|
|
|
|
|
|
|
|
|
|
self.textured_vertex_buffer.insert(
|
|
|
|
self.textured_vertex_buffer.insert(
|
|
|
|
k.clone(),
|
|
|
|
k.clone(),
|
|
|
@ -464,11 +466,13 @@ impl CanvasState {
|
|
|
|
{
|
|
|
|
{
|
|
|
|
let g = hprof::enter("Image Vertex Buffer");
|
|
|
|
let g = hprof::enter("Image Vertex Buffer");
|
|
|
|
for (k, v) in image_drawables.drain() {
|
|
|
|
for (k, v) in image_drawables.drain() {
|
|
|
|
let vertex_buffer = v.clone().iter()
|
|
|
|
let vertex_buffer = v.clone().get(0).unwrap().clone();
|
|
|
|
.fold(Vec::new(), |mut a: Vec<&RuntimeVertexDef>, b| {
|
|
|
|
// TODO
|
|
|
|
a.extend(b);
|
|
|
|
// v.clone().iter()
|
|
|
|
a
|
|
|
|
// .fold(Vec::new(), |mut a: Vec<&RuntimeVertexDef>, b| {
|
|
|
|
});
|
|
|
|
// a.extend(b);
|
|
|
|
|
|
|
|
// a
|
|
|
|
|
|
|
|
// });
|
|
|
|
|
|
|
|
|
|
|
|
self.image_vertex_buffer.insert(
|
|
|
|
self.image_vertex_buffer.insert(
|
|
|
|
k.clone(),
|
|
|
|
k.clone(),
|
|
|
|