History

Glow/shrink avatars when killed, send kill message when we move between domains, locations, etc.

Andrzej Kapolka committed 12 years ago

Commit 083800d1 parent 092515e7 files · +47 −9Browse files

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

Unified · Split

interface/src/Menu.cpp+7−1
@@ -914,6 +914,9 @@ void Menu::goToDomain() { · 913 unmodified lines
914 newHostname = domainDialog.textValue();914 newHostname = domainDialog.textValue();
915 }915 }
916 916
917 // send a node kill request, indicating to other clients that they should play the "disappeared" effect
918 NodeList::getInstance()->sendKillNode(&NODE_TYPE_AVATAR_MIXER, 1);
919
917 // give our nodeList the new domain-server hostname920 // give our nodeList the new domain-server hostname
918 NodeList::getInstance()->setDomainHostname(domainDialog.textValue());921 NodeList::getInstance()->setDomainHostname(domainDialog.textValue());
919 }922 }
@@ -953,8 +956,11 @@ void Menu::goToLocation() { · 33 unmodified lines
953 glm::vec3 newAvatarPos(x, y, z);956 glm::vec3 newAvatarPos(x, y, z);
954 957
955 if (newAvatarPos != avatarPos) {958 if (newAvatarPos != avatarPos) {
959 // send a node kill request, indicating to other clients that they should play the "disappeared" effect
960 NodeList::getInstance()->sendKillNode(&NODE_TYPE_AVATAR_MIXER, 1);
961
956 qDebug("Going To Location: %f, %f, %f...\n", x, y, z);962 qDebug("Going To Location: %f, %f, %f...\n", x, y, z);
957 myAvatar->setPosition(newAvatarPos);963 myAvatar->setPosition(newAvatarPos);
958 }964 }
959 }965 }
960 }966 }