移除了功能重复的ComponentTypeManager

packages/core/src/ECS/Core/ArchetypeSystem.ts

@@ -1,6 +1,6 @@
 import { Entity } from '../Entity';
-import { ComponentType } from './ComponentStorage';
-import { BitMask64Data, BitMask64Utils, ComponentTypeManager } from "../Utils";
+import { ComponentType, ComponentRegistry } from './ComponentStorage';
+import { BitMask64Data, BitMask64Utils } from "../Utils";
 import { BitMaskHashMap } from "../Utils/BitMaskHashMap";
 
 /**
@@ -266,10 +266,18 @@ export class ArchetypeSystem {
     
     /**
      * 生成原型ID
+     * 使用ComponentRegistry确保与Entity.componentMask使用相同的bitIndex
      */
     private generateArchetypeId(componentTypes: ComponentType[]): ArchetypeId {
-        let entityBits = ComponentTypeManager.instance.getEntityBits(componentTypes);
-        return entityBits.getValue();
+        let mask = BitMask64Utils.clone(BitMask64Utils.ZERO);
+        for (const type of componentTypes) {
+            if (!ComponentRegistry.isRegistered(type)) {
+                ComponentRegistry.register(type);
+            }
+            const bitMask = ComponentRegistry.getBitMask(type);
+            BitMask64Utils.orInPlace(mask, bitMask);
+        }
+        return mask;
     }
     
     /**

packages/core/src/ECS/Core/QuerySystem.ts

@@ -5,7 +5,6 @@ import { BitMask64Utils, BitMask64Data } from '../Utils/BigIntCompatibility';
 import { createLogger } from '../../Utils/Logger';
 import { getComponentTypeName } from '../Decorators';
 import { Archetype, ArchetypeSystem } from './ArchetypeSystem';
-import { ComponentTypeManager } from "../Utils";
 import { ReactiveQuery, ReactiveQueryConfig } from './ReactiveQuery';
 import { QueryCondition, QueryConditionType, QueryResult } from './QueryTypes';
 

packages/core/src/ECS/Utils/ComponentTypeManager.ts

@@ -1,101 +0,0 @@
-import { Bits } from './Bits';
-import { getComponentTypeName } from '../Decorators';
-import { ComponentType } from "../../Types";
-
-/**
- * 组件类型管理器
- * 负责管理组件类型的注册和ID分配
- * 支持无限数量的组件类型（通过自动扩展 BitMask）
- */
-export class ComponentTypeManager {
-    private static _instance: ComponentTypeManager;
-    private _componentTypes = new Map<Function, number>();
-    private _typeNames = new Map<number, string>();
-    private _nextTypeId = 0;
-
-    /**
-     * 获取单例实例
-     */
-    public static get instance(): ComponentTypeManager {
-        if (!ComponentTypeManager._instance) {
-            ComponentTypeManager._instance = new ComponentTypeManager();
-        }
-        return ComponentTypeManager._instance;
-    }
-
-    private constructor() {}
-
-    /**
-     * 获取组件类型的ID
-     * @param componentType 组件类型构造函数
-     * @returns 组件类型ID
-     */
-    public getTypeId(componentType: ComponentType): number {
-        let typeId = this._componentTypes.get(componentType);
-
-        if (typeId === undefined) {
-            typeId = this._nextTypeId++;
-            this._componentTypes.set(componentType, typeId);
-            this._typeNames.set(typeId, getComponentTypeName(componentType));
-        }
-
-        return typeId;
-    }
-
-    /**
-     * 获取组件类型名称
-     * @param typeId 组件类型ID
-     * @returns 组件类型名称
-     */
-    public getTypeName(typeId: number): string {
-        return this._typeNames.get(typeId) || 'Unknown';
-    }
-
-    /**
-     * 创建包含指定组件类型的Bits对象
-     * @param componentTypes 组件类型构造函数数组
-     * @returns Bits对象
-     */
-    public createBits(...componentTypes: ComponentType[]): Bits {
-        const bits = new Bits();
-        
-        for (const componentType of componentTypes) {
-            const typeId = this.getTypeId(componentType);
-            bits.set(typeId);
-        }
-        
-        return bits;
-    }
-
-    /**
-     * 获取实体的组件位掩码
-     * @param components 组件数组
-     * @returns Bits对象
-     */
-    public getEntityBits(components: ComponentType[]): Bits {
-        const bits = new Bits();
-        
-        for (const component of components) {
-            const typeId = this.getTypeId(component);
-            bits.set(typeId);
-        }
-        
-        return bits;
-    }
-
-    /**
-     * 重置管理器（主要用于测试）
-     */
-    public reset(): void {
-        this._componentTypes.clear();
-        this._typeNames.clear();
-        this._nextTypeId = 0;
-    }
-
-    /**
-     * 获取已注册的组件类型数量
-     */
-    public get registeredTypeCount(): number {
-        return this._componentTypes.size;
-    }
-} 

packages/core/src/ECS/Utils/index.ts

@@ -4,7 +4,6 @@ export { EntityProcessorList } from './EntityProcessorList';
 export { IdentifierPool } from './IdentifierPool';
 export { Matcher } from './Matcher';
 export { Bits } from './Bits';
-export { ComponentTypeManager } from './ComponentTypeManager';
 export { BitMask64Utils, BitMask64Data } from './BigIntCompatibility';
 export { SparseSet } from './SparseSet';
 export { ComponentSparseSet } from './ComponentSparseSet';