From dab82367f0e324479d2bb8d94f4f623456a0bb7b Mon Sep 17 00:00:00 2001
From: nullprop <git@nullprop.sh>
Date: Sun, 5 Nov 2023 15:38:26 +0200
Subject: [PATCH] refactoring

---
 src/core/light.rs |  9 ---------
 src/core/state.rs | 11 +++++++++--
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/core/light.rs b/src/core/light.rs
index e763a76..618ca6e 100644
--- a/src/core/light.rs
+++ b/src/core/light.rs
@@ -41,15 +41,6 @@ impl LightUniform {
     }
 }
 
-#[repr(C)]
-#[derive(Debug, Default, Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
-pub struct GlobalUniforms {
-    pub light_matrix_index: u32,
-    // No DownlevelFlags::BUFFER_BINDINGS_NOT_16_BYTE_ALIGNED in WebGL
-    pub use_shadowmaps: u32,
-    _padding: [u32; 2],
-}
-
 pub trait DrawLight<'a> {
     fn draw_light_mesh(
         &mut self,
diff --git a/src/core/state.rs b/src/core/state.rs
index ced2ffb..2bb8b48 100644
--- a/src/core/state.rs
+++ b/src/core/state.rs
@@ -6,8 +6,6 @@ use std::time::Duration;
 
 use wgpu::util::DeviceExt;
 use winit::{event::*, window::Window};
-use winit::dpi::PhysicalSize;
-use crate::core::light::GlobalUniforms;
 
 use super::camera::{Camera, CameraController, CameraUniform};
 use super::instance::{Instance, InstanceRaw};
@@ -20,6 +18,15 @@ use super::texture::Texture;
 const SHADOW_MAP_SIZE: u32 = 1024;
 const SHADOW_MAP_LAYERS: u32 = 6;
 
+#[repr(C)]
+#[derive(Debug, Default, Copy, Clone, bytemuck::Pod, bytemuck::Zeroable)]
+pub struct GlobalUniforms {
+    pub light_matrix_index: u32,
+    // No DownlevelFlags::BUFFER_BINDINGS_NOT_16_BYTE_ALIGNED in WebGL
+    pub use_shadowmaps: u32,
+    _padding: [u32; 2],
+}
+
 pub struct State {
     pub size: winit::dpi::PhysicalSize<u32>,