Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up some extra imports and debug code

Browse Source
This commit is contained in:
Woeful_Wolf 2024-01-28 16:34:52 +02:00
parent ca022a1d1b
commit a262521875
2 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
voxygen/src/session/mod.rs
View File

@ -1409,8 +1409,7 @@ impl PlayState for SessionState {
.get(player_entity) .get(player_entity)
.copied() .copied()
.unwrap(); .unwrap();
// self.scene.debug.add_shape(crate::scene::DebugShape::Line([aim_point,
// (player_pos.0 + Vec3 { x: 0.0, y: 0.0, z: 1000.0 })]));
drop(client); drop(client);
aim_point - (player_pos.0 + body_offsets) aim_point - (player_pos.0 + body_offsets)
} else { } else {

32
voxygen/src/session/target.rs
View File

@ -1,7 +1,4 @@
use core::prelude::v1;
use specs::{Join, LendJoin, WorldExt}; use specs::{Join, LendJoin, WorldExt};
use tracing::{debug, info};
use vek::*; use vek::*;
use client::{self, Client}; use client::{self, Client};
@ -17,8 +14,6 @@ use common::{
}; };
use common_base::span; use common_base::span;
use crate::scene::Scene;
#[derive(Clone, Copy, Debug)] #[derive(Clone, Copy, Debug)]
pub struct Target<T> { pub struct Target<T> {
pub kind: T, pub kind: T,
@ -356,17 +351,15 @@ fn closest_line_seg_line_seg(
let p3 = Vec3::new(p3.x as f64, p3.y as f64, p3.z as f64); let p3 = Vec3::new(p3.x as f64, p3.y as f64, p3.z as f64);
let p4 = Vec3::new(p4.x as f64, p4.y as f64, p4.z as f64); let p4 = Vec3::new(p4.x as f64, p4.y as f64, p4.z as f64);
let P1 = p1; let d1 = p2 - p1;
let P2 = p3; let d2 = p4 - p3;
let V1 = p2 - p1; let d21 = p3 - p1;
let V2 = p4 - p3;
let V21 = P2 - P1;
let v22 = V2.dot(V2); let v22 = d2.dot(d2);
let v11 = V1.dot(V1); let v11 = d1.dot(d1);
let v21 = V2.dot(V1); let v21 = d2.dot(d1);
let v21_1 = V21.dot(V1); let v21_1 = d21.dot(d1);
let v21_2 = V21.dot(V2); let v21_2 = d21.dot(d2);
let denom = v21 * v21 - v22 * v11; let denom = v21 * v21 - v22 * v11;
@ -382,13 +375,8 @@ fn closest_line_seg_line_seg(
let (s, t) = (s.clamp(0.0, 1.0), t.clamp(0.0, 1.0)); let (s, t) = (s.clamp(0.0, 1.0), t.clamp(0.0, 1.0));
if s == 0.0 { let p_a = p1 + s * d1;
info!("p3: {}, p4: {}", p3, p4); let p_b = p3 + t * d2;
info!("s: {}, t: {}", s, t);
}
let p_a = P1 + s * V1;
let p_b = P2 + t * V2;
( (
Vec3::new(p_a.x as f32, p_a.y as f32, p_a.z as f32), Vec3::new(p_a.x as f32, p_a.y as f32, p_a.z as f32),