Chromium Code Reviews| 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 42c349058508660b945750d247c88f5696d33354..5040182025e74c14d34c20eff5cc675249388192 100644 |
| --- a/chrome/browser/android/vr_shell/ui_elements.h |
| +++ b/chrome/browser/android/vr_shell/ui_elements.h |
| @@ -28,6 +28,16 @@ enum YAnchoring { |
| YBOTTOM |
| }; |
| +enum Fill { |
| + NONE = 0, |
| + SPRITE = 1, |
| + OPAQUE_GRADIENT = 2, |
| + GRID_GRADIENT = 3, |
| + // The element is the content quad. Only one content quad may be added to the |
|
cjgrant
2017/02/02 14:48:25
If commenting the type, please comment the others
tiborg1
2017/02/02 16:52:27
Good point. Done.
|
| + // scene. |
| + CONTENT = 4 |
| +}; |
| + |
| struct ReversibleTransform { |
| ReversibleTransform(); |
| @@ -72,7 +82,7 @@ struct ContentRectangle : public WorldRectangle { |
| // Valid IDs are non-negative. |
| int id = -1; |
| - // If a non-negative parent ID is specified, applicable tranformations |
| + // If a non-negative parent ID is specified, applicable transformations |
| // are applied relative to the parent, rather than absolutely. |
| int parent_id = -1; |
| @@ -86,10 +96,6 @@ struct ContentRectangle : public WorldRectangle { |
| // rather than the world. |
| bool lock_to_fov = false; |
| - // If true, this element is the content quad. Only one content quad may be |
| - // added to the scene. |
| - bool content_quad = false; |
| - |
| // Specifies the region (in pixels) of a texture to render. |
| Recti copy_rect = {0, 0, 0, 0}; |
| @@ -121,6 +127,13 @@ struct ContentRectangle : public WorldRectangle { |
| // Animations that affect the properties of the object over time. |
| std::vector<std::unique_ptr<Animation>> animations; |
| + Fill fill = Fill::NONE; |
| + |
| + Colorf edge_color = {1.0f, 1.0f, 1.0f, 1.0f}; |
| + Colorf center_color = {1.0f, 1.0f, 1.0f, 1.0f}; |
| + |
| + unsigned int tile_number; |
|
cjgrant
2017/02/02 14:48:25
tile_number is confusing to me - like it's a sprit
tiborg1
2017/02/02 16:52:27
Done.
|
| + |
| private: |
| DISALLOW_COPY_AND_ASSIGN(ContentRectangle); |
| }; |