From ea4c14530c3e7263ecf09095b6cc634eb1651de7 Mon Sep 17 00:00:00 2001
From: Robert Long <robert@robertlong.me>
Date: Wed, 6 Jun 2018 15:20:37 -0700
Subject: [PATCH] Code review changes
---
src/components/audio-feedback.js | 4 +---
src/components/character-controller.js | 6 ++++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/components/audio-feedback.js b/src/components/audio-feedback.js
index fda5838d8..aa7182fa7 100644
--- a/src/components/audio-feedback.js
+++ b/src/components/audio-feedback.js
@@ -34,11 +34,9 @@ AFRAME.registerComponent("networked-audio-analyser", {
*/
AFRAME.registerComponent("matcolor-audio-feedback", {
tick() {
- if (!this.mat) return;
-
const audioAnalyser = this.el.components["networked-audio-analyser"];
- if (!audioAnalyser) return;
+ if (!audioAnalyser || !this.mat) return;
this.object3D.mesh.color.setScalar(1 + audioAnalyser.volume / 255 * 2);
}
diff --git a/src/components/character-controller.js b/src/components/character-controller.js
index e3b49a7cf..f32debe66 100644
--- a/src/components/character-controller.js
+++ b/src/components/character-controller.js
@@ -140,8 +140,10 @@ AFRAME.registerComponent("character-controller", {
root.matrix.premultiply(pivotRotationMatrix);
// Reapply playspace (player rig) rotation
root.matrix.premultiply(rotationMatrix);
- // Reapply playspace (player rig) translation and update pos/rot/scale
- root.applyMatrix(trans);
+ // Reapply playspace (player rig) translation
+ root.matrix.premultiply(trans);
+ // update pos/rot/scale
+ root.matrix.decompose(root.position, root.quaternion, root.scale);
// TODO: the above matrix trnsfomraitons introduce some floating point errors in scale, this reverts them to
// avoid spamming network with fake scale updates
--
GitLab