Showing the changes to interface/src/Application.cpp (1 of 11 files). Show all
Unified · Split
| @@ -1182,6 +1182,24 @@ void Application::setRenderThirdPerson(bool thirdPerson) { · 1181 unmodified lines | |||
| 1182 | } | 1182 | } |
| 1183 | } | 1183 | } |
| 1184 | 1184 | ||
| 1185 | void Application::increaseAvatarSize() { | ||
| 1186 | if (3.0f < _myAvatar.getScale() + 0.25f) { | ||
| 1187 | return; | ||
| 1188 | } | ||
| 1189 | |||
| 1190 | _myAvatar.setScale(_myAvatar.getScale() + 0.25f); | ||
| 1191 | _myCamera.setScale(_myAvatar.getScale() + 0.25f); | ||
| 1192 | } | ||
| 1193 | |||
| 1194 | void Application::decreaseAvatarSize() { | ||
| 1195 | if (_myAvatar.getScale() + 0.25f < 0.25f) { | ||
| 1196 | return; | ||
| 1197 | } | ||
| 1198 | |||
| 1199 | _myAvatar.setScale(_myAvatar.getScale() - 0.25f); | ||
| 1200 | _myCamera.setScale(_myAvatar.getScale() - 0.25f); | ||
| 1201 | } | ||
| 1202 | |||
| 1185 | void Application::setFrustumOffset(bool frustumOffset) { | 1203 | void Application::setFrustumOffset(bool frustumOffset) { |
| 1186 | // reshape so that OpenGL will get the right lens details for the camera of choice | 1204 | // reshape so that OpenGL will get the right lens details for the camera of choice |
| 1187 | resizeGL(_glWidget->width(), _glWidget->height()); | 1205 | resizeGL(_glWidget->width(), _glWidget->height()); |
| @@ -1555,7 +1573,7 @@ void Application::initMenu() { · 367 unmodified lines | |||
| 1555 | _renderAvatarsOn->setChecked(true); | 1573 | _renderAvatarsOn->setChecked(true); |
| 1556 | (_renderAvatarBalls = renderMenu->addAction("Avatar as Balls"))->setCheckable(true); | 1574 | (_renderAvatarBalls = renderMenu->addAction("Avatar as Balls"))->setCheckable(true); |
| 1557 | _renderAvatarBalls->setChecked(false); | 1575 | _renderAvatarBalls->setChecked(false); |
| 1558 | renderMenu->addAction("Cycle Voxeltar Mode", _myAvatar.getVoxels(), SLOT(cycleMode())); | 1576 | renderMenu->addAction("Cycle Voxel Mode", _myAvatar.getVoxels(), SLOT(cycleMode())); |
| 1559 | (_renderFrameTimerOn = renderMenu->addAction("Show Timer"))->setCheckable(true); | 1577 | (_renderFrameTimerOn = renderMenu->addAction("Show Timer"))->setCheckable(true); |
| 1560 | _renderFrameTimerOn->setChecked(false); | 1578 | _renderFrameTimerOn->setChecked(false); |
| 1561 | (_renderLookatOn = renderMenu->addAction("Lookat Vectors"))->setCheckable(true); | 1579 | (_renderLookatOn = renderMenu->addAction("Lookat Vectors"))->setCheckable(true); |
| @@ -1564,6 +1582,9 @@ void Application::initMenu() { · 2 unmodified lines | |||
| 1564 | "First Person", this, SLOT(setRenderFirstPerson(bool)), Qt::Key_P))->setCheckable(true); | 1582 | "First Person", this, SLOT(setRenderFirstPerson(bool)), Qt::Key_P))->setCheckable(true); |
| 1565 | (_manualThirdPerson = renderMenu->addAction( | 1583 | (_manualThirdPerson = renderMenu->addAction( |
| 1566 | "Third Person", this, SLOT(setRenderThirdPerson(bool))))->setCheckable(true); | 1584 | "Third Person", this, SLOT(setRenderThirdPerson(bool))))->setCheckable(true); |
| 1585 | renderMenu->addAction("Increase Avatar Size", this, SLOT(increaseAvatarSize()), Qt::SHIFT | Qt::Key_Plus); | ||
| 1586 | renderMenu->addAction("Decrease Avatar Siz+e", this, SLOT(decreaseAvatarSize()), Qt::SHIFT | Qt::Key_Minus); | ||
| 1587 | |||
| 1567 | 1588 | ||
| 1568 | QMenu* toolsMenu = menuBar->addMenu("Tools"); | 1589 | QMenu* toolsMenu = menuBar->addMenu("Tools"); |
| 1569 | (_renderStatsOn = toolsMenu->addAction("Stats"))->setCheckable(true); | 1590 | (_renderStatsOn = toolsMenu->addAction("Stats"))->setCheckable(true); |
| @@ -1750,10 +1771,6 @@ void Application::init() { · 180 unmodified lines | |||
| 1750 | _palette.addAction(_colorVoxelMode, 0, 2); | 1771 | _palette.addAction(_colorVoxelMode, 0, 2); |
| 1751 | _palette.addAction(_eyedropperMode, 0, 3); | 1772 | _palette.addAction(_eyedropperMode, 0, 3); |
| 1752 | _palette.addAction(_selectVoxelMode, 0, 4); | 1773 | _palette.addAction(_selectVoxelMode, 0, 4); |
| 1753 | |||
| 1754 | float scale = 1.0f; | ||
| 1755 | _myAvatar.uniformScale(scale); | ||
| 1756 | _myCamera.setScale(scale); | ||
| 1757 | } | 1774 | } |
| 1758 | 1775 | ||
| 1759 | const float MAX_AVATAR_EDIT_VELOCITY = 1.0f; | 1776 | const float MAX_AVATAR_EDIT_VELOCITY = 1.0f; |