Final push

ros-dorian · Nov 25, 2018 · 8361cc0 · 8361cc0
1 parent 49c8ef8
commit 8361cc0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/src/main/java/ch/bobsthack/bobsthack2018/MainActivity.java b/app/src/main/java/ch/bobsthack/bobsthack2018/MainActivity.java
@@ -183,7 +183,7 @@ private void onUpdateFrame(FrameTime frameTime) {
 
         if(mCenterTop != null && !topLayoutAdded) {
             mTopLayout = new LayoutNode(this, R.layout.main_ui);
-            mTopLayout.setPosition(Vector3.add(mCenterTop.getWorldPosition(), new Vector3(0, 0.0f, 0)));
+            mTopLayout.setPosition(Vector3.add(mCenterTop.getWorldPosition(), new Vector3(0, 0.1f, 0)));
             mTopLayout.setWorldRotation(mTopNormal);
             mArFragment.getArSceneView().getScene().addChild(mTopLayout);
             topLayoutAdded = true;
@@ -192,14 +192,16 @@ private void onUpdateFrame(FrameTime frameTime) {
 
         if(mCenterFront != null && !frontLayoutAdded) {
             mFrontLayout = new LayoutNode(this, R.layout.front_layout);
-            mFrontLayout.setPosition(Vector3.add(mCenterFront.getWorldPosition(), new Vector3(-0.5f, 0, 0)));
+            mFrontLayout.setPosition(Vector3.add(mCenterFront.getWorldPosition(), new Vector3(0, 0, 0)));
+            mFrontLayout.setWorldRotation(Quaternion.multiply(mFrontNormal, Quaternion.axisAngle(new Vector3(1,0,0), -90)));
             mArFragment.getArSceneView().getScene().addChild(mFrontLayout);
             frontLayoutAdded = true;
         }
 
         if(mCenterRight != null && !rightLayoutAdded) {
             mRightLayout = new LayoutNode(this, R.layout.right_layout);
-            mRightLayout.setPosition(Vector3.add(mCenterRight.getWorldPosition(), new Vector3(0.0f, 0, 0)));
+            mRightLayout.setPosition(Vector3.add(mCenterRight.getWorldPosition(), new Vector3(0.0f, 0, -0.2f)));
+            mRightLayout.setWorldRotation(Quaternion.multiply(mRightNormal, Quaternion.axisAngle(new Vector3(1,0,0), -90)));
             mArFragment.getArSceneView().getScene().addChild(mRightLayout);
             rightLayoutAdded = true;
         }