Update deps

This commit is contained in:
Piotr Siuszko 2024-02-06 11:37:16 +01:00
parent 102eadf5c9
commit b4a9129685
7 changed files with 301 additions and 260 deletions

540
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -18,8 +18,8 @@ log = "0.4.11"
simple-logging = "2.0.2" simple-logging = "2.0.2"
image2 = { git = "https://github.com/Leinnan/image2-rs", branch="legacy", default-features = false, features=["io"] } image2 = { git = "https://github.com/Leinnan/image2-rs", branch="legacy", default-features = false, features=["io"] }
glutin = "0.26.0" glutin = "0.26.0"
serde = { version = "1.0.117", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0.59" serde_json = "1.0"
serde_yaml = "0.8" serde_yaml = "0.8"
[features] [features]

View File

@ -1,9 +1,7 @@
use doppler::assets_cache::AssetsCache; use doppler::assets_cache::AssetsCache;
use doppler::camera::*;
use doppler::client::Client; use doppler::client::Client;
use doppler::glutin::event::{ElementState, VirtualKeyCode}; use doppler::glutin::event::{ElementState, VirtualKeyCode};
use doppler::shader::Shader; use doppler::shader::Shader;
use doppler::map::*;
use doppler::components::*; use doppler::components::*;
pub struct Client2D{ pub struct Client2D{
@ -43,7 +41,7 @@ impl Client for Client2D {
} }
unsafe fn draw(&mut self) { unsafe fn draw(&mut self) {
use doppler::math::prelude::*; // use doppler::math::prelude::*;
self.models_2d.draw(&self.shader); self.models_2d.draw(&self.shader);
// let projection: Matrix4<f32> = perspective( // let projection: Matrix4<f32> = perspective(
// Deg(self.camera.zoom), // Deg(self.camera.zoom),
@ -57,13 +55,13 @@ impl Client for Client2D {
self.delta = delta; self.delta = delta;
} }
fn debug_draw(&mut self, ui: &doppler::imgui::Ui) { fn debug_draw(&mut self, _ui: &doppler::imgui::Ui) {
} }
fn on_mouse_scroll(&mut self, yoffset: f32) { fn on_mouse_scroll(&mut self, _yoffset: f32) {
} }
fn on_mouse_move(&mut self, x: f32, y: f32) { fn on_mouse_move(&mut self, _x: f32, _y: f32) {
} }
} }

View File

@ -77,7 +77,7 @@ impl Default for Camera {
impl Camera { impl Camera {
/// Returns the view matrix calculated using Eular Angles and the LookAt Matrix /// Returns the view matrix calculated using Eular Angles and the LookAt Matrix
pub fn get_view_matrix(&self) -> Matrix4 { pub fn get_view_matrix(&self) -> Matrix4 {
Matrix4::look_at(self.position, self.position + self.front, self.up) Matrix4::look_at_rh(self.position, self.position + self.front, self.up)
} }
/// Processes input received from any keyboard-like input system. Accepts input parameter in the form of camera defined ENUM (to abstract it from windowing systems) /// Processes input received from any keyboard-like input system. Accepts input parameter in the form of camera defined ENUM (to abstract it from windowing systems)

View File

@ -1,5 +1,3 @@
use std::default;
#[cfg(feature = "imgui_inspect")] #[cfg(feature = "imgui_inspect")]
use crate::imgui_helper::*; use crate::imgui_helper::*;
use crate::model::Model; use crate::model::Model;

View File

@ -10,7 +10,6 @@ use cgmath::prelude::*;
use cgmath::{Vector2, Vector3}; use cgmath::{Vector2, Vector3};
use gl; use gl;
use crate::assets_cache::AssetsCache;
use crate::shader::Shader; use crate::shader::Shader;
// NOTE: without repr(C) the compiler may reorder the fields or use different padding/alignment than C. // NOTE: without repr(C) the compiler may reorder the fields or use different padding/alignment than C.

View File

@ -160,7 +160,7 @@ impl Model {
self.directory.to_string() self.directory.to_string()
}; };
let texture = cache.get_material_texture( let texture = cache.get_material_texture(
&self.directory, &dir,
&diffuse_path.unwrap(), &diffuse_path.unwrap(),
"texture_diffuse", "texture_diffuse",
); );