Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-10 03:29:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Sneak in a toggle for chat circling.

Browse source
This commit is contained in:
Andrzej Kapolka 2013-11-05 12:30:38 -08:00
parent afc5e0795c
commit 359083ee9d
3 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Menu.cpp
View file

@ -326,6 +326,7 @@ Menu::Menu() :
false, false,
appInstance->getFaceshift(), appInstance->getFaceshift(),
SLOT(setTCPEnabled(bool))); SLOT(setTCPEnabled(bool)));
addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::ChatCircling, 0, true);
QMenu* webcamOptionsMenu = developerMenu->addMenu("Webcam Options"); QMenu* webcamOptionsMenu = developerMenu->addMenu("Webcam Options");

1
interface/src/Menu.h
View file

@ -146,6 +146,7 @@ namespace MenuOption {
const QString AutomaticallyAuditTree = "Automatically Audit Tree Stats"; const QString AutomaticallyAuditTree = "Automatically Audit Tree Stats";
const QString Bandwidth = "Bandwidth Display"; const QString Bandwidth = "Bandwidth Display";
const QString BandwidthDetails = "Bandwidth Details"; const QString BandwidthDetails = "Bandwidth Details";
const QString ChatCircling = "Chat Circling";
const QString Collisions = "Collisions"; const QString Collisions = "Collisions";
const QString CopyVoxels = "Copy"; const QString CopyVoxels = "Copy";
const QString CoverageMap = "Render Coverage Map"; const QString CoverageMap = "Render Coverage Map";

5
interface/src/avatar/MyAvatar.cpp
View file

@ -17,6 +17,7 @@
#include "Application.h" #include "Application.h"
#include "DataServerClient.h" #include "DataServerClient.h"
#include "Menu.h"
#include "MyAvatar.h" #include "MyAvatar.h"
#include "Physics.h" #include "Physics.h"
#include "devices/OculusManager.h" #include "devices/OculusManager.h"
@ -1110,6 +1111,10 @@ bool operator<(const SortedAvatar& s1, const SortedAvatar& s2) {
} }
void MyAvatar::updateChatCircle(float deltaTime) { void MyAvatar::updateChatCircle(float deltaTime) {
if (!Menu::getInstance()->isOptionChecked(MenuOption::ChatCircling)) {
return;
}
// find all members and sort by distance // find all members and sort by distance
QVector<SortedAvatar> sortedAvatars; QVector<SortedAvatar> sortedAvatars;
NodeList* nodeList = NodeList::getInstance(); NodeList* nodeList = NodeList::getInstance();