From 0cce359c28648603a4e360bd6f7115ff81cf16f6 Mon Sep 17 00:00:00 2001 From: mitchellhansen Date: Thu, 30 Jul 2020 23:11:56 -0700 Subject: [PATCH] going to abstract the events like I did for the vkcaster --- src/canvas/canvas_frame.rs | 6 ++-- src/drawables/sprite.rs | 61 ++++++++++++++++++++++---------------- src/main.rs | 13 ++++---- 3 files changed, 47 insertions(+), 33 deletions(-) diff --git a/src/canvas/canvas_frame.rs b/src/canvas/canvas_frame.rs index 540d28c3..a3f96777 100644 --- a/src/canvas/canvas_frame.rs +++ b/src/canvas/canvas_frame.rs @@ -7,7 +7,7 @@ use crate::canvas::managed::handles::{CanvasTextureHandle, CanvasImageHandle, Ca use vulkano::pipeline::vertex::Vertex; use std::any::Any; use crate::VertexTypes; -use vulkano::sync::Event; +use winit::event::Event; /// Trait which may be inherited by objects that wish to be drawn to the screen pub trait Drawable { @@ -15,8 +15,8 @@ pub trait Drawable { } /// Trait which may be inherited by objects that wish to receive events -pub trait Eventable { - fn notify(&self, event: &Event) -> (); +pub trait Eventable { + fn notify(&mut self, event: &Event) -> (); } /// Accumulator for Vectors of VertexTypes diff --git a/src/drawables/sprite.rs b/src/drawables/sprite.rs index e7366b0b..a1df1c89 100644 --- a/src/drawables/sprite.rs +++ b/src/drawables/sprite.rs @@ -3,78 +3,89 @@ use crate::canvas::*; use crate::canvas::managed::handles::{CanvasFontHandle, CanvasImageHandle, CanvasTextureHandle, Handle}; use crate::canvas::canvas_frame::{Drawable, Eventable}; use crate::util::vertex::{VertexTypes, TextureVertex3D, Vertex3D}; -use winit::event::{DeviceEvent, MouseButton, ElementState, Event}; +use winit::event::{DeviceEvent, MouseButton, ElementState, Event, WindowEvent}; /// #[derive(Debug, Clone)] pub struct Sprite { - pub verts: VertexTypes, + verts: VertexTypes, position: (f32, f32), size: (f32, f32), + depth: f32, + texture_handle: Arc, } /// Container class which implements drawable. impl Sprite { - /// - pub fn new(position: (f32, f32), - size: (f32, f32), - depth: u32, - texture_handle: Arc) -> Sprite { - let normalized_depth = (depth as f32 / 255.0); - let verts = vec![ + + fn generate_verts(position: (f32, f32), size: (f32, f32), depth: f32,) -> Vec { + vec![ TextureVertex3D { - v_position: [position.0, position.1, normalized_depth], // top left + v_position: [position.0, position.1, depth], // top left ti_position: [-0.0, -0.0], }, TextureVertex3D { - v_position: [position.0, position.1 + size.1, normalized_depth], // bottom left + v_position: [position.0, position.1 + size.1, depth], // bottom left ti_position: [-0.0, 1.0], }, TextureVertex3D { - v_position: [position.0 + size.0, position.1 + size.1, normalized_depth], // bottom right + v_position: [position.0 + size.0, position.1 + size.1, depth], // bottom right ti_position: [1.0, 1.0], }, TextureVertex3D { - v_position: [position.0, position.1, normalized_depth], // top left + v_position: [position.0, position.1, depth], // top left ti_position: [-0.0, -0.0], }, TextureVertex3D { - v_position: [position.0 + size.0, position.1 + size.1, normalized_depth], // bottom right + v_position: [position.0 + size.0, position.1 + size.1, depth], // bottom right ti_position: [1.0, 1.0], }, TextureVertex3D { - v_position: [position.0 + size.0, position.1, normalized_depth], // top right + v_position: [position.0 + size.0, position.1, depth], // top right ti_position: [1.0, -0.0], }, - ]; + ] + } + + /// + pub fn new(position: (f32, f32), + size: (f32, f32), + depth: u32, + texture_handle: Arc) -> Sprite { + + let normalized_depth = (depth as f32 / 255.0); Sprite { - verts: VertexTypes::TextureType(verts, texture_handle), + verts: VertexTypes::TextureType(Sprite::generate_verts(position, size, normalized_depth), texture_handle.clone()), position: position, size: size, + depth: normalized_depth, + texture_handle: texture_handle.clone(), } } } impl Drawable for Sprite { fn get(&self) -> VertexTypes { - self.verts.clone() + VertexTypes::TextureType(Sprite::generate_verts(self.position, self.size, self.depth), self.texture_handle.clone()) } } -impl Eventable for Sprite { - fn notify(&self, event: &Event) -> () { +impl Eventable for Sprite { + fn notify(&mut self, event: &Event) -> () { match event { - Event::DeviceEvent { event: DeviceEvent::Button{button, state }, .. } => { - match button.id.unwrap() { + Event::WindowEvent { event: WindowEvent::MouseInput{ device_id, state, button, modifiers }, .. } => { + match button { MouseButton::Left => { - if state.state == ElementState::Pressed { - // processor.save_edges_image(); + if *state == ElementState::Pressed { + self.position = (self.position.0, self.position.1 + 0.1); } }, - _ => () + _ => { + + } } } _ => {} diff --git a/src/main.rs b/src/main.rs index 9663c43a..2b8e1db5 100644 --- a/src/main.rs +++ b/src/main.rs @@ -23,7 +23,7 @@ use winit::event_loop::{EventLoop, ControlFlow}; use winit::platform::unix::WindowBuilderExtUnix; use winit::window::WindowBuilder; -use crate::canvas::canvas_frame::{CanvasFrame, Drawable}; +use crate::canvas::canvas_frame::{CanvasFrame, Drawable, Eventable}; use crate::canvas::managed::handles::{CanvasFontHandle, CanvasTextureHandle, Handle}; use crate::compute::compu_frame::CompuFrame; use crate::compute::managed::handles::{CompuBufferHandle, CompuKernelHandle}; @@ -114,7 +114,7 @@ pub fn main() { //let font_handle : Arc = // processor.get_font_handle(String::from("sansation.ttf")).unwrap(); - let funky_sprite = Sprite::new((0.0, 0.5), (0.5, 0.5), 0, funky_handle.clone()); + let mut funky_sprite = Sprite::new((0.0, 0.5), (0.5, 0.5), 0, funky_handle.clone()); let sfml_sprite = Sprite::new((0.0, -0.5), (0.5, 0.5), 1, sfml_handle.clone()); let rect = Rect::new((-0.5, -0.5), (0.5, 0.5), 1); @@ -200,11 +200,14 @@ pub fn main() { _ => () } } -// Event::DeviceEvent { event: DeviceEvent::Button(mouse_input), .. } => { -// mouse_xy.x -// }, _ => () } + + match event { + _ => { + funky_sprite.notify(&event); + } + } }); drop(l);