Merge pull request #140 from musehq/dev

v2.6.5

Author: alex-shortt

package.json

@@ -1,6 +1,6 @@
 {
   "name": "spacesvr",
-  "version": "2.6.4",
+  "version": "2.6.5",
   "private": true,
   "description": "A standardized reality for future of the 3D Web",
   "keywords": [

src/ideas/modifiers/Collidable/components/TrimeshCollider.tsx

@@ -1,7 +1,13 @@
-import { BufferGeometry, Euler, Group, Quaternion, Vector3 } from "three";
+import {
+  BufferGeometry,
+  Euler,
+  Group,
+  Matrix4,
+  Quaternion,
+  Vector3,
+} from "three";
 import { useMemo, useRef, useState } from "react";
-import { useLimiter } from "../../../../logic/limiter";
-import { useFrame } from "@react-three/fiber";
+import { useLimitedFrame } from "../../../../logic/limiter";
 import { useTrimeshCollision } from "../utils/trimesh";
 
 type TrimeshColliderProps = {
@@ -13,33 +19,51 @@ export default function TrimeshCollider(props: TrimeshColliderProps) {
 
   const group = useRef<Group>(null);
 
-  const dummyPos = useMemo(() => new Vector3(), []);
-  const dummyQuat = useMemo(() => new Quaternion(), []);
-  const dummyEuler = useMemo(() => new Euler(), []);
-  const dummyScale = useMemo(() => new Vector3(1, 1, 1), []);
-  const [scale, setScale] = useState(new Vector3(1, 1, 1));
+  const [pos] = useState(() => new Vector3());
+  const [quat] = useState(() => new Quaternion());
+  const [scale] = useState(() => new Vector3());
+  const [euler] = useState(() => new Euler());
+  const [curScale, setCurScale] = useState(new Vector3(1, 1, 1));
 
   const geometry = useMemo(() => {
-    const g = geo.clone().scale(scale.x, scale.y, scale.z);
+    const g = geo.clone().scale(curScale.x, curScale.y, curScale.z);
     g.computeVertexNormals();
     return g;
-  }, [geo, scale]);
+  }, [geo, curScale]);
 
   const [, api] = useTrimeshCollision(geometry);
 
-  const limiter = useLimiter(5);
-  useFrame(({ clock }) => {
-    if (!limiter.isReady(clock) || !group.current) return;
+  // there's some state update that causes the api not to receive an out of sync position
+  // i think it's whenever the api gets recreated. for now, just re-apply transforms every 2 seconds
+  const needsUpdate = useRef(false);
+  useLimitedFrame(1 / 2, () => {
+    needsUpdate.current = true;
+  });
+
+  const lastUpdatedMatrix = useRef<Matrix4>(new Matrix4());
+  useLimitedFrame(8, () => {
+    if (!group.current) return;
 
-    group.current.getWorldPosition(dummyPos);
-    group.current.getWorldQuaternion(dummyQuat);
-    group.current.getWorldScale(dummyScale);
+    // get global position, rotation, scale
+    group.current.updateWorldMatrix(true, false);
+    group.current.matrixWorld.decompose(pos, quat, scale);
 
-    api.position.copy(dummyPos);
-    api.rotation.copy(dummyEuler.setFromQuaternion(dummyQuat));
-    if (!dummyScale.equals(scale)) {
-      setScale(dummyScale.clone());
+    // no need to update if nothing changed
+    if (
+      lastUpdatedMatrix.current.equals(group.current.matrixWorld) &&
+      !needsUpdate.current
+    ) {
+      return;
     }
+
+    // update last values
+    lastUpdatedMatrix.current.copy(group.current.matrixWorld);
+    needsUpdate.current = false;
+
+    // if a change was found, update collider
+    api.position.copy(pos);
+    api.rotation.copy(euler.setFromQuaternion(quat));
+    if (!scale.equals(curScale)) setCurScale(scale.clone());
   });
 
   return <group ref={group} />;

src/layers/Environment/ui/PauseMenu/index.tsx

@@ -48,7 +48,7 @@ export default function PauseMenu(props: PauseMenuProps) {
   const PAUSE_ITEMS: PauseItem[] = [
     ...pauseMenuItems,
     {
-      text: "v2.6.4",
+      text: "v2.6.5",
       link: "https://www.npmjs.com/package/spacesvr",
     },
     ...menuItems,

src/layers/Player/components/colliders/CapsuleCollider.tsx

@@ -5,8 +5,8 @@ import { Group } from "three";
 
 // height of 0.9 (eye level) for a perceived height of 1
 const HEIGHT = 0.9;
-const RADIUS = 0.2;
-const SEGMENTS = 10;
+const RADIUS = 0.225;
+const SEGMENTS = 8;
 
 const SPHERE_SHAPE: ShapeType = "Sphere";