more refactoring, compiles.

This commit is contained in:
2019-08-29 22:22:10 -07:00
parent 1737319fc5
commit 0357296771
12 changed files with 361 additions and 275 deletions

View File

@@ -1,12 +1,12 @@
use crate::vertex_2d::{ColoredVertex2D, Vertex2D};
use std::sync::Arc;
use std::collections::HashMap;
use crate::canvas::Drawable;
use crate::canvas::{Drawable, CanvasTextureHandle, CanvasImage, CanvasImageHandle};
pub struct CanvasFrame {
pub colored_drawables: Vec<ColoredVertex2D>,
pub textured_drawables: HashMap<Arc<u32>, Vec<Vec<Vertex2D>>>,
pub image_drawables: HashMap<Arc<u32>, Vec<Vec<Vertex2D>>>,
pub textured_drawables: HashMap<Arc<CanvasTextureHandle>, Vec<Vec<Vertex2D>>>,
pub image_drawables: HashMap<Arc<CanvasImageHandle>, Vec<Vec<Vertex2D>>>,
}
impl CanvasFrame {