OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_ | 5 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_ |
6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_ | 6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_ |
7 | 7 |
8 #include <memory> | 8 #include <memory> |
9 #include <queue> | 9 #include <queue> |
10 #include <utility> | 10 #include <utility> |
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
211 // Current sizes for the render buffers. | 211 // Current sizes for the render buffers. |
212 gfx::Size render_size_primary_; | 212 gfx::Size render_size_primary_; |
213 gfx::Size render_size_headlocked_; | 213 gfx::Size render_size_headlocked_; |
214 | 214 |
215 // Intended render_size_primary_ for use by VrShell, so that it | 215 // Intended render_size_primary_ for use by VrShell, so that it |
216 // can be restored after exiting WebVR mode. | 216 // can be restored after exiting WebVR mode. |
217 gfx::Size render_size_vrshell_; | 217 gfx::Size render_size_vrshell_; |
218 | 218 |
219 std::unique_ptr<VrShellRenderer> vr_shell_renderer_; | 219 std::unique_ptr<VrShellRenderer> vr_shell_renderer_; |
220 | 220 |
| 221 bool cardboard_ = false; |
221 bool touch_pending_ = false; | 222 bool touch_pending_ = false; |
222 vr::Quatf controller_quat_; | 223 vr::Quatf controller_quat_; |
223 | 224 |
224 gfx::Point3F target_point_; | 225 gfx::Point3F target_point_; |
225 | 226 |
226 // TODO(mthiesse): We need to handle elements being removed, and update this | 227 // TODO(mthiesse): We need to handle elements being removed, and update this |
227 // state appropriately. | 228 // state appropriately. |
228 UiElement* reticle_render_target_ = nullptr; | 229 UiElement* reticle_render_target_ = nullptr; |
229 UiElement* hover_target_ = nullptr; | 230 UiElement* hover_target_ = nullptr; |
230 // TODO(mthiesse): We shouldn't have a fling target. Elements should fling | 231 // TODO(mthiesse): We shouldn't have a fling target. Elements should fling |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
275 gfx::Point3F pointer_start_; | 276 gfx::Point3F pointer_start_; |
276 | 277 |
277 base::WeakPtrFactory<VrShellGl> weak_ptr_factory_; | 278 base::WeakPtrFactory<VrShellGl> weak_ptr_factory_; |
278 | 279 |
279 DISALLOW_COPY_AND_ASSIGN(VrShellGl); | 280 DISALLOW_COPY_AND_ASSIGN(VrShellGl); |
280 }; | 281 }; |
281 | 282 |
282 } // namespace vr_shell | 283 } // namespace vr_shell |
283 | 284 |
284 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_ | 285 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_ |
OLD | NEW |