From 67cb813f35364e12f77ddee6b8386cb625405015 Mon Sep 17 00:00:00 2001
From: Piotr <mev_lyshkin@protonmail.com>
Date: Tue, 29 Sep 2020 23:52:04 +0200
Subject: [PATCH] Less dependencies in example crate

---
 Cargo.lock            |  5 -----
 Cargo.toml            |  5 -----
 doppler/src/lib.rs    |  9 +++------
 src/example_client.rs | 33 ++++++++++++++++-----------------
 src/main.rs           | 10 +---------
 5 files changed, 20 insertions(+), 42 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d1bcdc7..92b2ee6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -257,12 +257,7 @@ dependencies = [
 name = "doppler_example"
 version = "0.1.0"
 dependencies = [
- "cgmath",
  "doppler",
- "glutin",
- "imgui",
- "imgui-inspect",
- "imgui-inspect-derive",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index d53ac6d..64f0875 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,11 +11,6 @@ lto = true
 
 [dependencies]
 doppler = {path="doppler"}
-glutin = "0.24.1"
-cgmath = "0.17.0"
-imgui="0.4.0"
-imgui-inspect = "0.5.0"
-imgui-inspect-derive = "0.5.0"
 
 [profile.dev.package."*"]
 opt-level = 2
\ No newline at end of file
diff --git a/doppler/src/lib.rs b/doppler/src/lib.rs
index f15dff5..4a08825 100644
--- a/doppler/src/lib.rs
+++ b/doppler/src/lib.rs
@@ -1,14 +1,11 @@
 pub extern crate gl;
-pub extern crate glutin;
-
-#[cfg(feature = "imgui_inspect")]
 pub extern crate imgui;
 pub extern crate log;
 pub extern crate simple_logging;
 
-pub use cgmath::*;
-pub use glutin::*;
-pub use imgui::*;
+pub use cgmath as math;
+pub use glutin;
+pub use imgui_inspect;
 
 pub mod macros;
 
diff --git a/src/example_client.rs b/src/example_client.rs
index d5b1d10..957dcae 100644
--- a/src/example_client.rs
+++ b/src/example_client.rs
@@ -1,14 +1,14 @@
-use crate::doppler::assets_cache::AssetsCache;
-use crate::doppler::camera::*;
-use crate::doppler::client::Client;
-use crate::doppler::components::{ModelComponent, Transform};
-use crate::doppler::consts;
-use crate::doppler::light::*;
-use crate::doppler::sky::Sky;
-use cgmath::prelude::*;
-use cgmath::{perspective, vec3, Deg, Matrix4, Point3};
-use glutin::event::{ElementState, VirtualKeyCode};
-use imgui::*;
+use doppler::assets_cache::AssetsCache;
+use doppler::camera::*;
+use doppler::client::Client;
+use doppler::components::{ModelComponent, Transform};
+use doppler::consts;
+use doppler::light::*;
+use doppler::sky::Sky;
+use doppler::math::prelude::*;
+use doppler::math::{perspective, vec3, Deg, Matrix4, Point3};
+use doppler::glutin::event::{ElementState, VirtualKeyCode};
+use doppler::imgui::*;
 
 pub struct ExampleClient {
     models: Vec<ModelComponent>,
@@ -149,8 +149,7 @@ impl Client for ExampleClient {
         self.delta = delta;
     }
 
-    fn debug_draw(&mut self, ui: &imgui::Ui) {
-        use imgui::*;
+    fn debug_draw(&mut self, ui: &doppler::imgui::Ui) {
         if let Some(menu_bar) = ui.begin_main_menu_bar() {
             if let Some(menu) = ui.begin_menu(im_str!("Basic"), true) {
                 if MenuItem::new(im_str!("Show Object info"))
@@ -177,7 +176,7 @@ impl Client for ExampleClient {
         }
 
         {
-            use imgui_inspect::InspectArgsStruct;
+            use doppler::imgui_inspect;
 
             if self.show_camera_info {
                 Window::new(im_str!("CameraInfo"))
@@ -218,7 +217,7 @@ impl Client for ExampleClient {
                             &mut selected_mut,
                             "Object info",
                             &ui,
-                            &InspectArgsStruct::default(),
+                            &imgui_inspect::InspectArgsStruct::default(),
                         );
                     });
                 self.object_info_id = id;
@@ -241,7 +240,7 @@ impl Client for ExampleClient {
                             &mut selected_mut,
                             "DirectionalLightInfo",
                             &ui,
-                            &InspectArgsStruct::default(),
+                            &imgui_inspect::InspectArgsStruct::default(),
                         );
                     }
                     ui.separator();
@@ -256,7 +255,7 @@ impl Client for ExampleClient {
                             &mut selected_mut,
                             "PointLightInfo",
                             &ui,
-                            &InspectArgsStruct::default(),
+                            &imgui_inspect::InspectArgsStruct::default(),
                         );
                     }
                 });
diff --git a/src/main.rs b/src/main.rs
index e9cd304..ab1ca73 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,16 +1,8 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
-
-#[macro_use]
 extern crate doppler;
-
 mod example_client;
-
-use doppler::engine::Engine;
 use crate::example_client::ExampleClient;
 
 pub fn main() {
-    
-    let engine = Engine::default();
-
-    engine.run::<ExampleClient>();
+    doppler::engine::Engine::default().run::<ExampleClient>();
 }