Index: chrome/browser/android/vr_shell/vr_math.h |
diff --git a/chrome/browser/android/vr_shell/vr_math.h b/chrome/browser/android/vr_shell/vr_math.h |
index 3aa875534d5fb1f8f0c9cad358aa7a5cd7dab061..58eed13f034187e9a3d141f6d52a05262d53f9df 100644 |
--- a/chrome/browser/android/vr_shell/vr_math.h |
+++ b/chrome/browser/android/vr_shell/vr_math.h |
@@ -42,20 +42,8 @@ typedef struct Colorf { |
} Colorf; |
void SetIdentityM(gvr::Mat4f& mat); |
- |
void TranslateM(gvr::Mat4f& tmat, gvr::Mat4f& mat, float x, float y, float z); |
-void TranslateMRight(gvr::Mat4f& tmat, |
- gvr::Mat4f& mat, |
- float x, |
- float y, |
- float z); |
- |
void ScaleM(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); |
// Util functions that are copied from the treasure_hunt NDK demo in |
// third_party/gvr-andoir-sdk/ folder. |
@@ -76,17 +64,15 @@ gvr::Vec3f GetForwardVector(const gvr::Mat4f& matrix); |
gvr::Vec3f GetTranslation(const gvr::Mat4f& matrix); |
-gvr::Quatf QuatMultiply(const gvr::Quatf& a, const gvr::Quatf& b); |
- |
gvr::Mat4f QuatToMatrix(const gvr::Quatf& quat); |
float VectorLength(const gvr::Vec3f& vec); |
+gvr::Vec3f VectorSubtract(const gvr::Vec3f& a, const gvr::Vec3f& b); |
+float VectorDot(const gvr::Vec3f& a, const gvr::Vec3f& b); |
// Normalize a vector, and return its original length. |
float NormalizeVector(gvr::Vec3f& vec); |
-float VectorDot(const gvr::Vec3f& a, const gvr::Vec3f& b); |
- |
void NormalizeQuat(gvr::Quatf& quat); |
gvr::Quatf QuatFromAxisAngle(const gvr::Vec3f& axis, float angle); |