Merge branch 'dev' into IR-5411-gltf-loader

Author: HexaField

resources.json

@@ -616,7 +616,7 @@
     "name": "HDVideo.mp4"
   },
   "public/avatars/Adam.gltf": {
-    "type": "asset",
+    "type": "avatar",
     "tags": [
       "Model"
     ],
@@ -688,15 +688,15 @@
     "name": "ffd667f5c4c57f61a582c47337035d704ae616104df6ee505b3c715455c4c11c.ktx2"
   },
   "public/avatars/Test Avaturn.glb": {
-    "type": "asset",
+    "type": "avatar",
     "tags": [
       "Model"
     ],
     "dependencies": [],
     "name": "Test Avaturn.glb"
   },
   "public/avatars/Test RPM.glb": {
-    "type": "asset",
+    "type": "avatar",
     "tags": [
       "Model"
     ],

src/engine/benchmarks/AvatarBenchmark.tsx

@@ -3,10 +3,12 @@ import { UserID } from '@ir-engine/common/src/schema.type.module'
 import {
   Engine,
   Entity,
+  EntityTreeComponent,
   EntityUUID,
   UUIDComponent,
   createEntity,
   getComponent,
+  removeEntityNodeRecursively,
   setComponent,
   useComponent,
   useOptionalComponent
@@ -23,12 +25,8 @@ 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 { Object3DComponent } from '@ir-engine/spatial/src/renderer/components/Object3DComponent'
+import { ObjectComponent } from '@ir-engine/spatial/src/renderer/components/ObjectComponent'
 import { VisibleComponent, setVisibleComponent } from '@ir-engine/spatial/src/renderer/components/VisibleComponent'
-import {
-  EntityTreeComponent,
-  removeEntityNodeRecursively
-} from '@ir-engine/spatial/src/transform/components/EntityTree'
 import React, { useEffect } from 'react'
 import { Group, MathUtils, Quaternion, Vector3 } from 'three'
 import {
@@ -191,7 +189,7 @@ const AvatarIKSetupReactor = (props: {
     const uuid = MathUtils.generateUUID()
     setComponent(entity, UUIDComponent, uuid as EntityUUID)
     setComponent(entity, EntityTreeComponent, { parentEntity: rootEntity })
-    setComponent(entity, Object3DComponent, obj3d)
+    setComponent(entity, ObjectComponent, obj3d)
     setComponent(entity, TransformComponent, { position })
     setComponent(entity, VisibleComponent, true)
     setComponent(entity, RigidBodyComponent, { type: 'kinematic' })

src/engine/benchmarks/ParticlesBenchmark.ts

@@ -1,7 +1,7 @@
 import { Engine, Entity, getComponent, removeEntity, setComponent } from '@ir-engine/ecs'
 import { ParticleSystemComponent } from '@ir-engine/engine/src/scene/components/ParticleSystemComponent'
 import { TransformComponent } from '@ir-engine/spatial'
-import { Object3DComponent } from '@ir-engine/spatial/src/renderer/components/Object3DComponent'
+import { ObjectComponent } from '@ir-engine/spatial/src/renderer/components/ObjectComponent'
 import { VisibleComponent } from '@ir-engine/spatial/src/renderer/components/VisibleComponent'
 import { useEffect } from 'react'
 import { Group, MathUtils } from 'three'
@@ -19,7 +19,7 @@ const createParticleEntity = (rootEntity: Entity) => {
   position.setX(position.x + MathUtils.randFloat(-2.0, 2.0))
   const obj3d = new Group()
   obj3d.entity = entity
-  setComponent(entity, Object3DComponent, obj3d)
+  setComponent(entity, ObjectComponent, obj3d)
   setComponent(entity, TransformComponent, { position })
   setComponent(entity, ParticleSystemComponent)
   setComponent(entity, VisibleComponent, true)

src/engine/benchmarks/PhysicsBenchmark.ts

@@ -4,7 +4,7 @@ import { GeometryTypeEnum } from '@ir-engine/engine/src/scene/constants/Geometry
 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'
-import { Object3DComponent } from '@ir-engine/spatial/src/renderer/components/Object3DComponent'
+import { ObjectComponent } from '@ir-engine/spatial/src/renderer/components/ObjectComponent'
 import { VisibleComponent } from '@ir-engine/spatial/src/renderer/components/VisibleComponent'
 import { useEffect } from 'react'
 import { Group, MathUtils, Vector3 } from 'three'
@@ -24,7 +24,7 @@ const createPhysicsEntity = (rootEntity: Entity) => {
   position.setX(position.x + MathUtils.randFloat(-2.0, 2.0))
   const obj3d = new Group()
   obj3d.entity = entity
-  setComponent(entity, Object3DComponent, obj3d)
+  setComponent(entity, ObjectComponent, obj3d)
   setComponent(entity, TransformComponent, { position, scale })
   setComponent(entity, PrimitiveGeometryComponent, {
     geometryType: GeometryTypeEnum.SphereGeometry,

src/examples/GLTFs.tsx

@@ -6,13 +6,13 @@ import { State, getMutableState, useImmediateEffect } from '@ir-engine/hyperflux
 import { Entity, EntityUUID, UUIDComponent, createEntity, removeEntity } from '@ir-engine/ecs'
 
 import config from '@ir-engine/common/src/config'
+import { EntityTreeComponent } from '@ir-engine/ecs'
 import { AnimationComponent } from '@ir-engine/engine/src/avatar/components/AnimationComponent'
 import { GLTFComponent } from '@ir-engine/engine/src/gltf/GLTFComponent'
 import { AmbientLightComponent, DirectionalLightComponent, TransformComponent } from '@ir-engine/spatial'
 import { NameComponent } from '@ir-engine/spatial/src/common/NameComponent'
 import { RendererState } from '@ir-engine/spatial/src/renderer/RendererState'
 import { VisibleComponent, setVisibleComponent } from '@ir-engine/spatial/src/renderer/components/VisibleComponent'
-import { EntityTreeComponent } from '@ir-engine/spatial/src/transform/components/EntityTree'
 import { AnimationClip, Color, Euler, Quaternion } from 'three'
 import { RouteData } from '../sceneRoute'
 import { useExampleEntity } from './utils/common/entityUtils'

src/examples/LODs.tsx

@@ -22,7 +22,7 @@ import { TransformComponent } from '@ir-engine/spatial/src/transform/components/
 
 import config from '@ir-engine/common/src/config'
 import { Entity } from '@ir-engine/ecs/src/Entity'
-import { GroupComponent, addObjectToGroup } from '@ir-engine/spatial/src/renderer/components/GroupComponent'
+import { GroupComponent, addObjectToGroup } from '@ir-engine/spatial/src/renderer/components/ObjectComponent'
 import { Template } from './utils/template'
 
 // create rings for each LOD

src/examples/MultipleCanvasCameras.tsx

@@ -1,12 +1,14 @@
 import config from '@ir-engine/common/src/config'
 import {
+  EntityTreeComponent,
   EntityUUID,
   UUIDComponent,
   UndefinedEntity,
   createEntity,
   generateEntityUUID,
   getMutableComponent,
   hasComponent,
+  removeEntityNodeRecursively,
   setComponent
 } from '@ir-engine/ecs'
 import { GLTFComponent } from '@ir-engine/engine/src/gltf/GLTFComponent'
@@ -21,10 +23,6 @@ import { InputComponent } from '@ir-engine/spatial/src/input/components/InputCom
 import { RendererComponent } from '@ir-engine/spatial/src/renderer/WebGLRendererSystem'
 import { SceneComponent } from '@ir-engine/spatial/src/renderer/components/SceneComponents'
 import { VisibleComponent } from '@ir-engine/spatial/src/renderer/components/VisibleComponent'
-import {
-  EntityTreeComponent,
-  removeEntityNodeRecursively
-} from '@ir-engine/spatial/src/transform/components/EntityTree'
 import React, { useEffect, useRef } from 'react'
 
 let count = 0

src/examples/MultipleCanvasScenes.tsx

@@ -1,11 +1,13 @@
 import config from '@ir-engine/common/src/config'
 import {
+  EntityTreeComponent,
   EntityUUID,
   UUIDComponent,
   UndefinedEntity,
   createEntity,
   generateEntityUUID,
   hasComponent,
+  removeEntityNodeRecursively,
   setComponent
 } from '@ir-engine/ecs'
 import { GLTFComponent } from '@ir-engine/engine/src/gltf/GLTFComponent'
@@ -20,10 +22,6 @@ import { InputComponent } from '@ir-engine/spatial/src/input/components/InputCom
 import { RendererComponent } from '@ir-engine/spatial/src/renderer/WebGLRendererSystem'
 import { SceneComponent } from '@ir-engine/spatial/src/renderer/components/SceneComponents'
 import { VisibleComponent } from '@ir-engine/spatial/src/renderer/components/VisibleComponent'
-import {
-  EntityTreeComponent,
-  removeEntityNodeRecursively
-} from '@ir-engine/spatial/src/transform/components/EntityTree'
 import React, { useEffect, useRef } from 'react'
 
 const useScene = (canvas: React.MutableRefObject<HTMLCanvasElement>) => {

src/examples/PhysicsDynamicObjects.tsx

@@ -3,7 +3,7 @@ import { Entity, removeEntity, useOptionalComponent } from '@ir-engine/ecs'
 import { GLTFComponent } from '@ir-engine/engine/src/gltf/GLTFComponent'
 import { getMutableState, useImmediateEffect, useMutableState } from '@ir-engine/hyperflux'
 import '@ir-engine/ir-bot/src/functions/BotHookSystem'
-import { EngineState } from '@ir-engine/spatial/src/EngineState'
+import { ReferenceSpaceState } from '@ir-engine/spatial'
 import { RendererState } from '@ir-engine/spatial/src/renderer/RendererState'
 import React, { useEffect } from 'react'
 import { useRouteScene } from '../sceneRoute'
@@ -12,7 +12,7 @@ import { createPhysicsEntity } from './multipleScenes'
 export default function PhysicsDynamicObjects() {
   const sceneEntity = useRouteScene('ir-engine/default-project', 'public/scenes/default.gltf')!
   useNetwork({ online: false })
-  const viewerEntity = useMutableState(EngineState).viewerEntity.value
+  const viewerEntity = useMutableState(ReferenceSpaceState).viewerEntity.value
 
   useImmediateEffect(() => {
     if (!viewerEntity) return

src/examples/Retargeting.tsx

@@ -20,14 +20,13 @@ import createGLTFExporter from '@ir-engine/engine/src/assets/functions/createGLT
 import { GLTF } from '@ir-engine/engine/src/assets/loaders/gltf/GLTFLoader'
 import { NO_PROXY, defineState, getMutableState, getState, none, useHookstate } from '@ir-engine/hyperflux'
 
-import { Engine, getComponent, setComponent } from '@ir-engine/ecs'
+import { Engine, EntityTreeComponent, getComponent, setComponent } from '@ir-engine/ecs'
 import { getGLTFAsync } from '@ir-engine/engine/src/assets/functions/resourceLoaderHooks'
 import { MixamoBoneNames } from '@ir-engine/engine/src/avatar/AvatarBoneMatching'
 import { TransformComponent } from '@ir-engine/spatial'
 import { NameComponent } from '@ir-engine/spatial/src/common/NameComponent'
-import { GroupComponent, addObjectToGroup } from '@ir-engine/spatial/src/renderer/components/GroupComponent'
+import { GroupComponent, addObjectToGroup } from '@ir-engine/spatial/src/renderer/components/ObjectComponent'
 import { VisibleComponent } from '@ir-engine/spatial/src/renderer/components/VisibleComponent'
-import { EntityTreeComponent } from '@ir-engine/spatial/src/transform/components/EntityTree'
 import { VRMHumanBoneName } from '@pixiv/three-vrm'
 import { Template } from './utils/template'