Merge branch 'dev' into IR-9803-Dynamic-Authoring

HexaField · HexaField · commit 4011bfce894a · 2025-05-31T12:58:36.000+10:00
diff --git a/src/devtool/js/emulatedDevice.js b/src/devtool/js/emulatedDevice.js
@@ -24,7 +24,7 @@ import { generateUUID } from 'three/src/math/MathUtils.js';
 import { updateUserObjects } from './messenger';
 
 import config from '@ir-engine/common/src/config';
-const assetURL = config.client.fileServer + '/projects/ir-engine/ir-development-test-suite/devtool'
+const assetURL = config.client.fileServer + '/projects/ir-engine/ir-development-test-suite/src/devtool'
 
 const SELECTION_MOUSE_DOWN_THRESHOLD = 300;
 
diff --git a/src/devtool/jsx/controllers.jsx b/src/devtool/jsx/controllers.jsx
@@ -20,7 +20,7 @@ import {
 } from '../js/messenger';
 import config from '@ir-engine/common/src/config';
 
-const assetURL = config.client.fileServer + '/projects/ir-engine/ir-development-test-suite/devtool'
+const assetURL = config.client.fileServer + '/projects/ir-engine/ir-development-test-suite/src/devtool'
 
 import { Joystick } from '../js/joystick';
 import React from 'react';
diff --git a/src/devtool/jsx/hands.jsx b/src/devtool/jsx/hands.jsx
@@ -17,7 +17,7 @@ import React from 'react';
 import { createAnalogPressFunction } from './controllers.jsx';
 
 import config from '@ir-engine/common/src/config';
-const assetURL = config.client.fileServer + '/projects/ir-engine/ir-development-test-suite/devtool'
+const assetURL = config.client.fileServer + '/projects/ir-engine/ir-development-test-suite/src/devtool'
 
 
 export default function HandPanel({ deviceKey, device }) {
diff --git a/src/devtool/jsx/headset.jsx b/src/devtool/jsx/headset.jsx
@@ -15,7 +15,7 @@ import {
 } from '../js/messenger';
 import config from '@ir-engine/common/src/config';
 
-const assetURL = config.client.fileServer + '/projects/ir-engine/ir-development-test-suite/devtool'
+const assetURL = config.client.fileServer + '/projects/ir-engine/ir-development-test-suite/src/devtool'
 
 import { DEVICE_DEFINITIONS } from '../js/devices';
 import { EmulatorSettings } from '../js/emulatorStates';
diff --git a/src/devtool/jsx/inspector.jsx b/src/devtool/jsx/inspector.jsx
@@ -18,7 +18,7 @@ import React from 'react';
 import { changeRoomDimension } from '../js/messenger';
 
 import config from '@ir-engine/common/src/config';
-const assetURL = config.client.fileServer + '/projects/ir-engine/ir-development-test-suite/devtool'
+const assetURL = config.client.fileServer + '/projects/ir-engine/ir-development-test-suite/src/devtool'
 
 export default function Inspector({ device, inputMode }) {
 	const sceneContainerRef = React.useRef();
diff --git a/src/devtool/jsx/pose.jsx b/src/devtool/jsx/pose.jsx
@@ -14,7 +14,7 @@ import initKeyboardControl from '../js/keyboard';
 
 
 import config from '@ir-engine/common/src/config';
-const assetURL = config.client.fileServer + '/projects/ir-engine/ir-development-test-suite/devtool'
+const assetURL = config.client.fileServer + '/projects/ir-engine/ir-development-test-suite/src/devtool'
 
 export default function PoseBar({ device, setInputMode }) {
 	const saveDefaultPoseRef = React.useRef();
diff --git a/src/engine/benchmarks/AvatarBenchmark.tsx b/src/engine/benchmarks/AvatarBenchmark.tsx
@@ -4,6 +4,7 @@ import {
   Engine,
   Entity,
   EntityTreeComponent,
+  NetworkObjectComponent,
   UUIDComponent,
   createEntity,
   getComponent,
@@ -21,7 +22,6 @@ import { AvatarColliderComponent } from '@ir-engine/engine/src/avatar/components
 import { LoopAnimationComponent } from '@ir-engine/engine/src/avatar/components/LoopAnimationComponent'
 import { GLTFComponent } from '@ir-engine/engine/src/gltf/GLTFComponent'
 import { useHookstate } from '@ir-engine/hyperflux'
-import { NetworkObjectComponent } from '@ir-engine/network'
 import { TransformComponent } from '@ir-engine/spatial'
 import { RigidBodyComponent } from '@ir-engine/spatial/src/physics/components/RigidBodyComponent'
 import { VisibleComponent, setVisibleComponent } from '@ir-engine/spatial/src/renderer/components/VisibleComponent'
diff --git a/src/engine/benchmarks/PhysicsBenchmark.ts b/src/engine/benchmarks/PhysicsBenchmark.ts
@@ -1,6 +1,6 @@
 import { Engine, Entity, getComponent, removeEntity, setComponent } from '@ir-engine/ecs'
 import { PrimitiveGeometryComponent } from '@ir-engine/engine/src/scene/components/PrimitiveGeometryComponent'
-import { GeometryTypeEnum } from '@ir-engine/engine/src/scene/constants/GeometryTypeEnum'
+import { GeometryType } from '@ir-engine/engine/src/scene/constants/GeometryTypeEnum'
 import { TransformComponent } from '@ir-engine/spatial'
 import { ColliderComponent } from '@ir-engine/spatial/src/physics/components/ColliderComponent'
 import { RigidBodyComponent } from '@ir-engine/spatial/src/physics/components/RigidBodyComponent'
@@ -27,7 +27,7 @@ const createPhysicsEntity = (rootEntity: Entity) => {
   setComponent(entity, ObjectComponent, obj3d)
   setComponent(entity, TransformComponent, { position, scale })
   setComponent(entity, PrimitiveGeometryComponent, {
-    geometryType: GeometryTypeEnum.SphereGeometry,
+    geometryType: GeometryType.SphereGeometry,
     geometryParams: {
       radius: 1,
       widthSegments: 32,
diff --git a/src/examples/InstanceConnection.tsx b/src/examples/InstanceConnection.tsx
@@ -11,8 +11,7 @@ import { MediasoupDataProducerConsumerState } from '@ir-engine/common/src/transp
 import { MediasoupMediaProducerConsumerState } from '@ir-engine/common/src/transports/mediasoup/MediasoupMediaProducerConsumerState'
 import { MediasoupTransportState } from '@ir-engine/common/src/transports/mediasoup/MediasoupTransportState'
 import { Button } from '@ir-engine/editor/src/components/inputs/Button'
-import { getMutableState, getState, useHookstate } from '@ir-engine/hyperflux'
-import { Network, NetworkState } from '@ir-engine/network'
+import { getMutableState, getState, Network, NetworkState, useHookstate } from '@ir-engine/hyperflux'
 
 const TransportInfo = (props: { networkID: InstanceID; transportID: string }) => {
   const transportState = useHookstate(
diff --git a/src/examples/P2PConnection.tsx b/src/examples/P2PConnection.tsx
@@ -4,8 +4,7 @@ import { useNetwork } from '@ir-engine/client-core/src/components/World/EngineHo
 import { LocationService, LocationState } from '@ir-engine/client-core/src/social/services/LocationService'
 import { AuthService } from '@ir-engine/client-core/src/user/services/AuthService'
 import { InstanceID } from '@ir-engine/common/src/schema.type.module'
-import { getMutableState, useHookstate } from '@ir-engine/hyperflux'
-import { NetworkState } from '@ir-engine/network'
+import { getMutableState, NetworkState, useHookstate } from '@ir-engine/hyperflux'
 
 export default function P2PConnection() {
   const online = useHookstate(true)
diff --git a/src/examples/Retargeting.tsx b/src/examples/Retargeting.tsx
@@ -2,8 +2,8 @@ import React, { useEffect } from 'react'
 import { Bone, ConeGeometry, Mesh, MeshBasicMaterial, Quaternion, SkeletonHelper, SphereGeometry, Vector3 } from 'three'
 
 import { AVATAR_FILE_ALLOWED_EXTENSIONS } from '@ir-engine/common/src/constants/AvatarConstants'
-import { createEntity, getChildrenWithComponents, removeEntity } from '@ir-engine/ecs'
-import { Entity } from '@ir-engine/ecs/src/Entity'
+import { createEntity, getChildrenWithComponents, removeEntity, UUIDComponent } from '@ir-engine/ecs'
+import { Entity, EntityID, SourceID } from '@ir-engine/ecs/src/Entity'
 import { DndWrapper } from '@ir-engine/editor/src/components/dnd/DndWrapper'
 import { defineState, getMutableState, getState, none, useHookstate } from '@ir-engine/hyperflux'
 
@@ -12,9 +12,8 @@ import { MixamoBoneNames } from '@ir-engine/engine/src/avatar/AvatarBoneMatching
 import { VRMHumanBoneName } from '@ir-engine/engine/src/avatar/maps/VRMHumanBoneName'
 import { AssetState } from '@ir-engine/engine/src/gltf/GLTFState'
 import { ReferenceSpaceState, TransformComponent } from '@ir-engine/spatial'
-import { NameComponent } from '@ir-engine/spatial/src/common/NameComponent'
 import { BoneComponent } from '@ir-engine/spatial/src/renderer/components/BoneComponent'
-import { ObjectComponent, addObjectToGroup } from '@ir-engine/spatial/src/renderer/components/ObjectComponent'
+import { addObjectToGroup, ObjectComponent } from '@ir-engine/spatial/src/renderer/components/ObjectComponent'
 import { VisibleComponent } from '@ir-engine/spatial/src/renderer/components/VisibleComponent'
 import { Template } from './utils/template'
 
@@ -254,7 +253,10 @@ const RetargetingDND = () => {
           scale: helper.scale
         })
         addObjectToGroup(helperEntity, helper)
-        setComponent(helperEntity, NameComponent, bone.name + '--helper')
+        setComponent(helperEntity, UUIDComponent, {
+          entitySourceID: 'helper' as SourceID,
+          entityID: (bone.name + '--helper') as EntityID
+        })
         setComponent(helperEntity, EntityTreeComponent, { parentEntity: entity })
 
         if (bones.includes(bone.name)) getMutableState(BoneMatchedState)[bone.name].set(true)
@@ -285,7 +287,12 @@ const RetargetingDND = () => {
     const originalBoneName = useHookstate(() => bone.name)
 
     const boneHelper = getComponent(
-      NameComponent.getEntitiesByName(boneName.value + '--helper')[0],
+      UUIDComponent.getEntityByUUID(
+        UUIDComponent.join({
+          entitySourceID: 'helper' as SourceID,
+          entityID: (boneName.value + '--helper') as EntityID
+        })
+      ),
       ObjectComponent
     ) as Mesh<ConeGeometry, MeshBasicMaterial>
     const isBone = bone.type === 'Bone'
@@ -301,8 +308,16 @@ const RetargetingDND = () => {
       boneHelper.name = name + '--helper'
       const currentBoneName = boneName.value as MixamoBoneNames
       boneName.set(name)
-      const helperEntity = NameComponent.getEntitiesByName(currentBoneName + '--helper')[0]
-      setComponent(helperEntity, NameComponent, name + '--helper')
+      const helperEntity = UUIDComponent.getEntityByUUID(
+        UUIDComponent.join({
+          entitySourceID: 'helper' as SourceID,
+          entityID: (currentBoneName + '--helper') as EntityID
+        })
+      )
+      setComponent(helperEntity, UUIDComponent, {
+        entitySourceID: 'helper' as SourceID,
+        entityID: (name + '--helper') as EntityID
+      })
     }
 
     useEffect(() => {
diff --git a/src/examples/avatarMocap.tsx b/src/examples/avatarMocap.tsx
@@ -3,8 +3,16 @@ import { Entity, EntityID, EntityUUID, UUIDComponent, removeEntityNodeRecursivel
 import { setComponent, useComponent, useOptionalComponent } from '@ir-engine/ecs/src/ComponentFunctions'
 import { AvatarRigComponent } from '@ir-engine/engine/src/avatar/components/AvatarAnimationComponent'
 import { MotionCaptureResults, mocapDataChannelType } from '@ir-engine/engine/src/mocap/MotionCaptureSystem'
-import { NO_PROXY, State, UserID, getMutableState, getState, useHookstate } from '@ir-engine/hyperflux'
-import { DataChannelRegistryState, NetworkState } from '@ir-engine/network'
+import {
+  DataChannelRegistryState,
+  NO_PROXY,
+  NetworkState,
+  State,
+  UserID,
+  getMutableState,
+  getState,
+  useHookstate
+} from '@ir-engine/hyperflux'
 import { RendererState } from '@ir-engine/spatial/src/renderer/RendererState'
 import { VisibleComponent, setVisibleComponent } from '@ir-engine/spatial/src/renderer/components/VisibleComponent'
 import { encode } from 'msgpackr'
diff --git a/src/examples/avatarSimple.tsx b/src/examples/avatarSimple.tsx
@@ -25,12 +25,13 @@ import {
   setComponent,
   UndefinedEntity,
   useOptionalComponent,
-  UUIDComponent
+  UUIDComponent,
+  WorldNetworkAction
 } from '@ir-engine/ecs'
 import { AvatarNetworkAction } from '@ir-engine/engine/src/avatar/state/AvatarNetworkActions'
 import { GLTFComponent } from '@ir-engine/engine/src/gltf/GLTFComponent'
 import { AssetState, SceneState } from '@ir-engine/engine/src/gltf/GLTFState'
-import { NetworkActions, WorldNetworkAction } from '@ir-engine/network'
+import { NetworkActions } from '@ir-engine/hyperflux'
 import {
   AmbientLightComponent,
   DirectionalLightComponent,
diff --git a/src/examples/componentExamples/componentExamples.tsx b/src/examples/componentExamples/componentExamples.tsx
@@ -30,7 +30,7 @@ import { SplineComponent } from '@ir-engine/engine/src/scene/components/SplineCo
 import { SplineTrackComponent } from '@ir-engine/engine/src/scene/components/SplineTrackComponent'
 import { Heuristic, VariantComponent } from '@ir-engine/engine/src/scene/components/VariantComponent'
 import { VideoComponent } from '@ir-engine/engine/src/scene/components/VideoComponent'
-import { GeometryTypeEnum } from '@ir-engine/engine/src/scene/constants/GeometryTypeEnum'
+import { GeometryType } from '@ir-engine/engine/src/scene/constants/GeometryTypeEnum'
 import { createXRUI } from '@ir-engine/engine/src/xrui/createXRUI'
 import { useHookstate } from '@ir-engine/hyperflux'
 import { TransformComponent } from '@ir-engine/spatial'
@@ -289,16 +289,14 @@ export const subComponentExamples = [
       const entity = useExampleEntity(parent)
 
       useEffect(() => {
-        const geoTypes = Object.values(GeometryTypeEnum).filter(
-          (value) => typeof value === 'number'
-        ) as GeometryTypeEnum[]
-        const geoType = geoTypes[MathUtils.randInt(0, geoTypes.length)]
         setComponent(entity, NameComponent, 'Geometry-Example')
         setComponent(entity, PrimitiveGeometryComponent, {
-          geometryType: geoType
+          geometryType: GeometryType.TorusKnotGeometry,
+          geometryParams: {}
         })
         setVisibleComponent(entity, true)
         getComponent(entity, TransformComponent).position.set(0, 1.5, 0)
+        getComponent(entity, TransformComponent).scale.setScalar(0.25)
         onLoad(entity)
       }, [])
 
@@ -339,8 +337,8 @@ export const subComponentExamples = [
 
         setComponent(childEntity, NameComponent, 'Spline-Follow-Example')
         setComponent(childEntity, PrimitiveGeometryComponent, {
-          geometryType: GeometryTypeEnum.SphereGeometry,
-          geometryParams: { radius: 0.2, segments: 10 }
+          geometryType: GeometryType.SphereGeometry,
+          geometryParams: { radius: 0.5 }
         })
         setVisibleComponent(childEntity, true)
         setComponent(childEntity, SplineTrackComponent, {
diff --git a/src/examples/immersiveVR.tsx b/src/examples/immersiveVR.tsx
@@ -12,7 +12,7 @@ import { useRouteScene } from '../sceneRoute'
 import { DetectedMeshes, DetectedPlanes } from './XRMeshes'
 
 export default function ImmersiveVR() {
-  useRouteScene('ir-engine/default-project', 'public/scenes/default.gltf')
+  useRouteScene('ir-engine/default-project', 'public/scenes/apartment.gltf')
   useNetwork({ online: false })
   const viewerEntity = useMutableState(ReferenceSpaceState).viewerEntity.value
 
@@ -27,7 +27,7 @@ export default function ImmersiveVR() {
       <QueryReactor Components={[XRDetectedPlaneComponent]} ChildEntityReactor={DetectedPlanes} />
       <QueryReactor Components={[XRDetectedMeshComponent]} ChildEntityReactor={DetectedMeshes} />
       <MediaIconsBox />
-      <div className="flex-grid pointer-events-auto absolute right-0 z-50 flex h-full w-fit flex-col justify-start gap-1.5">
+      <div className="pointer-events-auto absolute right-0 z-50 flex h-full w-[350px] flex-col justify-start gap-1.5">
         <EmulatorDevtools mode="immersive-vr" />
       </div>
     </>
diff --git a/src/examples/multipleScenes.tsx b/src/examples/multipleScenes.tsx
@@ -23,7 +23,7 @@ import { GLTFComponent } from '@ir-engine/engine/src/gltf/GLTFComponent'
 import { AssetState, SceneState } from '@ir-engine/engine/src/gltf/GLTFState'
 import { PrimitiveGeometryComponent } from '@ir-engine/engine/src/scene/components/PrimitiveGeometryComponent'
 import { ShadowComponent } from '@ir-engine/engine/src/scene/components/ShadowComponent'
-import { GeometryTypeEnum } from '@ir-engine/engine/src/scene/constants/GeometryTypeEnum'
+import { GeometryType } from '@ir-engine/engine/src/scene/constants/GeometryTypeEnum'
 import { defineState, getMutableState, useHookstate, useMutableState } from '@ir-engine/hyperflux'
 import {
   DirectionalLightComponent,
@@ -81,7 +81,7 @@ export const createPhysicsEntity = (sceneEntity: Entity) => {
     restitution: MathUtils.randFloat(0.1, 1.0)
   })
   setComponent(colliderEntity, PrimitiveGeometryComponent, {
-    geometryType: GeometryTypeEnum.SphereGeometry
+    geometryType: GeometryType.SphereGeometry
   })
   setComponent(colliderEntity, InputComponent)
   setComponent(colliderEntity, ShadowComponent)
diff --git a/src/examples/utils/avatar/loadAvatarHelpers.ts b/src/examples/utils/avatar/loadAvatarHelpers.ts
@@ -1,16 +1,23 @@
 import { AvatarState } from '@ir-engine/client-core/src/user/services/AvatarService'
 import config from '@ir-engine/common/src/config'
 import { AvatarType } from '@ir-engine/common/src/schema.type.module'
-import { Engine, EntityID, EntityUUID, EntityUUIDPair, SourceID, UUIDComponent, createEntity } from '@ir-engine/ecs'
+import {
+  Engine,
+  EntityID,
+  EntityUUID,
+  EntityUUIDPair,
+  NetworkId,
+  SourceID,
+  UUIDComponent,
+  createEntity
+} from '@ir-engine/ecs'
 import { getComponent, setComponent } from '@ir-engine/ecs/src/ComponentFunctions'
 import { ikTargets } from '@ir-engine/engine/src/avatar/animation/Util'
 import { AvatarAnimationComponent } from '@ir-engine/engine/src/avatar/components/AvatarAnimationComponent'
 import { LoopAnimationComponent } from '@ir-engine/engine/src/avatar/components/LoopAnimationComponent'
 import { AvatarNetworkAction } from '@ir-engine/engine/src/avatar/state/AvatarNetworkActions'
 import { GLTFComponent } from '@ir-engine/engine/src/gltf/GLTFComponent'
-import { PeerID, UserID, dispatchAction, getMutableState } from '@ir-engine/hyperflux'
-import { NetworkActions, NetworkState } from '@ir-engine/network'
-import { NetworkId } from '@ir-engine/network/src/NetworkId'
+import { NetworkActions, NetworkState, PeerID, UserID, dispatchAction, getMutableState } from '@ir-engine/hyperflux'
 import { NameComponent } from '@ir-engine/spatial/src/common/NameComponent'
 import { Vector3_Up } from '@ir-engine/spatial/src/common/constants/MathConstants'
 import { VisibleComponent } from '@ir-engine/spatial/src/renderer/components/VisibleComponent'
diff --git a/src/examples/utils/avatar/simulateMovement.ts b/src/examples/utils/avatar/simulateMovement.ts
@@ -1,4 +1,4 @@
-import { SourceID } from '@ir-engine/ecs'
+import { NetworkObjectComponent, SourceID } from '@ir-engine/ecs'
 import { getComponent } from '@ir-engine/ecs/src/ComponentFunctions'
 import { ECSState } from '@ir-engine/ecs/src/ECSState'
 import { defineQuery } from '@ir-engine/ecs/src/QueryFunctions'
@@ -13,14 +13,10 @@ import {
   rightControllerOffset
 } from '@ir-engine/engine/src/avatar/functions/applyInputSourcePoseToIKTargets'
 import { getState } from '@ir-engine/hyperflux'
-import { NetworkObjectComponent } from '@ir-engine/network'
 import { Q_Y_180 } from '@ir-engine/spatial/src/common/constants/MathConstants'
 import { lerp } from '@ir-engine/spatial/src/common/functions/MathLerpFunctions'
 import { RigidBodyComponent } from '@ir-engine/spatial/src/physics/components/RigidBodyComponent'
 import { TransformComponent } from '@ir-engine/spatial/src/transform/components/TransformComponent'
-import { Quaternion } from 'three'
-
-const q = new Quaternion()
 
 const entitiesQuery = defineQuery([NetworkObjectComponent, RigidBodyComponent, AvatarComponent, AvatarRigComponent])
 
diff --git a/src/sceneRoute.tsx b/src/sceneRoute.tsx
@@ -92,7 +92,7 @@ const Routes = (props: { routeCategories: RouteCategories; header: string }) =>
 
   const hidden = useMutableState(ExampleRouteState).hidden
 
-  const ref = React.useRef<HTMLDivElement>(null)
+  const ref = React.useRef(document.body)
 
   useSpatialEngine()
   useEngineCanvas(ref)
@@ -198,7 +198,7 @@ const Routes = (props: { routeCategories: RouteCategories; header: string }) =>
             })}
           </div>
         </div>
-        <div id="examples-panel" ref={ref} style={{ flexGrow: 1, pointerEvents: 'none' }} />
+        <div id="examples-panel" style={{ flexGrow: 1, pointerEvents: 'none' }} />
         {routeReady && <Entry sceneEntity={sceneEntity} />}
       </div>
       <Debug />
