diff options
Diffstat (limited to 'stockton-render')
-rw-r--r-- | stockton-render/Cargo.toml | 1 | ||||
-rw-r--r-- | stockton-render/src/level.rs | 11 | ||||
-rw-r--r-- | stockton-render/src/ui.rs | 6 |
3 files changed, 8 insertions, 10 deletions
diff --git a/stockton-render/Cargo.toml b/stockton-render/Cargo.toml index 1329443..3ba8c01 100644 --- a/stockton-render/Cargo.toml +++ b/stockton-render/Cargo.toml @@ -8,7 +8,6 @@ edition = "2018" [dependencies] stockton-skeleton = { path = "../stockton-skeleton" } -stockton-types = { path = "../stockton-types" } stockton-levels = { path = "../stockton-levels" } stockton-input = { path = "../stockton-input" } anyhow = "1.0.40" diff --git a/stockton-render/src/level.rs b/stockton-render/src/level.rs index f577569..dd4d61a 100644 --- a/stockton-render/src/level.rs +++ b/stockton-render/src/level.rs @@ -13,17 +13,16 @@ use stockton_skeleton::{ AttachmentSpec, CompletePipeline, PipelineSpecBuilder, RenderpassSpec, ShaderDesc, VertexBufferSpec, VertexPrimitiveAssemblerSpec, }, - context::RenderingContext, - draw_passes::{util::TargetSpecificResources, DrawPass, IntoDrawPass, PassPosition}, + RenderingContext, + Session, + DrawPass, IntoDrawPass, PassPosition, + draw_passes::{util::TargetSpecificResources}, error::LockPoisoned, mem::{DataPool, DepthBufferPool, StagingPool, TexturesPool}, queue_negotiator::QueueFamilyNegotiator, - texture::{resolver::TextureResolver, TexLoadQueue, TextureLoadConfig, TextureRepo}, + texture::{TextureResolver, TexLoadQueue, TextureLoadConfig, TextureRepo}, types::*, -}; -use stockton_types::{ components::{CameraSettings, Transform}, - *, }; use anyhow::{Context, Result}; diff --git a/stockton-render/src/ui.rs b/stockton-render/src/ui.rs index 91e1b4b..981be02 100644 --- a/stockton-render/src/ui.rs +++ b/stockton-render/src/ui.rs @@ -7,16 +7,16 @@ use stockton_skeleton::{ AttachmentSpec, CompletePipeline, PipelineSpecBuilder, RenderpassSpec, ShaderDesc, VertexBufferSpec, VertexPrimitiveAssemblerSpec, }, - context::RenderingContext, + RenderingContext, + Session, draw_passes::{util::TargetSpecificResources, DrawPass, IntoDrawPass, PassPosition}, mem::{DataPool, StagingPool, TexturesPool}, queue_negotiator::QueueFamilyNegotiator, texture::{ - resolver::TextureResolver, LoadableImage, TexLoadQueue, TextureLoadConfig, TextureRepo, + TextureResolver, LoadableImage, TexLoadQueue, TextureLoadConfig, TextureRepo, }, types::*, }; -use stockton_types::{Session, Vector2}; use std::{ array::IntoIter, |