mitchellhansen/Trac3r-rust
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added slider thing, broke rendering somehow though

Browse Source
This commit is contained in:
mitchellhansen
2020-08-01 20:06:53 -07:00
parent 8da810f23a
commit f3a3be1d99
12 changed files with 78 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/canvas/canvas_state.rs
View File

@@ -31,7 +31,7 @@ use crate::canvas::managed::handles::{CanvasTextureHandle, CanvasImageHandle, Ca
use crate::canvas::managed::gpu_buffers::{CanvasImage, CanvasTexture, CanvasFont};
use crate::canvas::managed::shader::shader_common::CompiledShader;
use crate::canvas::managed::shader::generic_shader::GenericShader;
use crate::VertexTypes;
use crate::VertexType;
use crate::util::vertex::{TextVertex3D, TextureVertex3D, ImageVertex3D, ColorVertex3D, CanvasFrameAllocation};
use shade_runner::Input;
use winit::window::Window;
@@ -395,19 +395,19 @@ impl CanvasState {
for value in canvas_frame.map {
match value {
VertexTypes::TextureType(vertices, handle) => {
VertexType::TextureType(vertices, handle) => {
textured_vertex_buffer.entry(handle).or_insert(vertices.clone()).extend(vertices);
}
VertexTypes::ImageType(vertices, handle) => {
VertexType::ImageType(vertices, handle) => {
image_vertex_buffer.entry(handle).or_insert(vertices.clone()).extend(vertices);
}
VertexTypes::ColorType(vertices) => {
VertexType::ColorType(vertices) => {
colored_vertex_buffer.extend(vertices);
}
VertexTypes::ThreeDType(vertices) => {
VertexType::ThreeDType(vertices) => {
}
VertexTypes::TextType(vertices) => {
VertexType::TextType(vertices) => {
text_vertex_buffer.extend(vertices);
}
};