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

Side by Side Diff: device/vr/android/gvr/gvr_device.cc

Issue 2494983003: Mojo C++ bindings: switch device/vr mojom target to use STL/WTF types. (Closed)
Patch Set: . Created 4 years, 1 month 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/vr/BUILD.gn ('k') | device/vr/test/fake_vr_device.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 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.h" 5 #include "device/vr/android/gvr/gvr_device.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 #include <algorithm> 8 #include <algorithm>
9 9
10 #include "base/time/time.h" 10 #include "base/time/time.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 device->capabilities->canPresent = true; 43 device->capabilities->canPresent = true;
44 44
45 device->leftEye = mojom::VREyeParameters::New(); 45 device->leftEye = mojom::VREyeParameters::New();
46 device->rightEye = mojom::VREyeParameters::New(); 46 device->rightEye = mojom::VREyeParameters::New();
47 mojom::VREyeParametersPtr& left_eye = device->leftEye; 47 mojom::VREyeParametersPtr& left_eye = device->leftEye;
48 mojom::VREyeParametersPtr& right_eye = device->rightEye; 48 mojom::VREyeParametersPtr& right_eye = device->rightEye;
49 49
50 left_eye->fieldOfView = mojom::VRFieldOfView::New(); 50 left_eye->fieldOfView = mojom::VRFieldOfView::New();
51 right_eye->fieldOfView = mojom::VRFieldOfView::New(); 51 right_eye->fieldOfView = mojom::VRFieldOfView::New();
52 52
53 left_eye->offset = mojo::Array<float>::New(3); 53 left_eye->offset.resize(3);
54 right_eye->offset = mojo::Array<float>::New(3); 54 right_eye->offset.resize(3);
55 55
56 // TODO(bajones): GVR has a bug that causes it to return bad render target 56 // TODO(bajones): GVR has a bug that causes it to return bad render target
57 // sizes when the phone is in portait mode. Send arbitrary, 57 // sizes when the phone is in portait mode. Send arbitrary,
58 // not-horrifically-wrong values instead. 58 // not-horrifically-wrong values instead.
59 // gvr::Sizei render_target_size = gvr_api->GetRecommendedRenderTargetSize(); 59 // gvr::Sizei render_target_size = gvr_api->GetRecommendedRenderTargetSize();
60 left_eye->renderWidth = 1024; // render_target_size.width / 2; 60 left_eye->renderWidth = 1024; // render_target_size.width / 2;
61 left_eye->renderHeight = 1024; // render_target_size.height; 61 left_eye->renderHeight = 1024; // render_target_size.height;
62 62
63 right_eye->renderWidth = left_eye->renderWidth; 63 right_eye->renderWidth = left_eye->renderWidth;
64 right_eye->renderHeight = left_eye->renderHeight; 64 right_eye->renderHeight = left_eye->renderHeight;
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 if (!IsAccessAllowed(service)) 133 if (!IsAccessAllowed(service))
134 return nullptr; 134 return nullptr;
135 135
136 mojom::VRPosePtr pose = mojom::VRPose::New(); 136 mojom::VRPosePtr pose = mojom::VRPose::New();
137 137
138 pose->timestamp = base::Time::Now().ToJsTime(); 138 pose->timestamp = base::Time::Now().ToJsTime();
139 139
140 // Increment pose frame counter always, even if it's a faked pose. 140 // Increment pose frame counter always, even if it's a faked pose.
141 pose->poseIndex = ++pose_index_; 141 pose->poseIndex = ++pose_index_;
142 142
143 pose->orientation = mojo::Array<float>::New(4); 143 pose->orientation.emplace(4);
144 144
145 gvr::GvrApi* gvr_api = GetGvrApi(); 145 gvr::GvrApi* gvr_api = GetGvrApi();
146 if (!gvr_api) { 146 if (!gvr_api) {
147 // If we don't have a GvrApi instance return a static forward orientation. 147 // If we don't have a GvrApi instance return a static forward orientation.
148 pose->orientation[0] = 0.0; 148 pose->orientation.value()[0] = 0.0;
149 pose->orientation[1] = 0.0; 149 pose->orientation.value()[1] = 0.0;
150 pose->orientation[2] = 0.0; 150 pose->orientation.value()[2] = 0.0;
151 pose->orientation[3] = 1.0; 151 pose->orientation.value()[3] = 1.0;
152 152
153 return pose; 153 return pose;
154 } 154 }
155 155
156 gvr::ClockTimePoint target_time = gvr::GvrApi::GetTimePointNow(); 156 gvr::ClockTimePoint target_time = gvr::GvrApi::GetTimePointNow();
157 target_time.monotonic_system_time_nanos += kPredictionTimeWithoutVsyncNanos; 157 target_time.monotonic_system_time_nanos += kPredictionTimeWithoutVsyncNanos;
158 158
159 gvr::Mat4f head_mat = 159 gvr::Mat4f head_mat =
160 gvr_api->GetHeadSpaceFromStartSpaceRotation(target_time); 160 gvr_api->GetHeadSpaceFromStartSpaceRotation(target_time);
161 head_mat = gvr_api->ApplyNeckModel(head_mat, 1.0f); 161 head_mat = gvr_api->ApplyNeckModel(head_mat, 1.0f);
162 162
163 gfx::Transform inv_transform( 163 gfx::Transform inv_transform(
164 head_mat.m[0][0], head_mat.m[0][1], head_mat.m[0][2], head_mat.m[0][3], 164 head_mat.m[0][0], head_mat.m[0][1], head_mat.m[0][2], head_mat.m[0][3],
165 head_mat.m[1][0], head_mat.m[1][1], head_mat.m[1][2], head_mat.m[1][3], 165 head_mat.m[1][0], head_mat.m[1][1], head_mat.m[1][2], head_mat.m[1][3],
166 head_mat.m[2][0], head_mat.m[2][1], head_mat.m[2][2], head_mat.m[2][3], 166 head_mat.m[2][0], head_mat.m[2][1], head_mat.m[2][2], head_mat.m[2][3],
167 head_mat.m[3][0], head_mat.m[3][1], head_mat.m[3][2], head_mat.m[3][3]); 167 head_mat.m[3][0], head_mat.m[3][1], head_mat.m[3][2], head_mat.m[3][3]);
168 168
169 gfx::Transform transform; 169 gfx::Transform transform;
170 if (inv_transform.GetInverse(&transform)) { 170 if (inv_transform.GetInverse(&transform)) {
171 gfx::DecomposedTransform decomposed_transform; 171 gfx::DecomposedTransform decomposed_transform;
172 gfx::DecomposeTransform(&decomposed_transform, transform); 172 gfx::DecomposeTransform(&decomposed_transform, transform);
173 173
174 pose->orientation[0] = decomposed_transform.quaternion[0]; 174 pose->orientation.value()[0] = decomposed_transform.quaternion[0];
175 pose->orientation[1] = decomposed_transform.quaternion[1]; 175 pose->orientation.value()[1] = decomposed_transform.quaternion[1];
176 pose->orientation[2] = decomposed_transform.quaternion[2]; 176 pose->orientation.value()[2] = decomposed_transform.quaternion[2];
177 pose->orientation[3] = decomposed_transform.quaternion[3]; 177 pose->orientation.value()[3] = decomposed_transform.quaternion[3];
178 178
179 pose->position = mojo::Array<float>::New(3); 179 pose->position.emplace(3);
180 pose->position[0] = decomposed_transform.translate[0]; 180 pose->position.value()[0] = decomposed_transform.translate[0];
181 pose->position[1] = decomposed_transform.translate[1]; 181 pose->position.value()[1] = decomposed_transform.translate[1];
182 pose->position[2] = decomposed_transform.translate[2]; 182 pose->position.value()[2] = decomposed_transform.translate[2];
183 } 183 }
184 184
185 // Save the underlying GVR pose for use by rendering. It can't use a 185 // Save the underlying GVR pose for use by rendering. It can't use a
186 // VRPosePtr since that's a different data type. 186 // VRPosePtr since that's a different data type.
187 delegate_->SetGvrPoseForWebVr(head_mat, pose_index_); 187 delegate_->SetGvrPoseForWebVr(head_mat, pose_index_);
188 188
189 return pose; 189 return pose;
190 } 190 }
191 191
192 void GvrDevice::ResetPose(VRServiceImpl* service) { 192 void GvrDevice::ResetPose(VRServiceImpl* service) {
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 } 256 }
257 257
258 gvr::GvrApi* GvrDevice::GetGvrApi() { 258 gvr::GvrApi* GvrDevice::GetGvrApi() {
259 if (!delegate_) 259 if (!delegate_)
260 return nullptr; 260 return nullptr;
261 261
262 return delegate_->gvr_api(); 262 return delegate_->gvr_api();
263 } 263 }
264 264
265 } // namespace device 265 } // namespace device
OLDNEW
« no previous file with comments | « device/vr/BUILD.gn ('k') | device/vr/test/fake_vr_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698