History

Merge branch 'master' of git://github.com/worklist/hifi into windows_build

Brad Hefta-Gaub committed 12 years ago

Commit 392ff942 parents b947d1e 0f2aa6c11 files · +95 −53Browse files

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

Unified · Split

interface/src/Application.cpp+8−4
@@ -1352,8 +1352,9 @@ void Application::timer() { · 1351 unmodified lines
1352 // ask the node list to check in with the domain server1352 // ask the node list to check in with the domain server
1353 NodeList::getInstance()->sendDomainServerCheckIn();1353 NodeList::getInstance()->sendDomainServerCheckIn();
1354 1354
1355 // give the MyAvatar object position to the Profile so it can propagate to the data-server1355 // give the MyAvatar object position, orientation to the Profile so it can propagate to the data-server
1356 _profile.updatePosition(_myAvatar.getPosition());1356 _profile.updatePosition(_myAvatar.getPosition());
1357 _profile.updateOrientation(_myAvatar.getOrientation());
1357}1358}
1358 1359
1359static glm::vec3 getFaceVector(BoxFace face) {1360static glm::vec3 getFaceVector(BoxFace face) {
@@ -2133,9 +2134,12 @@ void Application::updateAvatars(float deltaTime, glm::vec3 mouseRayOrigin, glm:: · 773 unmodified lines
2133 for (vector<Avatar*>::iterator fade = _avatarFades.begin(); fade != _avatarFades.end(); fade++) {2134 for (vector<Avatar*>::iterator fade = _avatarFades.begin(); fade != _avatarFades.end(); fade++) {
2134 Avatar* avatar = *fade;2135 Avatar* avatar = *fade;
2135 const float SHRINK_RATE = 0.9f;2136 const float SHRINK_RATE = 0.9f;
2136 avatar->setNewScale(avatar->getNewScale() * SHRINK_RATE);2137
2137 const float MINIMUM_SCALE = 0.001f;2138 avatar->setTargetScale(avatar->getScale() * SHRINK_RATE);
2138 if (avatar->getNewScale() < MINIMUM_SCALE) {2139
2140 const float MIN_FADE_SCALE = 0.001;
2141
2142 if (avatar->getTargetScale() < MIN_FADE_SCALE) {
2139 delete avatar;2143 delete avatar;
2140 _avatarFades.erase(fade--);2144 _avatarFades.erase(fade--);
2141 2145

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