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/ui_texture.h"
 #include "chrome/browser/android/vr_shell/ui_elements/audio_capture_indicator.h"
@@ skipping 30 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;

[cjgrant, 2017/05/18 16:07:16]

We're implying Dms elsewhere (ie. lateral meters at 1 meter viewing distance). 
Seems weird to add them here.

[amp, 2017/05/18 16:15:33]

The only reason I added them here was to calculate the fullscreen distance (see
the comment on line 60) and because we then need to multiple them by that
distance for the actual height and width later.

What would you prefer to see instead, maybe just hardcoded values that were
pre-calculated?

Should we call the units something else, or should this live elsewhere?

+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 104 matching lines @@
   // Floor.
   element = base::MakeUnique<UiElement>();
   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_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_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_id(AllocateId());
   url_bar->set_translation({0, kUrlBarVerticalOffset, -kUrlBarDistance});
@@ skipping 48 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);
+    scene_->SetBackgroundColor(kFullscreenHorizonColor);
     main_content_->set_translation(
         {0, kFullscreenVerticalOffset, -kFullscreenDistance});
     main_content_->set_size({kFullscreenWidth, kFullscreenHeight, 1});
+
+    floor_->set_edge_color(kFullscreenHorizonColor);
+    floor_->set_center_color(kFullscreenCenterColor);
+    ceiling_->set_edge_color(kFullscreenHorizonColor);
+    ceiling_->set_center_color(kFullscreenCenterColor);
+    floor_grid_->set_center_color(kFullscreenHorizonColor);
+    vr::Colorf edge_color = kFullscreenHorizonColor;
+    edge_color.a = 0.0;
+    floor_grid_->set_edge_color(edge_color);
   } 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});
+
+    floor_->set_edge_color(kBackgroundHorizonColor);
+    floor_->set_center_color(kBackgroundCenterColor);
+    ceiling_->set_edge_color(kBackgroundHorizonColor);
+    ceiling_->set_center_color(kBackgroundCenterColor);
+    floor_grid_->set_center_color(kBackgroundHorizonColor);
+    vr::Colorf edge_color = kBackgroundHorizonColor;
+    edge_color.a = 0.0;
+    floor_grid_->set_edge_color(edge_color);
   }
 
   scene_->SetBackgroundDistance(main_content_->translation().z() *
                                 -kBackgroundDistanceMultiplier);
 }
 
 void UiSceneManager::SetWebVrSecureOrigin(bool secure) {
   secure_origin_ = secure;
   ConfigureSecurityWarnings();
 }
@@ skipping 54 matching lines @@
 void UiSceneManager::SetHistoryButtonsEnabled(bool can_go_back,
                                               bool can_go_forward) {}
 
 void UiSceneManager::OnCloseButtonClicked() {}
 
 int UiSceneManager::AllocateId() {
   return next_available_id_++;
 }
 
 }  // namespace vr_shell