Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Side by Side Diff: device/vr/android/cardboard/cardboard_vr_device.cc

Issue 2237943002: Remove now-unnecessary .obj() in Java method calls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@switch-context
Patch Set: Rebase *again* :( Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « device/usb/usb_service_android.cc ('k') | media/audio/android/audio_manager_android.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "device/vr/android/cardboard/cardboard_vr_device.h" 5 #include "device/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 16 matching lines...) Expand all
27 CardboardVRDevice::CardboardVRDevice(VRDeviceProvider* provider) 27 CardboardVRDevice::CardboardVRDevice(VRDeviceProvider* provider)
28 : VRDevice(provider) { 28 : VRDevice(provider) {
29 JNIEnv* env = AttachCurrentThread(); 29 JNIEnv* env = AttachCurrentThread();
30 j_cardboard_device_.Reset(Java_CardboardVRDevice_create( 30 j_cardboard_device_.Reset(Java_CardboardVRDevice_create(
31 env, base::android::GetApplicationContext())); 31 env, base::android::GetApplicationContext()));
32 j_head_matrix_.Reset(env, env->NewFloatArray(16)); 32 j_head_matrix_.Reset(env, env->NewFloatArray(16));
33 } 33 }
34 34
35 CardboardVRDevice::~CardboardVRDevice() { 35 CardboardVRDevice::~CardboardVRDevice() {
36 Java_CardboardVRDevice_stopTracking(AttachCurrentThread(), 36 Java_CardboardVRDevice_stopTracking(AttachCurrentThread(),
37 j_cardboard_device_.obj()); 37 j_cardboard_device_);
38 } 38 }
39 39
40 VRDisplayPtr CardboardVRDevice::GetVRDevice() { 40 VRDisplayPtr CardboardVRDevice::GetVRDevice() {
41 TRACE_EVENT0("input", "CardboardVRDevice::GetVRDevice"); 41 TRACE_EVENT0("input", "CardboardVRDevice::GetVRDevice");
42 VRDisplayPtr device = VRDisplay::New(); 42 VRDisplayPtr device = VRDisplay::New();
43 43
44 JNIEnv* env = AttachCurrentThread(); 44 JNIEnv* env = AttachCurrentThread();
45 45
46 ScopedJavaLocalRef<jstring> j_device_name = 46 ScopedJavaLocalRef<jstring> j_device_name =
47 Java_CardboardVRDevice_getDeviceName(env, j_cardboard_device_.obj()); 47 Java_CardboardVRDevice_getDeviceName(env, j_cardboard_device_);
48 device->displayName = 48 device->displayName =
49 base::android::ConvertJavaStringToUTF8(env, j_device_name.obj()); 49 base::android::ConvertJavaStringToUTF8(env, j_device_name.obj());
50 50
51 ScopedJavaLocalRef<jfloatArray> j_fov(env, env->NewFloatArray(4)); 51 ScopedJavaLocalRef<jfloatArray> j_fov(env, env->NewFloatArray(4));
52 Java_CardboardVRDevice_getFieldOfView(env, j_cardboard_device_.obj(), 52 Java_CardboardVRDevice_getFieldOfView(env, j_cardboard_device_, j_fov);
53 j_fov.obj());
54 53
55 std::vector<float> fov; 54 std::vector<float> fov;
56 base::android::JavaFloatArrayToFloatVector(env, j_fov.obj(), &fov); 55 base::android::JavaFloatArrayToFloatVector(env, j_fov.obj(), &fov);
57 56
58 device->capabilities = VRDisplayCapabilities::New(); 57 device->capabilities = VRDisplayCapabilities::New();
59 device->capabilities->hasOrientation = true; 58 device->capabilities->hasOrientation = true;
60 device->capabilities->hasPosition = false; 59 device->capabilities->hasPosition = false;
61 device->capabilities->hasExternalDisplay = false; 60 device->capabilities->hasExternalDisplay = false;
62 device->capabilities->canPresent = false; 61 device->capabilities->canPresent = false;
63 62
64 device->leftEye = VREyeParameters::New(); 63 device->leftEye = VREyeParameters::New();
65 device->rightEye = VREyeParameters::New(); 64 device->rightEye = VREyeParameters::New();
66 VREyeParametersPtr& left_eye = device->leftEye; 65 VREyeParametersPtr& left_eye = device->leftEye;
67 VREyeParametersPtr& right_eye = device->rightEye; 66 VREyeParametersPtr& right_eye = device->rightEye;
68 67
69 left_eye->fieldOfView = VRFieldOfView::New(); 68 left_eye->fieldOfView = VRFieldOfView::New();
70 left_eye->fieldOfView->upDegrees = fov[0]; 69 left_eye->fieldOfView->upDegrees = fov[0];
71 left_eye->fieldOfView->downDegrees = fov[1]; 70 left_eye->fieldOfView->downDegrees = fov[1];
72 left_eye->fieldOfView->leftDegrees = fov[2]; 71 left_eye->fieldOfView->leftDegrees = fov[2];
73 left_eye->fieldOfView->rightDegrees = fov[3]; 72 left_eye->fieldOfView->rightDegrees = fov[3];
74 73
75 // Cardboard devices always assume a mirrored FOV, so this is just the left 74 // Cardboard devices always assume a mirrored FOV, so this is just the left
76 // eye FOV with the left and right degrees swapped. 75 // eye FOV with the left and right degrees swapped.
77 right_eye->fieldOfView = VRFieldOfView::New(); 76 right_eye->fieldOfView = VRFieldOfView::New();
78 right_eye->fieldOfView->upDegrees = fov[0]; 77 right_eye->fieldOfView->upDegrees = fov[0];
79 right_eye->fieldOfView->downDegrees = fov[1]; 78 right_eye->fieldOfView->downDegrees = fov[1];
80 right_eye->fieldOfView->leftDegrees = fov[3]; 79 right_eye->fieldOfView->leftDegrees = fov[3];
81 right_eye->fieldOfView->rightDegrees = fov[2]; 80 right_eye->fieldOfView->rightDegrees = fov[2];
82 81
83 float ipd = Java_CardboardVRDevice_getIpd(env, j_cardboard_device_.obj()); 82 float ipd = Java_CardboardVRDevice_getIpd(env, j_cardboard_device_);
84 83
85 left_eye->offset = mojo::Array<float>::New(3); 84 left_eye->offset = mojo::Array<float>::New(3);
86 left_eye->offset[0] = ipd * -0.5f; 85 left_eye->offset[0] = ipd * -0.5f;
87 left_eye->offset[1] = 0.0f; 86 left_eye->offset[1] = 0.0f;
88 left_eye->offset[2] = 0.0f; 87 left_eye->offset[2] = 0.0f;
89 88
90 right_eye->offset = mojo::Array<float>::New(3); 89 right_eye->offset = mojo::Array<float>::New(3);
91 right_eye->offset[0] = ipd * 0.5f; 90 right_eye->offset[0] = ipd * 0.5f;
92 right_eye->offset[1] = 0.0f; 91 right_eye->offset[1] = 0.0f;
93 right_eye->offset[2] = 0.0f; 92 right_eye->offset[2] = 0.0f;
94 93
95 ScopedJavaLocalRef<jintArray> j_screen_size(env, env->NewIntArray(2)); 94 ScopedJavaLocalRef<jintArray> j_screen_size(env, env->NewIntArray(2));
96 Java_CardboardVRDevice_getScreenSize(env, j_cardboard_device_.obj(), 95 Java_CardboardVRDevice_getScreenSize(env, j_cardboard_device_, j_screen_size);
97 j_screen_size.obj());
98 96
99 std::vector<int> screen_size; 97 std::vector<int> screen_size;
100 base::android::JavaIntArrayToIntVector(env, j_screen_size.obj(), 98 base::android::JavaIntArrayToIntVector(env, j_screen_size.obj(),
101 &screen_size); 99 &screen_size);
102 100
103 left_eye->renderWidth = screen_size[0] / 2.0; 101 left_eye->renderWidth = screen_size[0] / 2.0;
104 left_eye->renderHeight = screen_size[1]; 102 left_eye->renderHeight = screen_size[1];
105 103
106 right_eye->renderWidth = screen_size[0] / 2.0; 104 right_eye->renderWidth = screen_size[0] / 2.0;
107 right_eye->renderHeight = screen_size[1]; 105 right_eye->renderHeight = screen_size[1];
108 106
109 return device; 107 return device;
110 } 108 }
111 109
112 VRPosePtr CardboardVRDevice::GetPose() { 110 VRPosePtr CardboardVRDevice::GetPose() {
113 TRACE_EVENT0("input", "CardboardVRDevice::GetSensorState"); 111 TRACE_EVENT0("input", "CardboardVRDevice::GetSensorState");
114 VRPosePtr pose = VRPose::New(); 112 VRPosePtr pose = VRPose::New();
115 113
116 pose->timestamp = base::Time::Now().ToJsTime(); 114 pose->timestamp = base::Time::Now().ToJsTime();
117 115
118 JNIEnv* env = AttachCurrentThread(); 116 JNIEnv* env = AttachCurrentThread();
119 Java_CardboardVRDevice_getSensorState(env, j_cardboard_device_.obj(), 117 Java_CardboardVRDevice_getSensorState(env, j_cardboard_device_,
120 j_head_matrix_.obj()); 118 j_head_matrix_);
121 119
122 std::vector<float> head_matrix; 120 std::vector<float> head_matrix;
123 base::android::JavaFloatArrayToFloatVector(env, j_head_matrix_.obj(), 121 base::android::JavaFloatArrayToFloatVector(env, j_head_matrix_.obj(),
124 &head_matrix); 122 &head_matrix);
125 123
126 gfx::Transform transform( 124 gfx::Transform transform(
127 head_matrix[0], head_matrix[1], head_matrix[2], head_matrix[3], 125 head_matrix[0], head_matrix[1], head_matrix[2], head_matrix[3],
128 head_matrix[4], head_matrix[5], head_matrix[6], head_matrix[7], 126 head_matrix[4], head_matrix[5], head_matrix[6], head_matrix[7],
129 head_matrix[8], head_matrix[9], head_matrix[10], head_matrix[11], 127 head_matrix[8], head_matrix[9], head_matrix[10], head_matrix[11],
130 head_matrix[12], head_matrix[13], head_matrix[14], head_matrix[15]); 128 head_matrix[12], head_matrix[13], head_matrix[14], head_matrix[15]);
(...skipping 10 matching lines...) Expand all
141 pose->position = mojo::Array<float>::New(3); 139 pose->position = mojo::Array<float>::New(3);
142 pose->position[0] = decomposed_transform.translate[0]; 140 pose->position[0] = decomposed_transform.translate[0];
143 pose->position[1] = decomposed_transform.translate[1]; 141 pose->position[1] = decomposed_transform.translate[1];
144 pose->position[2] = decomposed_transform.translate[2]; 142 pose->position[2] = decomposed_transform.translate[2];
145 143
146 return pose; 144 return pose;
147 } 145 }
148 146
149 void CardboardVRDevice::ResetPose() { 147 void CardboardVRDevice::ResetPose() {
150 Java_CardboardVRDevice_resetSensor(AttachCurrentThread(), 148 Java_CardboardVRDevice_resetSensor(AttachCurrentThread(),
151 j_cardboard_device_.obj()); 149 j_cardboard_device_);
152 } 150 }
153 151
154 } // namespace device 152 } // namespace device
OLDNEW
« no previous file with comments | « device/usb/usb_service_android.cc ('k') | media/audio/android/audio_manager_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698