diff --git a/package.json b/package.json index 4d5065af62d87e8f3b99e633446078155c92e9e3..bbecc28a1de2214af26dbf30b814ab4895c91039 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "aframe-physics-extras": "https://github.com/infinitelee/aframe-physics-extras#fix/physics-collider-crash", "aframe-physics-system": "https://github.com/infinitelee/aframe-physics-system#feature/shape-component", "aframe-rounded": "^1.0.3", - "aframe-teleport-controls": "^0.3.1", + "aframe-teleport-controls": "https://github.com/mozillareality/aframe-teleport-controls#hubs/master", "aframe-xr": "github:brianpeiris/aframe-xr#3162aed", "classnames": "^2.2.5", "copy-to-clipboard": "^3.0.8", diff --git a/src/components/character-controller.js b/src/components/character-controller.js index 8da41b1a2e4bf4f3928a8f74b6a521679b11759a..556c050ed922acc0fd2e72e55a9fe8e32840af86 100644 --- a/src/components/character-controller.js +++ b/src/components/character-controller.js @@ -5,7 +5,7 @@ const EPS = 10e-6; // Does not have any type of collisions yet. AFRAME.registerComponent("character-controller", { schema: { - groundAcc: { default: 7 }, + groundAcc: { default: 5.5 }, easing: { default: 10 }, pivot: { type: "selector" }, snapRotationDegrees: { default: THREE.Math.DEG2RAD * 45 }, diff --git a/src/hub.html b/src/hub.html index 6877a63d9b1ad11d71902e7caf5f00060ca36ed1..2ca2c34ce04b8b9f5cb03aef765140094687f7a8 100644 --- a/src/hub.html +++ b/src/hub.html @@ -197,10 +197,14 @@ hand-controls2="left" tracked-controls teleport-controls=" - cameraRig: #player-rig; - teleportOrigin: #player-camera; - button: action_teleport_; - collisionEntities: [nav-mesh]" + drawIncrementally: true; + incrementalDrawMs: 600; + hitOpacity: 0.3; + missOpacity: 0.2; + cameraRig: #player-rig; + teleportOrigin: #player-camera; + button: action_teleport_; + collisionEntities: [nav-mesh];" app-mode-toggle-playing__teleport-controls="mode: hud; invert: true;" haptic-feedback ></a-entity> @@ -211,10 +215,14 @@ hand-controls2="right" tracked-controls teleport-controls=" - cameraRig: #player-rig; - teleportOrigin: #player-camera; - button: action_teleport_; - collisionEntities: [nav-mesh]" + drawIncrementally: true; + incrementalDrawMs: 600; + hitOpacity: 0.3; + missOpacity: 0.2; + cameraRig: #player-rig; + teleportOrigin: #player-camera; + button: action_teleport_; + collisionEntities: [nav-mesh];" haptic-feedback raycaster="objects:.hud; showLine: true; far: 2;" cursor="fuse: false; downEvents: action_ui_select_down; upEvents: action_ui_select_up;" diff --git a/yarn.lock b/yarn.lock index 2be5a56ca5612c40c3b8093fe95ea07dcea56b0c..01d377b1e4441b058dc29d7eb865da622de5781a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -188,9 +188,9 @@ aframe-rounded@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/aframe-rounded/-/aframe-rounded-1.0.3.tgz#72c7d9c0ff02e94ee138bf217c284e187efa3cfb" -aframe-teleport-controls@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/aframe-teleport-controls/-/aframe-teleport-controls-0.3.1.tgz#7d7ef206f483ea92425a6333b0f8fb26c9596d1c" +"aframe-teleport-controls@https://github.com/mozillareality/aframe-teleport-controls#hubs/master": + version "0.3.2" + resolved "https://github.com/mozillareality/aframe-teleport-controls#9e2ef7da57144c4a615eba40a945d4cfa105a092" "aframe-xr@github:brianpeiris/aframe-xr#3162aed": version "0.0.9"