Skip to content
This repository was archived by the owner on Aug 21, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ describe('spawnAvatarReceptor', () => {
assert(hasComponent(entity, AvatarComponent))
assert(hasComponent(entity, NameComponent))
assert(hasComponent(entity, AvatarAnimationComponent))
assert(hasComponent(entity, GroupComponent))
assert(hasComponent(entity, SpawnPoseComponent))
assert(hasComponent(entity, AvatarControllerComponent))
assert(hasComponent(entity, LocalInputTagComponent))
Expand Down
3 changes: 0 additions & 3 deletions packages/engine/src/avatar/functions/spawnAvatarReceptor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,9 @@ import { CollisionComponent } from '../../physics/components/CollisionComponent'
import { RigidBodyComponent } from '../../physics/components/RigidBodyComponent'
import { AvatarCollisionMask, CollisionGroups } from '../../physics/enums/CollisionGroups'
import { getInteractionGroups } from '../../physics/functions/getInteractionGroups'
import { addObjectToGroup } from '../../scene/components/GroupComponent'
import { NameComponent } from '../../scene/components/NameComponent'
import { ShadowComponent } from '../../scene/components/ShadowComponent'
import { VisibleComponent } from '../../scene/components/VisibleComponent'
import { ObjectLayers } from '../../scene/constants/ObjectLayers'
import { setObjectLayers } from '../../scene/functions/setObjectLayers'
import { DistanceFromCameraComponent, FrustumCullCameraComponent } from '../../transform/components/DistanceComponents'
import { TransformComponent } from '../../transform/components/TransformComponent'
import { AnimationComponent } from '../components/AnimationComponent'
Expand Down
11 changes: 0 additions & 11 deletions packages/engine/src/ecs/classes/World.ts
Original file line number Diff line number Diff line change
Expand Up @@ -295,17 +295,6 @@ export class World {
[SystemUpdateType.POST_RENDER]: []
} as { [pipeline: string]: SystemInstance[] }

/**
* Entities mapped by name
* @deprecated use entitiesByName
*/
get namedEntities() {
return new Map(Object.entries(this.entitiesByName.value))
}

entitiesByName = createState({} as Record<string, Entity>)
entitiesByUuid = createState({} as Record<string, Entity>)

/**
* Network object query
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/engine/src/ecs/functions/ComponentFunctions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export type ComponentErrorsType<C extends Component> = C['errors'][number]

export const defineComponent = <
ComponentType = true,
Schema extends bitECS.ISchema = any,
Schema extends bitECS.ISchema = {},
JSON = ComponentType,
ComponentExtras = unknown,
SetJSON = PartialIfObject<DeepReadonly<JSON>>,
Expand Down
2 changes: 1 addition & 1 deletion packages/engine/src/scene/components/NameComponent.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { hookstate, none } from '@xrengine/hyperflux'

import { Entity } from '../../ecs/classes/Entity'
import { defineComponent, SetComponentType } from '../../ecs/functions/ComponentFunctions'
import { defineComponent } from '../../ecs/functions/ComponentFunctions'

export const NameComponent = defineComponent({
name: 'NameComponent',
Expand Down