Merge pull request #37 from ir-engine/IR-9383-Merge-SourceComponent-and-NodeIDComponent-into-UUIDComponent

refactor: replace NodeIDComponent with UUIDComponent in examples and …

Author: HexaField

src/examples/ShadowExample.tsx

@@ -1,5 +1,4 @@
-import { Entity, getComponent, setComponent } from '@ir-engine/ecs'
-import { NodeIDComponent } from '@ir-engine/engine/src/gltf/NodeIDComponent'
+import { Entity, getComponent, setComponent, UUIDComponent } from '@ir-engine/ecs'
 import { RenderSettingsComponent } from '@ir-engine/engine/src/scene/components/RenderSettingsComponent'
 import { ShadowComponent } from '@ir-engine/engine/src/scene/components/ShadowComponent'
 import {
@@ -25,7 +24,7 @@ export default function ShadowExampleEntry(props: { sceneEntity: Entity }) {
 
   useEffect(() => {
     setComponent(settingsEntity, RenderSettingsComponent, {
-      primaryLight: getComponent(directionalLightEntity, NodeIDComponent)
+      primaryLight: getComponent(directionalLightEntity, UUIDComponent).entityID
     }) // required for CSM
     setComponent(platformEntity, TransformComponent, {
       position: new Vector3(0, -0.5, 0),

src/examples/componentExamples/componentExamples.tsx

@@ -13,7 +13,6 @@ import {
 } from '@ir-engine/ecs'
 import { LoopAnimationComponent } from '@ir-engine/engine/src/avatar/components/LoopAnimationComponent'
 import { GLTFComponent } from '@ir-engine/engine/src/gltf/GLTFComponent'
-import { NodeIDComponent } from '@ir-engine/engine/src/gltf/NodeIDComponent'
 import {
   InteractableComponent,
   XRUIActivationType
@@ -26,7 +25,7 @@ import { PrimitiveGeometryComponent } from '@ir-engine/engine/src/scene/componen
 import { SDFComponent } from '@ir-engine/engine/src/scene/components/SDFComponent'
 import { SceneDynamicLoadComponent } from '@ir-engine/engine/src/scene/components/SceneDynamicLoadComponent'
 import { ShadowComponent } from '@ir-engine/engine/src/scene/components/ShadowComponent'
-import { SourceComponent } from '@ir-engine/engine/src/scene/components/SourceComponent'
+
 import { SplineComponent } from '@ir-engine/engine/src/scene/components/SplineComponent'
 import { SplineTrackComponent } from '@ir-engine/engine/src/scene/components/SplineTrackComponent'
 import { Heuristic, VariantComponent } from '@ir-engine/engine/src/scene/components/VariantComponent'
@@ -228,7 +227,6 @@ export const subComponentExamples = [
       useEffect(() => {
         setComponent(entity, NameComponent, 'Particle-Example')
         setComponent(entity, ParticleSystemComponent)
-        setComponent(entity, SourceComponent, parent)
         setVisibleComponent(entity, true)
         getComponent(entity, TransformComponent).position.set(0, 2, 0)
       }, [])
@@ -430,7 +428,7 @@ export const subComponentExamples = [
           callbacks: [
             {
               callbackID: LinkComponent.linkCallbackName,
-              target: getComponent(entity, NodeIDComponent)
+              target: getComponent(entity, UUIDComponent).entityID
             }
           ]
         })

src/examples/mountPoint.tsx

@@ -12,7 +12,6 @@ import {
   removeEntity,
   setComponent
 } from '@ir-engine/ecs'
-import { NodeIDComponent } from '@ir-engine/engine/src/gltf/NodeIDComponent'
 import {
   InteractableComponent,
   XRUIVisibilityOverride
@@ -52,7 +51,7 @@ export default function MountPointEntry() {
     setVisibleComponent(geometryEntity, true)
     setComponent(geometryEntity, MeshComponent, new Mesh(new CylinderGeometry(), new MeshStandardMaterial()))
 
-    const entity = NodeIDComponent.create(sceneEntity, UUIDComponent.generate())
+    const entity = UUIDComponent.create(sceneEntity)
     setComponent(entity, TransformComponent, { position: new Vector3(2, 0.4, 2) })
     setComponent(entity, EntityTreeComponent, { parentEntity: sceneEntity })
     setComponent(entity, NameComponent, 'Mount-Point-Example')
@@ -62,7 +61,7 @@ export default function MountPointEntry() {
       callbacks: [
         {
           callbackID: MountPointComponent.mountCallbackName,
-          target: getComponent(entity, NodeIDComponent)
+          target: getComponent(entity, UUIDComponent).entityID
         }
       ],
       uiInteractable: true,

src/examples/utils/common/entityUtils.ts

@@ -7,14 +7,13 @@ import {
   UUIDComponent
 } from '@ir-engine/ecs'
 import { GLTFComponent } from '@ir-engine/engine/src/gltf/GLTFComponent'
-import { NodeIDComponent } from '@ir-engine/engine/src/gltf/NodeIDComponent'
 import { useHookstate } from '@ir-engine/hyperflux'
 import { TransformComponent } from '@ir-engine/spatial'
 import { useEffect } from 'react'
 
 export const setupEntity = (parent: Entity): Entity => {
   const sourceEntity = getAncestorWithComponents(parent, [GLTFComponent])
-  const entity = NodeIDComponent.create(sourceEntity, UUIDComponent.generate())
+  const entity = UUIDComponent.create(sourceEntity)
   setComponent(entity, TransformComponent)
   setComponent(entity, EntityTreeComponent, { parentEntity: parent })
   return entity