| 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 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 | 124 |
| 125 void UpdateController(const gvr::Vec3f& forward_vector); | 125 void UpdateController(const gvr::Vec3f& forward_vector); |
| 126 | 126 |
| 127 void HandleQueuedTasks(); | 127 void HandleQueuedTasks(); |
| 128 | 128 |
| 129 // samplerExternalOES texture data for UI content image. | 129 // samplerExternalOES texture data for UI content image. |
| 130 jint ui_texture_id_ = 0; | 130 jint ui_texture_id_ = 0; |
| 131 // samplerExternalOES texture data for main content image. | 131 // samplerExternalOES texture data for main content image. |
| 132 jint content_texture_id_ = 0; | 132 jint content_texture_id_ = 0; |
| 133 | 133 |
| 134 float desktop_screen_tilt_; | |
| 135 float desktop_height_; | |
| 136 | |
| 137 std::unique_ptr<UiScene> scene_; | 134 std::unique_ptr<UiScene> scene_; |
| 138 std::unique_ptr<UiInterface> html_interface_; | 135 std::unique_ptr<UiInterface> html_interface_; |
| 139 | 136 |
| 140 std::unique_ptr<gvr::GvrApi> gvr_api_; | 137 std::unique_ptr<gvr::GvrApi> gvr_api_; |
| 141 std::unique_ptr<gvr::BufferViewportList> buffer_viewport_list_; | 138 std::unique_ptr<gvr::BufferViewportList> buffer_viewport_list_; |
| 142 std::unique_ptr<gvr::BufferViewport> buffer_viewport_; | 139 std::unique_ptr<gvr::BufferViewport> buffer_viewport_; |
| 143 std::unique_ptr<gvr::BufferViewport> headlocked_left_viewport_; | 140 std::unique_ptr<gvr::BufferViewport> headlocked_left_viewport_; |
| 144 std::unique_ptr<gvr::BufferViewport> headlocked_right_viewport_; | 141 std::unique_ptr<gvr::BufferViewport> headlocked_right_viewport_; |
| 145 std::unique_ptr<gvr::SwapChain> swap_chain_; | 142 std::unique_ptr<gvr::SwapChain> swap_chain_; |
| 146 | 143 |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 base::WeakPtrFactory<VrShell> weak_ptr_factory_; | 180 base::WeakPtrFactory<VrShell> weak_ptr_factory_; |
| 184 | 181 |
| 185 DISALLOW_COPY_AND_ASSIGN(VrShell); | 182 DISALLOW_COPY_AND_ASSIGN(VrShell); |
| 186 }; | 183 }; |
| 187 | 184 |
| 188 bool RegisterVrShell(JNIEnv* env); | 185 bool RegisterVrShell(JNIEnv* env); |
| 189 | 186 |
| 190 } // namespace vr_shell | 187 } // namespace vr_shell |
| 191 | 188 |
| 192 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ | 189 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ |
| OLD | NEW |