History

Changed shifted and meta variable name

atlante45 committed 13 years ago

Commit 84eae281 parent 466d50e1 file · +21 −21Browse files

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

Unified · Split

interface/src/Application.cpp+21−21
@@ -571,8 +571,8 @@ void Application::keyPressEvent(QKeyEvent* event) { · 570 unmodified lines
571571 _myAvatar.getHand().setRaveGloveEffectsMode((QKeyEvent*)event);
572572 }
573573
574− bool meta = event->modifiers().testFlag(Qt::MetaModifier);
575− bool shifted = event->modifiers().testFlag(Qt::ShiftModifier);
574+ bool isMeta = event->modifiers().testFlag(Qt::MetaModifier);
575+ bool isShifted = event->modifiers().testFlag(Qt::ShiftModifier);
576576 switch (event->key()) {
577577 case Qt::Key_BracketLeft:
578578 _viewFrustumOffsetYaw -= 0.5;
@@ -645,9 +645,9 @@ void Application::keyPressEvent(QKeyEvent* event) { · 66 unmodified lines
645645 break;
646646
647647 case Qt::Key_C:
648− if (shifted) {
648+ if (isShifted) {
649649 _occlusionCulling->trigger();
650− } else if (meta) {
650+ } else if (isMeta) {
651651 chooseVoxelPaintColor();
652652 } else {
653653 _myAvatar.setDriveKeys(DOWN, 1);
@@ -659,7 +659,7 @@ void Application::keyPressEvent(QKeyEvent* event) { · 5 unmodified lines
659659 break;
660660
661661 case Qt::Key_S:
662− if (shifted) {
662+ if (isShifted) {
663663 doTreeStats();
664664 } else {
665665 _myAvatar.setDriveKeys(BACK, 1);
@@ -672,7 +672,7 @@ void Application::keyPressEvent(QKeyEvent* event) { · 6 unmodified lines
672672 break;
673673
674674 case Qt::Key_G:
675− if (shifted) {
675+ if (isShifted) {
676676 _gravityUse->trigger();
677677 } else {
678678 _eyedropperMode->trigger();
@@ -680,7 +680,7 @@ void Application::keyPressEvent(QKeyEvent* event) { · 1 unmodified line
680680 break;
681681
682682 case Qt::Key_A:
683− if (shifted) {
683+ if (isShifted) {
684684 _renderAtmosphereOn->trigger();
685685 } else {
686686 _myAvatar.setDriveKeys(ROT_LEFT, 1);
@@ -700,23 +700,23 @@ void Application::keyPressEvent(QKeyEvent* event) { · 13 unmodified lines
700700 break;
701701
702702 case Qt::Key_Up:
703− _myAvatar.setDriveKeys(shifted ? UP : FWD, 1);
703+ _myAvatar.setDriveKeys(isShifted ? UP : FWD, 1);
704704 break;
705705
706706 case Qt::Key_Down:
707− _myAvatar.setDriveKeys(shifted ? DOWN : BACK, 1);
707+ _myAvatar.setDriveKeys(isShifted ? DOWN : BACK, 1);
708708 break;
709709
710710 case Qt::Key_Left:
711− _myAvatar.setDriveKeys(shifted ? LEFT : ROT_LEFT, 1);
711+ _myAvatar.setDriveKeys(isShifted ? LEFT : ROT_LEFT, 1);
712712 break;
713713
714714 case Qt::Key_Right:
715− _myAvatar.setDriveKeys(shifted ? RIGHT : ROT_RIGHT, 1);
715+ _myAvatar.setDriveKeys(isShifted ? RIGHT : ROT_RIGHT, 1);
716716 break;
717717
718718 case Qt::Key_I:
719− if (shifted) {
719+ if (isShifted) {
720720 _myCamera.setEyeOffsetOrientation(glm::normalize(
721721 glm::quat(glm::vec3(0.002f, 0, 0)) * _myCamera.getEyeOffsetOrientation()));
722722 } else {
@@ -726,7 +726,7 @@ void Application::keyPressEvent(QKeyEvent* event) { · 3 unmodified lines
726726 break;
727727
728728 case Qt::Key_K:
729− if (shifted) {
729+ if (isShifted) {
730730 _myCamera.setEyeOffsetOrientation(glm::normalize(
731731 glm::quat(glm::vec3(-0.002f, 0, 0)) * _myCamera.getEyeOffsetOrientation()));
732732 } else {
@@ -736,7 +736,7 @@ void Application::keyPressEvent(QKeyEvent* event) { · 3 unmodified lines
736736 break;
737737
738738 case Qt::Key_J:
739− if (shifted) {
739+ if (isShifted) {
740740 _myCamera.setEyeOffsetOrientation(glm::normalize(
741741 glm::quat(glm::vec3(0, 0.002f, 0)) * _myCamera.getEyeOffsetOrientation()));
742742 } else {
@@ -746,7 +746,7 @@ void Application::keyPressEvent(QKeyEvent* event) { · 3 unmodified lines
746746 break;
747747
748748 case Qt::Key_M:
749− if (shifted) {
749+ if (isShifted) {
750750 _myCamera.setEyeOffsetOrientation(glm::normalize(
751751 glm::quat(glm::vec3(0, -0.002f, 0)) * _myCamera.getEyeOffsetOrientation()));
752752 } else {
@@ -756,7 +756,7 @@ void Application::keyPressEvent(QKeyEvent* event) { · 3 unmodified lines
756756 break;
757757
758758 case Qt::Key_U:
759− if (shifted) {
759+ if (isShifted) {
760760 _myCamera.setEyeOffsetOrientation(glm::normalize(
761761 glm::quat(glm::vec3(0, 0, -0.002f)) * _myCamera.getEyeOffsetOrientation()));
762762 } else {
@@ -766,7 +766,7 @@ void Application::keyPressEvent(QKeyEvent* event) { · 3 unmodified lines
766766 break;
767767
768768 case Qt::Key_Y:
769− if (shifted) {
769+ if (isShifted) {
770770 _myCamera.setEyeOffsetOrientation(glm::normalize(
771771 glm::quat(glm::vec3(0, 0, 0.002f)) * _myCamera.getEyeOffsetOrientation()));
772772 } else {
@@ -781,14 +781,14 @@ void Application::keyPressEvent(QKeyEvent* event) { · 8 unmodified lines
781781 _lookingInMirror->trigger();
782782 break;
783783 case Qt::Key_F:
784− if (shifted) {
784+ if (isShifted) {
785785 _frustumOn->trigger();
786786 } else {
787787 _fullScreenMode->trigger();
788788 }
789789 break;
790790 case Qt::Key_V:
791− if (shifted) {
791+ if (isShifted) {
792792 _renderVoxels->trigger();
793793 } else {
794794 _addVoxelMode->trigger();
@@ -798,7 +798,7 @@ void Application::keyPressEvent(QKeyEvent* event) { · 3 unmodified lines
798798 _manualFirstPerson->trigger();
799799 break;
800800 case Qt::Key_R:
801− if (shifted) {
801+ if (isShifted) {
802802 _frustumRenderModeAction->trigger();
803803 } else {
804804 _deleteVoxelMode->trigger();
@@ -808,7 +808,7 @@ void Application::keyPressEvent(QKeyEvent* event) { · 3 unmodified lines
808808 _colorVoxelMode->trigger();
809809 break;
810810 case Qt::Key_O:
811− if (shifted) {
811+ if (isShifted) {
812812 _viewFrustumFromOffset->trigger();
813813 } else {
814814 _selectVoxelMode->trigger();

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