From 95f1a84ae8f9547eda2fa54e062c03634d14d1f7 Mon Sep 17 00:00:00 2001
From: Robert Long <robert@robertlong.me>
Date: Fri, 11 May 2018 15:49:26 -0700
Subject: [PATCH] Avoid decomposing matrices when we don't need to in
character-controller
---
src/components/character-controller.js | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/components/character-controller.js b/src/components/character-controller.js
index 2b86ff0a3..9701a3a26 100644
--- a/src/components/character-controller.js
+++ b/src/components/character-controller.js
@@ -118,22 +118,22 @@ AFRAME.registerComponent("character-controller", {
yawMatrix.makeRotationAxis(rotationAxis, rotationDelta);
// Translate to middle of playspace (player rig)
- root.applyMatrix(transInv);
+ root.matrix.premultiply(transInv);
// Zero playspace (player rig) rotation
- root.applyMatrix(rotationInvMatrix);
+ root.matrix.premultiply(rotationInvMatrix);
// Zero pivot (camera/head) rotation
- root.applyMatrix(pivotRotationInvMatrix);
+ root.matrix.premultiply(pivotRotationInvMatrix);
// Apply joystick translation
- root.applyMatrix(move);
+ root.matrix.premultiply(move);
// Apply joystick yaw rotation
- root.applyMatrix(yawMatrix);
+ root.matrix.premultiply(yawMatrix);
// Apply snap rotation if necessary
- root.applyMatrix(this.pendingSnapRotationMatrix);
+ root.matrix.premultiply(this.pendingSnapRotationMatrix);
// Reapply pivot (camera/head) rotation
- root.applyMatrix(pivotRotationMatrix);
+ root.matrix.premultiply(pivotRotationMatrix);
// Reapply playspace (player rig) rotation
- root.applyMatrix(rotationMatrix);
- // Reapply playspace (player rig) translation
+ root.matrix.premultiply(rotationMatrix);
+ // Reapply playspace (player rig) translation and update pos/rot/scale
root.applyMatrix(trans);
// TODO: the above matrix trnsfomraitons introduce some floating point erros in scale, this reverts them to avoid spamming network with fake scale updates
--
GitLab