From 84654f8c6ab35e12b44cbea4b5049435f1ac866b Mon Sep 17 00:00:00 2001
From: Robert Long <robert@robertlong.me>
Date: Fri, 9 Feb 2018 10:42:42 -0800
Subject: [PATCH] Temp camera scale fix
---
src/components/camera-scale.js | 6 ++++++
src/room.js | 1 +
templates/room.hbs | 7 ++++---
3 files changed, 11 insertions(+), 3 deletions(-)
create mode 100644 src/components/camera-scale.js
diff --git a/src/components/camera-scale.js b/src/components/camera-scale.js
new file mode 100644
index 000000000..888704757
--- /dev/null
+++ b/src/components/camera-scale.js
@@ -0,0 +1,6 @@
+AFRAME.registerComponent("camera-scale", {
+ init() {
+ const camera = this.el.object3DMap.camera;
+ camera.scale.set(1000, 1000, 1000);
+ }
+});
diff --git a/src/room.js b/src/room.js
index a0ef0818d..70ddd6a91 100644
--- a/src/room.js
+++ b/src/room.js
@@ -40,6 +40,7 @@ import "./components/spawn-controller";
import "./components/model-inflator";
import "./components/spin";
import "./components/bone-visibility";
+import "./components/camera-scale";
import "./systems/personal-space-bubble";
diff --git a/templates/room.hbs b/templates/room.hbs
index a78883a50..087a81f8e 100644
--- a/templates/room.hbs
+++ b/templates/room.hbs
@@ -109,7 +109,8 @@
<template data-selector=".Head">
<a-entity
id="head"
- camera="userHeight: 1.6; active: true;"
+ camera="userHeight: 1.6"
+ camera-scale
personal-space-bubble
look-controls
visible="false"
@@ -140,14 +141,14 @@
teleport-controls="cameraRig: #player-rig; teleportOrigin: #head; button: action_teleport_"
bone-visibility
>
- <a-entity
+ <!--<a-entity
id="watch"
cached-gltf-model="#watch-model"
bone-mute-state-indicator
position="-0.003 0.009 0.085"
rotation="-79.12547150756669 -160.1417037390651 -100.1530225888679"
scale="1.5 1.5 1.5"
- >
+ >-->
</a-entity>
</a-entity>
</template>
--
GitLab