History

merged from master

Jose Carlos committed 12 years ago

Commit 828508b2 parents ba0b01d 2f5a02138 files · +948 −295Browse files

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

Unified · Split

interface/src/Menu.cpp+5−4
@@ -327,7 +327,8 @@ Menu::Menu() : · 326 unmodified lines
327327 QMenu* avatarOptionsMenu = developerMenu->addMenu("Avatar Options");
328328
329329 addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::Avatars, 0, true);
330− addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::CollisionProxies);
330+ addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::RenderSkeletonCollisionProxies);
331+ addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::RenderHeadCollisionProxies);
331332
332333 addCheckableActionToQMenuAndActionHash(avatarOptionsMenu, MenuOption::LookAtVectors, 0, false);
333334 addCheckableActionToQMenuAndActionHash(avatarOptionsMenu,
@@ -772,7 +773,7 @@ void Menu::editPreferences() { · 438 unmodified lines
772773 QFormLayout* form = new QFormLayout();
773774 layout->addLayout(form, 1);
774775
775− QString faceURLString = applicationInstance->getAvatar()->getHead().getFaceModel().getURL().toString();
776+ QString faceURLString = applicationInstance->getAvatar()->getHead()->getFaceModel().getURL().toString();
776777 QLineEdit* faceURLEdit = new QLineEdit(faceURLString);
777778 faceURLEdit->setMinimumWidth(QLINE_MINIMUM_WIDTH);
778779 faceURLEdit->setPlaceholderText(DEFAULT_HEAD_MODEL_URL.toString());
@@ -790,7 +791,7 @@ void Menu::editPreferences() { · 11 unmodified lines
790791 form->addRow("Display name:", displayNameEdit);
791792
792793 QSlider* pupilDilation = new QSlider(Qt::Horizontal);
793− pupilDilation->setValue(applicationInstance->getAvatar()->getHead().getPupilDilation() * pupilDilation->maximum());
794+ pupilDilation->setValue(applicationInstance->getAvatar()->getHead()->getPupilDilation() * pupilDilation->maximum());
794795 form->addRow("Pupil Dilation:", pupilDilation);
795796
796797 QSlider* faceshiftEyeDeflection = new QSlider(Qt::Horizontal);
@@ -873,7 +874,7 @@ void Menu::editPreferences() { · 76 unmodified lines
873874 applicationInstance->getAvatar()->sendIdentityPacket();
874875 }
875876
876− applicationInstance->getAvatar()->getHead().setPupilDilation(pupilDilation->value() / (float)pupilDilation->maximum());
877+ applicationInstance->getAvatar()->getHead()->setPupilDilation(pupilDilation->value() / (float)pupilDilation->maximum());
877878
878879 _maxVoxels = maxVoxels->value();
879880 applicationInstance->getVoxels()->setMaxVoxels(_maxVoxels);

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