Commit 7a4b49e0 authored by amp's avatar amp Committed by Commit bot

Cleanup magic numbers in native scene manager.

Also updates 2D quad properties to conform to spec.

BUG=643483

Review-Url: https://codereview.chromium.org/2832843004
Cr-Commit-Position: refs/heads/master@{#467749}
parent bc74b94b
...@@ -20,6 +20,16 @@ static constexpr int kWarningTimeoutSeconds = 30; ...@@ -20,6 +20,16 @@ static constexpr int kWarningTimeoutSeconds = 30;
static constexpr float kWarningDistance = 0.7; static constexpr float kWarningDistance = 0.7;
static constexpr float kWarningAngleRadians = 16.3 * M_PI / 180.0; static constexpr float kWarningAngleRadians = 16.3 * M_PI / 180.0;
static constexpr float kPermanentWarningHeight = 0.226;
static constexpr float kPermanentWarningWidth = 0.078;
static constexpr float kTransientWarningHeight = 0.512;
static constexpr float kTransientWarningWidth = 0.160;
static constexpr float kContentHeight = 2.4;
static constexpr float kContentWidth = 1.6;
static constexpr float kContentDistance = 2.5;
static constexpr float kContentVerticalOffset = -0.26;
} // namespace } // namespace
UiSceneManager::UiSceneManager(UiScene* scene) UiSceneManager::UiSceneManager(UiScene* scene)
...@@ -36,7 +46,7 @@ UiSceneManager::UiSceneManager(UiScene* scene) ...@@ -36,7 +46,7 @@ UiSceneManager::UiSceneManager(UiScene* scene)
element->id = id++; element->id = id++;
element->name = "Permanent security warning"; element->name = "Permanent security warning";
element->fill = vr_shell::Fill::NONE; element->fill = vr_shell::Fill::NONE;
element->size = {0.226f, 0.078f, 1}; element->size = {kPermanentWarningWidth, kPermanentWarningHeight, 1};
element->scale = {kWarningDistance, kWarningDistance, 1}; element->scale = {kWarningDistance, kWarningDistance, 1};
element->translation = {0, kWarningDistance * sin(kWarningAngleRadians), element->translation = {0, kWarningDistance * sin(kWarningAngleRadians),
-kWarningDistance * cos(kWarningAngleRadians)}; -kWarningDistance * cos(kWarningAngleRadians)};
...@@ -52,7 +62,7 @@ UiSceneManager::UiSceneManager(UiScene* scene) ...@@ -52,7 +62,7 @@ UiSceneManager::UiSceneManager(UiScene* scene)
element->id = id++; element->id = id++;
element->name = "Transient security warning"; element->name = "Transient security warning";
element->fill = vr_shell::Fill::NONE; element->fill = vr_shell::Fill::NONE;
element->size = {0.512f, 0.160f, 1}; element->size = {kTransientWarningWidth, kTransientWarningHeight, 1};
element->scale = {kWarningDistance, kWarningDistance, 1}; element->scale = {kWarningDistance, kWarningDistance, 1};
element->translation = {0, 0, -kWarningDistance}; element->translation = {0, 0, -kWarningDistance};
element->visible = false; element->visible = false;
...@@ -66,8 +76,8 @@ UiSceneManager::UiSceneManager(UiScene* scene) ...@@ -66,8 +76,8 @@ UiSceneManager::UiSceneManager(UiScene* scene)
element->id = id++; element->id = id++;
element->name = "Content"; element->name = "Content";
element->fill = vr_shell::Fill::CONTENT; element->fill = vr_shell::Fill::CONTENT;
element->size = {2.4f, 1.6f, 1}; element->size = {kContentWidth, kContentHeight, 1};
element->translation = {0, -0.1f, -2.5f}; element->translation = {0, kContentVerticalOffset, -kContentDistance};
element->visible = false; element->visible = false;
main_content_ = element.get(); main_content_ = element.get();
scene_->AddUiElement(std::move(element)); scene_->AddUiElement(std::move(element));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment