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 'disable-camera-turning-in-char-selection-until-the-world-is-ready-for-it-' into 'master'

Browse Source 
Disable cam rotation in char selection until we have generated world in the background

See merge request veloren/veloren!1536
This commit is contained in:
Monty Marz 2020-11-20 18:11:46 +00:00
commit 2b4e1ee964
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
voxygen/src/scene/simple.rs
View File

@ -83,7 +83,7 @@ pub struct Scene {
figure_model_cache: FigureModelCache,
figure_state: FigureState<CharacterSkeleton>,
turning_camera: bool,
//turning_camera: bool,
turning_character: bool,
char_ori: f32,
}
@ -193,7 +193,7 @@ impl Scene {
camera,
turning_camera: false,
//turning_camera: false,
turning_character: false,
char_ori: -start_angle,
}
@ -216,18 +216,18 @@ impl Scene {
},
Event::MouseButton(button, state) => {
if state == PressState::Pressed {
self.turning_camera = button == MouseButton::Right;
//self.turning_camera = button == MouseButton::Right;
self.turning_character = button == MouseButton::Left;
} else {
self.turning_camera = false;
//self.turning_camera = false;
self.turning_character = false;
}
true
},
Event::CursorMove(delta) => {
if self.turning_camera {
/*if self.turning_camera {
self.camera.rotate_by(Vec3::new(delta.x * 0.01, 0.0, 0.0))
}
}*/
if self.turning_character {
self.char_ori += delta.x * 0.01;
}