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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 float left, | 63 float left, |
61 float top, | 64 float top, |
62 float width, | 65 float width, |
63 float height) override {} | 66 float height) override {} |
64 | 67 |
65 gvr::GvrApi* gvr_api() override { return gvr_api_.get(); } | 68 gvr::GvrApi* gvr_api() override { return gvr_api_.get(); } |
66 | 69 |
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_; |
| 73 std::unique_ptr<gvr::GvrApi> controller_api_; |
70 }; | 74 }; |
71 | 75 |
72 GvrDeviceProvider::GvrDeviceProvider() | 76 GvrDeviceProvider::GvrDeviceProvider() |
73 : VRDeviceProvider(), | 77 : VRDeviceProvider(), |
74 main_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()) {} | 78 main_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()) {} |
75 | 79 |
76 GvrDeviceProvider::~GvrDeviceProvider() { | 80 GvrDeviceProvider::~GvrDeviceProvider() { |
| 81 GamepadDataFetcherManager::GetInstance()->RemoveSourceFactory( |
| 82 GAMEPAD_SOURCE_GVR); |
| 83 |
77 ExitPresent(); | 84 ExitPresent(); |
78 } | 85 } |
79 | 86 |
80 void GvrDeviceProvider::GetDevices(std::vector<VRDevice*>* devices) { | 87 void GvrDeviceProvider::GetDevices(std::vector<VRDevice*>* devices) { |
81 Initialize(); | 88 Initialize(); |
82 | 89 |
83 if (vr_device_) | 90 if (vr_device_) |
84 devices->push_back(vr_device_.get()); | 91 devices->push_back(vr_device_.get()); |
85 } | 92 } |
86 | 93 |
87 void GvrDeviceProvider::Initialize() { | 94 void GvrDeviceProvider::Initialize() { |
88 if (!non_presenting_delegate_) { | 95 if (!non_presenting_delegate_) { |
89 non_presenting_delegate_.reset(new GvrNonPresentingDelegate()); | 96 non_presenting_delegate_.reset(new GvrNonPresentingDelegate()); |
90 if (non_presenting_delegate_->gvr_api()) { | 97 if (non_presenting_delegate_->gvr_api()) { |
91 vr_device_.reset(new GvrDevice(this, non_presenting_delegate_.get())); | 98 vr_device_.reset(new GvrDevice(this, non_presenting_delegate_.get())); |
| 99 |
| 100 GamepadDataFetcherManager::GetInstance()->AddFactory( |
| 101 new GvrGamepadDataFetcher::Factory(non_presenting_delegate_.get())); |
92 } | 102 } |
93 } | 103 } |
94 } | 104 } |
95 | 105 |
96 bool GvrDeviceProvider::RequestPresent() { | 106 bool GvrDeviceProvider::RequestPresent() { |
97 GvrDelegateProvider* delegate_provider = GvrDelegateProvider::GetInstance(); | 107 GvrDelegateProvider* delegate_provider = GvrDelegateProvider::GetInstance(); |
98 if (!delegate_provider) | 108 if (!delegate_provider) |
99 return false; | 109 return false; |
100 | 110 |
101 return delegate_provider->RequestWebVRPresent(this); | 111 return delegate_provider->RequestWebVRPresent(this); |
(...skipping 30 matching lines...) Expand all Loading... |
132 base::Bind(&GvrDeviceProvider::ExitPresent, base::Unretained(this))); | 142 base::Bind(&GvrDeviceProvider::ExitPresent, base::Unretained(this))); |
133 } | 143 } |
134 | 144 |
135 void GvrDeviceProvider::GvrDelegateReady(GvrDelegate* delegate) { | 145 void GvrDeviceProvider::GvrDelegateReady(GvrDelegate* delegate) { |
136 DCHECK(main_thread_task_runner_->BelongsToCurrentThread()); | 146 DCHECK(main_thread_task_runner_->BelongsToCurrentThread()); |
137 | 147 |
138 vr_device_->SetDelegate(delegate); | 148 vr_device_->SetDelegate(delegate); |
139 } | 149 } |
140 | 150 |
141 } // namespace device | 151 } // namespace device |
OLD | NEW |