From a9635b2c3ddc3dea1528a922faa864fbe9e17e0d Mon Sep 17 00:00:00 2001 From: Carter Anderson Date: Sat, 11 Jan 2020 11:29:57 -0800 Subject: [PATCH] move vertex to render mod --- src/lib.rs | 1 - src/render/mesh.rs | 2 +- src/render/mod.rs | 3 ++- src/{ => render}/vertex.rs | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename src/{ => render}/vertex.rs (100%) diff --git a/src/lib.rs b/src/lib.rs index 1f5a57d28a..0e4a3a59c3 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,7 +2,6 @@ mod app; pub mod asset; mod core; pub mod render; -mod vertex; pub use crate::core::*; pub use app::{App, AppBuilder}; diff --git a/src/render/mesh.rs b/src/render/mesh.rs index adc30bac56..76f10ed165 100644 --- a/src/render/mesh.rs +++ b/src/render/mesh.rs @@ -1,4 +1,4 @@ -use crate::{asset::Asset, math::*, vertex::Vertex}; +use crate::{asset::Asset, math::*, render::Vertex}; use wgpu::{Buffer, Device}; use zerocopy::AsBytes; diff --git a/src/render/mod.rs b/src/render/mod.rs index cb9ffe95ec..4aaf9b2e26 100644 --- a/src/render/mod.rs +++ b/src/render/mod.rs @@ -9,6 +9,7 @@ mod light; mod material; mod rect; mod render_graph; +mod vertex; pub use camera::*; pub use light::*; @@ -18,8 +19,8 @@ pub use rect::*; pub use render_graph::*; pub use shader::*; -use crate::vertex::Vertex; use std::mem; +pub use vertex::Vertex; pub struct UniformBuffer { pub buffer: wgpu::Buffer, diff --git a/src/vertex.rs b/src/render/vertex.rs similarity index 100% rename from src/vertex.rs rename to src/render/vertex.rs