Skip to content

Commit

Permalink
refactor: move registerComponentClass call
Browse files Browse the repository at this point in the history
  • Loading branch information
Yuki Shimada committed Sep 15, 2024
1 parent d53a564 commit 93add5d
Show file tree
Hide file tree
Showing 24 changed files with 46 additions and 34 deletions.
4 changes: 0 additions & 4 deletions src/effekseer/EffekseerComponent.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
/// <reference path="../../vendor/effekseer.d.ts" />
import { Component } from '../foundation/core/Component';
import { applyMixins, EntityRepository } from '../foundation/core/EntityRepository';
import { SceneGraphComponent } from '../foundation/components/SceneGraph/SceneGraphComponent';
import { ProcessStage } from '../foundation/definitions/ProcessStage';
import { TransformComponent } from '../foundation/components/Transform/TransformComponent';
import { CameraComponent } from '../foundation/components/Camera/CameraComponent';
import { ComponentRepository } from '../foundation/core/ComponentRepository';
import { WellKnownComponentTIDs } from '../foundation/components/WellKnownComponentTIDs';
import { CGAPIResourceRepository } from '../foundation/renderer/CGAPIResourceRepository';
import { ComponentTID, EntityUID, ComponentSID, Second } from '../types/CommonTypes';
import { Config } from '../foundation/core/Config';
import { MutableMatrix44 } from '../foundation/math/MutableMatrix44';
import { Is } from '../foundation/misc/Is';
import { IVector3 } from '../foundation/math/IVector';
Expand Down Expand Up @@ -377,7 +374,6 @@ export class EffekseerComponent extends Component {
return base as unknown as ComponentToComponentMethods<SomeComponentClass> & EntityBase;
}
}
ComponentRepository.registerComponentClass(EffekseerComponent);

export interface IEffekseerEntityMethods {
getEffekseer(): EffekseerComponent;
Expand Down
1 change: 0 additions & 1 deletion src/foundation/components/Animation/AnimationComponent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -841,4 +841,3 @@ export class AnimationComponent extends Component {
this.__isAnimating = false;
}
}
ComponentRepository.registerComponentClass(AnimationComponent);
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { AnimationTrackName } from '../../../types/AnimationTypes';
import { ComponentSID, ComponentTID, EntityUID } from '../../../types/CommonTypes';
import { Component } from '../../core/Component';
import { ComponentRepository } from '../../core/ComponentRepository';
import { IEntity } from '../../core/Entity';
import { EntityRepository, applyMixins } from '../../core/EntityRepository';
import { ProcessStage } from '../../definitions/ProcessStage';
Expand Down Expand Up @@ -191,5 +190,3 @@ export class AnimationStateComponent extends Component {
return base as unknown as ComponentToComponentMethods<SomeComponentClass> & EntityBase;
}
}

ComponentRepository.registerComponentClass(AnimationStateComponent);
3 changes: 0 additions & 3 deletions src/foundation/components/BlendShape/BlendShapeComponent.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Component } from '../../core/Component';
import { ComponentRepository } from '../../core/ComponentRepository';
import { applyMixins, EntityRepository } from '../../core/EntityRepository';
import { WellKnownComponentTIDs } from '../WellKnownComponentTIDs';
import { ProcessStage } from '../../definitions/ProcessStage';
Expand Down Expand Up @@ -93,5 +92,3 @@ export class BlendShapeComponent extends Component {
return base as unknown as ComponentToComponentMethods<SomeComponentClass> & EntityBase;
}
}

ComponentRepository.registerComponentClass(BlendShapeComponent);
1 change: 0 additions & 1 deletion src/foundation/components/Camera/CameraComponent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -947,7 +947,6 @@ export class CameraComponent extends Component {
return base as unknown as ComponentToComponentMethods<SomeComponentClass> & EntityBaseClass;
}
}
ComponentRepository.registerComponentClass(CameraComponent);

export function createCameraEntity(): ICameraEntity {
const entity = createGroupEntity();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Component } from '../../core/Component';
import { EntityUID, ComponentSID, ComponentTID } from '../../../types/CommonTypes';
import { applyMixins, EntityRepository } from '../../core/EntityRepository';
import { ComponentRepository } from '../../core/ComponentRepository';
import { WellKnownComponentTIDs } from '../WellKnownComponentTIDs';
import { OrbitCameraController } from '../../cameras/OrbitCameraController';
import { ICameraController } from '../../cameras/ICameraController';
Expand Down Expand Up @@ -105,7 +104,6 @@ export class CameraControllerComponent extends Component {
return base as unknown as ComponentToComponentMethods<SomeComponentClass> & EntityBase;
}
}
ComponentRepository.registerComponentClass(CameraControllerComponent);

export function createCameraControllerEntity(): ICameraControllerEntity {
const entity = createCameraEntity();
Expand Down
3 changes: 0 additions & 3 deletions src/foundation/components/Constraint/ConstraintComponent.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import { ComponentSID, ComponentTID, EntityUID } from '../../../types/CommonTypes';
import { IVrmConstraint } from '../../constraints/IVrmConstraint';
import { VrmRollConstraint } from '../../constraints/VrmRollConstraint';
import { Component } from '../../core/Component';
import { ComponentRepository } from '../../core/ComponentRepository';
import { IEntity } from '../../core/Entity';
import { EntityRepository, applyMixins } from '../../core/EntityRepository';
import { ProcessStage } from '../../definitions/ProcessStage';
Expand Down Expand Up @@ -71,4 +69,3 @@ export class ConstraintComponent extends Component {
return base as unknown as ComponentToComponentMethods<SomeComponentClass> & EntityBase;
}
}
ComponentRepository.registerComponentClass(ConstraintComponent);
1 change: 0 additions & 1 deletion src/foundation/components/Light/LightComponent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,6 @@ export class LightComponent extends Component {
return base as unknown as ComponentToComponentMethods<SomeComponentClass> & EntityBase;
}
}
ComponentRepository.registerComponentClass(LightComponent);

export function createLightEntity(): ILightEntity {
const entity = createGroupEntity();
Expand Down
3 changes: 0 additions & 3 deletions src/foundation/components/Mesh/MeshComponent.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { ComponentRepository } from '../../core/ComponentRepository';
import { Component } from '../../core/Component';
import { applyMixins, EntityRepository } from '../../core/EntityRepository';
import { WellKnownComponentTIDs } from '../WellKnownComponentTIDs';
Expand Down Expand Up @@ -311,5 +310,3 @@ export class MeshComponent extends Component {
return base as unknown as ComponentToComponentMethods<SomeComponentClass> & EntityBase;
}
}

ComponentRepository.registerComponentClass(MeshComponent);
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,6 @@ export class MeshRendererComponent extends Component {
return base as unknown as ComponentToComponentMethods<SomeComponentClass> & EntityBase;
}
}
ComponentRepository.registerComponentClass(MeshRendererComponent);

export function createMeshEntity(): IMeshEntity {
const entity = createGroupEntity();
Expand Down
3 changes: 0 additions & 3 deletions src/foundation/components/Physics/PhysicsComponent.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Component } from '../../core/Component';
import { ComponentRepository } from '../../core/ComponentRepository';
import { applyMixins, EntityRepository } from '../../core/EntityRepository';
import { WellKnownComponentTIDs } from '../WellKnownComponentTIDs';
import { ProcessStage } from '../../definitions/ProcessStage';
Expand Down Expand Up @@ -79,8 +78,6 @@ export class PhysicsComponent extends Component {
}
}

ComponentRepository.registerComponentClass(PhysicsComponent);

export function createPhysicsEntity(): IPhysicsEntity {
const entity = createGroupEntity();
const entityAddedComponent = EntityRepository.addComponentToEntity(PhysicsComponent, entity);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { MemoryManager } from '../../core/MemoryManager';
import { Matrix44 } from '../../math/Matrix44';
import { Vector3 } from '../../math/Vector3';
import { createGroupEntity } from './createGroupEntity';
import { SceneGraphComponent } from './SceneGraphComponent';
import { flattenHierarchy } from './SceneGraphOps';
import '../registerComponents';

describe('SceneGraphComponent', () => {
function generateEntity() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1067,4 +1067,3 @@ export class SceneGraphComponent extends Component {
return base as unknown as ComponentToComponentMethods<SomeComponentClass> & EntityBase;
}
}
ComponentRepository.registerComponentClass(SceneGraphComponent);
5 changes: 5 additions & 0 deletions src/foundation/components/SceneGraph/createGroupEntity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,17 @@ import { EntityRepository } from '../../core/EntityRepository';
import { ISceneGraphEntity } from '../../helpers/EntityHelper';
import { createTransformEntity } from '../Transform/TransformComponent';
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;
}
2 changes: 0 additions & 2 deletions src/foundation/components/Skeletal/SkeletalComponent.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { ComponentRepository } from '../../core/ComponentRepository';
import { Component } from '../../core/Component';
import { applyMixins, EntityRepository } from '../../core/EntityRepository';
import { WellKnownComponentTIDs } from '../WellKnownComponentTIDs';
Expand Down Expand Up @@ -465,7 +464,6 @@ export class SkeletalComponent extends Component {
return m;
}
}
ComponentRepository.registerComponentClass(SkeletalComponent);

export function createSkeletalEntity(): ISkeletalEntity {
const entity = createGroupEntity();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { MemoryManager } from '../../core/MemoryManager';
import { Vector3 } from '../../math/Vector3';
import { createTransformEntity } from './TransformComponent';
import '../registerComponents';

function generateEntity() {
return createTransformEntity();
Expand Down
3 changes: 0 additions & 3 deletions src/foundation/components/Transform/TransformComponent.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Quaternion } from '../../math/Quaternion';
import { Component } from '../../core/Component';
import { ComponentRepository } from '../../core/ComponentRepository';
import { applyMixins, EntityRepository } from '../../core/EntityRepository';
import { WellKnownComponentTIDs } from '../WellKnownComponentTIDs';
import { ProcessStage } from '../../definitions/ProcessStage';
Expand Down Expand Up @@ -504,8 +503,6 @@ export class TransformComponent extends Component {
}
}

ComponentRepository.registerComponentClass(TransformComponent);

export function createTransformEntity(): ITransformEntity {
const entity = EntityRepository.createEntity();
const entity1 = EntityRepository.addComponentToEntity(TransformComponent, entity);
Expand Down
2 changes: 0 additions & 2 deletions src/foundation/components/Vrm/VrmComponent.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { ComponentSID, ComponentTID, EntityUID, Index } from '../../../types/CommonTypes';
import { Component } from '../../core/Component';
import { ComponentRepository } from '../../core/ComponentRepository';
import { IEntity } from '../../core/Entity';
import { applyMixins, EntityRepository } from '../../core/EntityRepository';
import { ProcessStage } from '../../definitions/ProcessStage';
Expand Down Expand Up @@ -116,4 +115,3 @@ export class VrmComponent extends Component {
return base as unknown as ComponentToComponentMethods<SomeComponentClass> & EntityBase;
}
}
ComponentRepository.registerComponentClass(VrmComponent);
1 change: 1 addition & 0 deletions src/foundation/components/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ export * from './Vrm/index';

export * from './ComponentTypes';
export * from './WellKnownComponentTIDs';
export * from './registerComponents';
34 changes: 34 additions & 0 deletions src/foundation/components/registerComponents.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import { EffekseerComponent } from '../../effekseer/EffekseerComponent';
import { ComponentRepository } from '../core/ComponentRepository';
import { AnimationComponent } from './Animation/AnimationComponent';
import { AnimationStateComponent } from './AnimationState/AnimationStateComponent';
import { BlendShapeComponent } from './BlendShape/BlendShapeComponent';
import { CameraComponent } from './Camera/CameraComponent';
import { CameraControllerComponent } from './CameraController/CameraControllerComponent';
import { ConstraintComponent } from './Constraint/ConstraintComponent';
import { LightComponent } from './Light/LightComponent';
import { MeshComponent } from './Mesh/MeshComponent';
import { MeshRendererComponent } from './MeshRenderer/MeshRendererComponent';
import { PhysicsComponent } from './Physics/PhysicsComponent';
import { SceneGraphComponent } from './SceneGraph/SceneGraphComponent';
import { SkeletalComponent } from './Skeletal/SkeletalComponent';
import { TransformComponent } from './Transform/TransformComponent';
import { VrmComponent } from './Vrm/VrmComponent';

ComponentRepository.registerComponentClass(AnimationStateComponent);
ComponentRepository.registerComponentClass(AnimationComponent);
ComponentRepository.registerComponentClass(TransformComponent);
ComponentRepository.registerComponentClass(SceneGraphComponent);
ComponentRepository.registerComponentClass(MeshComponent);
ComponentRepository.registerComponentClass(MeshRendererComponent);
ComponentRepository.registerComponentClass(LightComponent);
ComponentRepository.registerComponentClass(CameraControllerComponent);
ComponentRepository.registerComponentClass(CameraComponent);
ComponentRepository.registerComponentClass(SkeletalComponent);
ComponentRepository.registerComponentClass(BlendShapeComponent);
ComponentRepository.registerComponentClass(PhysicsComponent);
ComponentRepository.registerComponentClass(EffekseerComponent);
ComponentRepository.registerComponentClass(VrmComponent);
ComponentRepository.registerComponentClass(ConstraintComponent);

export {};
1 change: 1 addition & 0 deletions src/foundation/core/EntityRepository.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { AnimationComponent } from '../components/Animation/AnimationComponent';
import { TransformComponent } from '../components/Transform/TransformComponent';
import { Vector3 } from '../math';
import { createGroupEntity } from '../components/SceneGraph/createGroupEntity';
import '../components/registerComponents';

test('getEntitiesNumber', () => {
const entity1 = EntityRepository.createEntity();
Expand Down
1 change: 1 addition & 0 deletions src/foundation/enhanced_js_objects/Array.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { createMeshEntity } from '../components/MeshRenderer/MeshRendererCompone
import { IEntity } from '../core/Entity';
import { MemoryManager } from '../core/MemoryManager';
import { ArrayAsRn, enhanceArray } from './Array';
import '../components/registerComponents';

declare global {
// eslint-disable-next-line @typescript-eslint/no-empty-interface
Expand Down
1 change: 1 addition & 0 deletions src/foundation/helpers/EntityHelper.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { SceneGraphComponent } from '../components/SceneGraph/SceneGraphComponen
import { TransformComponent } from '../components/Transform/TransformComponent';
import { EntityRepository } from '../core/EntityRepository';
import { MemoryManager } from '../core/MemoryManager';
import '../components/registerComponents';

describe('EntityHelper', () => {
beforeAll(() => {
Expand Down
1 change: 1 addition & 0 deletions src/foundation/renderer/RenderPass.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { createMeshEntity } from '../components/MeshRenderer/MeshRendererComponent';
import { MemoryManager } from '../core/MemoryManager';
import { RenderPass } from './RenderPass';
import '../components/registerComponents';

function generateEntity() {
return createMeshEntity();
Expand Down

0 comments on commit 93add5d

Please sign in to comment.