moved around the file heirarchy to make these handles safer

This commit is contained in:
2020-02-04 23:02:21 -08:00
parent bb5617420e
commit 8fcd26063a
23 changed files with 163 additions and 127 deletions

View File

@@ -0,0 +1,71 @@
use crate::canvas::canvas_state::{Drawable};
use std::sync::Arc;
use crate::canvas::managed::handles::{CanvasImageHandle, CanvasTextureHandle};
pub struct CompuSprite {
pub vertices: [(f32, f32, f32); 6],
pub ti_position: [(f32, f32); 6],
position: (f32, f32),
size: (f32, f32),
color: (f32, f32, f32, f32),
image_handle: Arc<CanvasImageHandle>,
}
impl CompuSprite {
pub fn new(position: (f32, f32),
size: (f32, f32),
depth: u32,
image_size: (f32, f32),
image_handle: Arc<CanvasImageHandle>) -> CompuSprite {
let normalized_depth = (depth as f32 / 255.0);
CompuSprite {
vertices: [
(position.0, position.1 , normalized_depth), // top left
(position.0, position.1 + size.1 , normalized_depth), // bottom left
(position.0 + size.0, position.1 + size.1, normalized_depth), // bottom right
(position.0, position.1 , normalized_depth), // top left
(position.0 + size.0, position.1 + size.1, normalized_depth), // bottom right
(position.0 + size.0, position.1 , normalized_depth), // top right
],
ti_position: [
(0.0 , 0.0 ), // top left
(0.0 , image_size.1), // bottom left
(image_size.0, image_size.1), // bottom right
(0.0 , 0.0 ), // top left
(image_size.0, image_size.1), // bottom right
(image_size.0, 0.0 ), // top right
],
position: position,
size: size,
color: (0.0, 0.0, 0.0, 0.0),
image_handle: image_handle.clone(),
}
}
}
impl Drawable for CompuSprite {
fn get_vertices(&self) -> Vec<(f32, f32, f32)> {
self.vertices.to_vec()
}
fn get_color(&self) -> (f32, f32, f32, f32) {
self.color
}
fn get_ti_coords(&self) -> Vec<(f32, f32)> {
self.ti_position.to_vec()
}
fn get_texture_handle(&self) -> Option<Arc<CanvasTextureHandle>> {
None
}
fn get_image_handle(&self) -> Option<Arc<CanvasImageHandle>> {
Some(self.image_handle.clone())
}
}