Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3667)

Unified Diff: chrome/browser/android/vr_shell/ui_elements.h

Issue 2730883003: Remove unnecessary UI element math. (Closed)
Patch Set: Remove more code. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/android/vr_shell/ui_elements.h
diff --git a/chrome/browser/android/vr_shell/ui_elements.h b/chrome/browser/android/vr_shell/ui_elements.h
index ec6d78a0f93bcecc35efc457764660aca2e877ab..17adc48167305c5716b71c8d77136c464804e35f 100644
--- a/chrome/browser/android/vr_shell/ui_elements.h
+++ b/chrome/browser/android/vr_shell/ui_elements.h
@@ -44,8 +44,8 @@ enum Fill {
CONTENT = 4,
};
-struct ReversibleTransform {
- ReversibleTransform();
+struct Transform {
+ Transform();
void MakeIdentity();
void Rotate(gvr::Quatf quat);
@@ -54,23 +54,22 @@ struct ReversibleTransform {
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 parame
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
cjgrant 2017/03/06 18:41:47 Done.
+
+ private:
+ Transform transform_;
};
struct ContentRectangle : public WorldRectangle {
« no previous file with comments | « no previous file | chrome/browser/android/vr_shell/ui_elements.cc » ('j') | chrome/browser/android/vr_shell/ui_elements.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698