Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-17 21:20:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

use static methods for setting avatar debug options

Browse source
This commit is contained in:
Andrew Meadows 2017-04-21 11:41:00 -07:00
parent 75b563d598
commit aa90a6bd02
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
interface/src/Menu.cpp
View file

@ -503,14 +503,14 @@ Menu::Menu() {
qApp, SLOT(setActiveEyeTracker())); qApp, SLOT(setActiveEyeTracker()));
#endif #endif
addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::AvatarReceiveStats, 0, false, action = addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::AvatarReceiveStats, 0, false);
avatar.get(), SLOT(setShowReceiveStats(bool))); connect(action, &QAction::triggered, []{ Avatar::setShowReceiveStats(Menu::getInstance()->isOptionChecked(MenuOption::AvatarReceiveStats)); });
addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::ShowBoundingCollisionShapes, 0, false, action = addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::ShowBoundingCollisionShapes, 0, false);
avatar.get(), SLOT(setShowCollisionShapes(bool))); connect(action, &QAction::triggered, []{ Avatar::setShowCollisionShapes(Menu::getInstance()->isOptionChecked(MenuOption::ShowBoundingCollisionShapes)); });
addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::ShowMyLookAtVectors, 0, false, action = addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::ShowMyLookAtVectors, 0, false);
avatar.get(), SLOT(setShowMyLookAtVectors(bool))); connect(action, &QAction::triggered, []{ Avatar::setShowMyLookAtVectors(Menu::getInstance()->isOptionChecked(MenuOption::ShowMyLookAtVectors)); });
addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::ShowOtherLookAtVectors, 0, false, action = addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::ShowOtherLookAtVectors, 0, false);
avatar.get(), SLOT(setShowOtherLookAtVectors(bool))); connect(action, &QAction::triggered, []{ Avatar::setShowOtherLookAtVectors(Menu::getInstance()->isOptionChecked(MenuOption::ShowOtherLookAtVectors)); });
addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::FixGaze, 0, false); addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::FixGaze, 0, false);
addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::AnimDebugDrawDefaultPose, 0, false, addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::AnimDebugDrawDefaultPose, 0, false,

11
interface/src/avatar/Avatar.h
View file

@ -68,6 +68,12 @@ class Avatar : public AvatarData {
Q_PROPERTY(glm::vec3 skeletonOffset READ getSkeletonOffset WRITE setSkeletonOffset) Q_PROPERTY(glm::vec3 skeletonOffset READ getSkeletonOffset WRITE setSkeletonOffset)
public: public:
static void setShowReceiveStats(bool receiveStats);
static void setShowMyLookAtVectors(bool showMine);
static void setShowOtherLookAtVectors(bool showOthers);
static void setShowCollisionShapes(bool render);
static void setShowNamesAboveHeads(bool show);
explicit Avatar(QThread* thread, RigPointer rig = nullptr); explicit Avatar(QThread* thread, RigPointer rig = nullptr);
~Avatar(); ~Avatar();
@ -251,11 +257,6 @@ public:
bool isInPhysicsSimulation() const { return _physicsCallback != nullptr; } bool isInPhysicsSimulation() const { return _physicsCallback != nullptr; }
public slots: public slots:
void setShowReceiveStats(bool receiveStats);
void setShowMyLookAtVectors(bool showMine);
void setShowOtherLookAtVectors(bool showOthers);
void setShowCollisionShapes(bool render);
void setShowNamesAboveHeads(bool show);
// FIXME - these should be migrated to use Pose data instead // FIXME - these should be migrated to use Pose data instead
// thread safe, will return last valid palm from cache // thread safe, will return last valid palm from cache