Update fullscreen ux, make floor and ceiling visible.

chrome/browser/android/vr_shell/ui_scene_manager.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/vr_shell/ui_scene_manager.h"
 
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/android/vr_shell/textures/close_button_texture.h"
 #include "chrome/browser/android/vr_shell/textures/ui_texture.h"
@@ skipping 39 matching lines @@
 static constexpr float kUrlBarDistance = 2.4;
 static constexpr float kUrlBarWidth = 0.672 * kUrlBarDistance;
 static constexpr float kUrlBarHeight = 0.088 * kUrlBarDistance;
 static constexpr float kUrlBarVerticalOffset = -0.516 * kUrlBarDistance;
 
 static constexpr float kLoadingIndicatorWidth = 0.24 * kUrlBarDistance;
 static constexpr float kLoadingIndicatorHeight = 0.008 * kUrlBarDistance;
 static constexpr float kLoadingIndicatorOffset =
     -0.016 * kUrlBarDistance - kLoadingIndicatorHeight / 2;
 
-static constexpr float kFullscreenWidth = 2.88;
-static constexpr float kFullscreenHeight = 1.62;
-static constexpr float kFullscreenDistance = 3;
-static constexpr float kFullscreenVerticalOffset = -0.26;
-static constexpr vr::Colorf kFullscreenBackgroundColor = {0.1, 0.1, 0.1, 1.0};
-
 static constexpr float kSceneSize = 25.0;
 static constexpr float kSceneHeight = 4.0;
 static constexpr int kFloorGridlineCount = 40;
 static constexpr vr::Colorf kBackgroundHorizonColor = {0.57, 0.57, 0.57, 1.0};
 static constexpr vr::Colorf kBackgroundCenterColor = {0.48, 0.48, 0.48, 1.0};
 
+static constexpr float kFullscreenWidthDms = 1.138;
+static constexpr float kFullscreenHeightDms = 0.64;
+static constexpr float kFullscreenVerticalOffsetDms = 0.1;
+// Fullscreen distance calculated as value needed to make the content quad
+// extend down to the floor (with small pullback used to prevent actual
+// intersection). Note this assumes the vertical offset will always be offest
+// below the origin (ie negative).
+static constexpr float kFullscreenDistance =
+    (kSceneHeight / 2.0) /
+    ((kFullscreenVerticalOffsetDms + (kFullscreenHeightDms / 2.0)) + 0.01);
+
+static constexpr float kFullscreenHeight =
+    kFullscreenHeightDms * kFullscreenDistance;
+static constexpr float kFullscreenWidth =
+    kFullscreenWidthDms * kFullscreenDistance;
+static constexpr float kFullscreenVerticalOffset =
+    -kFullscreenVerticalOffsetDms * kFullscreenDistance;
+static constexpr vr::Colorf kFullscreenHorizonColor = {0.1, 0.1, 0.1, 1.0};
+static constexpr vr::Colorf kFullscreenCenterColor = {0.2, 0.2, 0.2, 1.0};
+
 // Tiny distance to offset textures that should appear in the same plane.
 static constexpr float kTextureOffset = 0.01;
 
 }  // namespace
 
 UiSceneManager::UiSceneManager(VrBrowserInterface* browser,
                                UiScene* scene,
                                bool in_cct,
                                bool in_web_vr)
     : browser_(browser),
@@ skipping 12 matching lines @@
 
   ConfigureScene();
   ConfigureSecurityWarnings();
 }
 
 UiSceneManager::~UiSceneManager() {}
 
 void UiSceneManager::CreateScreenDimmer() {
   std::unique_ptr<UiElement> element;
   element = base::MakeUnique<ScreenDimmer>();
+  element->set_debug_id(kScreenDimmer);
   element->set_id(AllocateId());
   element->set_fill(vr_shell::Fill::NONE);
   element->set_visible(false);
   element->set_hit_testable(false);
   element->set_is_overlay(true);
   screen_dimmer_ = element.get();
   scene_->AddUiElement(std::move(element));
 }
 
 void UiSceneManager::CreateSecurityWarnings() {
@@ skipping 24 matching lines @@
   element->set_size({kTransientWarningWidth, kTransientWarningHeight, 1});
   element->set_scale({kWarningDistance, kWarningDistance, 1});
   element->set_translation({0, 0, -kWarningDistance});
   element->set_visible(false);
   element->set_hit_testable(false);
   element->set_lock_to_fov(true);
   transient_security_warning_ = element.get();
   scene_->AddUiElement(std::move(element));
 
   element = base::MakeUnique<ExitWarning>(1024);
+  element->set_debug_id(kExitWarning);
   element->set_id(AllocateId());
   element->set_fill(vr_shell::Fill::NONE);
   element->set_size({kExitWarningWidth, kExitWarningHeight, 1});
   element->set_scale({kExitWarningDistance, kExitWarningDistance, 1});
   element->set_translation({0, 0, -kExitWarningDistance});
   element->set_visible(false);
   element->set_hit_testable(false);
   element->set_lock_to_fov(true);
   exit_warning_ = element.get();
   scene_->AddUiElement(std::move(element));
 }
 
 void UiSceneManager::CreateSystemIndicators() {
   std::unique_ptr<UiElement> element;
 
   // TODO(acondor): Make constants for sizes and positions once the UX for the
   // indicators is defined.
   element = base::MakeUnique<AudioCaptureIndicator>(512);
+  element->set_debug_id(kAudioCaptureIndicator);
   element->set_id(AllocateId());
   element->set_translation({-0.3, 0.8, -kContentDistance + 0.1});
   element->set_size({0.5, 0, 1});
   element->set_visible(false);
   audio_capture_indicator_ = element.get();
   scene_->AddUiElement(std::move(element));
 
   element = base::MakeUnique<VideoCaptureIndicator>(512);
+  element->set_debug_id(kVideoCaptureIndicator);
   element->set_id(AllocateId());
   element->set_translation({0.3, 0.8, -kContentDistance + 0.1});
   element->set_size({0.5, 0, 1});
   element->set_visible(false);
   video_capture_indicator_ = element.get();
   scene_->AddUiElement(std::move(element));
 
   element = base::MakeUnique<ScreenCaptureIndicator>(512);
+  element->set_debug_id(kScreenCaptureIndicator);
   element->set_id(AllocateId());
   element->set_translation({0.0, 0.65, -kContentDistance + 0.1});
   element->set_size({0.4, 0, 1});
   element->set_visible(false);
   screen_capture_indicator_ = element.get();
   scene_->AddUiElement(std::move(element));
 }
 
 void UiSceneManager::CreateContentQuad() {
   std::unique_ptr<UiElement> element;
 
   element = base::MakeUnique<UiElement>();
+  element->set_debug_id(kContentQuad);
   element->set_id(AllocateId());
   element->set_fill(vr_shell::Fill::CONTENT);
   element->set_size({kContentWidth, kContentHeight, 1});
   element->set_translation({0, kContentVerticalOffset, -kContentDistance});
   element->set_visible(false);
   main_content_ = element.get();
   content_elements_.push_back(element.get());
   scene_->AddUiElement(std::move(element));
 
   // Place an invisible but hittable plane behind the content quad, to keep the
   // reticle roughly planar with the content if near content.
   element = base::MakeUnique<UiElement>();
+  element->set_debug_id(kBackplane);
   element->set_id(AllocateId());
   element->set_fill(vr_shell::Fill::NONE);
   element->set_size({kBackplaneSize, kBackplaneSize, 1.0});
   element->set_translation({0.0, 0.0, -kTextureOffset});
   element->set_parent_id(main_content_->id());
   content_elements_.push_back(element.get());
   scene_->AddUiElement(std::move(element));
 
   // Limit reticle distance to a sphere based on content distance.
   scene_->SetBackgroundDistance(main_content_->translation().z() *
                                 -kBackgroundDistanceMultiplier);
 }
 
 void UiSceneManager::CreateBackground() {
   std::unique_ptr<UiElement> element;
 
   // Floor.
   element = base::MakeUnique<UiElement>();
+  element->set_debug_id(kFloor);
   element->set_id(AllocateId());
   element->set_size({kSceneSize, kSceneSize, 1.0});
   element->set_translation({0.0, -kSceneHeight / 2, 0.0});
   element->set_rotation({1.0, 0.0, 0.0, -M_PI / 2.0});
   element->set_fill(vr_shell::Fill::OPAQUE_GRADIENT);
   element->set_edge_color(kBackgroundHorizonColor);
   element->set_center_color(kBackgroundCenterColor);
   element->set_draw_phase(0);
-  control_elements_.push_back(element.get());
+  floor_ = element.get();
+  content_elements_.push_back(element.get());
   scene_->AddUiElement(std::move(element));
 
   // Ceiling.
   element = base::MakeUnique<UiElement>();
+  element->set_debug_id(kCeiling);
   element->set_id(AllocateId());
   element->set_fill(vr_shell::Fill::OPAQUE_GRADIENT);
   element->set_size({kSceneSize, kSceneSize, 1.0});
   element->set_translation({0.0, kSceneHeight / 2, 0.0});
   element->set_rotation({1.0, 0.0, 0.0, M_PI / 2});
   element->set_fill(vr_shell::Fill::OPAQUE_GRADIENT);
   element->set_edge_color(kBackgroundHorizonColor);
   element->set_center_color(kBackgroundCenterColor);
   element->set_draw_phase(0);
-  control_elements_.push_back(element.get());
+  ceiling_ = element.get();
+  content_elements_.push_back(element.get());
   scene_->AddUiElement(std::move(element));
 
   // Floor grid.
   element = base::MakeUnique<UiElement>();
+  element->set_debug_id(kFloorGrid);
   element->set_id(AllocateId());
   element->set_fill(vr_shell::Fill::GRID_GRADIENT);
   element->set_size({kSceneSize, kSceneSize, 1.0});
   element->set_translation({0.0, -kSceneHeight / 2 + kTextureOffset, 0.0});
   element->set_rotation({1.0, 0.0, 0.0, -M_PI / 2});
   element->set_fill(vr_shell::Fill::GRID_GRADIENT);
   element->set_center_color(kBackgroundHorizonColor);
   vr::Colorf edge_color = kBackgroundHorizonColor;
   edge_color.a = 0.0;
   element->set_edge_color(edge_color);
   element->set_gridline_count(kFloorGridlineCount);
   element->set_draw_phase(0);
-  control_elements_.push_back(element.get());
+  floor_grid_ = element.get();
+  content_elements_.push_back(element.get());
   scene_->AddUiElement(std::move(element));
 
   scene_->SetBackgroundColor(kBackgroundHorizonColor);
 }
 
 void UiSceneManager::CreateUrlBar() {
   // TODO(cjgrant): Incorporate final size and position.
   auto url_bar = base::MakeUnique<UrlBar>(512);
+  url_bar->set_debug_id(kUrlBar);
   url_bar->set_id(AllocateId());
   url_bar->set_translation({0, kUrlBarVerticalOffset, -kUrlBarDistance});
   url_bar->set_size({kUrlBarWidth, kUrlBarHeight, 1});
   url_bar->SetBackButtonCallback(
       base::Bind(&UiSceneManager::OnBackButtonClicked, base::Unretained(this)));
   url_bar_ = url_bar.get();
   control_elements_.push_back(url_bar.get());
   scene_->AddUiElement(std::move(url_bar));
 
   auto indicator = base::MakeUnique<LoadingIndicator>(256);
+  indicator->set_debug_id(kLoadingIndicator);
   indicator->set_id(AllocateId());
   indicator->set_translation({0, 0, kLoadingIndicatorOffset});
   indicator->set_size({kLoadingIndicatorWidth, kLoadingIndicatorHeight, 1});
   indicator->set_parent_id(url_bar_->id());
   indicator->set_y_anchoring(YAnchoring::YTOP);
   loading_indicator_ = indicator.get();
   control_elements_.push_back(indicator.get());
   scene_->AddUiElement(std::move(indicator));
 }
 
@@ skipping 35 matching lines @@
   }
 
   // Content elements.
   for (UiElement* element : content_elements_) {
     element->SetEnabled(!web_vr_mode_);
   }
 
   // Update content quad parameters depending on fullscreen.
   // TODO(http://crbug.com/642937): Animate fullscreen transitions.
   if (fullscreen_) {
-    scene_->SetBackgroundColor(kFullscreenBackgroundColor);
     main_content_->set_translation(
         {0, kFullscreenVerticalOffset, -kFullscreenDistance});
     main_content_->set_size({kFullscreenWidth, kFullscreenHeight, 1});
+
+    ConfigureBackgroundColor(kFullscreenCenterColor, kFullscreenHorizonColor);
   } else {
-    scene_->SetBackgroundColor(kBackgroundHorizonColor);
     // Note that main_content_ is already visible in this case.
     main_content_->set_translation(
         {0, kContentVerticalOffset, -kContentDistance});
     main_content_->set_size({kContentWidth, kContentHeight, 1});
+
+    ConfigureBackgroundColor(kBackgroundCenterColor, kBackgroundHorizonColor);
   }
 
   scene_->SetBackgroundDistance(main_content_->translation().z() *
                                 -kBackgroundDistanceMultiplier);
 }
 
+void UiSceneManager::ConfigureBackgroundColor(vr::Colorf center_color,
+                                              vr::Colorf horizon_color) {
+  scene_->SetBackgroundColor(horizon_color);
+  floor_->set_edge_color(horizon_color);
+  floor_->set_center_color(center_color);
+  ceiling_->set_edge_color(horizon_color);
+  ceiling_->set_center_color(center_color);
+  floor_grid_->set_center_color(horizon_color);
+  vr::Colorf edge_color = horizon_color;
+  edge_color.a = 0.0;
+  floor_grid_->set_edge_color(edge_color);
+}
+
 void UiSceneManager::SetAudioCapturingIndicator(bool enabled) {
   audio_capture_indicator_->set_visible(enabled);
 }
 
 void UiSceneManager::SetVideoCapturingIndicator(bool enabled) {
   video_capture_indicator_->set_visible(enabled);
 }
 
 void UiSceneManager::SetScreenCapturingIndicator(bool enabled) {
   // TODO(asimjour) add the indicator and change the visibility here.
@@ skipping 69 matching lines @@
 
 void UiSceneManager::OnCloseButtonClicked() {
   browser_->ExitCct();
 }
 
 int UiSceneManager::AllocateId() {
   return next_available_id_++;
 }
 
 }  // namespace vr_shell