diff --git a/Cargo.lock b/Cargo.lock index 921ea12..46e47eb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -72,7 +72,7 @@ dependencies = [ "ndk 0.8.0", "ndk-context", "ndk-sys 0.5.0+25.2.9519653", - "num_enum 0.7.1", + "num_enum 0.7.2", "thiserror", ] @@ -1185,7 +1185,7 @@ dependencies = [ "jni-sys", "log", "ndk-sys 0.5.0+25.2.9519653", - "num_enum 0.7.1", + "num_enum 0.7.2", "raw-window-handle 0.6.0", "thiserror", ] @@ -1316,11 +1316,11 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683751d591e6d81200c39fb0d1032608b77724f34114db54f571ff1317b337c0" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ - "num_enum_derive 0.7.1", + "num_enum_derive 0.7.2", ] [[package]] @@ -1349,11 +1349,11 @@ dependencies = [ [[package]] name = "num_enum_derive" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 2.0.1", + "proc-macro-crate 3.0.0", "proc-macro2", "quote", "syn 2.0.48", @@ -1567,12 +1567,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "2.0.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a" +checksum = "6b2685dd208a3771337d8d386a89840f0f43cd68be8dae90a5f8c2384effc9cd" dependencies = [ - "toml_datetime", - "toml_edit 0.20.2", + "toml_edit 0.21.0", ] [[package]] @@ -2103,9 +2102,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" [[package]] name = "toml_edit" @@ -2120,9 +2119,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.20.2" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ "indexmap", "toml_datetime", diff --git a/README.md b/README.md index 9e7b4b7..40d2e02 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # ⚜️ Vent-Engine ⚜️ -**A game engine written in Rust using WGPU with the goal to be very fast & user-friendly** +**A game engine written in Rust using an Vulkan renderer with the goal to be very fast & user-friendly** ![CI](https://github.com/Snowiiii/Vent-Engine/actions/workflows/rust.yml/badge.svg) ![Apache_2.0](https://img.shields.io/badge/license-Apache_2.0-blue.svg) diff --git a/crates/vent-assets/src/model/gltf.rs b/crates/vent-assets/src/model/gltf.rs index 0c1fd06..32d7e1b 100644 --- a/crates/vent-assets/src/model/gltf.rs +++ b/crates/vent-assets/src/model/gltf.rs @@ -194,13 +194,18 @@ impl GLTFLoader { gltf::texture::MinFilter::Nearest => { (vk::Filter::NEAREST, vk::SamplerMipmapMode::NEAREST) } - gltf::texture::MinFilter::Linear - | gltf::texture::MinFilter::LinearMipmapNearest => { + gltf::texture::MinFilter::Linear => { (vk::Filter::LINEAR, vk::SamplerMipmapMode::NEAREST) } gltf::texture::MinFilter::NearestMipmapNearest => { (vk::Filter::NEAREST, vk::SamplerMipmapMode::NEAREST) } + gltf::texture::MinFilter::LinearMipmapNearest => { + (vk::Filter::LINEAR, vk::SamplerMipmapMode::NEAREST) + } + gltf::texture::MinFilter::NearestMipmapLinear => { + (vk::Filter::LINEAR, vk::SamplerMipmapMode::LINEAR) + } gltf::texture::MinFilter::LinearMipmapLinear => { (vk::Filter::LINEAR, vk::SamplerMipmapMode::LINEAR) } diff --git a/crates/vent-ecs/Cargo.toml b/crates/vent-ecs/Cargo.toml index 3f62996..e6d1ea2 100644 --- a/crates/vent-ecs/Cargo.toml +++ b/crates/vent-ecs/Cargo.toml @@ -6,4 +6,4 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -winit = { version = "0.29.4", default-features = false } \ No newline at end of file +winit = { version = "0.29.9", default-features = false } \ No newline at end of file diff --git a/crates/vent-runtime/src/render/camera/camera_controller3d.rs b/crates/vent-runtime/src/render/camera/camera_controller3d.rs index 50b13e3..f5e6fb3 100644 --- a/crates/vent-runtime/src/render/camera/camera_controller3d.rs +++ b/crates/vent-runtime/src/render/camera/camera_controller3d.rs @@ -37,7 +37,6 @@ impl CameraController3D { match event.logical_key.as_ref() { // Arrow keys works but WASD not :C Key::Character("W") | Key::Named(NamedKey::ArrowUp) => { - print!("pressed W"); camera.position.x += sin_pitch * self.speed * delta_time; camera.position.z += cos_pitch * self.speed * delta_time; return true;