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

Merge branch 'timo-arrowheight' into 'master'

Browse Source 
timo arrow spawn height

See merge request veloren/veloren!558
This commit is contained in:
Joshua Barretto 2019-10-06 20:19:01 +00:00
commit 1a9408c397
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/lib.rs
View File

@ -297,12 +297,16 @@ impl Server {
dir,
projectile,
} => {
let pos = state
let mut pos = state
.ecs()
.read_storage::<comp::Pos>()
.get(entity)
.unwrap()
.0;
// TODO: Player height
pos.z += 1.2;
Self::create_projectile(
state,
comp::Pos(pos),

1
voxygen/src/scene/figure/mod.rs
View File

@ -548,6 +548,7 @@ impl<S: Skeleton> FigureState<S> {
let mat = Mat4::<f32>::identity()
* Mat4::translation_3d(self.pos)
* Mat4::rotation_z(-ori.x.atan2(ori.y))
* Mat4::rotation_x(ori.z.atan2(Vec2::from(ori).magnitude()))
* Mat4::scaling_3d(Vec3::from(0.8 * scale));
let locals = FigureLocals::new(mat, col);