Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-08 04:07:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixing variable names to match coding standard

Browse source
This commit is contained in:
Wayne Chen 2018-12-13 14:34:25 -08:00
parent 0daa909192
commit 3806914e76
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
interface/src/Application.cpp
View file

@ -8623,15 +8623,15 @@ void Application::setShowBulletConstraintLimits(bool value) {
void Application::createLoginDialogOverlay() { void Application::createLoginDialogOverlay() {
const glm::vec2 LOGIN_OVERLAY_DIMENSIONS{ 0.89f, 0.5f }; const glm::vec2 LOGIN_OVERLAY_DIMENSIONS{ 0.89f, 0.5f };
const auto overlayOffset = glm::vec2(0.7f, -0.1f); const auto OVERLAY_OFFSET = glm::vec2(0.7f, -0.1f);
auto cameraPosition = _myCamera.getPosition(); auto cameraPosition = _myCamera.getPosition();
auto cameraOrientation = _myCamera.getOrientation(); auto cameraOrientation = _myCamera.getOrientation();
auto upVec = getMyAvatar()->getWorldOrientation() * Vectors::UNIT_Y; auto upVec = getMyAvatar()->getWorldOrientation() * Vectors::UNIT_Y;
auto headLookVec = (cameraOrientation * Vectors::FRONT); auto headLookVec = (cameraOrientation * Vectors::FRONT);
// DEFAULT_DPI / tablet scale percentage // DEFAULT_DPI / tablet scale percentage
const float overlayDpi = 31.0f / (75.0f / 100.0f); const float OVERLAY_DPI = 31.0f / (75.0f / 100.0f);
auto offset = headLookVec * overlayOffset.x; auto offset = headLookVec * OVERLAY_OFFSET.x;
const auto overlayPosition = (cameraPosition + offset) + (upVec * overlayOffset.y); auto overlayPosition = (cameraPosition + offset) + (upVec * OVERLAY_OFFSET.y);
QVariantMap overlayProperties = { QVariantMap overlayProperties = {
{ "name", "LoginDialogOverlay" }, { "name", "LoginDialogOverlay" },
{ "url", OVERLAY_LOGIN_DIALOG_URL }, { "url", OVERLAY_LOGIN_DIALOG_URL },
@ -8650,11 +8650,11 @@ void Application::createLoginDialogOverlay() {
auto loginOverlay = std::dynamic_pointer_cast<Web3DOverlay>(overlays.getOverlay(_loginDialogOverlayID)); auto loginOverlay = std::dynamic_pointer_cast<Web3DOverlay>(overlays.getOverlay(_loginDialogOverlayID));
auto keyboard = DependencyManager::get<Keyboard>().data(); auto keyboard = DependencyManager::get<Keyboard>().data();
if (!keyboard->getAnchorID().isNull() && !_loginDialogOverlayID.isNull()) { if (!keyboard->getAnchorID().isNull() && !_loginDialogOverlayID.isNull()) {
const auto keyboardLocalOrientation = glm::quat(0.0f, 0.0, 1.0f, 0.25f); const auto KEYBOARD_LOCAL_ORIENTATION = glm::quat(0.0f, 0.0, 1.0f, 0.25f);
const auto keyboardLocalOffset = glm::vec3(-0.4f * getMyAvatar()->getSensorToWorldScale(), -0.3f, 0.2f); auto keyboardLocalOffset = glm::vec3(-0.4f * getMyAvatar()->getSensorToWorldScale(), -0.3f, 0.2f);
QVariantMap properties { QVariantMap properties {
{ "position", vec3toVariant(loginOverlay->getWorldPosition() + keyboardLocalOffset) }, { "position", vec3toVariant(loginOverlay->getWorldPosition() + keyboardLocalOffset) },
{ "orientation", quatToVariant(loginOverlay->getWorldOrientation() * keyboardLocalOrientation) }, { "orientation", quatToVariant(loginOverlay->getWorldOrientation() * KEYBOARD_LOCAL_ORIENTATION) },
}; };
overlays.editOverlay(keyboard->getAnchorID(), properties); overlays.editOverlay(keyboard->getAnchorID(), properties);
keyboard->setResetKeyboardPositionOnRaise(false); keyboard->setResetKeyboardPositionOnRaise(false);
@ -8670,7 +8670,7 @@ void Application::createLoginDialogOverlay() {
void Application::updateLoginDialogOverlayPosition() { void Application::updateLoginDialogOverlayPosition() {
const float LOOK_AWAY_THRESHOLD_ANGLE = 40.0f; const float LOOK_AWAY_THRESHOLD_ANGLE = 40.0f;
const auto overlayOffset = glm::vec2(0.7f, -0.1f); const auto OVERLAY_OFFSET = glm::vec2(0.7f, -0.1f);
auto& overlays = getOverlays(); auto& overlays = getOverlays();
auto loginOverlay = std::dynamic_pointer_cast<Web3DOverlay>(overlays.getOverlay(_loginDialogOverlayID)); auto loginOverlay = std::dynamic_pointer_cast<Web3DOverlay>(overlays.getOverlay(_loginDialogOverlayID));
auto overlayPositionVec = loginOverlay->getWorldPosition(); auto overlayPositionVec = loginOverlay->getWorldPosition();
@ -8680,18 +8680,18 @@ void Application::updateLoginDialogOverlayPosition() {
auto overlayToHeadVec = overlayPositionVec - cameraPositionVec; auto overlayToHeadVec = overlayPositionVec - cameraPositionVec;
auto pointAngle = (glm::acos(glm::dot(glm::normalize(overlayToHeadVec), glm::normalize(headLookVec))) * 180.0f / PI); auto pointAngle = (glm::acos(glm::dot(glm::normalize(overlayToHeadVec), glm::normalize(headLookVec))) * 180.0f / PI);
auto upVec = getMyAvatar()->getWorldOrientation() * Vectors::UNIT_Y; auto upVec = getMyAvatar()->getWorldOrientation() * Vectors::UNIT_Y;
auto offset = headLookVec * overlayOffset.x; auto offset = headLookVec * OVERLAY_OFFSET.x;
const auto newOverlayPositionVec = (cameraPositionVec + offset) + (upVec * overlayOffset.y); auto newOverlayPositionVec = (cameraPositionVec + offset) + (upVec * OVERLAY_OFFSET.y);
const auto newOverlayOrientation = glm::inverse(glm::quat_cast(glm::lookAt(newOverlayPositionVec, cameraPositionVec, upVec))) * Quaternions::Y_180; auto newOverlayOrientation = glm::inverse(glm::quat_cast(glm::lookAt(newOverlayPositionVec, cameraPositionVec, upVec))) * Quaternions::Y_180;
bool overlayOutOfBounds = glm::distance(overlayPositionVec, cameraPositionVec) > 1.0f; bool overlayOutOfBounds = glm::distance(overlayPositionVec, cameraPositionVec) > 1.0f;
if (pointAngle > LOOK_AWAY_THRESHOLD_ANGLE || overlayOutOfBounds) { if (pointAngle > LOOK_AWAY_THRESHOLD_ANGLE || overlayOutOfBounds) {
const auto keyboardLocalOrientation = glm::quat(0.0f, 0.0, 1.0f, 0.25f); const auto KEYBOARD_LOCAL_ORIENTATION = glm::quat(0.0f, 0.0, 1.0f, 0.25f);
const auto keyboardLocalOffset = glm::vec3(-0.4f * getMyAvatar()->getSensorToWorldScale(), -0.3f, 0.2f); auto keyboardLocalOffset = glm::vec3(-0.4f * getMyAvatar()->getSensorToWorldScale(), -0.3f, 0.2f);
QVariantMap keyboardProperties { QVariantMap keyboardProperties {
{ "position", vec3toVariant(loginOverlay->getWorldPosition() + keyboardLocalOffset) }, { "position", vec3toVariant(loginOverlay->getWorldPosition() + keyboardLocalOffset) },
{ "orientation", quatToVariant(loginOverlay->getWorldOrientation() * keyboardLocalOrientation) }, { "orientation", quatToVariant(loginOverlay->getWorldOrientation() * KEYBOARD_LOCAL_ORIENTATION) },
}; };
auto keyboard = DependencyManager::get<Keyboard>().data(); auto keyboard = DependencyManager::get<Keyboard>().data();
overlays.editOverlay(keyboard->getAnchorID(), keyboardProperties); overlays.editOverlay(keyboard->getAnchorID(), keyboardProperties);