Remove unnecessary UI element math.

chrome/browser/android/vr_shell/ui_elements.h

 // Copyright 2016 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.
 
 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_UI_ELEMENTS_H_
 #define CHROME_BROWSER_ANDROID_VR_SHELL_UI_ELEMENTS_H_
 
 #include <memory>
 #include <vector>
 
@@ skipping 26 matching lines @@
   // center color.
   OPAQUE_GRADIENT = 2,
   // Same as OPAQUE_GRADIENT but the element is drawn as a grid.
   GRID_GRADIENT = 3,
   // The element is filled with the content web site. Only one content element
   // may be added to the
   // scene.
   CONTENT = 4,
 };
 
-struct ReversibleTransform {
-  ReversibleTransform();
+struct Transform {
+  Transform();
 
   void MakeIdentity();
   void Rotate(gvr::Quatf quat);
   void Rotate(float ax, float ay, float az, float rad);
   void Translate(float tx, float ty, float tz);
   void Scale(float sx, float sy, float sz);
 
   gvr::Mat4f to_world;
-  gvr::Mat4f from_world;
-
-  // This object-to-world orientation quaternion is technically
-  // redundant, but it's easy to track it here for use as needed.
-  // TODO(klausw): use this instead of MatrixVectorRotation()?
-  // Would need quat * vector implementation.
-  gvr::Quatf orientation = {0.0f, 0.0f, 0.0f, 1.0f};
 };
 
-struct WorldObject {
-  ReversibleTransform transform;
-};
+class WorldRectangle {
+ public:
+  const gvr::Mat4f& TransformMatrix() const;
+  void SetTransform(const Transform& transform);
 
-struct WorldRectangle : public WorldObject {
   gvr::Vec3f GetCenter() const;
   gvr::Vec3f GetNormal() const;
-  float GetRayDistance(gvr::Vec3f rayOrigin, gvr::Vec3f rayVector) const;
+  bool GetRayDistance(const gvr::Vec3f& ray_origin,

[tiborg, 2017/03/06 17:51:43]

Add comment to describe the return type and parameters?

[cjgrant, 2017/03/06 18:41:47]

Done.

+                      const gvr::Vec3f& ray_vector,
+                      float* distance) const;
+  gvr::Vec2f GetUnitRectangleCoordinates(const gvr::Vec3f& world_point);

[tiborg, 2017/03/06 17:51:43]

Also here I would say comments help a lot (return type, parameters, what the
function does).

[cjgrant, 2017/03/06 18:41:47]

Done.

+
+ private:
+  Transform transform_;
 };
 
 struct ContentRectangle : public WorldRectangle {
   ContentRectangle();
   ~ContentRectangle();
 
   void Animate(int64_t time);
 
   // Indicates whether the element should be visually rendered.
   bool IsVisible() const;
@@ skipping 58 matching lines @@
 
   int draw_phase = 1;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ContentRectangle);
 };
 
 }  // namespace vr_shell
 
 #endif  // CHROME_BROWSER_ANDROID_VR_SHELL_UI_ELEMENTS_H_