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 #include "device/vr/android/gvr/gvr_device_provider.h" | 5 #include "device/vr/android/gvr/gvr_device_provider.h" |
6 | 6 |
7 #include <jni.h> | 7 #include <jni.h> |
8 | 8 |
9 #include "base/android/context_utils.h" | 9 #include "base/android/context_utils.h" |
10 #include "base/android/jni_android.h" | 10 #include "base/android/jni_android.h" |
11 #include "base/android/jni_utils.h" | 11 #include "base/android/jni_utils.h" |
12 #include "base/android/scoped_java_ref.h" | 12 #include "base/android/scoped_java_ref.h" |
13 #include "device/vr/android/gvr/gvr_delegate.h" | 13 #include "device/vr/android/gvr/gvr_delegate.h" |
14 #include "device/vr/android/gvr/gvr_device.h" | 14 #include "device/vr/android/gvr/gvr_device.h" |
| 15 #include "device/vr/android/gvr/gvr_gamepad_data_fetcher.h" |
15 #include "device/vr/vr_device_manager.h" | 16 #include "device/vr/vr_device_manager.h" |
16 #include "jni/GvrDeviceProvider_jni.h" | 17 #include "jni/GvrDeviceProvider_jni.h" |
17 #include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/g
vr.h" | 18 #include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/g
vr.h" |
| 19 #include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/g
vr_controller.h" |
| 20 #include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/g
vr_types.h" |
18 | 21 |
19 using base::android::AttachCurrentThread; | 22 using base::android::AttachCurrentThread; |
20 using base::android::GetApplicationContext; | 23 using base::android::GetApplicationContext; |
21 | 24 |
22 namespace device { | 25 namespace device { |
23 | 26 |
24 // A temporary delegate till a VrShell instance becomes available. | 27 // A temporary delegate till a VrShell instance becomes available. |
25 class GvrNonPresentingDelegate : public GvrDelegate { | 28 class GvrNonPresentingDelegate : public GvrDelegate { |
26 public: | 29 public: |
27 GvrNonPresentingDelegate() { Initialize(); } | 30 GvrNonPresentingDelegate() { Initialize(); } |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 private: | 70 private: |
68 base::android::ScopedJavaGlobalRef<jobject> j_device_; | 71 base::android::ScopedJavaGlobalRef<jobject> j_device_; |
69 std::unique_ptr<gvr::GvrApi> gvr_api_; | 72 std::unique_ptr<gvr::GvrApi> gvr_api_; |
70 }; | 73 }; |
71 | 74 |
72 GvrDeviceProvider::GvrDeviceProvider() | 75 GvrDeviceProvider::GvrDeviceProvider() |
73 : VRDeviceProvider(), | 76 : VRDeviceProvider(), |
74 main_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()) {} | 77 main_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()) {} |
75 | 78 |
76 GvrDeviceProvider::~GvrDeviceProvider() { | 79 GvrDeviceProvider::~GvrDeviceProvider() { |
| 80 GamepadDataFetcherManager::GetInstance()->RemoveSourceFactory( |
| 81 GAMEPAD_SOURCE_GVR); |
| 82 |
77 ExitPresent(); | 83 ExitPresent(); |
78 } | 84 } |
79 | 85 |
80 void GvrDeviceProvider::GetDevices(std::vector<VRDevice*>* devices) { | 86 void GvrDeviceProvider::GetDevices(std::vector<VRDevice*>* devices) { |
81 Initialize(); | 87 Initialize(); |
82 | 88 |
83 if (vr_device_) | 89 if (vr_device_) |
84 devices->push_back(vr_device_.get()); | 90 devices->push_back(vr_device_.get()); |
85 } | 91 } |
86 | 92 |
87 void GvrDeviceProvider::SetClient(VRClientDispatcher* client) { | 93 void GvrDeviceProvider::SetClient(VRClientDispatcher* client) { |
88 if (!client_) | 94 if (!client_) |
89 client_.reset(client); | 95 client_.reset(client); |
90 } | 96 } |
91 | 97 |
92 void GvrDeviceProvider::Initialize() { | 98 void GvrDeviceProvider::Initialize() { |
93 if (!non_presenting_delegate_) { | 99 if (!non_presenting_delegate_) { |
94 non_presenting_delegate_.reset(new GvrNonPresentingDelegate()); | 100 non_presenting_delegate_.reset(new GvrNonPresentingDelegate()); |
95 if (non_presenting_delegate_->gvr_api()) { | 101 if (non_presenting_delegate_->gvr_api()) { |
96 vr_device_.reset(new GvrDevice(this, non_presenting_delegate_.get())); | 102 vr_device_.reset(new GvrDevice(this, non_presenting_delegate_.get())); |
97 client_->OnDeviceConnectionStatusChanged(vr_device_.get(), true); | 103 client_->OnDeviceConnectionStatusChanged(vr_device_.get(), true); |
| 104 |
| 105 GamepadDataFetcherManager::GetInstance()->AddFactory( |
| 106 new GvrGamepadDataFetcher::Factory(non_presenting_delegate_.get(), |
| 107 vr_device_->id())); |
98 } | 108 } |
99 } | 109 } |
100 } | 110 } |
101 | 111 |
102 bool GvrDeviceProvider::RequestPresent() { | 112 bool GvrDeviceProvider::RequestPresent() { |
103 GvrDelegateProvider* delegate_provider = GvrDelegateProvider::GetInstance(); | 113 GvrDelegateProvider* delegate_provider = GvrDelegateProvider::GetInstance(); |
104 if (!delegate_provider) | 114 if (!delegate_provider) |
105 return false; | 115 return false; |
106 | 116 |
107 return delegate_provider->RequestWebVRPresent(this); | 117 return delegate_provider->RequestWebVRPresent(this); |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
139 base::Bind(&GvrDeviceProvider::ExitPresent, base::Unretained(this))); | 149 base::Bind(&GvrDeviceProvider::ExitPresent, base::Unretained(this))); |
140 } | 150 } |
141 | 151 |
142 void GvrDeviceProvider::GvrDelegateReady(GvrDelegate* delegate) { | 152 void GvrDeviceProvider::GvrDelegateReady(GvrDelegate* delegate) { |
143 DCHECK(main_thread_task_runner_->BelongsToCurrentThread()); | 153 DCHECK(main_thread_task_runner_->BelongsToCurrentThread()); |
144 | 154 |
145 vr_device_->SetDelegate(delegate); | 155 vr_device_->SetDelegate(delegate); |
146 } | 156 } |
147 | 157 |
148 } // namespace device | 158 } // namespace device |
OLD | NEW |