From 6367a9ba5a549b62f01da61fb50323877b9f52ff Mon Sep 17 00:00:00 2001 From: tcmal Date: Sun, 25 Aug 2024 17:44:24 +0100 Subject: refactor(all): move types to -skeleton --- stockton-render/src/level.rs | 11 +++++------ stockton-render/src/ui.rs | 6 +++--- 2 files changed, 8 insertions(+), 9 deletions(-) (limited to 'stockton-render/src') 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, -- cgit v1.2.3