refactor: createXXXEntity functions

src/foundation/components/Camera/CameraComponent.ts

@@ -947,9 +947,3 @@ export class CameraComponent extends Component {
     return base as unknown as ComponentToComponentMethods<SomeComponentClass> & EntityBaseClass;
   }
 }
-
-export function createCameraEntity(): ICameraEntity {
-  const entity = createGroupEntity();
-  const entityAddedComponent = EntityRepository.addComponentToEntity(CameraComponent, entity);
-  return entityAddedComponent;
-}

src/foundation/components/Camera/createCameraEntity.ts

@@ -0,0 +1,13 @@
+import { EntityRepository } from '../../core/EntityRepository';
+import { ICameraEntity } from '../../helpers/EntityHelper';
+import { createGroupEntity } from '../SceneGraph/createGroupEntity';
+import { WellKnownComponentTIDs } from '../WellKnownComponentTIDs';
+
+export function createCameraEntity(): ICameraEntity {
+  const entity = createGroupEntity();
+  const entityAddedComponent = EntityRepository.tryToAddComponentToEntityByTID(
+    WellKnownComponentTIDs.CameraComponentTID,
+    entity
+  ) as ICameraEntity;
+  return entityAddedComponent;
+}

src/foundation/components/Camera/index.ts

@@ -1,2 +1,3 @@
 export * from './CameraComponent';
 export * from './ICameraEntity';
+export * from './createCameraEntity';

src/foundation/components/CameraController/CameraControllerComponent.ts

@@ -12,7 +12,6 @@ import {
 import { IEntity } from '../../core/Entity';
 import { ComponentToComponentMethods } from '../ComponentTypes';
 import { ProcessStage } from '../../definitions';
-import { createCameraEntity } from '../Camera/CameraComponent';
 import { ICameraControllerEntity } from '../../helpers/EntityHelper';
 
 /**
@@ -104,12 +103,3 @@ export class CameraControllerComponent extends Component {
     return base as unknown as ComponentToComponentMethods<SomeComponentClass> & EntityBase;
   }
 }
-
-export function createCameraControllerEntity(): ICameraControllerEntity {
-  const entity = createCameraEntity();
-  const entityAddedComponent = EntityRepository.addComponentToEntity(
-    CameraControllerComponent,
-    entity
-  );
-  return entityAddedComponent;
-}

src/foundation/components/CameraController/createCameraControllerEntity.ts

@@ -0,0 +1,13 @@
+import { EntityRepository } from '../../core/EntityRepository';
+import { ICameraControllerEntity } from '../../helpers/EntityHelper';
+import { createCameraEntity } from '../Camera/createCameraEntity';
+import { WellKnownComponentTIDs } from '../WellKnownComponentTIDs';
+
+export function createCameraControllerEntity(): ICameraControllerEntity {
+  const entity = createCameraEntity();
+  const entityAddedComponent = EntityRepository.tryToAddComponentToEntityByTID(
+    WellKnownComponentTIDs.CameraControllerComponentTID,
+    entity
+  ) as ICameraControllerEntity;
+  return entityAddedComponent;
+}

src/foundation/components/CameraController/index.ts

@@ -1,2 +1,3 @@
 export * from './CameraControllerComponent';
 export * from './ICameraControllerEntity';
+export * from './createCameraControllerEntity';

src/foundation/components/Light/LightComponent.ts

@@ -228,9 +228,3 @@ export class LightComponent extends Component {
     return base as unknown as ComponentToComponentMethods<SomeComponentClass> & EntityBase;
   }
 }
-
-export function createLightEntity(): ILightEntity {
-  const entity = createGroupEntity();
-  const entityAddedComponent = EntityRepository.addComponentToEntity(LightComponent, entity);
-  return entityAddedComponent;
-}

src/foundation/components/Light/createLightEntity.ts

@@ -0,0 +1,13 @@
+import { EntityRepository } from '../../core/EntityRepository';
+import { ILightEntity } from '../../helpers/EntityHelper';
+import { createGroupEntity } from '../SceneGraph/createGroupEntity';
+import { WellKnownComponentTIDs } from '../WellKnownComponentTIDs';
+
+export function createLightEntity(): ILightEntity {
+  const entity = createGroupEntity();
+  const entityAddedComponent = EntityRepository.tryToAddComponentToEntityByTID(
+    WellKnownComponentTIDs.LightComponentTID,
+    entity
+  ) as ILightEntity;
+  return entityAddedComponent;
+}

src/foundation/components/Light/index.ts

@@ -1,2 +1,3 @@
 export * from './ILightEntity';
 export * from './LightComponent';
+export * from './createLightEntity';

src/foundation/components/MeshRenderer/MeshRendererComponent.ts

@@ -468,13 +468,3 @@ export class MeshRendererComponent extends Component {
     return base as unknown as ComponentToComponentMethods<SomeComponentClass> & EntityBase;
   }
 }
-
-export function createMeshEntity(): IMeshEntity {
-  const entity = createGroupEntity();
-  const entityAddedComponent = EntityRepository.addComponentToEntity(MeshComponent, entity);
-  const entityAddedComponent2 = EntityRepository.addComponentToEntity(
-    MeshRendererComponent,
-    entityAddedComponent
-  );
-  return entityAddedComponent2;
-}

src/foundation/components/MeshRenderer/createMeshEntity.ts

@@ -0,0 +1,17 @@
+import { EntityRepository } from '../../core/EntityRepository';
+import { IMeshEntity } from '../../helpers/EntityHelper';
+import { createGroupEntity } from '../SceneGraph/createGroupEntity';
+import { WellKnownComponentTIDs } from '../WellKnownComponentTIDs';
+
+export function createMeshEntity(): IMeshEntity {
+  const entity = createGroupEntity();
+  const entityAddedComponent = EntityRepository.tryToAddComponentToEntityByTID(
+    WellKnownComponentTIDs.MeshComponentTID,
+    entity
+  );
+  const entityAddedComponent2 = EntityRepository.tryToAddComponentToEntityByTID(
+    WellKnownComponentTIDs.MeshRendererComponentTID,
+    entityAddedComponent
+  ) as IMeshEntity;
+  return entityAddedComponent2;
+}

src/foundation/components/MeshRenderer/index.ts

@@ -1,2 +1,3 @@
 export * from './IMeshRendererEntity';
 export * from './MeshRendererComponent';
+export * from './createMeshEntity';

src/foundation/components/Physics/PhysicsComponent.ts

@@ -77,9 +77,3 @@ export class PhysicsComponent extends Component {
     return base as unknown as ComponentToComponentMethods<SomeComponentClass> & EntityBase;
   }
 }
-
-export function createPhysicsEntity(): IPhysicsEntity {
-  const entity = createGroupEntity();
-  const entityAddedComponent = EntityRepository.addComponentToEntity(PhysicsComponent, entity);
-  return entityAddedComponent;
-}

src/foundation/components/Physics/createPhysicsEntity.ts

@@ -0,0 +1,13 @@
+import { EntityRepository } from '../../core/EntityRepository';
+import { IPhysicsEntity } from '../../helpers/EntityHelper';
+import { createGroupEntity } from '../SceneGraph/createGroupEntity';
+import { WellKnownComponentTIDs } from '../WellKnownComponentTIDs';
+
+export function createPhysicsEntity(): IPhysicsEntity {
+  const entity = createGroupEntity();
+  const entityAddedComponent = EntityRepository.tryToAddComponentToEntityByTID(
+    WellKnownComponentTIDs.PhysicsComponentTID,
+    entity
+  ) as IPhysicsEntity;
+  return entityAddedComponent;
+}

src/foundation/components/Physics/index.ts

@@ -1,2 +1,3 @@
 export * from './IPhysicsEntity';
 export * from './PhysicsComponent';
+export * from './createPhysicsEntity';

src/foundation/components/SceneGraph/SceneGraphComponent.ts

@@ -1,4 +1,3 @@
-import { ComponentRepository } from '../../core/ComponentRepository';
 import { Component } from '../../core/Component';
 import { Matrix44 } from '../../math/Matrix44';
 import { applyMixins, EntityRepository } from '../../core/EntityRepository';
@@ -27,7 +26,7 @@ import { ScaleGizmo } from '../../gizmos/ScaleGizmo';
 import { IMatrix44 } from '../../math/IMatrix';
 import { IQuaternion, IVector3, MutableScalar, Quaternion } from '../../math';
 import { OimoPhysicsStrategy } from '../../physics/Oimo/OimoPhysicsStrategy';
-import { createTransformEntity, TransformComponent } from '../Transform/TransformComponent';
+import { TransformComponent } from '../Transform/TransformComponent';
 import { flattenHierarchy } from './SceneGraphOps';
 
 export class SceneGraphComponent extends Component {

src/foundation/components/SceneGraph/createGroupEntity.ts

@@ -1,18 +1,13 @@
 import { EntityRepository } from '../../core/EntityRepository';
 import { ISceneGraphEntity } from '../../helpers/EntityHelper';
-import { createTransformEntity } from '../Transform/TransformComponent';
+import { createTransformEntity } from '../Transform/createTransformEntity';
 import { WellKnownComponentTIDs } from '../WellKnownComponentTIDs';
-import { SceneGraphComponent } from './SceneGraphComponent';
 
 export function createGroupEntity(): ISceneGraphEntity {
   const entity = createTransformEntity();
   const entityAddedComponent = EntityRepository.tryToAddComponentToEntityByTID(
     WellKnownComponentTIDs.SceneGraphComponentTID,
     entity
   ) as ISceneGraphEntity;
-  // const entityAddedComponent = EntityRepository.addComponentToEntity(
-  //   SceneGraphComponent,
-  //   entity
-  // ) as ISceneGraphEntity;
   return entityAddedComponent;
 }

src/foundation/components/Skeletal/SkeletalComponent.ts

@@ -464,9 +464,3 @@ export class SkeletalComponent extends Component {
     return m;
   }
 }
-
-export function createSkeletalEntity(): ISkeletalEntity {
-  const entity = createGroupEntity();
-  const entityAddedComponent = EntityRepository.addComponentToEntity(SkeletalComponent, entity);
-  return entityAddedComponent;
-}

src/foundation/components/Skeletal/createSkeletalEntity.ts

@@ -0,0 +1,13 @@
+import { EntityRepository } from '../../core/EntityRepository';
+import { ISkeletalEntity } from '../../helpers/EntityHelper';
+import { createGroupEntity } from '../SceneGraph/createGroupEntity';
+import { WellKnownComponentTIDs } from '../WellKnownComponentTIDs';
+
+export function createSkeletalEntity(): ISkeletalEntity {
+  const entity = createGroupEntity();
+  const entityAddedComponent = EntityRepository.tryToAddComponentToEntityByTID(
+    WellKnownComponentTIDs.SkeletalComponentTID,
+    entity
+  ) as ISkeletalEntity;
+  return entityAddedComponent;
+}

src/foundation/components/Skeletal/index.ts

@@ -1,3 +1,4 @@
 export * from './AnimationRetarget';
 export * from './ISkeletalEntity';
 export * from './SkeletalComponent';
+export * from './createSkeletalEntity';

src/foundation/components/Transform/TransformComponent.test.ts

@@ -1,6 +1,6 @@
 import { MemoryManager } from '../../core/MemoryManager';
 import { Vector3 } from '../../math/Vector3';
-import { createTransformEntity } from './TransformComponent';
+import { createTransformEntity } from './createTransformEntity';
 import '../registerComponents';
 
 function generateEntity() {

src/foundation/components/Transform/TransformComponent.ts

@@ -502,9 +502,3 @@ export class TransformComponent extends Component {
     return base as unknown as ComponentToComponentMethods<SomeComponentClass> & EntityBase;
   }
 }
-
-export function createTransformEntity(): ITransformEntity {
-  const entity = EntityRepository.createEntity();
-  const entity1 = EntityRepository.addComponentToEntity(TransformComponent, entity);
-  return entity1;
-}

src/foundation/components/Transform/createTransformEntity.ts

@@ -0,0 +1,12 @@
+import { EntityRepository } from '../../core/EntityRepository';
+import { ITransformEntity } from '../../helpers/EntityHelper';
+import { WellKnownComponentTIDs } from '../WellKnownComponentTIDs';
+
+export function createTransformEntity(): ITransformEntity {
+  const entity = EntityRepository.createEntity();
+  const entity1 = EntityRepository.tryToAddComponentToEntityByTID(
+    WellKnownComponentTIDs.TransformComponentTID,
+    entity
+  ) as ITransformEntity;
+  return entity1;
+}

src/foundation/components/Transform/index.ts

@@ -1,2 +1,3 @@
 export * from './ITransformEntity';
 export * from './TransformComponent';
+export * from './createTransformEntity';

src/foundation/enhanced_js_objects/Array.test.ts

@@ -1,8 +1,8 @@
 import { MeshComponent } from '../components/Mesh/MeshComponent';
-import { createMeshEntity } from '../components/MeshRenderer/MeshRendererComponent';
 import { IEntity } from '../core/Entity';
 import { MemoryManager } from '../core/MemoryManager';
 import { ArrayAsRn, enhanceArray } from './Array';
+import { createMeshEntity } from '../components/MeshRenderer/createMeshEntity';
 import '../components/registerComponents';
 
 declare global {

src/foundation/gizmos/AABBGizmo.ts

@@ -6,7 +6,7 @@ import { Vector3 } from '../math/Vector3';
 import { Mesh } from '../geometry/Mesh';
 import { ISceneGraphEntity } from '../helpers/EntityHelper';
 import { Is } from '../misc/Is';
-import { createMeshEntity } from '../components/MeshRenderer/MeshRendererComponent';
+import { createMeshEntity } from '../components/MeshRenderer/createMeshEntity';
 
 /**
  * AABB Gizmo class

src/foundation/gizmos/LightGizmo.ts

@@ -1,4 +1,4 @@
-import { createMeshEntity } from '../components/MeshRenderer/MeshRendererComponent';
+import { createMeshEntity } from '../components/MeshRenderer/createMeshEntity';
 import { PrimitiveMode } from '../definitions/PrimitiveMode';
 import { VertexAttribute } from '../definitions/VertexAttribute';
 import { Mesh } from '../geometry/Mesh';

src/foundation/gizmos/LocatorGizmo.ts

@@ -1,5 +1,4 @@
-import { createMeshEntity } from '../components/MeshRenderer/MeshRendererComponent';
-import { Entity } from '../core/Entity';
+import { createMeshEntity } from '../components/MeshRenderer/createMeshEntity';
 import { PrimitiveMode } from '../definitions/PrimitiveMode';
 import { VertexAttribute } from '../definitions/VertexAttribute';
 import { Mesh } from '../geometry/Mesh';

src/foundation/gizmos/ScaleGizmo.ts

@@ -1,5 +1,5 @@
 import { CameraComponent } from '../components/Camera/CameraComponent';
-import { createMeshEntity } from '../components/MeshRenderer/MeshRendererComponent';
+import { createMeshEntity } from '../components/MeshRenderer/createMeshEntity';
 import { createGroupEntity } from '../components/SceneGraph/createGroupEntity';
 import { ComponentRepository } from '../core/ComponentRepository';
 import { Config } from '../core/Config';

src/foundation/gizmos/TranslationGizmo.ts

@@ -27,8 +27,8 @@ import {
 } from '../system/InputManager';
 import { Gizmo } from './Gizmo';
 import { IQuaternion } from '../math';
-import { createMeshEntity } from '../components/MeshRenderer/MeshRendererComponent';
 import { createGroupEntity } from '../components/SceneGraph/createGroupEntity';
+import { createMeshEntity } from '../components/MeshRenderer/createMeshEntity';
 
 declare let window: any;
 

src/foundation/helpers/EntityHelper.ts

@@ -16,6 +16,7 @@ import { LightComponent } from '../components/Light/LightComponent';
 import { IConstraintEntityMethods } from '../components/Constraint/IConstraintEntity';
 import { IAnimationStateEntityMethods } from '../components/AnimationState';
 import { createGroupEntity } from '../components/SceneGraph/createGroupEntity';
+import { WellKnownComponentTIDs } from '../components';
 
 export type ITransformEntity = IEntity & ITransformEntityMethods;
 export type ISceneGraphEntity = ITransformEntity & ISceneGraphEntityMethods;
@@ -32,11 +33,14 @@ export interface IAnimationStateEntity extends ISceneGraphEntity, IAnimationStat
 
 export function createLightWithCameraEntity(): ILightEntity & ICameraEntityMethods {
   const entity = createGroupEntity();
-  const entityAddedComponent = EntityRepository.addComponentToEntity(LightComponent, entity);
-  const entityAddedComponent2 = EntityRepository.addComponentToEntity(
-    CameraComponent,
+  const entityAddedComponent = EntityRepository.tryToAddComponentToEntityByTID(
+    WellKnownComponentTIDs.LightComponentTID,
+    entity
+  ) as ILightEntity;
+  const entityAddedComponent2 = EntityRepository.tryToAddComponentToEntityByTID(
+    WellKnownComponentTIDs.CameraComponentTID,
     entityAddedComponent
-  );
+  ) as ILightEntity & ICameraEntityMethods;
 
   entityAddedComponent2.getCamera().isSyncToLight = true;
 

src/foundation/helpers/MeshHelper.ts

@@ -14,7 +14,7 @@ import { PhysicsComponent } from '../components/Physics/PhysicsComponent';
 import { EntityRepository } from '../core/EntityRepository';
 import { OimoPhysicsStrategy } from '../physics/Oimo/OimoPhysicsStrategy';
 import { PhysicsShape } from '../definitions/PhysicsShapeType';
-import { createMeshEntity } from '../components/MeshRenderer/MeshRendererComponent';
+import { createMeshEntity } from '../components/MeshRenderer/createMeshEntity';
 
 const createPlane = (
   desc: PlaneDescriptor & {

src/foundation/importer/ModelConverter.ts

@@ -78,17 +78,18 @@ import {
   IMeshEntity,
 } from '../helpers/EntityHelper';
 import { BlendShapeComponent } from '../components/BlendShape/BlendShapeComponent';
-import { createLightEntity, LightComponent } from '../components/Light/LightComponent';
+import { LightComponent } from '../components/Light/LightComponent';
 import { IBlendShapeEntityMethods } from '../components/BlendShape/IBlendShapeEntity';
 import { BufferView } from '../memory/BufferView';
 import { RhodoniteImportExtension } from './RhodoniteImportExtension';
 import { Vrm0xMaterialProperty } from '../../types/VRM0x';
 import { MutableMatrix44 } from '../math/MutableMatrix44';
 import { Sampler } from '../textures/Sampler';
 import { AnimationStateComponent } from '../components/AnimationState/AnimationStateComponent';
-import { createCameraEntity } from '../components/Camera/CameraComponent';
-import { createMeshEntity } from '../components/MeshRenderer/MeshRendererComponent';
 import { createGroupEntity } from '../components/SceneGraph/createGroupEntity';
+import { createMeshEntity } from '../components/MeshRenderer/createMeshEntity';
+import { createLightEntity } from '../components/Light/createLightEntity';
+import { createCameraEntity } from '../components/Camera/createCameraEntity';
 
 declare let DracoDecoderModule: any;
 

src/foundation/renderer/RenderPass.test.ts

@@ -1,6 +1,6 @@
-import { createMeshEntity } from '../components/MeshRenderer/MeshRendererComponent';
 import { MemoryManager } from '../core/MemoryManager';
 import { RenderPass } from './RenderPass';
+import { createMeshEntity } from '../components/MeshRenderer/createMeshEntity';
 import '../components/registerComponents';
 
 function generateEntity() {

src/foundation/system/System.ts

@@ -29,7 +29,7 @@ import { initDefaultTextures } from '../materials/core/DummyTextures';
 import { WebGpuResourceRepository } from '../../webgpu/WebGpuResourceRepository';
 import { WebGpuDeviceWrapper } from '../../webgpu/WebGpuDeviceWrapper';
 import { WebGpuStrategyBasic } from '../../webgpu/WebGpuStrategyBasic';
-import { CameraComponent, createCameraEntity } from '../components/Camera/CameraComponent';
+import { CameraComponent } from '../components/Camera/CameraComponent';
 import { AnimationComponent } from '../components/Animation/AnimationComponent';
 import { CameraControllerComponent } from '../components/CameraController/CameraControllerComponent';
 import { MeshRendererComponent } from '../components/MeshRenderer/MeshRendererComponent';
@@ -38,6 +38,7 @@ import { Primitive } from '../geometry/Primitive';
 import { VERSION } from '../../version';
 import { ShaderSemantics } from '../definitions/ShaderSemantics';
 import { Scalar } from '../math/Scalar';
+import { createCameraEntity } from '../components/Camera/createCameraEntity';
 declare const spector: any;
 
 /**

src/xr/WebARSystem.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-empty-function */
-import { createCameraEntity } from '../foundation/components/Camera/CameraComponent';
+import { createCameraEntity } from '../foundation/components/Camera/createCameraEntity';
 import { ICameraEntity } from '../foundation/helpers/EntityHelper';
 import { MutableMatrix44 } from '../foundation/math/MutableMatrix44';
 import { MutableQuaternion } from '../foundation/math/MutableQuaternion';