| 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_H_ | 5 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ |
| 6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ | 6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ |
| 7 | 7 |
| 8 #include <jni.h> | 8 #include <jni.h> |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 std::unique_ptr<gvr::BufferViewport> buffer_viewport_; | 106 std::unique_ptr<gvr::BufferViewport> buffer_viewport_; |
| 107 std::unique_ptr<gvr::SwapChain> swap_chain_; | 107 std::unique_ptr<gvr::SwapChain> swap_chain_; |
| 108 | 108 |
| 109 gvr::Mat4f view_matrix_; | 109 gvr::Mat4f view_matrix_; |
| 110 gvr::Mat4f projection_matrix_; | 110 gvr::Mat4f projection_matrix_; |
| 111 | 111 |
| 112 gvr::Mat4f head_pose_; | 112 gvr::Mat4f head_pose_; |
| 113 gvr::Vec3f forward_vector_; | 113 gvr::Vec3f forward_vector_; |
| 114 | 114 |
| 115 gvr::Sizei render_size_; | 115 gvr::Sizei render_size_; |
| 116 float cursor_distance_; |
| 116 | 117 |
| 117 std::unique_ptr<VrCompositor> content_compositor_view_; | 118 std::unique_ptr<VrCompositor> content_compositor_view_; |
| 118 content::ContentViewCore* content_cvc_; | 119 content::ContentViewCore* content_cvc_; |
| 119 | 120 |
| 120 VrShellDelegate* delegate_; | 121 VrShellDelegate* delegate_; |
| 121 std::unique_ptr<VrShellRenderer> vr_shell_renderer_; | 122 std::unique_ptr<VrShellRenderer> vr_shell_renderer_; |
| 122 base::android::ScopedJavaGlobalRef<jobject> j_vr_shell_; | 123 base::android::ScopedJavaGlobalRef<jobject> j_vr_shell_; |
| 123 | 124 |
| 124 gvr::Quatf controller_quat_; | 125 gvr::Quatf controller_quat_; |
| 125 bool controller_active_ = false; | 126 bool controller_active_ = false; |
| 126 gvr::Vec3f look_at_vector_; | 127 gvr::Vec3f look_at_vector_; |
| 127 int ui_tex_width_ = 0; | 128 int ui_tex_width_ = 0; |
| 128 int ui_tex_height_ = 0; | 129 int ui_tex_height_ = 0; |
| 129 | 130 |
| 130 bool webvr_mode_ = false; | 131 bool webvr_mode_ = false; |
| 131 | 132 |
| 132 base::WeakPtrFactory<VrShell> weak_ptr_factory_; | 133 base::WeakPtrFactory<VrShell> weak_ptr_factory_; |
| 133 | 134 |
| 134 DISALLOW_COPY_AND_ASSIGN(VrShell); | 135 DISALLOW_COPY_AND_ASSIGN(VrShell); |
| 135 }; | 136 }; |
| 136 | 137 |
| 137 bool RegisterVrShell(JNIEnv* env); | 138 bool RegisterVrShell(JNIEnv* env); |
| 138 | 139 |
| 139 } // namespace vr_shell | 140 } // namespace vr_shell |
| 140 | 141 |
| 141 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ | 142 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ |
| OLD | NEW |