Improve depth sorting: do not clamp hitPoint used for ndc calculation (…

…#1887)
MozillaReality · Sep 26, 2019 · 49ffa84 · 49ffa84
1 parent 6de9b52
commit 49ffa84
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/BrightnessMenuWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/BrightnessMenuWidget.java
@@ -23,7 +23,7 @@ protected void initializeWidgetPlacement(WidgetPlacement aPlacement) {
         aPlacement.anchorX = 0.0f;
         aPlacement.anchorY = 0.0f;
         aPlacement.translationY = WidgetPlacement.dpDimension(getContext(), R.dimen.video_projection_menu_translation_y);
-        aPlacement.translationZ = 30.0f;
+        aPlacement.translationZ = 2.0f;
     }
 
     public void setParentWidget(UIWidget aParent) {

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TrayWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/TrayWidget.java
@@ -483,8 +483,8 @@ public void run() {
             mLibraryNotification.getPlacement().parentHandle = getHandle();
             mLibraryNotification.getPlacement().anchorY = 0.0f;
             mLibraryNotification.getPlacement().translationX = (offsetViewBounds.left + mBookmarksButton.getWidth() / 2.0f) * ratio;
-            mLibraryNotification.getPlacement().translationY = ((offsetViewBounds.top - 66) * ratio);
-            mLibraryNotification.getPlacement().translationZ = 38.0f;
+            mLibraryNotification.getPlacement().translationY = ((offsetViewBounds.top - 60) * ratio);
+            mLibraryNotification.getPlacement().translationZ = 25.0f;
             mLibraryNotification.getPlacement().density = 3.0f;
             mLibraryNotification.setText(R.string.bookmarks_saved_notification);
             mLibraryNotification.setCurvedMode(false);

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/VideoProjectionMenuWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/VideoProjectionMenuWidget.java
@@ -46,7 +46,7 @@ protected void initializeWidgetPlacement(WidgetPlacement aPlacement) {
         aPlacement.anchorX = 0.0f;
         aPlacement.anchorY = 0.0f;
         aPlacement.translationY = WidgetPlacement.dpDimension(getContext(), R.dimen.video_projection_menu_translation_y);
-        aPlacement.translationZ = 30.0f;
+        aPlacement.translationZ = 2.0f;
     }
 
     public void setParentWidget(UIWidget aParent) {

diff --git a/app/src/main/cpp/BrowserWorld.cpp b/app/src/main/cpp/BrowserWorld.cpp
@@ -1398,9 +1398,9 @@ BrowserWorld::ComputeNormalizedZ(const vrb::NodePtr& aNode) const {
   bool inside = false;
   float distance;
   if (target->GetQuad()) {
-    target->GetQuad()->TestIntersection(headPosition, headDirection, hitPoint, normal, true, inside, distance);
+    target->GetQuad()->TestIntersection(headPosition, headDirection, hitPoint, normal, false, inside, distance);
   } else if (target->GetCylinder()) {
-    target->GetCylinder()->TestIntersection(headPosition, headDirection, hitPoint, normal, true, inside, distance);
+    target->GetCylinder()->TestIntersection(headPosition, headDirection, hitPoint, normal, false, inside, distance);
   }
 
   const vrb::Matrix& projection = m.device->GetCamera(device::Eye::Left)->GetPerspective();

diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
@@ -83,7 +83,7 @@
 
     <!-- Video Projection Menu -->
     <dimen name="video_projection_menu_width">330dp</dimen>
-    <dimen name="video_projection_menu_translation_y">15dp</dimen>
+    <dimen name="video_projection_menu_translation_y">7dp</dimen>
 
     <!-- Brightness Menu -->
     <dimen name="brightness_menu_width">150dp</dimen>