[update] events & component to be defined in the packge root. Update all references.

Author: vmarcella

crates/lambda-rs/examples/push_constants.rs

@@ -1,9 +1,7 @@
 use lambda::{
-  core::{
-    component::Component,
-    events::WindowEvent,
-    runtime::start_runtime,
-  },
+  component::Component,
+  core::runtime::start_runtime,
+  events::WindowEvent,
   math::{
     matrix,
     matrix::Matrix,
@@ -201,19 +199,17 @@ impl Component for PushConstantsExample {
     println!("Detaching component");
   }
 
-  fn on_event(&mut self, event: lambda::core::events::Events) {
+  fn on_event(&mut self, event: lambda::events::Events) {
     // Only handle resizes.
     match event {
-      lambda::core::events::Events::Window { event, issued_at } => {
-        match event {
-          WindowEvent::Resize { width, height } => {
-            self.width = width;
-            self.height = height;
-            println!("Window resized to {}x{}", width, height);
-          }
-          _ => {}
+      lambda::events::Events::Window { event, issued_at } => match event {
+        WindowEvent::Resize { width, height } => {
+          self.width = width;
+          self.height = height;
+          println!("Window resized to {}x{}", width, height);
         }
-      }
+        _ => {}
+      },
       _ => {}
     }
   }

crates/lambda-rs/examples/triangle.rs

@@ -1,13 +1,11 @@
 use lambda::{
-  core::{
-    component::Component,
-    events::{
-      ComponentEvent,
-      Events,
-      KeyEvent,
-      WindowEvent,
-    },
-    runtime::start_runtime,
+  component::Component,
+  core::runtime::start_runtime,
+  events::{
+    ComponentEvent,
+    Events,
+    KeyEvent,
+    WindowEvent,
   },
   render::{
     command::RenderCommand,
@@ -59,7 +57,7 @@ impl Component for DemoComponent {
   fn on_event(self: &mut DemoComponent, event: Events) {
     match event {
       Events::Runtime { event, issued_at } => match event {
-        lambda::core::events::RuntimeEvent::Shutdown => {
+        lambda::events::RuntimeEvent::Shutdown => {
           println!("Shutting down the runtime");
         }
         _ => {}

crates/lambda-rs/examples/triangles.rs

@@ -1,13 +1,11 @@
 use lambda::{
-  core::{
-    component::Component,
-    events::{
-      Events,
-      KeyEvent,
-      VirtualKey,
-      WindowEvent,
-    },
-    runtime::start_runtime,
+  component::Component,
+  core::runtime::start_runtime,
+  events::{
+    Events,
+    KeyEvent,
+    VirtualKey,
+    WindowEvent,
   },
   render::{
     command::RenderCommand,
@@ -144,7 +142,7 @@ impl Component for TrianglesComponent {
   fn on_event(&mut self, event: Events) {
     match event {
       Events::Runtime { event, issued_at } => match event {
-        lambda::core::events::RuntimeEvent::Shutdown => {
+        lambda::events::RuntimeEvent::Shutdown => {
           println!("Shutting down the runtime");
         }
         _ => {}

crates/lambda-rs/src/core/component.rs renamed to crates/lambda-rs/src/component.rs

@@ -1,9 +1,11 @@
 use std::time::Duration;
 
-use super::events::Events;
-use crate::render::{
-  command::RenderCommand,
-  RenderContext,
+use crate::{
+  events::Events,
+  render::{
+    command::RenderCommand,
+    RenderContext,
+  },
 };
 
 /// The Component Interface for allowing Component based data structures

crates/lambda-rs/src/core/mod.rs

@@ -1,4 +1,2 @@
-pub mod component;
-pub mod events;
 pub mod runtime;
 pub mod window;

crates/lambda-rs/src/core/events.rs renamed to crates/lambda-rs/src/events.rs

@@ -1,5 +1,7 @@
+pub mod component;
 pub mod components;
 pub mod core;
+pub mod events;
 pub mod math;
 pub mod render;
 pub mod runtimes;

crates/lambda-rs/src/lib.rs

@@ -5,7 +5,7 @@ use lambda_platform::winit::{
   WindowProperties,
 };
 
-use crate::core::events::Events;
+use crate::events::Events;
 
 pub struct WindowBuilder {
   name: String,

crates/lambda-rs/src/render/window.rs

@@ -6,7 +6,6 @@ use std::time::Instant;
 
 use lambda_platform::winit::{
   winit_exports::{
-    ControlFlow,
     ElementState,
     Event as WinitEvent,
     WindowEvent as WinitWindowEvent,
@@ -16,16 +15,14 @@ use lambda_platform::winit::{
 };
 
 use crate::{
-  core::{
-    component::Component,
-    events::{
-      ComponentEvent,
-      Events,
-      KeyEvent,
-      RuntimeEvent,
-      WindowEvent,
-    },
-    runtime::Runtime,
+  component::Component,
+  core::runtime::Runtime,
+  events::{
+    ComponentEvent,
+    Events,
+    KeyEvent,
+    RuntimeEvent,
+    WindowEvent,
   },
   render::{
     window::{

crates/lambda-rs/src/runtimes/application.rs

@@ -8,14 +8,12 @@ use args::{
   ParsedArgument,
 };
 use lambda::{
-  core::{
-    component::Component,
-    events::{
-      ComponentEvent,
-      Events,
-      WindowEvent,
-    },
-    runtime::start_runtime,
+  component::Component,
+  core::runtime::start_runtime,
+  events::{
+    ComponentEvent,
+    Events,
+    WindowEvent,
   },
   math::matrix::{
     self,
@@ -178,16 +176,14 @@ struct ObjLoader {
 impl Component for ObjLoader {
   fn on_event(&mut self, event: Events) {
     match event {
-      lambda::core::events::Events::Window { event, issued_at } => {
-        match event {
-          WindowEvent::Resize { width, height } => {
-            self.width = width;
-            self.height = height;
-            println!("Window resized to {}x{}", width, height);
-          }
-          _ => {}
+      lambda::events::Events::Window { event, issued_at } => match event {
+        WindowEvent::Resize { width, height } => {
+          self.width = width;
+          self.height = height;
+          println!("Window resized to {}x{}", width, height);
         }
-      }
+        _ => {}
+      },
       _ => {}
     }
   }