Cleanup and version bump

Author: XavierCS-dev

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "effect-engine"
-version = "0.1.2"
+version = "0.2.0-alpha"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Cargo.toml

@@ -1,18 +1,13 @@
-use std::f32::consts::PI;
+use wgpu::util::DeviceExt;
 
-use wgpu::{util::DeviceExt, Queue};
-
-use crate::engine::{
-    primitives::{matrix::Matrix4, vector::Vector3},
-    transform::transform::{Transform2D, Transform2DSystem},
-};
+use crate::engine::primitives::vector::Vector3;
 
 pub struct Camera2D {
     look_at: glam::Mat4,
     proj: glam::Mat4,
-    near: f32,
-    far: f32,
-    fov_deg: f32,
+    _near: f32,
+    _far: f32,
+    _fov_deg: f32,
     bind_group: wgpu::BindGroup,
     bind_group_layout: wgpu::BindGroupLayout,
     buffer: wgpu::Buffer,
@@ -60,9 +55,9 @@ impl Camera2D {
         Self {
             proj,
             look_at,
-            near,
-            far,
-            fov_deg,
+            _near: near,
+            _far: far,
+            _fov_deg: fov_deg,
             buffer,
             bind_group,
             bind_group_layout,

src/engine/camera/camera.rs

@@ -8,13 +8,8 @@ use winit::dpi::PhysicalSize;
 
 use super::camera::camera::Camera2D;
 use super::camera::camera::Camera2DSystem;
-use super::primitives::vector::Vector3;
 use super::texture::background2d::Background2D;
-use super::{
-    primitives::vertex::Vertex,
-    texture::texture2d::{Texture2D, TextureID},
-    traits::layer::Layer,
-};
+use super::{primitives::vertex::Vertex, texture::texture2d::Texture2D};
 
 use anyhow::Result;
 
@@ -34,6 +29,7 @@ pub struct Engine {
 /*
 * Update and input should run closures defined by the user
 * these closures are to be stored in Engine upon initialisation
+* 0.3.0 release
 */
 impl Engine {
     pub async fn new(window: winit::window::Window, camera_fov: f32, v_sync: bool) -> Self {
@@ -187,13 +183,13 @@ impl Engine {
         }
     }
 
-    pub fn input(&mut self, event: &winit::event::Event<()>, delta: &std::time::Duration) {
+    pub fn input(&mut self, _event: &winit::event::Event<()>, _delta: &std::time::Duration) {
         // do nothing
         // not sure what to do with this yet
         // TODO: move input to be a burden on user.
     }
 
-    pub fn update(&mut self, delta: &std::time::Duration) {
+    pub fn update(&mut self, _delta: &std::time::Duration) {
         // TODO: Move update to be a burden on user
 
         // millis returns 0 for some reason...use nano

src/engine/engine.rs

@@ -1,20 +1,14 @@
-use anyhow::{bail, Result};
+use anyhow::Result;
 use std::collections::{hash_map::Keys, HashMap};
 use winit::dpi::PhysicalSize;
 
-use wgpu::util::DeviceExt;
-
-use crate::{
-    engine::{
-        entity::entity::{Entity2D, Entity2DRaw},
-        primitives::vertex::Vertex,
-        texture::{
-            texture2d::{Texture2D, TextureID},
-            texture_atlas2d::TextureAtlas2D,
-        },
-        util::effect_error::EffectError,
+use crate::engine::{
+    entity::entity::{Entity2D, Entity2DRaw},
+    primitives::vertex::Vertex,
+    texture::{
+        texture2d::{Texture2D, TextureID},
+        texture_atlas2d::TextureAtlas2D,
     },
-    EffectSystem,
 };
 
 #[derive(std::cmp::PartialEq, std::cmp::Eq, Hash, Clone, Copy, Debug, PartialOrd, Ord)]
@@ -178,7 +172,7 @@ impl Layer2DSystem {
         Layer2DSystem::alloc_buffer(data, size * 2, device, queue, "Entity Buffer", false)
     }
 
-    fn create_index_buffer(device: &wgpu::Device, queue: &wgpu::Queue) -> wgpu::Buffer {
+    fn _create_index_buffer(device: &wgpu::Device, queue: &wgpu::Queue) -> wgpu::Buffer {
         let mut indices: Vec<u16> = Vec::new();
         indices.extend_from_slice(&[0, 1, 2, 0, 2, 3]);
         let data: &[u8] = bytemuck::cast_slice(&indices);
@@ -187,7 +181,7 @@ impl Layer2DSystem {
     }
 
     fn create_vertex_buffer(
-        texture_size: PhysicalSize<u32>,
+        _texture_size: PhysicalSize<u32>,
         tex_coord_size: PhysicalSize<f32>,
         device: &wgpu::Device,
         queue: &wgpu::Queue,

src/engine/layer/layer.rs

@@ -169,6 +169,14 @@ impl Background2D {
     pub fn camera_bind_group(&self) -> &wgpu::BindGroup {
         &self.camera_bind_group
     }
+
+    pub fn texture(&self) -> &Texture2D {
+        &self.texture_data
+    }
+
+    pub fn dimensions(&self) -> PhysicalSize<u32> {
+        self.dimensions
+    }
 }
 
 // manage all background related operations

src/engine/texture/background2d.rs

@@ -1,8 +1,5 @@
-use image::GenericImageView;
 use image::ImageBuffer;
 use image::Rgba;
-use std::fs;
-use std::io::prelude::*;
 
 #[derive(std::cmp::PartialEq, std::cmp::Eq, Hash, Clone, Debug, Copy)]
 pub struct TextureID(pub &'static str);

src/engine/texture/texture2d.rs

@@ -1,16 +1,11 @@
-use crate::engine::{
-    texture::texture2d::Texture2DSystem,
-    util::{effect_error::EffectError, file_to_bytes::file_to_bytes},
-};
+use crate::engine::{texture::texture2d::Texture2DSystem, util::effect_error::EffectError};
 
-use image::{GenericImage, GenericImageView, ImageBuffer, Rgba};
-use wgpu::Extent3d;
+use image::{GenericImage, ImageBuffer};
 use winit::dpi::PhysicalSize;
 
-use super::texture2d::{Texture2D, TextureID};
+use super::texture2d::Texture2D;
 
 use anyhow::{bail, Result};
-use image::EncodableLayout;
 
 const MAX_WIDTH: u32 = 8192;
 const MAX_HEIGHT: u32 = 8192;