OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "content/browser/vr/android/cardboard/cardboard_vr_device.h" | 5 #include "content/browser/vr/android/cardboard/cardboard_vr_device.h" |
6 | 6 |
7 #include <math.h> | 7 #include <math.h> |
8 #include <algorithm> | 8 #include <algorithm> |
9 | 9 |
10 #include "base/android/context_utils.h" | 10 #include "base/android/context_utils.h" |
(...skipping 22 matching lines...) Expand all Loading... |
33 j_cardboard_device_.Reset(Java_CardboardVRDevice_create( | 33 j_cardboard_device_.Reset(Java_CardboardVRDevice_create( |
34 env, base::android::GetApplicationContext())); | 34 env, base::android::GetApplicationContext())); |
35 j_head_matrix_.Reset(env, env->NewFloatArray(16)); | 35 j_head_matrix_.Reset(env, env->NewFloatArray(16)); |
36 } | 36 } |
37 | 37 |
38 CardboardVRDevice::~CardboardVRDevice() { | 38 CardboardVRDevice::~CardboardVRDevice() { |
39 Java_CardboardVRDevice_stopTracking(AttachCurrentThread(), | 39 Java_CardboardVRDevice_stopTracking(AttachCurrentThread(), |
40 j_cardboard_device_.obj()); | 40 j_cardboard_device_.obj()); |
41 } | 41 } |
42 | 42 |
43 VRDeviceInfoPtr CardboardVRDevice::GetVRDevice() { | 43 mojom::VRDeviceInfoPtr CardboardVRDevice::GetVRDevice() { |
44 TRACE_EVENT0("input", "CardboardVRDevice::GetVRDevice"); | 44 TRACE_EVENT0("input", "CardboardVRDevice::GetVRDevice"); |
45 VRDeviceInfoPtr device = VRDeviceInfo::New(); | 45 mojom::VRDeviceInfoPtr device = VRDeviceInfo::New(); |
46 | 46 |
47 JNIEnv* env = AttachCurrentThread(); | 47 JNIEnv* env = AttachCurrentThread(); |
48 | 48 |
49 ScopedJavaLocalRef<jstring> j_device_name = | 49 ScopedJavaLocalRef<jstring> j_device_name = |
50 Java_CardboardVRDevice_getDeviceName(env, j_cardboard_device_.obj()); | 50 Java_CardboardVRDevice_getDeviceName(env, j_cardboard_device_.obj()); |
51 device->deviceName = | 51 device->deviceName = |
52 base::android::ConvertJavaStringToUTF8(env, j_device_name.obj()); | 52 base::android::ConvertJavaStringToUTF8(env, j_device_name.obj()); |
53 | 53 |
54 ScopedJavaLocalRef<jfloatArray> j_fov(env, env->NewFloatArray(4)); | 54 ScopedJavaLocalRef<jfloatArray> j_fov(env, env->NewFloatArray(4)); |
55 Java_CardboardVRDevice_getFieldOfView(env, j_cardboard_device_.obj(), | 55 Java_CardboardVRDevice_getFieldOfView(env, j_cardboard_device_.obj(), |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
114 | 114 |
115 right_eye->renderRect = VRRect::New(); | 115 right_eye->renderRect = VRRect::New(); |
116 right_eye->renderRect->x = screen_size[0] / 2.0; | 116 right_eye->renderRect->x = screen_size[0] / 2.0; |
117 right_eye->renderRect->y = 0; | 117 right_eye->renderRect->y = 0; |
118 right_eye->renderRect->width = screen_size[0] / 2.0; | 118 right_eye->renderRect->width = screen_size[0] / 2.0; |
119 right_eye->renderRect->height = screen_size[1]; | 119 right_eye->renderRect->height = screen_size[1]; |
120 | 120 |
121 return device; | 121 return device; |
122 } | 122 } |
123 | 123 |
124 VRSensorStatePtr CardboardVRDevice::GetSensorState() { | 124 mojom::VRSensorStatePtr CardboardVRDevice::GetSensorState() { |
125 TRACE_EVENT0("input", "CardboardVRDevice::GetSensorState"); | 125 TRACE_EVENT0("input", "CardboardVRDevice::GetSensorState"); |
126 VRSensorStatePtr state = VRSensorState::New(); | 126 mojom::VRSensorStatePtr state = VRSensorState::New(); |
127 | 127 |
128 state->timestamp = base::Time::Now().ToJsTime(); | 128 state->timestamp = base::Time::Now().ToJsTime(); |
129 state->frameIndex = frame_index_++; | 129 state->frameIndex = frame_index_++; |
130 | 130 |
131 JNIEnv* env = AttachCurrentThread(); | 131 JNIEnv* env = AttachCurrentThread(); |
132 Java_CardboardVRDevice_getSensorState(env, j_cardboard_device_.obj(), | 132 Java_CardboardVRDevice_getSensorState(env, j_cardboard_device_.obj(), |
133 j_head_matrix_.obj()); | 133 j_head_matrix_.obj()); |
134 | 134 |
135 std::vector<float> head_matrix; | 135 std::vector<float> head_matrix; |
136 base::android::JavaFloatArrayToFloatVector(env, j_head_matrix_.obj(), | 136 base::android::JavaFloatArrayToFloatVector(env, j_head_matrix_.obj(), |
(...skipping 21 matching lines...) Expand all Loading... |
158 | 158 |
159 return state; | 159 return state; |
160 } | 160 } |
161 | 161 |
162 void CardboardVRDevice::ResetSensor() { | 162 void CardboardVRDevice::ResetSensor() { |
163 Java_CardboardVRDevice_resetSensor(AttachCurrentThread(), | 163 Java_CardboardVRDevice_resetSensor(AttachCurrentThread(), |
164 j_cardboard_device_.obj()); | 164 j_cardboard_device_.obj()); |
165 } | 165 } |
166 | 166 |
167 } // namespace content | 167 } // namespace content |
OLD | NEW |