History

Merge pull request #986 from PhilipRosedale/master

Faceshift rotates body, slow near others for easier positioning

ZappoMan committed 13 years ago

Commit fb85add2 parents 1bd67d3 f88a36311 files · +60 −74Browse files

Showing the changes to interface/src/Application.cpp (1 of 11 files). Show all

Unified · Split

interface/src/Application.cpp+8−3
@@ -1752,6 +1752,11 @@ void Application::update(float deltaTime) { · 1751 unmodified lines
17521752
17531753 // Update faceshift
17541754 _faceshift.update();
1755+
1756+ // Copy angular velocity if measured by faceshift, to the head
1757+ if (_faceshift.isActive()) {
1758+ _myAvatar.getHead().setAngularVelocity(_faceshift.getHeadAngularVelocity());
1759+ }
17551760
17561761 // if we have faceshift, use that to compute the lookat direction
17571762 glm::vec3 lookAtRayOrigin = mouseRayOrigin, lookAtRayDirection = mouseRayDirection;
@@ -1934,7 +1939,7 @@ void Application::update(float deltaTime) { · 176 unmodified lines
19341939 if (!avatar->isInitialized()) {
19351940 avatar->init();
19361941 }
1937− avatar->simulate(deltaTime, NULL, 0.f);
1942+ avatar->simulate(deltaTime, NULL);
19381943 avatar->setMouseRay(mouseRayOrigin, mouseRayDirection);
19391944 }
19401945 node->unlock();
@@ -1949,9 +1954,9 @@ void Application::update(float deltaTime) { · 8 unmodified lines
19491954 }
19501955
19511956 if (Menu::getInstance()->isOptionChecked(MenuOption::TransmitterDrive) && _myTransmitter.isConnected()) {
1952− _myAvatar.simulate(deltaTime, &_myTransmitter, Menu::getInstance()->getGyroCameraSensitivity());
1957+ _myAvatar.simulate(deltaTime, &_myTransmitter);
19531958 } else {
1954− _myAvatar.simulate(deltaTime, NULL, Menu::getInstance()->getGyroCameraSensitivity());
1959+ _myAvatar.simulate(deltaTime, NULL);
19551960 }
19561961
19571962 // no transmitter drive implies transmitter pick

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t