refactor(all): move types to -skeleton

3 files changed, 6 insertions, 8 deletions

diff --git a/examples/render-quad/Cargo.toml b/examples/render-quad/Cargo.toml
index 0c4306d..99cf38e 100644
--- a/examples/render-quad/Cargo.toml
+++ b/examples/render-quad/Cargo.toml
@@ -8,7 +8,6 @@ edition = "2018"
 stockton-skeleton = { path = "../../stockton-skeleton", features = ["vulkan"] }
 stockton-input = { path = "../../stockton-input" }
 stockton-input-codegen = { path = "../../stockton-input-codegen" }
-stockton-types = { path = "../../stockton-types" }
 stockton-levels = { path = "../../stockton-levels" }
 stockton-contrib = { path = "../../stockton-contrib", features = ["delta_time", "flycam"] }
 stockton-render = { path = "../../stockton-render" }
diff --git a/examples/render-quad/src/level.rs b/examples/render-quad/src/level.rs
index d10c3b6..74d1cc3 100644
--- a/examples/render-quad/src/level.rs
+++ b/examples/render-quad/src/level.rs
@@ -2,6 +2,7 @@ use stockton_levels::parts::{
     data::{FaceRef, Geometry, TextureRef},
     HasFaces, HasTextures, HasVisData, IsFace, IsTexture,
 };
+use stockton_skeleton::components::{CameraSettings, Transform};
 
 pub struct DemoLevel {
     pub faces: Box<[Face]>,
@@ -70,8 +71,8 @@ impl<'a> HasVisData<'a> for DemoLevel {
 
     fn get_visible(
         &'a self,
-        _transform: &stockton_types::components::Transform,
-        _settings: &stockton_types::components::CameraSettings,
+        _transform: &Transform,
+        _settings: &CameraSettings,
     ) -> Self::Faces {
         0..self.faces.len() as u32
     }
diff --git a/examples/render-quad/src/main.rs b/examples/render-quad/src/main.rs
index 0b7f3be..c5d52a9 100644
--- a/examples/render-quad/src/main.rs
+++ b/examples/render-quad/src/main.rs
@@ -15,7 +15,7 @@ use std::{
 use stockton_contrib::{delta_time::*, flycam::*};
 use stockton_input::{Axis, InputManager, Mouse};
 use stockton_levels::{
-    parts::data::{Geometry, Vertex},
+    parts::{data::{Geometry, Vertex}, FsResolver},
     types::Rgba,
 };
 use stockton_render::{
@@ -24,11 +24,9 @@ use stockton_render::{
     window::{process_window_events_system, UiState, WindowEvent, WindowFlow},
 };
 use stockton_skeleton::{
-    draw_passes::ConsDrawPass, error::full_error_display, texture::resolver::FsResolver, Renderer,
-};
-use stockton_types::{
+    draw_passes::ConsDrawPass, error::full_error_display, Renderer,
+    Session, types::*, 
     components::{CameraSettings, Transform},
-    Session, Vector2, Vector3,
 };
 
 use anyhow::{Context, Result};