Merge branch 'dev' into IR-8644-Networked-Hyperflux

Author: HexaField

LICENSE

@@ -498,7 +498,7 @@ The Original Code is Infinite Reality Engine.
 The Original Developer is the Initial Developer. The Initial Developer of the
 Original Code is the Infinite Reality Engine team.
 
-All portions of the code written by the Infinite Reality Engine team are Copyright © 2021-2023 
+All portions of the code written by the Infinite Reality Engine team are Copyright © 2021-2025
 Infinite Reality Engine. All Rights Reserved."
 
 [NOTE: The text of this Exhibit A may differ slightly from the text of the 

src/devtool/EmulatorDevtools.tsx

@@ -19,7 +19,7 @@ The Original Code is Infinite Reality Engine.
 The Original Developer is the Initial Developer. The Initial Developer of the
 Original Code is the Infinite Reality Engine team.
 
-All portions of the code written by the Infinite Reality Engine team are Copyright © 2021-2023 
+All portions of the code written by the Infinite Reality Engine team are Copyright © 2021-2025
 Infinite Reality Engine. All Rights Reserved.
 */
 

src/examples/MultipleCanvasCameras.tsx

@@ -19,7 +19,7 @@ import { CameraComponent } from '@ir-engine/spatial/src/camera/components/Camera
 import { CameraOrbitComponent } from '@ir-engine/spatial/src/camera/components/CameraOrbitComponent'
 import { NameComponent } from '@ir-engine/spatial/src/common/NameComponent'
 import { InputComponent } from '@ir-engine/spatial/src/input/components/InputComponent'
-import { RendererComponent } from '@ir-engine/spatial/src/renderer/WebGLRendererSystem'
+import { RendererComponent } from '@ir-engine/spatial/src/renderer/components/RendererComponent'
 import { SceneComponent } from '@ir-engine/spatial/src/renderer/components/SceneComponents'
 import { VisibleComponent } from '@ir-engine/spatial/src/renderer/components/VisibleComponent'
 import React, { useEffect, useRef } from 'react'

src/examples/MultipleCanvasScenes.tsx

@@ -18,7 +18,7 @@ import { CameraComponent } from '@ir-engine/spatial/src/camera/components/Camera
 import { CameraOrbitComponent } from '@ir-engine/spatial/src/camera/components/CameraOrbitComponent'
 import { NameComponent } from '@ir-engine/spatial/src/common/NameComponent'
 import { InputComponent } from '@ir-engine/spatial/src/input/components/InputComponent'
-import { RendererComponent } from '@ir-engine/spatial/src/renderer/WebGLRendererSystem'
+import { RendererComponent } from '@ir-engine/spatial/src/renderer/components/RendererComponent'
 import { SceneComponent } from '@ir-engine/spatial/src/renderer/components/SceneComponents'
 import { VisibleComponent } from '@ir-engine/spatial/src/renderer/components/VisibleComponent'
 import React, { useEffect, useRef } from 'react'

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(() => {

src/examples/avatarSimple.tsx

@@ -39,7 +39,7 @@ import {
   TransformComponent
 } from '@ir-engine/spatial'
 import { NameComponent } from '@ir-engine/spatial/src/common/NameComponent'
-import { RendererComponent } from '@ir-engine/spatial/src/renderer/WebGLRendererSystem'
+import { RendererComponent } from '@ir-engine/spatial/src/renderer/components/RendererComponent'
 import { SceneComponent } from '@ir-engine/spatial/src/renderer/components/SceneComponents'
 import { VisibleComponent } from '@ir-engine/spatial/src/renderer/components/VisibleComponent'
 

src/examples/multipleScenes.tsx

@@ -38,14 +38,14 @@ import { InputComponent } from '@ir-engine/spatial/src/input/components/InputCom
 import { ColliderComponent } from '@ir-engine/spatial/src/physics/components/ColliderComponent'
 import { RigidBodyComponent } from '@ir-engine/spatial/src/physics/components/RigidBodyComponent'
 import { RendererState } from '@ir-engine/spatial/src/renderer/RendererState'
-import { RendererComponent } from '@ir-engine/spatial/src/renderer/WebGLRendererSystem'
+import { RendererComponent } from '@ir-engine/spatial/src/renderer/components/RendererComponent'
 import { SceneComponent } from '@ir-engine/spatial/src/renderer/components/SceneComponents'
 import { VisibleComponent } from '@ir-engine/spatial/src/renderer/components/VisibleComponent'
 import {
   MaterialInstanceComponent,
   MaterialStateComponent
 } from '@ir-engine/spatial/src/renderer/materials/MaterialComponent'
-import { computeTransformMatrix } from '@ir-engine/spatial/src/transform/systems/TransformSystem'
+// TransformComponent is already imported above
 import React, { useEffect } from 'react'
 import { Cache, Color, Euler, MathUtils, Matrix4, MeshLambertMaterial, Quaternion, Vector3 } from 'three'
 import { Transform } from './utils/transform'
@@ -196,7 +196,7 @@ const SceneReactor = (props: { coord: Vector3 }) => {
       rotation: new Quaternion(),
       scale: new Vector3(0.5, 0.5, 0.5)
     })
-    computeTransformMatrix(gltfEntity)
+    TransformComponent.computeTransformMatrix(gltfEntity)
 
     // apply transform state
     const transformComponent = getComponent(gltfEntity, TransformComponent)
@@ -207,7 +207,7 @@ const SceneReactor = (props: { coord: Vector3 }) => {
       transformComponent.rotation,
       transformComponent.scale
     )
-    computeTransformMatrix(gltfEntity)
+    TransformComponent.computeTransformMatrix(gltfEntity)
   }, [transform.position, transform.rotation, transform.scale])
 
   useEffect(() => {