refactor: replace EntityUUID with SourceID in multiple examples

Author: HexaField

src/examples/MultipleCanvasCameras.tsx

@@ -2,7 +2,7 @@ import config from '@ir-engine/common/src/config'
 import {
   EntityID,
   EntityTreeComponent,
-  EntityUUID,
+  SourceID,
   UUIDComponent,
   UndefinedEntity,
   createEntity,
@@ -59,7 +59,7 @@ const useScene = (canvas: React.MutableRefObject<HTMLCanvasElement>) => {
 
     setComponent(cameraEntity, NameComponent, '3D Preview Camera for ' + count)
     setComponent(cameraEntity, UUIDComponent, {
-      entitySourceID: 'engine' as EntityUUID,
+      entitySourceID: 'engine' as SourceID,
       entityID: ('camera' + count) as EntityID
     })
 
@@ -80,7 +80,7 @@ export default function MultipleCanvasCameras() {
   const sceneEntity = useHookstate(() => {
     const sceneEntity = createEntity()
     setComponent(sceneEntity, UUIDComponent, {
-      entitySourceID: 'engine' as EntityUUID,
+      entitySourceID: 'engine' as SourceID,
       entityID: 'scene' as EntityID
     })
     setComponent(sceneEntity, TransformComponent)
@@ -109,7 +109,7 @@ export default function MultipleCanvasCameras() {
     const camera2Entity = panel2State.cameraEntity
     const modelEntity = createEntity()
     setComponent(modelEntity, UUIDComponent, {
-      entitySourceID: 'engine' as EntityUUID,
+      entitySourceID: 'engine' as SourceID,
       entityID: 'model' as EntityID
     })
     setComponent(modelEntity, TransformComponent)

src/examples/MultipleCanvasScenes.tsx

@@ -2,7 +2,7 @@ import config from '@ir-engine/common/src/config'
 import {
   EntityID,
   EntityTreeComponent,
-  EntityUUID,
+  SourceID,
   UUIDComponent,
   UndefinedEntity,
   createEntity,
@@ -29,7 +29,7 @@ const useScene = (canvas: React.MutableRefObject<HTMLCanvasElement>) => {
   const panelState = useHookstate(() => {
     const sceneEntity = createEntity()
     setComponent(sceneEntity, UUIDComponent, {
-      entitySourceID: 'engine' as EntityUUID,
+      entitySourceID: 'engine' as SourceID,
       entityID: 'scene' as EntityID
     })
     setComponent(sceneEntity, TransformComponent)
@@ -39,7 +39,7 @@ const useScene = (canvas: React.MutableRefObject<HTMLCanvasElement>) => {
 
     const cameraEntity = createEntity()
     setComponent(cameraEntity, UUIDComponent, {
-      entitySourceID: 'engine' as EntityUUID,
+      entitySourceID: 'engine' as SourceID,
       entityID: 'camera' as EntityID
     })
     setComponent(cameraEntity, CameraComponent)
@@ -101,7 +101,7 @@ export default function MultipleCanvasScenes() {
     const { cameraEntity, sceneEntity } = panel1State
     const modelEntity = createEntity()
     setComponent(modelEntity, UUIDComponent, {
-      entitySourceID: 'engine' as EntityUUID,
+      entitySourceID: 'engine' as SourceID,
       entityID: 'model 1' as EntityID
     })
     setComponent(modelEntity, TransformComponent)
@@ -118,7 +118,7 @@ export default function MultipleCanvasScenes() {
     const { cameraEntity, sceneEntity } = panel2State
     const modelEntity = createEntity()
     setComponent(modelEntity, UUIDComponent, {
-      entitySourceID: 'engine' as EntityUUID,
+      entitySourceID: 'engine' as SourceID,
       entityID: 'model 2' as EntityID
     })
     setComponent(modelEntity, TransformComponent)

src/examples/avatarMocap.tsx

@@ -177,10 +177,15 @@ function AvatarMocap(props: { sceneEntity: Entity }) {
     })
     setComponent(entity, VisibleComponent, true)
 
-    const id = spawnAvatar(rootUUID.value.entitySourceID, rootUUID.value.entityID, selectedAvatar.value, {
-      position: new Vector3(),
-      rotation: new Quaternion()
-    })
+    const id = spawnAvatar(
+      UUIDComponent.concatenateUUID(rootUUID.value),
+      rootUUID.value.entityID,
+      selectedAvatar.value,
+      {
+        position: new Vector3(),
+        rotation: new Quaternion()
+      }
+    )
     userID.set(id)
 
     return () => {

src/examples/avatarSimple.tsx

@@ -135,7 +135,7 @@ export default function AvatarSimpleEntry() {
           position: new Vector3((Math.random() - 0.5) * spread, 0, (Math.random() - 0.5) * spread),
           parentUUID: parentUUID,
           avatarURL: randomAvatar.modelResource!.url,
-          entitySourceID: parentUUID,
+          entitySourceID: getComponent(entity.value, UUIDComponent).entitySourceID,
           entityID: 'avatar' as EntityID,
           name: 'test user ' + i,
           $peer: ('test peer ' + i) as PeerID

src/examples/componentExamples/componentExamples.tsx

@@ -348,7 +348,9 @@ export const subComponentExamples = [
           geometryParams: { radius: 0.2, segments: 10 }
         })
         setVisibleComponent(childEntity, true)
-        setComponent(childEntity, SplineTrackComponent, { splineEntityUUID: UUIDComponent.getUUID(entity) })
+        setComponent(childEntity, SplineTrackComponent, {
+          splineEntityUUID: getComponent(entity, UUIDComponent).entityID
+        })
         onLoad(entity)
       }, [])
 

src/examples/multipleScenes.tsx

@@ -5,7 +5,7 @@ import {
   Entity,
   EntityID,
   EntityTreeComponent,
-  EntityUUID,
+  SourceID,
   UUIDComponent,
   UndefinedEntity,
   createEntity,
@@ -59,7 +59,7 @@ export const createPhysicsEntity = (sceneEntity: Entity) => {
   const i = physicsEntityCount++
 
   const position = new Vector3(Math.random() * 10 - 5, Math.random() * 2 + 2, Math.random() * 10 - 5)
-  setComponent(entity, UUIDComponent, { entitySourceID: 'engine' as EntityUUID, entityID: ('Ball-' + i) as EntityID })
+  setComponent(entity, UUIDComponent, { entitySourceID: 'engine' as SourceID, entityID: ('Ball-' + i) as EntityID })
   setComponent(entity, EntityTreeComponent, { parentEntity: sceneEntity })
   setComponent(entity, TransformComponent, { position, scale: new Vector3(2, 2, 2) })
   setComponent(entity, VisibleComponent, true)
@@ -69,7 +69,7 @@ export const createPhysicsEntity = (sceneEntity: Entity) => {
   const colliderEntity = createEntity()
   setComponent(colliderEntity, VisibleComponent, true)
   setComponent(colliderEntity, UUIDComponent, {
-    entitySourceID: 'engine' as EntityUUID,
+    entitySourceID: 'engine' as SourceID,
     entityID: ('Ball-' + i + '-collider') as EntityID
   })
   setComponent(colliderEntity, EntityTreeComponent, { parentEntity: entity })

src/examples/utils/avatar/loadAvatarHelpers.ts

@@ -45,7 +45,7 @@ export const mockNetworkAvatars = (avatarList: AvatarType[]) => {
         position: new Vector3(0, 0, column),
         rotation: new Quaternion().setFromAxisAngle(Vector3_Up, Math.PI),
         ownerID: userId,
-        entitySourceID: parentUUID,
+        entitySourceID: getComponent(Engine.instance.originEntity, UUIDComponent).entitySourceID,
         entityID: 'avatar' as EntityID,
         avatarURL: avatar.modelResource!.url,
         name: userId + '_avatar'
@@ -66,7 +66,6 @@ export const loadNetworkAvatar = (avatar: AvatarType | string, i: number, u = 'u
       userID: userId
     })
   )
-
   const parentUUID = UUIDComponent.concatenateUUID(getComponent(Engine.instance.originEntity, UUIDComponent))
 
   dispatchAction(
@@ -75,7 +74,7 @@ export const loadNetworkAvatar = (avatar: AvatarType | string, i: number, u = 'u
       position: new Vector3(x, 0, i * 2),
       rotation: new Quaternion().setFromAxisAngle(Vector3_Up, Math.PI),
       ownerID: userId,
-      entitySourceID: parentUUID,
+      entitySourceID: getComponent(Engine.instance.originEntity, UUIDComponent).entitySourceID,
       entityID: 'avatar' as EntityID,
       avatarURL: typeof avatar === 'string' ? avatar : avatar.modelResource!.url,
       name: userId + '_avatar'
@@ -176,7 +175,7 @@ export const loadAssetWithIK = (avatar: AvatarType, position: Vector3, i: number
 
 export const loadAssetTPose = async (filename, position: Vector3, i: number) => {
   const entity = createEntity()
-  const parentUUID = UUIDComponent.concatenateUUID(getComponent(Engine.instance.originEntity, UUIDComponent))
+  const parentUUID = UUIDComponent.getAsSourceID(Engine.instance.originEntity)
   setComponent(entity, NameComponent, 'TPose Avatar ' + i)
   setComponent(entity, UUIDComponent, {
     entitySourceID: parentUUID,
@@ -195,7 +194,7 @@ export const loadAssetTPose = async (filename, position: Vector3, i: number) =>
 
 export const loadAssetWithLoopAnimation = async (filename, position: Vector3, i: number) => {
   const entity = createEntity()
-  const parentUUID = UUIDComponent.concatenateUUID(getComponent(Engine.instance.originEntity, UUIDComponent))
+  const parentUUID = UUIDComponent.getAsSourceID(Engine.instance.originEntity)
   setComponent(entity, NameComponent, 'Anim Avatar ' + i + ' ' + filename.split('/').pop())
   setComponent(entity, UUIDComponent, {
     entitySourceID: parentUUID,