mitchellhansen/voxel-raycaster
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Netork control of the camera now works, slight hitch every few seconds though. Not sure how to track that down

Browse Source
This commit is contained in:
MitchellHansen
2017-01-23 22:32:15 -08:00
parent 8d2fc26929
commit a69f7258f4
5 changed files with 229 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Camera.cpp
View File

@@ -96,10 +96,9 @@ void Camera::recieve_event(VrEventPublisher* publisher, std::unique_ptr<vr::Even
if (held_event->code == sf::Keyboard::LShift) {
default_impulse = 0.01f;
}
if (held_event->code == sf::Keyboard::RShift) {
else if (held_event->code == sf::Keyboard::RShift) {
default_impulse = 1.0f;
}
else if (held_event->code == sf::Keyboard::C) {
look_at_center();
}
@@ -130,7 +129,7 @@ void Camera::recieve_event(VrEventPublisher* publisher, std::unique_ptr<vr::Even
vr::KeyPressed *key_event = static_cast<vr::KeyPressed*>(event.get());
if (key_event->code == sf::Keyboard::Y) {
if (key_event->code == sf::Keyboard::M) {
if (mouse_enabled)
mouse_enabled = false;
else
@@ -156,6 +155,22 @@ void Camera::recieve_event(VrEventPublisher* publisher, std::unique_ptr<vr::Even
}
}
}
else if (event->type == vr::Event::JoystickMoved) {
vr::JoystickMoved *joystick_event = static_cast<vr::JoystickMoved*>(event.get());
if (joystick_event->axis == sf::Joystick::Axis::X) {
movement.x -= joystick_event->position / 5;
//add_relative_impulse(Camera::DIRECTION::FORWARD, joystick_event->position);
}
else if (joystick_event->axis == sf::Joystick::Axis::Y) {
movement.y += joystick_event->position / 5;
//add_relative_impulse(Camera::DIRECTION::RIGHT, joystick_event->position);
}
//else if (joystick_event->axis == sf::Joystick::Axis::Z) {
// add_relative_impulse(Camera::DIRECTION::DOWN, joystick_event->position);
//}
}
}