event system needs some thinkin
This commit is contained in:
@@ -6,12 +6,18 @@ use crate::canvas::managed::shader::dynamic_vertex::RuntimeVertexDef;
|
||||
use crate::canvas::managed::handles::{CanvasTextureHandle, CanvasImageHandle, CanvasFontHandle, Handle};
|
||||
use vulkano::pipeline::vertex::Vertex;
|
||||
use std::any::Any;
|
||||
use crate::VertexTypeContainer;
|
||||
use crate::{VertexTypeContainer, Move, Geom};
|
||||
use winit::event::Event;
|
||||
|
||||
/// Trait which may be inherited by objects that wish to be drawn to the screen
|
||||
pub trait Drawable {
|
||||
fn get(&self, window_size: (u32, u32)) -> Vec<VertexTypeContainer>;
|
||||
fn get(&self,
|
||||
window_size: (u32, u32),
|
||||
position: (f32, f32),
|
||||
rotation: f32,
|
||||
size: (f32, f32),
|
||||
depth: f32,
|
||||
) -> Vec<VertexTypeContainer>;
|
||||
}
|
||||
|
||||
/// Trait which may be inherited by objects that wish to receive events
|
||||
@@ -32,7 +38,6 @@ pub struct CanvasFrame {
|
||||
}
|
||||
|
||||
impl CanvasFrame {
|
||||
|
||||
pub fn new(window_size: (u32, u32)) -> CanvasFrame {
|
||||
CanvasFrame {
|
||||
map: vec![],
|
||||
@@ -42,14 +47,20 @@ impl CanvasFrame {
|
||||
|
||||
/// Push this drawable onto the back of the accumulator
|
||||
pub fn add(&mut self, drawable: Vec<VertexTypeContainer>) {
|
||||
for i in drawable{
|
||||
for i in drawable {
|
||||
self.map.push(i);
|
||||
}
|
||||
}
|
||||
|
||||
/// Push this drawable onto the back of the accumulator
|
||||
pub fn draw(&mut self, drawable: &dyn Drawable) {
|
||||
for i in drawable.get(self.window_size) {
|
||||
pub fn draw(&mut self, drawable: &dyn Drawable, mv: Move, geom: Geom) {
|
||||
for i in drawable.get(
|
||||
self.window_size,
|
||||
(mv.pos_x, mv.pos_y),
|
||||
geom.rotation,
|
||||
(geom.size_x, geom.size_y),
|
||||
geom.depth
|
||||
) {
|
||||
self.map.push(i);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user