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

Side by Side Diff: chrome/browser/android/vr_shell/vr_shell_gl.h

Issue 2879973002: Expose Gamepad API instance for Cardboard button (Closed)
Patch Set: fix crash in tests Created 3 years, 7 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 unified diff | Download patch
OLDNEW
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 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 // Current sizes for the render buffers. 210 // Current sizes for the render buffers.
211 gfx::Size render_size_primary_; 211 gfx::Size render_size_primary_;
212 gfx::Size render_size_headlocked_; 212 gfx::Size render_size_headlocked_;
213 213
214 // Intended render_size_primary_ for use by VrShell, so that it 214 // Intended render_size_primary_ for use by VrShell, so that it
215 // can be restored after exiting WebVR mode. 215 // can be restored after exiting WebVR mode.
216 gfx::Size render_size_vrshell_; 216 gfx::Size render_size_vrshell_;
217 217
218 std::unique_ptr<VrShellRenderer> vr_shell_renderer_; 218 std::unique_ptr<VrShellRenderer> vr_shell_renderer_;
219 219
220 bool cardboard_ = false;
220 bool touch_pending_ = false; 221 bool touch_pending_ = false;
221 vr::Quatf controller_quat_; 222 vr::Quatf controller_quat_;
222 223
223 gfx::Point3F target_point_; 224 gfx::Point3F target_point_;
224 225
225 // TODO(mthiesse): We need to handle elements being removed, and update this 226 // TODO(mthiesse): We need to handle elements being removed, and update this
226 // state appropriately. 227 // state appropriately.
227 UiElement* reticle_render_target_ = nullptr; 228 UiElement* reticle_render_target_ = nullptr;
228 UiElement* hover_target_ = nullptr; 229 UiElement* hover_target_ = nullptr;
229 // TODO(mthiesse): We shouldn't have a fling target. Elements should fling 230 // TODO(mthiesse): We shouldn't have a fling target. Elements should fling
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_
OLDNEW
« no previous file with comments | « chrome/browser/android/vr_shell/vr_shell.cc ('k') | chrome/browser/android/vr_shell/vr_shell_gl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698