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

Unified Diff: chrome/browser/android/vr_shell/vr_math.cc

Issue 2705293002: Chrome VR clang-format cleanup (Closed)
Patch Set: Rebase to ToT. Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/android/vr_shell/vr_math.h ('k') | chrome/browser/android/vr_shell/vr_shell.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/vr_shell/vr_math.cc
diff --git a/chrome/browser/android/vr_shell/vr_math.cc b/chrome/browser/android/vr_shell/vr_math.cc
index 933f996c42ee05a2f2631d117326def41f330d0a..112d491c7d26e30d9995d767f0574a04e044ad35 100644
--- a/chrome/browser/android/vr_shell/vr_math.cc
+++ b/chrome/browser/android/vr_shell/vr_math.cc
@@ -67,8 +67,11 @@ void TranslateMRight(gvr::Mat4f& tmat,
}
// Left multiply a scale matrix.
-void ScaleM(gvr::Mat4f& tmat, const gvr::Mat4f& mat,
- float x, float y, float z) {
+void ScaleM(gvr::Mat4f& tmat,
+ const gvr::Mat4f& mat,
+ float x,
+ float y,
+ float z) {
if (&tmat != &mat) {
for (int i = 0; i < 4; ++i) {
for (int j = 0; j < 3; ++j) {
@@ -85,8 +88,11 @@ void ScaleM(gvr::Mat4f& tmat, const gvr::Mat4f& mat,
}
// Right multiply a scale matrix.
-void ScaleMRight(gvr::Mat4f& tmat, const gvr::Mat4f& mat,
- float x, float y, float z) {
+void ScaleMRight(gvr::Mat4f& tmat,
+ const gvr::Mat4f& mat,
+ float x,
+ float y,
+ float z) {
if (&tmat != &mat) {
for (int i = 0; i < 4; ++i) {
for (int j = 0; j < 3; ++j) {
@@ -284,8 +290,10 @@ gvr::Mat4f QuatToMatrix(const gvr::Quatf& quat) {
const float m32 = 2.0f * (yz + xw);
const float m33 = 1.0f - 2.0f * x2 - 2.0f * y2;
- return {{{m11, m12, m13, 0.0f}, {m21, m22, m23, 0.0f},
- {m31, m32, m33, 0.0f}, {0.0f, 0.0f, 0.0f, 1.0f}}};
+ return {{{m11, m12, m13, 0.0f},
+ {m21, m22, m23, 0.0f},
+ {m31, m32, m33, 0.0f},
+ {0.0f, 0.0f, 0.0f, 1.0f}}};
}
gvr::Vec3f GetRayPoint(const gvr::Vec3f& rayOrigin,
« no previous file with comments | « chrome/browser/android/vr_shell/vr_math.h ('k') | chrome/browser/android/vr_shell/vr_shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698