Compare commits

...

3 Commits

Author SHA1 Message Date
YHH
3c7c3c98af style(core): 统一代码风格并强化命名规范 2025-10-31 23:53:39 +08:00
YHH
be7b3afb4a style(core): 统一代码风格并强化命名规范 2025-10-31 18:33:31 +08:00
YHH
3e037f4ae0 style(core): 统一代码风格并强化命名规范 2025-10-31 18:29:53 +08:00
88 changed files with 1126 additions and 988 deletions

View File

@@ -31,9 +31,32 @@
"@typescript-eslint/no-unsafe-call": "warn", "@typescript-eslint/no-unsafe-call": "warn",
"@typescript-eslint/no-unsafe-return": "warn", "@typescript-eslint/no-unsafe-return": "warn",
"@typescript-eslint/no-unsafe-argument": "warn", "@typescript-eslint/no-unsafe-argument": "warn",
"@typescript-eslint/no-unsafe-function-type": "error",
"@typescript-eslint/explicit-module-boundary-types": "off", "@typescript-eslint/explicit-module-boundary-types": "off",
"@typescript-eslint/no-unused-vars": ["warn", { "argsIgnorePattern": "^_" }], "@typescript-eslint/no-unused-vars": ["warn", { "argsIgnorePattern": "^_" }],
"@typescript-eslint/no-non-null-assertion": "off" "@typescript-eslint/no-non-null-assertion": "off",
"@typescript-eslint/no-unnecessary-type-assertion": "error",
"@typescript-eslint/naming-convention": [
"error",
{
"selector": "memberLike",
"modifiers": ["private"],
"format": ["camelCase"],
"leadingUnderscore": "require"
},
{
"selector": "memberLike",
"modifiers": ["public"],
"format": ["camelCase"],
"leadingUnderscore": "forbid"
},
{
"selector": "memberLike",
"modifiers": ["protected"],
"format": ["camelCase"],
"leadingUnderscore": "require"
}
]
}, },
"ignorePatterns": [ "ignorePatterns": [
"node_modules/", "node_modules/",

View File

@@ -329,8 +329,8 @@ export class Core {
*/ */
public static setScene<T extends IScene>(scene: T): T { public static setScene<T extends IScene>(scene: T): T {
if (!this._instance) { if (!this._instance) {
Core._logger.warn("Core实例未创建请先调用Core.create()"); Core._logger.warn('Core实例未创建请先调用Core.create()');
throw new Error("Core实例未创建"); throw new Error('Core实例未创建');
} }
return this._instance._sceneManager.setScene(scene); return this._instance._sceneManager.setScene(scene);
@@ -387,7 +387,7 @@ export class Core {
*/ */
public static loadScene<T extends IScene>(scene: T): void { public static loadScene<T extends IScene>(scene: T): void {
if (!this._instance) { if (!this._instance) {
Core._logger.warn("Core实例未创建请先调用Core.create()"); Core._logger.warn('Core实例未创建请先调用Core.create()');
return; return;
} }
@@ -422,7 +422,7 @@ export class Core {
*/ */
public static update(deltaTime: number): void { public static update(deltaTime: number): void {
if (!this._instance) { if (!this._instance) {
Core._logger.warn("Core实例未创建请先调用Core.create()"); Core._logger.warn('Core实例未创建请先调用Core.create()');
return; return;
} }
@@ -472,7 +472,7 @@ export class Core {
*/ */
public static enableDebug(config: IECSDebugConfig): void { public static enableDebug(config: IECSDebugConfig): void {
if (!this._instance) { if (!this._instance) {
Core._logger.warn("Core实例未创建请先调用Core.create()"); Core._logger.warn('Core实例未创建请先调用Core.create()');
return; return;
} }

View File

@@ -76,8 +76,8 @@ export interface UpdatableMetadata {
* ``` * ```
*/ */
export function Injectable(): ClassDecorator { export function Injectable(): ClassDecorator {
return function (target: Function): void { return function (target: Constructor): void {
const existing = injectableMetadata.get(target as Constructor); const existing = injectableMetadata.get(target);
injectableMetadata.set(target as Constructor, { injectableMetadata.set(target as Constructor, {
injectable: true, injectable: true,
@@ -117,13 +117,13 @@ export function Injectable(): ClassDecorator {
* ``` * ```
*/ */
export function Updatable(priority: number = 0): ClassDecorator { export function Updatable(priority: number = 0): ClassDecorator {
return function (target: Function): void { return function (target: Constructor): void {
// 验证类原型上是否有update方法 // 验证类原型上是否有update方法
const prototype = (target as Constructor & { prototype: { update?: unknown } }).prototype; const prototype = (target as Constructor & { prototype: { update?: unknown } }).prototype;
if (!prototype || typeof prototype.update !== 'function') { if (!prototype || typeof prototype.update !== 'function') {
throw new Error( throw new Error(
`@Updatable() decorator requires class ${target.name} to implement IUpdatable interface with update() method. ` + `@Updatable() decorator requires class ${target.name} to implement IUpdatable interface with update() method. ` +
`Please add 'implements IUpdatable' and define update(deltaTime?: number): void method.` "Please add 'implements IUpdatable' and define update(deltaTime?: number): void method."
); );
} }
@@ -228,6 +228,7 @@ export function getInjectMetadata(target: Constructor): Map<number, ServiceType<
* const instance = createInstance(MySystem, container); * const instance = createInstance(MySystem, container);
* ``` * ```
*/ */
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export function createInstance<T>( export function createInstance<T>(
constructor: new (...args: any[]) => T, constructor: new (...args: any[]) => T,
container: ServiceContainer container: ServiceContainer
@@ -249,7 +250,7 @@ export function createInstance<T>(
if (typeof serviceType === 'string' || typeof serviceType === 'symbol') { if (typeof serviceType === 'string' || typeof serviceType === 'symbol') {
// 字符串或Symbol类型的服务标识 // 字符串或Symbol类型的服务标识
throw new Error( throw new Error(
`String and Symbol service identifiers are not yet supported in constructor injection. ` + 'String and Symbol service identifiers are not yet supported in constructor injection. ' +
`Please use class types for ${constructor.name} parameter ${i}` `Please use class types for ${constructor.name} parameter ${i}`
); );
} else { } else {
@@ -338,7 +339,7 @@ export function registerInjectable<T extends IService>(
if (!isInjectable(serviceType)) { if (!isInjectable(serviceType)) {
throw new Error( throw new Error(
`${serviceType.name} is not marked as @Injectable(). ` + `${serviceType.name} is not marked as @Injectable(). ` +
`Please add @Injectable() decorator to the class.` 'Please add @Injectable() decorator to the class.'
); );
} }

View File

@@ -19,8 +19,9 @@ export interface IService {
* 服务类型 * 服务类型
* *
* 支持任意构造函数签名,以便与依赖注入装饰器配合使用 * 支持任意构造函数签名,以便与依赖注入装饰器配合使用
* 使用 any[] 以允许任意参数类型的构造函数 * 使用 any[] 以允许任意参数类型的构造函数,这是类型系统的必要妥协
*/ */
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export type ServiceType<T extends IService> = new (...args: any[]) => T; export type ServiceType<T extends IService> = new (...args: any[]) => T;
/** /**
@@ -240,7 +241,7 @@ export class ServiceContainer {
// 检测循环依赖 // 检测循环依赖
if (this._resolving.has(type as ServiceType<IService>)) { if (this._resolving.has(type as ServiceType<IService>)) {
const chain = Array.from(this._resolving).map(t => t.name).join(' -> '); const chain = Array.from(this._resolving).map((t) => t.name).join(' -> ');
throw new Error(`Circular dependency detected: ${chain} -> ${type.name}`); throw new Error(`Circular dependency detected: ${chain} -> ${type.name}`);
} }
@@ -337,7 +338,7 @@ export class ServiceContainer {
// 如果有单例实例,调用 dispose // 如果有单例实例,调用 dispose
if (registration.instance) { if (registration.instance) {
// 从可更新列表中移除 // 从可更新列表中移除
const index = this._updatableServices.findIndex(item => item.instance === registration.instance); const index = this._updatableServices.findIndex((item) => item.instance === registration.instance);
if (index !== -1) { if (index !== -1) {
this._updatableServices.splice(index, 1); this._updatableServices.splice(index, 1);
} }

View File

@@ -36,7 +36,16 @@ export abstract class Component implements IComponent {
* *
* 用于为每个组件分配唯一的ID。 * 用于为每个组件分配唯一的ID。
*/ */
public static _idGenerator: number = 0; private static _nextId: number = 0;
/**
* 获取下一个组件ID只读
*
* @returns 下一个将要分配的组件ID
*/
public static get nextComponentId(): number {
return Component._nextId;
}
/** /**
* 组件唯一标识符 * 组件唯一标识符
@@ -58,7 +67,7 @@ export abstract class Component implements IComponent {
* 自动分配唯一ID给组件。 * 自动分配唯一ID给组件。
*/ */
constructor() { constructor() {
this.id = Component._idGenerator++; this.id = Component._nextId++;
} }
/** /**

View File

@@ -1,7 +1,7 @@
import { Entity } from '../Entity'; import { Entity } from '../Entity';
import { ComponentType, ComponentRegistry } from './ComponentStorage'; import { ComponentType, ComponentRegistry } from './ComponentStorage';
import { BitMask64Data, BitMask64Utils } from "../Utils"; import { BitMask64Data, BitMask64Utils } from '../Utils';
import { BitMaskHashMap } from "../Utils/BitMaskHashMap"; import { BitMaskHashMap } from '../Utils/BitMaskHashMap';
/** /**
* 原型标识符 * 原型标识符
@@ -32,7 +32,7 @@ export interface ArchetypeQueryResult {
/** /**
* Archetype系统 * Archetype系统
* *
* 根据实体的组件组合将实体分组到不同的原型中,提供高效的查询性能。 * 根据实体的组件组合将实体分组到不同的原型中,提供高效的查询性能。
*/ */
export class ArchetypeSystem { export class ArchetypeSystem {
@@ -50,7 +50,7 @@ export class ArchetypeSystem {
/** 所有原型 */ /** 所有原型 */
private _allArchetypes: Archetype[] = []; private _allArchetypes: Archetype[] = [];
/** /**
* 添加实体到原型系统 * 添加实体到原型系统
*/ */
@@ -66,7 +66,7 @@ export class ArchetypeSystem {
archetype.entities.add(entity); archetype.entities.add(entity);
this._entityToArchetype.set(entity, archetype); this._entityToArchetype.set(entity, archetype);
} }
/** /**
* 从原型系统中移除实体 * 从原型系统中移除实体
*/ */
@@ -118,7 +118,7 @@ export class ArchetypeSystem {
this._entityToArchetype.set(entity, newArchetype); this._entityToArchetype.set(entity, newArchetype);
} }
/** /**
* 查询包含指定组件组合的原型 * 查询包含指定组件组合的原型
* *
@@ -198,14 +198,14 @@ export class ArchetypeSystem {
totalEntities totalEntities
}; };
} }
/** /**
* 获取实体所属的原型 * 获取实体所属的原型
*/ */
public getEntityArchetype(entity: Entity): Archetype | undefined { public getEntityArchetype(entity: Entity): Archetype | undefined {
return this._entityToArchetype.get(entity); return this._entityToArchetype.get(entity);
} }
/** /**
* 获取所有原型 * 获取所有原型
*/ */
@@ -247,7 +247,7 @@ export class ArchetypeSystem {
*/ */
private updateAllArchetypeArrays(): void { private updateAllArchetypeArrays(): void {
this._allArchetypes = []; this._allArchetypes = [];
for (let archetype of this._archetypes.values()) { for (const archetype of this._archetypes.values()) {
this._allArchetypes.push(archetype); this._allArchetypes.push(archetype);
} }
} }
@@ -258,18 +258,18 @@ export class ArchetypeSystem {
private getEntityComponentTypes(entity: Entity): ComponentType[] { private getEntityComponentTypes(entity: Entity): ComponentType[] {
let componentTypes = this._entityComponentTypesCache.get(entity); let componentTypes = this._entityComponentTypesCache.get(entity);
if (!componentTypes) { if (!componentTypes) {
componentTypes = entity.components.map(component => component.constructor as ComponentType); componentTypes = entity.components.map((component) => component.constructor as ComponentType);
this._entityComponentTypesCache.set(entity, componentTypes); this._entityComponentTypesCache.set(entity, componentTypes);
} }
return componentTypes; return componentTypes;
} }
/** /**
* 生成原型ID * 生成原型ID
* 使用ComponentRegistry确保与Entity.componentMask使用相同的bitIndex * 使用ComponentRegistry确保与Entity.componentMask使用相同的bitIndex
*/ */
private generateArchetypeId(componentTypes: ComponentType[]): ArchetypeId { private generateArchetypeId(componentTypes: ComponentType[]): ArchetypeId {
let mask = BitMask64Utils.clone(BitMask64Utils.ZERO); const mask = BitMask64Utils.clone(BitMask64Utils.ZERO);
for (const type of componentTypes) { for (const type of componentTypes) {
if (!ComponentRegistry.isRegistered(type)) { if (!ComponentRegistry.isRegistered(type)) {
ComponentRegistry.register(type); ComponentRegistry.register(type);
@@ -279,7 +279,7 @@ export class ArchetypeSystem {
} }
return mask; return mask;
} }
/** /**
* 创建新原型 * 创建新原型
*/ */

View File

@@ -356,4 +356,4 @@ export class ComponentPoolManager {
return maxSize > 0 ? (used / maxSize * 100) : 0; return maxSize > 0 ? (used / maxSize * 100) : 0;
} }
} }

View File

@@ -9,7 +9,6 @@ import { ComponentRegistry, ComponentType } from './ComponentStorage/ComponentRe
export { ComponentRegistry, ComponentType }; export { ComponentRegistry, ComponentType };
/** /**
* 高性能组件存储器 * 高性能组件存储器
*/ */
@@ -21,7 +20,7 @@ export class ComponentStorage<T extends Component> {
constructor(componentType: ComponentType<T>) { constructor(componentType: ComponentType<T>) {
this.componentType = componentType; this.componentType = componentType;
// 确保组件类型已注册 // 确保组件类型已注册
if (!ComponentRegistry.isRegistered(componentType)) { if (!ComponentRegistry.isRegistered(componentType)) {
ComponentRegistry.register(componentType); ComponentRegistry.register(componentType);
@@ -152,7 +151,7 @@ export class ComponentStorage<T extends Component> {
usedSlots: number; usedSlots: number;
freeSlots: number; freeSlots: number;
fragmentation: number; fragmentation: number;
} { } {
const totalSlots = this.dense.length; const totalSlots = this.dense.length;
const usedSlots = this.dense.length; const usedSlots = this.dense.length;
const freeSlots = 0; // 永远无空洞 const freeSlots = 0; // 永远无空洞
@@ -173,7 +172,7 @@ export class ComponentStorage<T extends Component> {
*/ */
export class ComponentStorageManager { export class ComponentStorageManager {
private static readonly _logger = createLogger('ComponentStorage'); private static readonly _logger = createLogger('ComponentStorage');
private storages = new Map<Function, ComponentStorage<Component> | SoAStorage<Component>>(); private storages = new Map<ComponentType, ComponentStorage<Component> | SoAStorage<Component>>();
/** /**
* 检查组件类型是否启用SoA存储 * 检查组件类型是否启用SoA存储
@@ -342,15 +341,15 @@ export class ComponentStorageManager {
* @returns 组件位掩码 * @returns 组件位掩码
*/ */
public getComponentMask(entityId: number): BitMask64Data { public getComponentMask(entityId: number): BitMask64Data {
let mask = BitMask64Utils.clone(BitMask64Utils.ZERO); const mask = BitMask64Utils.clone(BitMask64Utils.ZERO);
for (const [componentType, storage] of this.storages.entries()) { for (const [componentType, storage] of this.storages.entries()) {
if (storage.hasComponent(entityId)) { if (storage.hasComponent(entityId)) {
const componentMask = ComponentRegistry.getBitMask(componentType as ComponentType); const componentMask = ComponentRegistry.getBitMask(componentType as ComponentType);
BitMask64Utils.orInPlace(mask, componentMask); BitMask64Utils.orInPlace(mask, componentMask);
} }
} }
return mask; return mask;
} }
@@ -360,12 +359,12 @@ export class ComponentStorageManager {
*/ */
public getAllStats(): Map<string, { totalSlots: number; usedSlots: number; freeSlots: number; fragmentation: number }> { public getAllStats(): Map<string, { totalSlots: number; usedSlots: number; freeSlots: number; fragmentation: number }> {
const stats = new Map<string, { totalSlots: number; usedSlots: number; freeSlots: number; fragmentation: number }>(); const stats = new Map<string, { totalSlots: number; usedSlots: number; freeSlots: number; fragmentation: number }>();
for (const [componentType, storage] of this.storages.entries()) { for (const [componentType, storage] of this.storages.entries()) {
const typeName = getComponentTypeName(componentType as ComponentType); const typeName = getComponentTypeName(componentType as ComponentType);
stats.set(typeName, storage.getStats()); stats.set(typeName, storage.getStats());
} }
return stats; return stats;
} }
@@ -378,4 +377,4 @@ export class ComponentStorageManager {
} }
this.storages.clear(); this.storages.clear();
} }
} }

View File

@@ -6,6 +6,7 @@ import { getComponentTypeName } from '../../Decorators';
/** /**
* 组件类型定义 * 组件类型定义
*/ */
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export type ComponentType<T extends Component = Component> = new (...args: any[]) => T; export type ComponentType<T extends Component = Component> = new (...args: any[]) => T;
/** /**
@@ -14,9 +15,9 @@ export type ComponentType<T extends Component = Component> = new (...args: any[]
*/ */
export class ComponentRegistry { export class ComponentRegistry {
protected static readonly _logger = createLogger('ComponentStorage'); protected static readonly _logger = createLogger('ComponentStorage');
private static componentTypes = new Map<Function, number>(); private static componentTypes = new Map<ComponentType, number>();
private static bitIndexToType = new Map<number, Function>(); private static bitIndexToType = new Map<number, ComponentType>();
private static componentNameToType = new Map<string, Function>(); private static componentNameToType = new Map<string, ComponentType>();
private static componentNameToId = new Map<string, number>(); private static componentNameToId = new Map<string, number>();
private static maskCache = new Map<string, BitMask64Data>(); private static maskCache = new Map<string, BitMask64Data>();
private static nextBitIndex = 0; private static nextBitIndex = 0;
@@ -102,7 +103,7 @@ export class ComponentRegistry {
* @param componentName 组件名称 * @param componentName 组件名称
* @returns 组件类型构造函数 * @returns 组件类型构造函数
*/ */
public static getComponentType(componentName: string): Function | null { public static getComponentType(componentName: string): ComponentType | null {
return this.componentNameToType.get(componentName) || null; return this.componentNameToType.get(componentName) || null;
} }
@@ -110,7 +111,7 @@ export class ComponentRegistry {
* 获取所有已注册的组件类型 * 获取所有已注册的组件类型
* @returns 组件类型映射 * @returns 组件类型映射
*/ */
public static getAllRegisteredTypes(): Map<Function, number> { public static getAllRegisteredTypes(): Map<ComponentType, number> {
return new Map(this.componentTypes); return new Map(this.componentTypes);
} }
@@ -118,7 +119,7 @@ export class ComponentRegistry {
* 获取所有组件名称到类型的映射 * 获取所有组件名称到类型的映射
* @returns 名称到类型的映射 * @returns 名称到类型的映射
*/ */
public static getAllComponentNames(): Map<string, Function> { public static getAllComponentNames(): Map<string, ComponentType> {
return new Map(this.componentNameToType); return new Map(this.componentNameToType);
} }
@@ -153,7 +154,7 @@ export class ComponentRegistry {
*/ */
public static createSingleComponentMask(componentName: string): BitMask64Data { public static createSingleComponentMask(componentName: string): BitMask64Data {
const cacheKey = `single:${componentName}`; const cacheKey = `single:${componentName}`;
if (this.maskCache.has(cacheKey)) { if (this.maskCache.has(cacheKey)) {
return this.maskCache.get(cacheKey)!; return this.maskCache.get(cacheKey)!;
} }
@@ -176,12 +177,12 @@ export class ComponentRegistry {
public static createComponentMask(componentNames: string[]): BitMask64Data { public static createComponentMask(componentNames: string[]): BitMask64Data {
const sortedNames = [...componentNames].sort(); const sortedNames = [...componentNames].sort();
const cacheKey = `multi:${sortedNames.join(',')}`; const cacheKey = `multi:${sortedNames.join(',')}`;
if (this.maskCache.has(cacheKey)) { if (this.maskCache.has(cacheKey)) {
return this.maskCache.get(cacheKey)!; return this.maskCache.get(cacheKey)!;
} }
let mask = BitMask64Utils.clone(BitMask64Utils.ZERO); const mask = BitMask64Utils.clone(BitMask64Utils.ZERO);
for (const name of componentNames) { for (const name of componentNames) {
const componentId = this.getComponentId(name); const componentId = this.getComponentId(name);
if (componentId !== undefined) { if (componentId !== undefined) {
@@ -212,4 +213,4 @@ export class ComponentRegistry {
this.maskCache.clear(); this.maskCache.clear();
this.nextBitIndex = 0; this.nextBitIndex = 0;
} }
} }

View File

@@ -1,6 +1,6 @@
import { import {
IEventBus, IEventBus,
IEventListenerConfig, IEventListenerConfig,
IEventStats, IEventStats,
IEventData, IEventData,
IEntityEventData, IEntityEventData,
@@ -10,10 +10,10 @@ import {
IPerformanceEventData IPerformanceEventData
} from '../../Types'; } from '../../Types';
import { createLogger } from '../../Utils/Logger'; import { createLogger } from '../../Utils/Logger';
import { import {
TypeSafeEventSystem, TypeSafeEventSystem,
EventListenerConfig, EventListenerConfig,
EventStats EventStats
} from './EventSystem'; } from './EventSystem';
import { import {
ECSEventType, ECSEventType,
@@ -30,12 +30,12 @@ export class EventBus implements IEventBus {
private eventSystem: TypeSafeEventSystem; private eventSystem: TypeSafeEventSystem;
private eventIdCounter = 0; private eventIdCounter = 0;
private isDebugMode = false; private isDebugMode = false;
constructor(debugMode: boolean = false) { constructor(debugMode: boolean = false) {
this.eventSystem = new TypeSafeEventSystem(); this.eventSystem = new TypeSafeEventSystem();
this.isDebugMode = debugMode; this.isDebugMode = debugMode;
} }
/** /**
* 发射事件 * 发射事件
* @param eventType 事件类型 * @param eventType 事件类型
@@ -53,7 +53,7 @@ export class EventBus implements IEventBus {
this.eventSystem.emitSync(eventType, finalData); this.eventSystem.emitSync(eventType, finalData);
} }
/** /**
* 异步发射事件 * 异步发射事件
* @param eventType 事件类型 * @param eventType 事件类型
@@ -71,7 +71,7 @@ export class EventBus implements IEventBus {
await this.eventSystem.emit(eventType, finalData); await this.eventSystem.emit(eventType, finalData);
} }
/** /**
* 监听事件 * 监听事件
* @param eventType 事件类型 * @param eventType 事件类型
@@ -80,26 +80,26 @@ export class EventBus implements IEventBus {
* @returns 监听器ID * @returns 监听器ID
*/ */
public on<T>( public on<T>(
eventType: string, eventType: string,
handler: (data: T) => void, handler: (data: T) => void,
config: IEventListenerConfig = {} config: IEventListenerConfig = {}
): string { ): string {
this.validateEventType(eventType); this.validateEventType(eventType);
const eventConfig: EventListenerConfig = { const eventConfig: EventListenerConfig = {
once: config.once || false, once: config.once || false,
priority: config.priority || EventPriority.NORMAL, priority: config.priority || EventPriority.NORMAL,
async: config.async || false, async: config.async || false,
context: config.context context: config.context
}; };
if (this.isDebugMode) { if (this.isDebugMode) {
EventBus._logger.info(`添加监听器: ${eventType}`, eventConfig); EventBus._logger.info(`添加监听器: ${eventType}`, eventConfig);
} }
return this.eventSystem.on(eventType, handler, eventConfig); return this.eventSystem.on(eventType, handler, eventConfig);
} }
/** /**
* 监听事件(一次性) * 监听事件(一次性)
* @param eventType 事件类型 * @param eventType 事件类型
@@ -108,13 +108,13 @@ export class EventBus implements IEventBus {
* @returns 监听器ID * @returns 监听器ID
*/ */
public once<T>( public once<T>(
eventType: string, eventType: string,
handler: (data: T) => void, handler: (data: T) => void,
config: IEventListenerConfig = {} config: IEventListenerConfig = {}
): string { ): string {
return this.on(eventType, handler, { ...config, once: true }); return this.on(eventType, handler, { ...config, once: true });
} }
/** /**
* 异步监听事件 * 异步监听事件
* @param eventType 事件类型 * @param eventType 事件类型
@@ -123,13 +123,13 @@ export class EventBus implements IEventBus {
* @returns 监听器ID * @returns 监听器ID
*/ */
public onAsync<T>( public onAsync<T>(
eventType: string, eventType: string,
handler: (data: T) => Promise<void>, handler: (data: T) => Promise<void>,
config: IEventListenerConfig = {} config: IEventListenerConfig = {}
): string { ): string {
return this.on(eventType, handler as any, { ...config, async: true }); return this.on(eventType, handler as (data: T) => void, { ...config, async: true });
} }
/** /**
* 移除事件监听器 * 移除事件监听器
* @param eventType 事件类型 * @param eventType 事件类型
@@ -139,10 +139,10 @@ export class EventBus implements IEventBus {
if (this.isDebugMode) { if (this.isDebugMode) {
EventBus._logger.info(`移除监听器: ${listenerId} 事件: ${eventType}`); EventBus._logger.info(`移除监听器: ${listenerId} 事件: ${eventType}`);
} }
return this.eventSystem.off(eventType, listenerId); return this.eventSystem.off(eventType, listenerId);
} }
/** /**
* 移除指定事件类型的所有监听器 * 移除指定事件类型的所有监听器
* @param eventType 事件类型 * @param eventType 事件类型
@@ -151,10 +151,10 @@ export class EventBus implements IEventBus {
if (this.isDebugMode) { if (this.isDebugMode) {
EventBus._logger.info(`移除所有监听器: ${eventType}`); EventBus._logger.info(`移除所有监听器: ${eventType}`);
} }
this.eventSystem.offAll(eventType); this.eventSystem.offAll(eventType);
} }
/** /**
* 检查是否有指定事件的监听器 * 检查是否有指定事件的监听器
* @param eventType 事件类型 * @param eventType 事件类型
@@ -162,14 +162,14 @@ export class EventBus implements IEventBus {
public hasListeners(eventType: string): boolean { public hasListeners(eventType: string): boolean {
return this.eventSystem.hasListeners(eventType); return this.eventSystem.hasListeners(eventType);
} }
/** /**
* 获取事件统计信息 * 获取事件统计信息
* @param eventType 事件类型(可选) * @param eventType 事件类型(可选)
*/ */
public getStats(eventType?: string): IEventStats | Map<string, IEventStats> { public getStats(eventType?: string): IEventStats | Map<string, IEventStats> {
const stats = this.eventSystem.getStats(eventType); const stats = this.eventSystem.getStats(eventType);
if (stats instanceof Map) { if (stats instanceof Map) {
// 转换Map中的每个EventStats为IEventStats // 转换Map中的每个EventStats为IEventStats
const result = new Map<string, IEventStats>(); const result = new Map<string, IEventStats>();
@@ -181,7 +181,7 @@ export class EventBus implements IEventBus {
return this.convertEventStats(stats); return this.convertEventStats(stats);
} }
} }
/** /**
* 清空所有监听器 * 清空所有监听器
*/ */
@@ -189,10 +189,10 @@ export class EventBus implements IEventBus {
if (this.isDebugMode) { if (this.isDebugMode) {
EventBus._logger.info('清空所有监听器'); EventBus._logger.info('清空所有监听器');
} }
this.eventSystem.clear(); this.eventSystem.clear();
} }
/** /**
* 启用或禁用事件系统 * 启用或禁用事件系统
* @param enabled 是否启用 * @param enabled 是否启用
@@ -200,7 +200,7 @@ export class EventBus implements IEventBus {
public setEnabled(enabled: boolean): void { public setEnabled(enabled: boolean): void {
this.eventSystem.setEnabled(enabled); this.eventSystem.setEnabled(enabled);
} }
/** /**
* 设置调试模式 * 设置调试模式
* @param debug 是否启用调试 * @param debug 是否启用调试
@@ -208,7 +208,7 @@ export class EventBus implements IEventBus {
public setDebugMode(debug: boolean): void { public setDebugMode(debug: boolean): void {
this.isDebugMode = debug; this.isDebugMode = debug;
} }
/** /**
* 设置最大监听器数量 * 设置最大监听器数量
* @param max 最大数量 * @param max 最大数量
@@ -216,7 +216,7 @@ export class EventBus implements IEventBus {
public setMaxListeners(max: number): void { public setMaxListeners(max: number): void {
this.eventSystem.setMaxListeners(max); this.eventSystem.setMaxListeners(max);
} }
/** /**
* 获取监听器数量 * 获取监听器数量
* @param eventType 事件类型 * @param eventType 事件类型
@@ -224,7 +224,7 @@ export class EventBus implements IEventBus {
public getListenerCount(eventType: string): number { public getListenerCount(eventType: string): number {
return this.eventSystem.getListenerCount(eventType); return this.eventSystem.getListenerCount(eventType);
} }
/** /**
* 设置事件批处理配置 * 设置事件批处理配置
* @param eventType 事件类型 * @param eventType 事件类型
@@ -238,7 +238,7 @@ export class EventBus implements IEventBus {
enabled: true enabled: true
}); });
} }
/** /**
* 刷新指定事件的批处理队列 * 刷新指定事件的批处理队列
* @param eventType 事件类型 * @param eventType 事件类型
@@ -246,7 +246,7 @@ export class EventBus implements IEventBus {
public flushBatch(eventType: string): void { public flushBatch(eventType: string): void {
this.eventSystem.flushBatch(eventType); this.eventSystem.flushBatch(eventType);
} }
/** /**
* 重置事件统计 * 重置事件统计
* @param eventType 事件类型(可选) * @param eventType 事件类型(可选)
@@ -254,9 +254,9 @@ export class EventBus implements IEventBus {
public resetStats(eventType?: string): void { public resetStats(eventType?: string): void {
this.eventSystem.resetStats(eventType); this.eventSystem.resetStats(eventType);
} }
// 便捷方法发射预定义的ECS事件 // 便捷方法发射预定义的ECS事件
/** /**
* 发射实体创建事件 * 发射实体创建事件
* @param entityData 实体事件数据 * @param entityData 实体事件数据
@@ -320,59 +320,59 @@ export class EventBus implements IEventBus {
public emitPerformanceWarning(performanceData: IPerformanceEventData): void { public emitPerformanceWarning(performanceData: IPerformanceEventData): void {
this.emit(ECSEventType.PERFORMANCE_WARNING, performanceData); this.emit(ECSEventType.PERFORMANCE_WARNING, performanceData);
} }
// 便捷方法监听预定义的ECS事件 // 便捷方法监听预定义的ECS事件
/** /**
* 监听实体创建事件 * 监听实体创建事件
* @param handler 事件处理器 * @param handler 事件处理器
* @param config 监听器配置 * @param config 监听器配置
*/ */
public onEntityCreated( public onEntityCreated(
handler: (data: IEntityEventData) => void, handler: (data: IEntityEventData) => void,
config?: IEventListenerConfig config?: IEventListenerConfig
): string { ): string {
return this.on(ECSEventType.ENTITY_CREATED, handler, config); return this.on(ECSEventType.ENTITY_CREATED, handler, config);
} }
/** /**
* 监听组件添加事件 * 监听组件添加事件
* @param handler 事件处理器 * @param handler 事件处理器
* @param config 监听器配置 * @param config 监听器配置
*/ */
public onComponentAdded( public onComponentAdded(
handler: (data: IComponentEventData) => void, handler: (data: IComponentEventData) => void,
config?: IEventListenerConfig config?: IEventListenerConfig
): string { ): string {
return this.on(ECSEventType.COMPONENT_ADDED, handler, config); return this.on(ECSEventType.COMPONENT_ADDED, handler, config);
} }
/** /**
* 监听系统错误事件 * 监听系统错误事件
* @param handler 事件处理器 * @param handler 事件处理器
* @param config 监听器配置 * @param config 监听器配置
*/ */
public onSystemError( public onSystemError(
handler: (data: ISystemEventData) => void, handler: (data: ISystemEventData) => void,
config?: IEventListenerConfig config?: IEventListenerConfig
): string { ): string {
return this.on(ECSEventType.SYSTEM_ERROR, handler, config); return this.on(ECSEventType.SYSTEM_ERROR, handler, config);
} }
/** /**
* 监听性能警告事件 * 监听性能警告事件
* @param handler 事件处理器 * @param handler 事件处理器
* @param config 监听器配置 * @param config 监听器配置
*/ */
public onPerformanceWarning( public onPerformanceWarning(
handler: (data: IPerformanceEventData) => void, handler: (data: IPerformanceEventData) => void,
config?: IEventListenerConfig config?: IEventListenerConfig
): string { ): string {
return this.on(ECSEventType.PERFORMANCE_WARNING, handler, config); return this.on(ECSEventType.PERFORMANCE_WARNING, handler, config);
} }
// 私有方法 // 私有方法
/** /**
* 验证事件类型仅在debug模式下执行提升性能 * 验证事件类型仅在debug模式下执行提升性能
* @param eventType 事件类型 * @param eventType 事件类型
@@ -387,7 +387,7 @@ export class EventBus implements IEventBus {
} }
} }
} }
/** /**
* 增强事件数据 * 增强事件数据
* @param eventType 事件类型 * @param eventType 事件类型
@@ -402,9 +402,9 @@ export class EventBus implements IEventBus {
source: 'EventBus' source: 'EventBus'
} as T & IEventData; } as T & IEventData;
} }
const enhanced = data as T & IEventData; const enhanced = data as T & IEventData;
// 如果数据还没有基础事件属性,添加它们 // 如果数据还没有基础事件属性,添加它们
if (!enhanced.timestamp) { if (!enhanced.timestamp) {
enhanced.timestamp = Date.now(); enhanced.timestamp = Date.now();
@@ -415,10 +415,10 @@ export class EventBus implements IEventBus {
if (!enhanced.source) { if (!enhanced.source) {
enhanced.source = 'EventBus'; enhanced.source = 'EventBus';
} }
return enhanced; return enhanced;
} }
/** /**
* 转换EventStats为IEventStats * 转换EventStats为IEventStats
* @param stats EventStats实例 * @param stats EventStats实例
@@ -441,7 +441,7 @@ export class EventBus implements IEventBus {
*/ */
export class GlobalEventBus { export class GlobalEventBus {
private static instance: EventBus; private static instance: EventBus;
/** /**
* 获取全局事件总线实例 * 获取全局事件总线实例
* @param debugMode 是否启用调试模式 * @param debugMode 是否启用调试模式
@@ -452,7 +452,7 @@ export class GlobalEventBus {
} }
return this.instance; return this.instance;
} }
/** /**
* 重置全局事件总线实例 * 重置全局事件总线实例
* @param debugMode 是否启用调试模式 * @param debugMode 是否启用调试模式
@@ -466,4 +466,3 @@ export class GlobalEventBus {
} }
} }

View File

@@ -3,12 +3,12 @@ import { createLogger } from '../../Utils/Logger';
/** /**
* 事件处理器函数类型 * 事件处理器函数类型
*/ */
export type EventHandler<T = any> = (event: T) => void; export type EventHandler<T = unknown> = (event: T) => void;
/** /**
* 异步事件处理器函数类型 * 异步事件处理器函数类型
*/ */
export type AsyncEventHandler<T = any> = (event: T) => Promise<void>; export type AsyncEventHandler<T = unknown> = (event: T) => Promise<void>;
/** /**
* 事件监听器配置 * 事件监听器配置
@@ -21,13 +21,13 @@ export interface EventListenerConfig {
/** 是否异步执行 */ /** 是否异步执行 */
async?: boolean; async?: boolean;
/** 执行上下文 */ /** 执行上下文 */
context?: any; context?: unknown;
} }
/** /**
* 内部事件监听器 * 内部事件监听器
*/ */
interface InternalEventListener<T = any> { interface InternalEventListener<T = unknown> {
handler: EventHandler<T> | AsyncEventHandler<T>; handler: EventHandler<T> | AsyncEventHandler<T>;
config: EventListenerConfig; config: EventListenerConfig;
id: string; id: string;
@@ -71,8 +71,8 @@ export class TypeSafeEventSystem {
private static readonly _logger = createLogger('EventSystem'); private static readonly _logger = createLogger('EventSystem');
private listeners = new Map<string, InternalEventListener[]>(); private listeners = new Map<string, InternalEventListener[]>();
private stats = new Map<string, EventStats>(); private stats = new Map<string, EventStats>();
private batchQueue = new Map<string, any[]>(); private batchQueue = new Map<string, unknown[]>();
private batchTimers = new Map<string, number>(); private batchTimers = new Map<string, ReturnType<typeof setTimeout>>();
private batchConfigs = new Map<string, EventBatchConfig>(); private batchConfigs = new Map<string, EventBatchConfig>();
private nextListenerId = 0; private nextListenerId = 0;
private isEnabled = true; private isEnabled = true;
@@ -133,7 +133,7 @@ export class TypeSafeEventSystem {
const listeners = this.listeners.get(eventType); const listeners = this.listeners.get(eventType);
if (!listeners) return false; if (!listeners) return false;
const index = listeners.findIndex(l => l.id === listenerId); const index = listeners.findIndex((l) => l.id === listenerId);
if (index === -1) return false; if (index === -1) return false;
listeners.splice(index, 1); listeners.splice(index, 1);
@@ -353,7 +353,7 @@ export class TypeSafeEventSystem {
id: listenerId id: listenerId
}; };
listeners.push(listener); listeners.push(listener as InternalEventListener);
// 初始化统计信息 // 初始化统计信息
if (!this.stats.has(eventType)) { if (!this.stats.has(eventType)) {
@@ -379,8 +379,8 @@ export class TypeSafeEventSystem {
const sortedListeners = this.sortListenersByPriority(listeners); const sortedListeners = this.sortListenersByPriority(listeners);
// 分离同步和异步监听器 // 分离同步和异步监听器
const syncListeners = sortedListeners.filter(l => !l.config.async); const syncListeners = sortedListeners.filter((l) => !l.config.async);
const asyncListeners = sortedListeners.filter(l => l.config.async); const asyncListeners = sortedListeners.filter((l) => l.config.async);
// 执行同步监听器 // 执行同步监听器
for (const listener of syncListeners) { for (const listener of syncListeners) {
@@ -447,7 +447,7 @@ export class TypeSafeEventSystem {
if (!listeners) return; if (!listeners) return;
for (const id of listenerIds) { for (const id of listenerIds) {
const index = listeners.findIndex(l => l.id === id); const index = listeners.findIndex((l) => l.id === id);
if (index !== -1) { if (index !== -1) {
listeners.splice(index, 1); listeners.splice(index, 1);
} }
@@ -488,7 +488,7 @@ export class TypeSafeEventSystem {
this.flushBatch(eventType); this.flushBatch(eventType);
}, config.delay); }, config.delay);
this.batchTimers.set(eventType, timer as any); this.batchTimers.set(eventType, timer);
} }
} }
@@ -578,4 +578,3 @@ export class TypeSafeEventSystem {
*/ */
export const GlobalEventSystem = new TypeSafeEventSystem(); export const GlobalEventSystem = new TypeSafeEventSystem();

View File

@@ -1,2 +1,2 @@
export { EventBus, GlobalEventBus } from '../EventBus'; export { EventBus, GlobalEventBus } from '../EventBus';
export { TypeSafeEventSystem, EventListenerConfig, EventStats } from '../EventSystem'; export { TypeSafeEventSystem, EventListenerConfig, EventStats } from '../EventSystem';

View File

@@ -8,4 +8,4 @@ export {
createECSAPI, createECSAPI,
initializeECS, initializeECS,
ECS ECS
} from './FluentAPI/index'; } from './FluentAPI/index';

View File

@@ -52,4 +52,4 @@ export class ComponentBuilder<T extends Component> {
public build(): T { public build(): T {
return this.component; return this.component;
} }
} }

View File

@@ -47,7 +47,7 @@ export class ECSFluentAPI {
* @returns 组件构建器 * @returns 组件构建器
*/ */
public createComponent<T extends Component>( public createComponent<T extends Component>(
componentClass: new (...args: unknown[]) => T, componentClass: new (...args: unknown[]) => T,
...args: unknown[] ...args: unknown[]
): ComponentBuilder<T> { ): ComponentBuilder<T> {
return new ComponentBuilder(componentClass, ...args); return new ComponentBuilder(componentClass, ...args);
@@ -164,7 +164,7 @@ export class ECSFluentAPI {
componentStats: Map<string, unknown>; componentStats: Map<string, unknown>;
queryStats: unknown; queryStats: unknown;
eventStats: Map<string, unknown>; eventStats: Map<string, unknown>;
} { } {
return { return {
entityCount: this.scene.entities.count, entityCount: this.scene.entities.count,
systemCount: this.scene.systems.length, systemCount: this.scene.systems.length,
@@ -183,8 +183,8 @@ export class ECSFluentAPI {
* @returns ECS流式API实例 * @returns ECS流式API实例
*/ */
export function createECSAPI( export function createECSAPI(
scene: IScene, scene: IScene,
querySystem: QuerySystem, querySystem: QuerySystem,
eventSystem: TypeSafeEventSystem eventSystem: TypeSafeEventSystem
): ECSFluentAPI { ): ECSFluentAPI {
return new ECSFluentAPI(scene, querySystem, eventSystem); return new ECSFluentAPI(scene, querySystem, eventSystem);
@@ -202,9 +202,9 @@ export let ECS: ECSFluentAPI;
* @param eventSystem 事件系统 * @param eventSystem 事件系统
*/ */
export function initializeECS( export function initializeECS(
scene: IScene, scene: IScene,
querySystem: QuerySystem, querySystem: QuerySystem,
eventSystem: TypeSafeEventSystem eventSystem: TypeSafeEventSystem
): void { ): void {
ECS = createECSAPI(scene, querySystem, eventSystem); ECS = createECSAPI(scene, querySystem, eventSystem);
} }

View File

@@ -95,4 +95,4 @@ export class EntityBatchOperator {
public count(): number { public count(): number {
return this.entities.length; return this.entities.length;
} }
} }

View File

@@ -15,8 +15,8 @@ export class EntityBuilder {
this.scene = scene; this.scene = scene;
this.storageManager = storageManager; this.storageManager = storageManager;
const id = scene.identifierPool.checkOut(); const id = scene.identifierPool.checkOut();
this.entity = new Entity("", id); this.entity = new Entity('', id);
this.entity.scene = this.scene as any; this.entity.scene = this.scene;
} }
/** /**
@@ -92,7 +92,7 @@ export class EntityBuilder {
* @returns 实体构建器 * @returns 实体构建器
*/ */
public configure<T extends Component>( public configure<T extends Component>(
componentType: ComponentType<T>, componentType: ComponentType<T>,
configurator: (component: T) => void configurator: (component: T) => void
): EntityBuilder { ): EntityBuilder {
const component = this.entity.getComponent(componentType); const component = this.entity.getComponent(componentType);
@@ -199,4 +199,4 @@ export class EntityBuilder {
newBuilder.entity = this.entity; // 实际应该是深度克隆 newBuilder.entity = this.entity; // 实际应该是深度克隆
return newBuilder; return newBuilder;
} }
} }

View File

@@ -87,4 +87,4 @@ export class SceneBuilder {
public build(): Scene { public build(): Scene {
return this.scene; return this.scene;
} }
} }

View File

@@ -2,4 +2,4 @@ export { EntityBuilder } from './EntityBuilder';
export { SceneBuilder } from './SceneBuilder'; export { SceneBuilder } from './SceneBuilder';
export { ComponentBuilder } from './ComponentBuilder'; export { ComponentBuilder } from './ComponentBuilder';
export { EntityBatchOperator } from './EntityBatchOperator'; export { EntityBatchOperator } from './EntityBatchOperator';
export { ECSFluentAPI, createECSAPI, initializeECS, ECS } from './ECSFluentAPI'; export { ECSFluentAPI, createECSAPI, initializeECS, ECS } from './ECSFluentAPI';

View File

@@ -1,3 +1,2 @@
export { QuerySystem } from '../QuerySystem'; export { QuerySystem } from '../QuerySystem';
export { ECSFluentAPI, createECSAPI } from '../FluentAPI'; export { ECSFluentAPI, createECSAPI } from '../FluentAPI';

View File

@@ -30,14 +30,14 @@ interface QueryCacheEntry {
/** /**
* 高性能实体查询系统 * 高性能实体查询系统
* *
* 提供快速的实体查询功能,支持按组件类型、标签、名称等多种方式查询实体。 * 提供快速的实体查询功能,支持按组件类型、标签、名称等多种方式查询实体。
* *
* @example * @example
* ```typescript * ```typescript
* // 查询所有包含Position和Velocity组件的实体 * // 查询所有包含Position和Velocity组件的实体
* const movingEntities = querySystem.queryAll(PositionComponent, VelocityComponent); * const movingEntities = querySystem.queryAll(PositionComponent, VelocityComponent);
* *
* // 查询特定标签的实体 * // 查询特定标签的实体
* const playerEntities = querySystem.queryByTag(PLAYER_TAG); * const playerEntities = querySystem.queryByTag(PLAYER_TAG);
* ``` * ```
@@ -92,10 +92,10 @@ export class QuerySystem {
/** /**
* 添加单个实体到查询系统 * 添加单个实体到查询系统
* *
* 将新实体添加到查询系统中,并自动更新相关索引。 * 将新实体添加到查询系统中,并自动更新相关索引。
* 为了提高批量添加性能,可以延迟缓存清理。 * 为了提高批量添加性能,可以延迟缓存清理。
* *
* @param entity 要添加的实体 * @param entity 要添加的实体
* @param deferCacheClear 是否延迟缓存清理(用于批量操作) * @param deferCacheClear 是否延迟缓存清理(用于批量操作)
*/ */
@@ -121,17 +121,17 @@ export class QuerySystem {
/** /**
* 批量添加实体 * 批量添加实体
* *
* 高效地批量添加多个实体,减少缓存清理次数。 * 高效地批量添加多个实体,减少缓存清理次数。
* 使用Set来避免O(n)的重复检查。 * 使用Set来避免O(n)的重复检查。
* *
* @param entities 要添加的实体列表 * @param entities 要添加的实体列表
*/ */
public addEntities(entities: Entity[]): void { public addEntities(entities: Entity[]): void {
if (entities.length === 0) return; if (entities.length === 0) return;
// 使用Set来快速检查重复 // 使用Set来快速检查重复
const existingIds = new Set(this.entities.map(e => e.id)); const existingIds = new Set(this.entities.map((e) => e.id));
let addedCount = 0; let addedCount = 0;
for (const entity of entities) { for (const entity of entities) {
@@ -155,10 +155,10 @@ export class QuerySystem {
/** /**
* 批量添加实体(无重复检查版本) * 批量添加实体(无重复检查版本)
* *
* 假设所有实体都是新的,跳过重复检查以获得最大性能。 * 假设所有实体都是新的,跳过重复检查以获得最大性能。
* 仅在确保没有重复实体时使用。 * 仅在确保没有重复实体时使用。
* *
* @param entities 要添加的实体列表 * @param entities 要添加的实体列表
*/ */
public addEntitiesUnchecked(entities: Entity[]): void { public addEntitiesUnchecked(entities: Entity[]): void {
@@ -437,13 +437,13 @@ export class QuerySystem {
/** /**
* 按标签查询实体 * 按标签查询实体
* *
* 返回具有指定标签的所有实体。 * 返回具有指定标签的所有实体。
* 标签查询使用专用索引,具有很高的查询性能。 * 标签查询使用专用索引,具有很高的查询性能。
* *
* @param tag 要查询的标签值 * @param tag 要查询的标签值
* @returns 查询结果,包含匹配的实体和性能信息 * @returns 查询结果,包含匹配的实体和性能信息
* *
* @example * @example
* ```typescript * ```typescript
* // 查询所有玩家实体 * // 查询所有玩家实体
@@ -485,13 +485,13 @@ export class QuerySystem {
/** /**
* 按名称查询实体 * 按名称查询实体
* *
* 返回具有指定名称的所有实体。 * 返回具有指定名称的所有实体。
* 名称查询使用专用索引,适用于查找特定的命名实体。 * 名称查询使用专用索引,适用于查找特定的命名实体。
* *
* @param name 要查询的实体名称 * @param name 要查询的实体名称
* @returns 查询结果,包含匹配的实体和性能信息 * @returns 查询结果,包含匹配的实体和性能信息
* *
* @example * @example
* ```typescript * ```typescript
* // 查找名为"Player"的实体 * // 查找名为"Player"的实体
@@ -533,13 +533,13 @@ export class QuerySystem {
/** /**
* 按单个组件类型查询实体 * 按单个组件类型查询实体
* *
* 返回包含指定组件类型的所有实体。 * 返回包含指定组件类型的所有实体。
* 这是最基础的查询方法,具有最高的查询性能。 * 这是最基础的查询方法,具有最高的查询性能。
* *
* @param componentType 要查询的组件类型 * @param componentType 要查询的组件类型
* @returns 查询结果,包含匹配的实体和性能信息 * @returns 查询结果,包含匹配的实体和性能信息
* *
* @example * @example
* ```typescript * ```typescript
* // 查询所有具有位置组件的实体 * // 查询所有具有位置组件的实体
@@ -679,7 +679,7 @@ export class QuerySystem {
} }
// 多组件查询:使用排序后的类型名称创建键 // 多组件查询:使用排序后的类型名称创建键
const sortKey = componentTypes.map(t => { const sortKey = componentTypes.map((t) => {
const name = getComponentTypeName(t); const name = getComponentTypeName(t);
return name; return name;
}).sort().join(','); }).sort().join(',');
@@ -810,7 +810,7 @@ export class QuerySystem {
*/ */
private createComponentMask(componentTypes: ComponentType[]): BitMask64Data { private createComponentMask(componentTypes: ComponentType[]): BitMask64Data {
// 生成缓存键 // 生成缓存键
const cacheKey = componentTypes.map(t => { const cacheKey = componentTypes.map((t) => {
return getComponentTypeName(t); return getComponentTypeName(t);
}).sort().join(','); }).sort().join(',');
@@ -821,7 +821,7 @@ export class QuerySystem {
} }
// 使用ComponentRegistry而不是ComponentTypeManager,确保bitIndex一致 // 使用ComponentRegistry而不是ComponentTypeManager,确保bitIndex一致
let mask = BitMask64Utils.clone(BitMask64Utils.ZERO); const mask = BitMask64Utils.clone(BitMask64Utils.ZERO);
for (const type of componentTypes) { for (const type of componentTypes) {
// 确保组件已注册 // 确保组件已注册
if (!ComponentRegistry.isRegistered(type)) { if (!ComponentRegistry.isRegistered(type)) {
@@ -842,20 +842,40 @@ export class QuerySystem {
public get version(): number { public get version(): number {
return this._version; return this._version;
} }
/** /**
* 获取所有实体 * 查询所有实体
*
* 返回场景中的所有实体,不进行任何过滤。
*
* @returns 所有实体的只读数组
*
* @example
* ```typescript
* const allEntities = scene.querySystem.queryAllEntities();
* console.log(`场景中共有 ${allEntities.length} 个实体`);
* ```
*/ */
public getAllEntities(): readonly Entity[] { public queryAllEntities(): readonly Entity[] {
return this.entities; return this.entities;
} }
/**
* 获取所有实体
*
* @deprecated 使用 queryAllEntities() 代替,以保持命名一致性
* @see {@link queryAllEntities}
*/
public getAllEntities(): readonly Entity[] {
return this.queryAllEntities();
}
/** /**
* 获取系统统计信息 * 获取系统统计信息
* *
* 返回查询系统的详细统计信息,包括实体数量、索引状态、 * 返回查询系统的详细统计信息,包括实体数量、索引状态、
* 查询性能统计等,用于性能监控和调试。 * 查询性能统计等,用于性能监控和调试。
* *
* @returns 系统统计信息对象 * @returns 系统统计信息对象
*/ */
public getStats(): { public getStats(): {
@@ -875,13 +895,17 @@ export class QuerySystem {
cacheHitRate: string; cacheHitRate: string;
}; };
optimizationStats: { optimizationStats: {
archetypeSystem: any; archetypeSystem: Array<{
id: BitMask64Data;
componentTypes: string[];
entityCount: number;
}>;
}; };
cacheStats: { cacheStats: {
size: number; size: number;
hitRate: string; hitRate: string;
}; };
} { } {
return { return {
entityCount: this.entities.length, entityCount: this.entities.length,
indexStats: { indexStats: {
@@ -895,9 +919,9 @@ export class QuerySystem {
(this.queryStats.cacheHits / this.queryStats.totalQueries * 100).toFixed(2) + '%' : '0%' (this.queryStats.cacheHits / this.queryStats.totalQueries * 100).toFixed(2) + '%' : '0%'
}, },
optimizationStats: { optimizationStats: {
archetypeSystem: this.archetypeSystem.getAllArchetypes().map(a => ({ archetypeSystem: this.archetypeSystem.getAllArchetypes().map((a) => ({
id: a.id, id: a.id,
componentTypes: a.componentTypes.map(t => getComponentTypeName(t)), componentTypes: a.componentTypes.map((t) => getComponentTypeName(t)),
entityCount: a.entities.size entityCount: a.entities.size
})) }))
}, },
@@ -1023,7 +1047,7 @@ export class QuerySystem {
} }
case QueryConditionType.NONE: { case QueryConditionType.NONE: {
const mask = this.createComponentMask(componentTypes); const mask = this.createComponentMask(componentTypes);
return this.entities.filter(entity => return this.entities.filter((entity) =>
BitMask64Utils.hasNone(entity.componentMask, mask) BitMask64Utils.hasNone(entity.componentMask, mask)
); );
} }
@@ -1139,10 +1163,10 @@ export class QuerySystem {
/** /**
* 查询构建器 * 查询构建器
* *
* 提供链式API来构建复杂的实体查询条件。 * 提供链式API来构建复杂的实体查询条件。
* 支持组合多种查询条件,创建灵活的查询表达式。 * 支持组合多种查询条件,创建灵活的查询表达式。
* *
* @example * @example
* ```typescript * ```typescript
* const result = new QueryBuilder(querySystem) * const result = new QueryBuilder(querySystem)
@@ -1162,7 +1186,7 @@ export class QueryBuilder {
/** /**
* 添加"必须包含所有组件"条件 * 添加"必须包含所有组件"条件
* *
* @param componentTypes 必须包含的组件类型 * @param componentTypes 必须包含的组件类型
* @returns 查询构建器实例,支持链式调用 * @returns 查询构建器实例,支持链式调用
*/ */
@@ -1177,7 +1201,7 @@ export class QueryBuilder {
/** /**
* 添加"必须包含任意组件"条件 * 添加"必须包含任意组件"条件
* *
* @param componentTypes 必须包含其中任意一个的组件类型 * @param componentTypes 必须包含其中任意一个的组件类型
* @returns 查询构建器实例,支持链式调用 * @returns 查询构建器实例,支持链式调用
*/ */
@@ -1192,7 +1216,7 @@ export class QueryBuilder {
/** /**
* 添加"不能包含任何组件"条件 * 添加"不能包含任何组件"条件
* *
* @param componentTypes 不能包含的组件类型 * @param componentTypes 不能包含的组件类型
* @returns 查询构建器实例,支持链式调用 * @returns 查询构建器实例,支持链式调用
*/ */
@@ -1207,9 +1231,9 @@ export class QueryBuilder {
/** /**
* 执行查询并返回结果 * 执行查询并返回结果
* *
* 根据已添加的查询条件执行实体查询。 * 根据已添加的查询条件执行实体查询。
* *
* @returns 查询结果,包含匹配的实体和性能信息 * @returns 查询结果,包含匹配的实体和性能信息
*/ */
public execute(): QueryResult { public execute(): QueryResult {
@@ -1241,7 +1265,7 @@ export class QueryBuilder {
* 创建组件掩码 * 创建组件掩码
*/ */
private createComponentMask(componentTypes: ComponentType[]): BitMask64Data { private createComponentMask(componentTypes: ComponentType[]): BitMask64Data {
let mask = BitMask64Utils.clone(BitMask64Utils.ZERO); const mask = BitMask64Utils.clone(BitMask64Utils.ZERO);
for (const type of componentTypes) { for (const type of componentTypes) {
try { try {
const bitMask = ComponentRegistry.getBitMask(type); const bitMask = ComponentRegistry.getBitMask(type);
@@ -1255,13 +1279,13 @@ export class QueryBuilder {
/** /**
* 重置查询构建器 * 重置查询构建器
* *
* 清除所有已添加的查询条件,重新开始构建查询。 * 清除所有已添加的查询条件,重新开始构建查询。
* *
* @returns 查询构建器实例,支持链式调用 * @returns 查询构建器实例,支持链式调用
*/ */
public reset(): QueryBuilder { public reset(): QueryBuilder {
this.conditions = []; this.conditions = [];
return this; return this;
} }
} }

View File

@@ -136,7 +136,7 @@ export class ReactiveQuery {
private generateQueryId(): string { private generateQueryId(): string {
const typeStr = this._condition.type; const typeStr = this._condition.type;
const componentsStr = this._condition.componentTypes const componentsStr = this._condition.componentTypes
.map(t => t.name) .map((t) => t.name)
.sort() .sort()
.join(','); .join(',');
return `${typeStr}:${componentsStr}`; return `${typeStr}:${componentsStr}`;

View File

@@ -39,15 +39,22 @@ interface IWeakRefConstructor {
new <T extends object>(target: T): IWeakRef<T>; new <T extends object>(target: T): IWeakRef<T>;
} }
/**
* 包含 WeakRef 的全局对象类型
*/
interface GlobalWithWeakRef {
WeakRef?: IWeakRefConstructor;
}
/** /**
* WeakRef 实现 * WeakRef 实现
* *
* 优先使用原生 WeakRef不支持时降级到 Polyfill * 优先使用原生 WeakRef不支持时降级到 Polyfill
*/ */
const WeakRefImpl: IWeakRefConstructor = ( const WeakRefImpl: IWeakRefConstructor = (
(typeof globalThis !== 'undefined' && (globalThis as any).WeakRef) || (typeof globalThis !== 'undefined' && (globalThis as GlobalWithWeakRef).WeakRef) ||
(typeof global !== 'undefined' && (global as any).WeakRef) || (typeof global !== 'undefined' && (global as unknown as GlobalWithWeakRef).WeakRef) ||
(typeof window !== 'undefined' && (window as any).WeakRef) || (typeof window !== 'undefined' && (window as unknown as GlobalWithWeakRef).WeakRef) ||
WeakRefPolyfill WeakRefPolyfill
) as IWeakRefConstructor; ) as IWeakRefConstructor;
@@ -174,6 +181,8 @@ export class ReferenceTracker {
for (const record of validRecords) { for (const record of validRecords) {
const component = record.component.deref(); const component = record.component.deref();
if (component) { if (component) {
// 使用 any 进行动态属性访问,因为无法静态验证所有可能的组件属性
// eslint-disable-next-line @typescript-eslint/no-explicit-any
(component as any)[record.propertyKey] = null; (component as any)[record.propertyKey] = null;
} }
} }
@@ -287,7 +296,7 @@ export class ReferenceTracker {
* 获取调试信息 * 获取调试信息
*/ */
public getDebugInfo(): object { public getDebugInfo(): object {
const info: Record<string, any> = {}; const info: Record<string, unknown> = {};
for (const [entityId, records] of this._references.entries()) { for (const [entityId, records] of this._references.entries()) {
const validRecords = []; const validRecords = [];

View File

@@ -2,12 +2,42 @@ import { Component } from '../Component';
import { ComponentType } from './ComponentStorage'; import { ComponentType } from './ComponentStorage';
import { createLogger } from '../../Utils/Logger'; import { createLogger } from '../../Utils/Logger';
/**
* 装饰器目标类型,用于存储元数据
*/
interface DecoratorTarget {
constructor: ComponentTypeWithMetadata;
}
/**
* 带有元数据的组件类型
*/
interface ComponentTypeWithMetadata {
__enableSoA?: boolean;
__highPrecisionFields?: Set<string>;
__float64Fields?: Set<string>;
__float32Fields?: Set<string>;
__int32Fields?: Set<string>;
__uint32Fields?: Set<string>;
__int16Fields?: Set<string>;
__uint16Fields?: Set<string>;
__int8Fields?: Set<string>;
__uint8Fields?: Set<string>;
__uint8ClampedFields?: Set<string>;
__serializeMapFields?: Set<string>;
__serializeSetFields?: Set<string>;
__serializeArrayFields?: Set<string>;
__deepCopyFields?: Set<string>;
__autoTypedFields?: Map<string, Record<string, unknown>>;
__bigIntFields?: Set<string>;
}
/** /**
* 启用SoA优化装饰器 * 启用SoA优化装饰器
* 默认关闭SoA只有在大规模批量操作场景下才建议开启 * 默认关闭SoA只有在大规模批量操作场景下才建议开启
*/ */
export function EnableSoA<T extends ComponentType>(target: T): T { export function EnableSoA<T extends ComponentType>(target: T): T {
(target as any).__enableSoA = true; (target as unknown as { __enableSoA: boolean }).__enableSoA = true;
return target; return target;
} }
@@ -16,7 +46,7 @@ export function EnableSoA<T extends ComponentType>(target: T): T {
* 高精度数值装饰器 * 高精度数值装饰器
* 标记字段需要保持完整精度存储为复杂对象而非TypedArray * 标记字段需要保持完整精度存储为复杂对象而非TypedArray
*/ */
export function HighPrecision(target: any, propertyKey: string | symbol): void { export function HighPrecision(target: DecoratorTarget, propertyKey: string | symbol): void {
const key = String(propertyKey); const key = String(propertyKey);
if (!target.constructor.__highPrecisionFields) { if (!target.constructor.__highPrecisionFields) {
target.constructor.__highPrecisionFields = new Set(); target.constructor.__highPrecisionFields = new Set();
@@ -28,7 +58,7 @@ export function HighPrecision(target: any, propertyKey: string | symbol): void {
* 64位浮点数装饰器 * 64位浮点数装饰器
* 标记字段使用Float64Array存储更高精度但更多内存 * 标记字段使用Float64Array存储更高精度但更多内存
*/ */
export function Float64(target: any, propertyKey: string | symbol): void { export function Float64(target: DecoratorTarget, propertyKey: string | symbol): void {
const key = String(propertyKey); const key = String(propertyKey);
if (!target.constructor.__float64Fields) { if (!target.constructor.__float64Fields) {
target.constructor.__float64Fields = new Set(); target.constructor.__float64Fields = new Set();
@@ -40,7 +70,7 @@ export function Float64(target: any, propertyKey: string | symbol): void {
* 32位浮点数装饰器 * 32位浮点数装饰器
* 标记字段使用Float32Array存储默认类型平衡性能和精度 * 标记字段使用Float32Array存储默认类型平衡性能和精度
*/ */
export function Float32(target: any, propertyKey: string | symbol): void { export function Float32(target: DecoratorTarget, propertyKey: string | symbol): void {
const key = String(propertyKey); const key = String(propertyKey);
if (!target.constructor.__float32Fields) { if (!target.constructor.__float32Fields) {
target.constructor.__float32Fields = new Set(); target.constructor.__float32Fields = new Set();
@@ -52,7 +82,7 @@ export function Float32(target: any, propertyKey: string | symbol): void {
* 32位整数装饰器 * 32位整数装饰器
* 标记字段使用Int32Array存储适用于整数值 * 标记字段使用Int32Array存储适用于整数值
*/ */
export function Int32(target: any, propertyKey: string | symbol): void { export function Int32(target: DecoratorTarget, propertyKey: string | symbol): void {
const key = String(propertyKey); const key = String(propertyKey);
if (!target.constructor.__int32Fields) { if (!target.constructor.__int32Fields) {
target.constructor.__int32Fields = new Set(); target.constructor.__int32Fields = new Set();
@@ -64,7 +94,7 @@ export function Int32(target: any, propertyKey: string | symbol): void {
* 32位无符号整数装饰器 * 32位无符号整数装饰器
* 标记字段使用Uint32Array存储适用于无符号整数如ID、标志位等 * 标记字段使用Uint32Array存储适用于无符号整数如ID、标志位等
*/ */
export function Uint32(target: any, propertyKey: string | symbol): void { export function Uint32(target: DecoratorTarget, propertyKey: string | symbol): void {
const key = String(propertyKey); const key = String(propertyKey);
if (!target.constructor.__uint32Fields) { if (!target.constructor.__uint32Fields) {
target.constructor.__uint32Fields = new Set(); target.constructor.__uint32Fields = new Set();
@@ -76,7 +106,7 @@ export function Uint32(target: any, propertyKey: string | symbol): void {
* 16位整数装饰器 * 16位整数装饰器
* 标记字段使用Int16Array存储适用于小范围整数 * 标记字段使用Int16Array存储适用于小范围整数
*/ */
export function Int16(target: any, propertyKey: string | symbol): void { export function Int16(target: DecoratorTarget, propertyKey: string | symbol): void {
const key = String(propertyKey); const key = String(propertyKey);
if (!target.constructor.__int16Fields) { if (!target.constructor.__int16Fields) {
target.constructor.__int16Fields = new Set(); target.constructor.__int16Fields = new Set();
@@ -88,7 +118,7 @@ export function Int16(target: any, propertyKey: string | symbol): void {
* 16位无符号整数装饰器 * 16位无符号整数装饰器
* 标记字段使用Uint16Array存储适用于小范围无符号整数 * 标记字段使用Uint16Array存储适用于小范围无符号整数
*/ */
export function Uint16(target: any, propertyKey: string | symbol): void { export function Uint16(target: DecoratorTarget, propertyKey: string | symbol): void {
const key = String(propertyKey); const key = String(propertyKey);
if (!target.constructor.__uint16Fields) { if (!target.constructor.__uint16Fields) {
target.constructor.__uint16Fields = new Set(); target.constructor.__uint16Fields = new Set();
@@ -100,7 +130,7 @@ export function Uint16(target: any, propertyKey: string | symbol): void {
* 8位整数装饰器 * 8位整数装饰器
* 标记字段使用Int8Array存储适用于很小的整数值 * 标记字段使用Int8Array存储适用于很小的整数值
*/ */
export function Int8(target: any, propertyKey: string | symbol): void { export function Int8(target: DecoratorTarget, propertyKey: string | symbol): void {
const key = String(propertyKey); const key = String(propertyKey);
if (!target.constructor.__int8Fields) { if (!target.constructor.__int8Fields) {
target.constructor.__int8Fields = new Set(); target.constructor.__int8Fields = new Set();
@@ -112,7 +142,7 @@ export function Int8(target: any, propertyKey: string | symbol): void {
* 8位无符号整数装饰器 * 8位无符号整数装饰器
* 标记字段使用Uint8Array存储适用于字节值、布尔标志等 * 标记字段使用Uint8Array存储适用于字节值、布尔标志等
*/ */
export function Uint8(target: any, propertyKey: string | symbol): void { export function Uint8(target: DecoratorTarget, propertyKey: string | symbol): void {
const key = String(propertyKey); const key = String(propertyKey);
if (!target.constructor.__uint8Fields) { if (!target.constructor.__uint8Fields) {
target.constructor.__uint8Fields = new Set(); target.constructor.__uint8Fields = new Set();
@@ -124,7 +154,7 @@ export function Uint8(target: any, propertyKey: string | symbol): void {
* 8位夹紧整数装饰器 * 8位夹紧整数装饰器
* 标记字段使用Uint8ClampedArray存储适用于颜色值等需要夹紧的数据 * 标记字段使用Uint8ClampedArray存储适用于颜色值等需要夹紧的数据
*/ */
export function Uint8Clamped(target: any, propertyKey: string | symbol): void { export function Uint8Clamped(target: DecoratorTarget, propertyKey: string | symbol): void {
const key = String(propertyKey); const key = String(propertyKey);
if (!target.constructor.__uint8ClampedFields) { if (!target.constructor.__uint8ClampedFields) {
target.constructor.__uint8ClampedFields = new Set(); target.constructor.__uint8ClampedFields = new Set();
@@ -137,7 +167,7 @@ export function Uint8Clamped(target: any, propertyKey: string | symbol): void {
* 序列化Map装饰器 * 序列化Map装饰器
* 标记Map字段需要序列化/反序列化存储 * 标记Map字段需要序列化/反序列化存储
*/ */
export function SerializeMap(target: any, propertyKey: string | symbol): void { export function SerializeMap(target: DecoratorTarget, propertyKey: string | symbol): void {
const key = String(propertyKey); const key = String(propertyKey);
if (!target.constructor.__serializeMapFields) { if (!target.constructor.__serializeMapFields) {
target.constructor.__serializeMapFields = new Set(); target.constructor.__serializeMapFields = new Set();
@@ -149,7 +179,7 @@ export function SerializeMap(target: any, propertyKey: string | symbol): void {
* 序列化Set装饰器 * 序列化Set装饰器
* 标记Set字段需要序列化/反序列化存储 * 标记Set字段需要序列化/反序列化存储
*/ */
export function SerializeSet(target: any, propertyKey: string | symbol): void { export function SerializeSet(target: DecoratorTarget, propertyKey: string | symbol): void {
const key = String(propertyKey); const key = String(propertyKey);
if (!target.constructor.__serializeSetFields) { if (!target.constructor.__serializeSetFields) {
target.constructor.__serializeSetFields = new Set(); target.constructor.__serializeSetFields = new Set();
@@ -161,7 +191,7 @@ export function SerializeSet(target: any, propertyKey: string | symbol): void {
* 序列化Array装饰器 * 序列化Array装饰器
* 标记Array字段需要序列化/反序列化存储 * 标记Array字段需要序列化/反序列化存储
*/ */
export function SerializeArray(target: any, propertyKey: string | symbol): void { export function SerializeArray(target: DecoratorTarget, propertyKey: string | symbol): void {
const key = String(propertyKey); const key = String(propertyKey);
if (!target.constructor.__serializeArrayFields) { if (!target.constructor.__serializeArrayFields) {
target.constructor.__serializeArrayFields = new Set(); target.constructor.__serializeArrayFields = new Set();
@@ -173,7 +203,7 @@ export function SerializeArray(target: any, propertyKey: string | symbol): void
* 深拷贝装饰器 * 深拷贝装饰器
* 标记字段需要深拷贝处理(适用于嵌套对象) * 标记字段需要深拷贝处理(适用于嵌套对象)
*/ */
export function DeepCopy(target: any, propertyKey: string | symbol): void { export function DeepCopy(target: DecoratorTarget, propertyKey: string | symbol): void {
const key = String(propertyKey); const key = String(propertyKey);
if (!target.constructor.__deepCopyFields) { if (!target.constructor.__deepCopyFields) {
target.constructor.__deepCopyFields = new Set(); target.constructor.__deepCopyFields = new Set();
@@ -197,7 +227,7 @@ export function AutoTyped(options?: {
precision?: boolean; precision?: boolean;
signed?: boolean; signed?: boolean;
}) { }) {
return function (target: any, propertyKey: string | symbol): void { return function (target: DecoratorTarget, propertyKey: string | symbol): void {
const key = String(propertyKey); const key = String(propertyKey);
if (!target.constructor.__autoTypedFields) { if (!target.constructor.__autoTypedFields) {
target.constructor.__autoTypedFields = new Map(); target.constructor.__autoTypedFields = new Map();
@@ -214,6 +244,7 @@ export class TypeInference {
/** /**
* 根据数值范围推断最优的TypedArray类型 * 根据数值范围推断最优的TypedArray类型
*/ */
// eslint-disable-next-line @typescript-eslint/no-explicit-any
public static inferOptimalType(value: any, options: { public static inferOptimalType(value: any, options: {
minValue?: number; minValue?: number;
maxValue?: number; maxValue?: number;
@@ -338,42 +369,42 @@ export class SoAStorage<T extends Component> {
private fields = new Map<string, SupportedTypedArray>(); private fields = new Map<string, SupportedTypedArray>();
private stringFields = new Map<string, string[]>(); // 专门存储字符串 private stringFields = new Map<string, string[]>(); // 专门存储字符串
private serializedFields = new Map<string, string[]>(); // 序列化存储Map/Set/Array private serializedFields = new Map<string, string[]>(); // 序列化存储Map/Set/Array
private complexFields = new Map<number, Map<string, any>>(); // 存储复杂对象 private complexFields = new Map<number, Map<string, unknown>>(); // 存储复杂对象
private entityToIndex = new Map<number, number>(); private entityToIndex = new Map<number, number>();
private indexToEntity: number[] = []; private indexToEntity: number[] = [];
private freeIndices: number[] = []; private freeIndices: number[] = [];
private _size = 0; private _size = 0;
private _capacity = 1000; private _capacity = 1000;
public readonly type: ComponentType<T>; public readonly type: ComponentType<T>;
constructor(componentType: ComponentType<T>) { constructor(componentType: ComponentType<T>) {
this.type = componentType; this.type = componentType;
this.initializeFields(componentType); this.initializeFields(componentType);
} }
private initializeFields(componentType: ComponentType<T>): void { private initializeFields(componentType: ComponentType<T>): void {
const instance = new componentType(); const instance = new componentType();
const highPrecisionFields = (componentType as any).__highPrecisionFields || new Set(); const highPrecisionFields = (componentType as unknown as ComponentTypeWithMetadata).__highPrecisionFields || new Set();
const float64Fields = (componentType as any).__float64Fields || new Set(); const float64Fields = (componentType as unknown as ComponentTypeWithMetadata).__float64Fields || new Set();
const float32Fields = (componentType as any).__float32Fields || new Set(); const float32Fields = (componentType as unknown as ComponentTypeWithMetadata).__float32Fields || new Set();
const int32Fields = (componentType as any).__int32Fields || new Set(); const int32Fields = (componentType as unknown as ComponentTypeWithMetadata).__int32Fields || new Set();
const uint32Fields = (componentType as any).__uint32Fields || new Set(); const uint32Fields = (componentType as unknown as ComponentTypeWithMetadata).__uint32Fields || new Set();
const int16Fields = (componentType as any).__int16Fields || new Set(); const int16Fields = (componentType as unknown as ComponentTypeWithMetadata).__int16Fields || new Set();
const uint16Fields = (componentType as any).__uint16Fields || new Set(); const uint16Fields = (componentType as unknown as ComponentTypeWithMetadata).__uint16Fields || new Set();
const int8Fields = (componentType as any).__int8Fields || new Set(); const int8Fields = (componentType as unknown as ComponentTypeWithMetadata).__int8Fields || new Set();
const uint8Fields = (componentType as any).__uint8Fields || new Set(); const uint8Fields = (componentType as unknown as ComponentTypeWithMetadata).__uint8Fields || new Set();
const uint8ClampedFields = (componentType as any).__uint8ClampedFields || new Set(); const uint8ClampedFields = (componentType as unknown as ComponentTypeWithMetadata).__uint8ClampedFields || new Set();
const autoTypedFields = (componentType as any).__autoTypedFields || new Map(); const autoTypedFields = (componentType as unknown as ComponentTypeWithMetadata).__autoTypedFields || new Map();
const serializeMapFields = (componentType as any).__serializeMapFields || new Set(); const serializeMapFields = (componentType as unknown as ComponentTypeWithMetadata).__serializeMapFields || new Set();
const serializeSetFields = (componentType as any).__serializeSetFields || new Set(); const serializeSetFields = (componentType as unknown as ComponentTypeWithMetadata).__serializeSetFields || new Set();
const serializeArrayFields = (componentType as any).__serializeArrayFields || new Set(); const serializeArrayFields = (componentType as unknown as ComponentTypeWithMetadata).__serializeArrayFields || new Set();
// const deepCopyFields = (componentType as any).__deepCopyFields || new Set(); // 未使用但保留供future使用 // const deepCopyFields = (componentType as unknown as ComponentTypeWithMetadata).__deepCopyFields || new Set(); // 未使用但保留供future使用
for (const key in instance) { for (const key in instance) {
if (instance.hasOwnProperty(key) && key !== 'id') { if (Object.prototype.hasOwnProperty.call(instance, key) && key !== 'id') {
const value = (instance as any)[key]; const value = (instance as any)[key];
const type = typeof value; const type = typeof value;
if (type === 'number') { if (type === 'number') {
if (highPrecisionFields.has(key)) { if (highPrecisionFields.has(key)) {
// 标记为高精度,作为复杂对象处理 // 标记为高精度,作为复杂对象处理
@@ -438,14 +469,14 @@ export class SoAStorage<T extends Component> {
} }
} }
} }
public addComponent(entityId: number, component: T): void { public addComponent(entityId: number, component: T): void {
if (this.entityToIndex.has(entityId)) { if (this.entityToIndex.has(entityId)) {
const index = this.entityToIndex.get(entityId)!; const index = this.entityToIndex.get(entityId)!;
this.updateComponentAtIndex(index, component); this.updateComponentAtIndex(index, component);
return; return;
} }
let index: number; let index: number;
if (this.freeIndices.length > 0) { if (this.freeIndices.length > 0) {
index = this.freeIndices.pop()!; index = this.freeIndices.pop()!;
@@ -455,13 +486,13 @@ export class SoAStorage<T extends Component> {
this.resize(this._capacity * 2); this.resize(this._capacity * 2);
} }
} }
this.entityToIndex.set(entityId, index); this.entityToIndex.set(entityId, index);
this.indexToEntity[index] = entityId; this.indexToEntity[index] = entityId;
this.updateComponentAtIndex(index, component); this.updateComponentAtIndex(index, component);
this._size++; this._size++;
} }
private updateComponentAtIndex(index: number, component: T): void { private updateComponentAtIndex(index: number, component: T): void {
const entityId = this.indexToEntity[index]!; const entityId = this.indexToEntity[index]!;
const complexFieldMap = new Map<string, any>(); const complexFieldMap = new Map<string, any>();
@@ -470,13 +501,13 @@ export class SoAStorage<T extends Component> {
const serializeSetFields = (this.type as any).__serializeSetFields || new Set(); const serializeSetFields = (this.type as any).__serializeSetFields || new Set();
const serializeArrayFields = (this.type as any).__serializeArrayFields || new Set(); const serializeArrayFields = (this.type as any).__serializeArrayFields || new Set();
const deepCopyFields = (this.type as any).__deepCopyFields || new Set(); const deepCopyFields = (this.type as any).__deepCopyFields || new Set();
// 处理所有字段 // 处理所有字段
for (const key in component) { for (const key in component) {
if (component.hasOwnProperty(key) && key !== 'id') { if (Object.prototype.hasOwnProperty.call(component, key) && key !== 'id') {
const value = (component as any)[key]; const value = (component as any)[key];
const type = typeof value; const type = typeof value;
if (type === 'number') { if (type === 'number') {
if (highPrecisionFields.has(key) || !this.fields.has(key)) { if (highPrecisionFields.has(key) || !this.fields.has(key)) {
// 标记为高精度或未在TypedArray中的数值作为复杂对象存储 // 标记为高精度或未在TypedArray中的数值作为复杂对象存储
@@ -487,7 +518,7 @@ export class SoAStorage<T extends Component> {
array[index] = value; array[index] = value;
} }
} else if (type === 'boolean' && this.fields.has(key)) { } else if (type === 'boolean' && this.fields.has(key)) {
// 布尔值存储到TypedArray // 布尔值存储到TypedArray
const array = this.fields.get(key)!; const array = this.fields.get(key)!;
array[index] = value ? 1 : 0; array[index] = value ? 1 : 0;
} else if (this.stringFields.has(key)) { } else if (this.stringFields.has(key)) {
@@ -509,13 +540,13 @@ export class SoAStorage<T extends Component> {
} }
} }
} }
// 存储复杂字段 // 存储复杂字段
if (complexFieldMap.size > 0) { if (complexFieldMap.size > 0) {
this.complexFields.set(entityId, complexFieldMap); this.complexFields.set(entityId, complexFieldMap);
} }
} }
/** /**
* 序列化值为JSON字符串 * 序列化值为JSON字符串
*/ */
@@ -539,14 +570,14 @@ export class SoAStorage<T extends Component> {
return '{}'; return '{}';
} }
} }
/** /**
* 反序列化JSON字符串为值 * 反序列化JSON字符串为值
*/ */
private deserializeValue(serialized: string, key: string, mapFields: Set<string>, setFields: Set<string>, arrayFields: Set<string>): any { private deserializeValue(serialized: string, key: string, mapFields: Set<string>, setFields: Set<string>, arrayFields: Set<string>): any {
try { try {
const parsed = JSON.parse(serialized); const parsed = JSON.parse(serialized);
if (mapFields.has(key)) { if (mapFields.has(key)) {
// 恢复Map // 恢复Map
return new Map(parsed); return new Map(parsed);
@@ -564,7 +595,7 @@ export class SoAStorage<T extends Component> {
return null; return null;
} }
} }
/** /**
* 深拷贝对象 * 深拷贝对象
*/ */
@@ -572,15 +603,15 @@ export class SoAStorage<T extends Component> {
if (obj === null || typeof obj !== 'object') { if (obj === null || typeof obj !== 'object') {
return obj; return obj;
} }
if (obj instanceof Date) { if (obj instanceof Date) {
return new Date(obj.getTime()); return new Date(obj.getTime());
} }
if (obj instanceof Array) { if (obj instanceof Array) {
return obj.map(item => this.deepClone(item)); return obj.map((item) => this.deepClone(item));
} }
if (obj instanceof Map) { if (obj instanceof Map) {
const cloned = new Map(); const cloned = new Map();
for (const [key, value] of obj.entries()) { for (const [key, value] of obj.entries()) {
@@ -588,7 +619,7 @@ export class SoAStorage<T extends Component> {
} }
return cloned; return cloned;
} }
if (obj instanceof Set) { if (obj instanceof Set) {
const cloned = new Set(); const cloned = new Set();
for (const value of obj.values()) { for (const value of obj.values()) {
@@ -596,46 +627,46 @@ export class SoAStorage<T extends Component> {
} }
return cloned; return cloned;
} }
// 普通对象 // 普通对象
const cloned: any = {}; const cloned: any = {};
for (const key in obj) { for (const key in obj) {
if (obj.hasOwnProperty(key)) { if (Object.prototype.hasOwnProperty.call(obj, key)) {
cloned[key] = this.deepClone(obj[key]); cloned[key] = this.deepClone(obj[key]);
} }
} }
return cloned; return cloned;
} }
public getComponent(entityId: number): T | null { public getComponent(entityId: number): T | null {
const index = this.entityToIndex.get(entityId); const index = this.entityToIndex.get(entityId);
if (index === undefined) { if (index === undefined) {
return null; return null;
} }
// 创建真正的组件实例以保持兼容性 // 创建真正的组件实例以保持兼容性
const component = new this.type() as any; const component = new this.type() as any;
const serializeMapFields = (this.type as any).__serializeMapFields || new Set(); const serializeMapFields = (this.type as any).__serializeMapFields || new Set();
const serializeSetFields = (this.type as any).__serializeSetFields || new Set(); const serializeSetFields = (this.type as any).__serializeSetFields || new Set();
const serializeArrayFields = (this.type as any).__serializeArrayFields || new Set(); const serializeArrayFields = (this.type as any).__serializeArrayFields || new Set();
// 恢复数值字段 // 恢复数值字段
for (const [fieldName, array] of this.fields.entries()) { for (const [fieldName, array] of this.fields.entries()) {
const value = array[index]; const value = array[index];
const fieldType = this.getFieldType(fieldName); const fieldType = this.getFieldType(fieldName);
if (fieldType === 'boolean') { if (fieldType === 'boolean') {
component[fieldName] = value === 1; component[fieldName] = value === 1;
} else { } else {
component[fieldName] = value; component[fieldName] = value;
} }
} }
// 恢复字符串字段 // 恢复字符串字段
for (const [fieldName, stringArray] of this.stringFields.entries()) { for (const [fieldName, stringArray] of this.stringFields.entries()) {
component[fieldName] = stringArray[index]; component[fieldName] = stringArray[index];
} }
// 恢复序列化字段 // 恢复序列化字段
for (const [fieldName, serializedArray] of this.serializedFields.entries()) { for (const [fieldName, serializedArray] of this.serializedFields.entries()) {
const serialized = serializedArray[index]; const serialized = serializedArray[index];
@@ -643,7 +674,7 @@ export class SoAStorage<T extends Component> {
component[fieldName] = this.deserializeValue(serialized, fieldName, serializeMapFields, serializeSetFields, serializeArrayFields); component[fieldName] = this.deserializeValue(serialized, fieldName, serializeMapFields, serializeSetFields, serializeArrayFields);
} }
} }
// 恢复复杂字段 // 恢复复杂字段
const complexFieldMap = this.complexFields.get(entityId); const complexFieldMap = this.complexFields.get(entityId);
if (complexFieldMap) { if (complexFieldMap) {
@@ -651,39 +682,39 @@ export class SoAStorage<T extends Component> {
component[fieldName] = value; component[fieldName] = value;
} }
} }
return component as T; return component as T;
} }
private getFieldType(fieldName: string): string { private getFieldType(fieldName: string): string {
// 通过创建临时实例检查字段类型 // 通过创建临时实例检查字段类型
const tempInstance = new this.type(); const tempInstance = new this.type();
const value = (tempInstance as any)[fieldName]; const value = (tempInstance as any)[fieldName];
return typeof value; return typeof value;
} }
public hasComponent(entityId: number): boolean { public hasComponent(entityId: number): boolean {
return this.entityToIndex.has(entityId); return this.entityToIndex.has(entityId);
} }
public removeComponent(entityId: number): T | null { public removeComponent(entityId: number): T | null {
const index = this.entityToIndex.get(entityId); const index = this.entityToIndex.get(entityId);
if (index === undefined) { if (index === undefined) {
return null; return null;
} }
// 获取组件副本以便返回 // 获取组件副本以便返回
const component = this.getComponent(entityId); const component = this.getComponent(entityId);
// 清理复杂字段 // 清理复杂字段
this.complexFields.delete(entityId); this.complexFields.delete(entityId);
this.entityToIndex.delete(entityId); this.entityToIndex.delete(entityId);
this.freeIndices.push(index); this.freeIndices.push(index);
this._size--; this._size--;
return component; return component;
} }
private resize(newCapacity: number): void { private resize(newCapacity: number): void {
// 调整数值字段的TypedArray // 调整数值字段的TypedArray
for (const [fieldName, oldArray] of this.fields.entries()) { for (const [fieldName, oldArray] of this.fields.entries()) {
@@ -716,7 +747,7 @@ export class SoAStorage<T extends Component> {
newArray.set(oldArray); newArray.set(oldArray);
this.fields.set(fieldName, newArray); this.fields.set(fieldName, newArray);
} }
// 调整字符串字段的数组 // 调整字符串字段的数组
for (const [fieldName, oldArray] of this.stringFields.entries()) { for (const [fieldName, oldArray] of this.stringFields.entries()) {
const newArray = new Array(newCapacity); const newArray = new Array(newCapacity);
@@ -725,7 +756,7 @@ export class SoAStorage<T extends Component> {
} }
this.stringFields.set(fieldName, newArray); this.stringFields.set(fieldName, newArray);
} }
// 调整序列化字段的数组 // 调整序列化字段的数组
for (const [fieldName, oldArray] of this.serializedFields.entries()) { for (const [fieldName, oldArray] of this.serializedFields.entries()) {
const newArray = new Array(newCapacity); const newArray = new Array(newCapacity);
@@ -734,14 +765,14 @@ export class SoAStorage<T extends Component> {
} }
this.serializedFields.set(fieldName, newArray); this.serializedFields.set(fieldName, newArray);
} }
this._capacity = newCapacity; this._capacity = newCapacity;
} }
public getActiveIndices(): number[] { public getActiveIndices(): number[] {
return Array.from(this.entityToIndex.values()); return Array.from(this.entityToIndex.values());
} }
public getFieldArray(fieldName: string): SupportedTypedArray | null { public getFieldArray(fieldName: string): SupportedTypedArray | null {
return this.fields.get(fieldName) || null; return this.fields.get(fieldName) || null;
} }
@@ -749,38 +780,38 @@ export class SoAStorage<T extends Component> {
public getTypedFieldArray<K extends keyof T>(fieldName: K): SupportedTypedArray | null { public getTypedFieldArray<K extends keyof T>(fieldName: K): SupportedTypedArray | null {
return this.fields.get(String(fieldName)) || null; return this.fields.get(String(fieldName)) || null;
} }
public getEntityIndex(entityId: number): number | undefined { public getEntityIndex(entityId: number): number | undefined {
return this.entityToIndex.get(entityId); return this.entityToIndex.get(entityId);
} }
public getEntityIdByIndex(index: number): number | undefined { public getEntityIdByIndex(index: number): number | undefined {
return this.indexToEntity[index]; return this.indexToEntity[index];
} }
public size(): number { public size(): number {
return this._size; return this._size;
} }
public clear(): void { public clear(): void {
this.entityToIndex.clear(); this.entityToIndex.clear();
this.indexToEntity = []; this.indexToEntity = [];
this.freeIndices = []; this.freeIndices = [];
this.complexFields.clear(); this.complexFields.clear();
this._size = 0; this._size = 0;
// 重置数值字段数组 // 重置数值字段数组
for (const array of this.fields.values()) { for (const array of this.fields.values()) {
array.fill(0); array.fill(0);
} }
// 重置字符串字段数组 // 重置字符串字段数组
for (const stringArray of this.stringFields.values()) { for (const stringArray of this.stringFields.values()) {
for (let i = 0; i < stringArray.length; i++) { for (let i = 0; i < stringArray.length; i++) {
stringArray[i] = undefined as any; stringArray[i] = undefined as any;
} }
} }
// 重置序列化字段数组 // 重置序列化字段数组
for (const serializedArray of this.serializedFields.values()) { for (const serializedArray of this.serializedFields.values()) {
for (let i = 0; i < serializedArray.length; i++) { for (let i = 0; i < serializedArray.length; i++) {
@@ -884,7 +915,7 @@ export class SoAStorage<T extends Component> {
bytesPerElement = 4; bytesPerElement = 4;
typeName = 'unknown'; typeName = 'unknown';
} }
const memory = array.length * bytesPerElement; const memory = array.length * bytesPerElement;
totalMemory += memory; totalMemory += memory;
@@ -914,4 +945,4 @@ export class SoAStorage<T extends Component> {
const activeIndices = this.getActiveIndices(); const activeIndices = this.getActiveIndices();
operation(this.fields, activeIndices); operation(this.fields, activeIndices);
} }
} }

View File

@@ -1,3 +1,3 @@
export { ComponentPool, ComponentPoolManager } from '../ComponentPool'; export { ComponentPool, ComponentPoolManager } from '../ComponentPool';
export { ComponentStorage, ComponentRegistry } from '../ComponentStorage'; export { ComponentStorage, ComponentRegistry } from '../ComponentStorage';
export { EnableSoA, HighPrecision, Float64, Float32, Int32, SerializeMap, SoAStorage } from '../SoAStorage'; export { EnableSoA, HighPrecision, Float64, Float32, Int32, SerializeMap, SoAStorage } from '../SoAStorage';

View File

@@ -46,4 +46,4 @@ export {
// 类型定义 // 类型定义
SupportedTypedArray SupportedTypedArray
} from './SoAStorage'; } from './SoAStorage';

View File

@@ -13,14 +13,14 @@ export enum ECSEventType {
ENTITY_TAG_ADDED = 'entity:tag:added', ENTITY_TAG_ADDED = 'entity:tag:added',
ENTITY_TAG_REMOVED = 'entity:tag:removed', ENTITY_TAG_REMOVED = 'entity:tag:removed',
ENTITY_NAME_CHANGED = 'entity:name:changed', ENTITY_NAME_CHANGED = 'entity:name:changed',
// 组件相关事件 // 组件相关事件
COMPONENT_ADDED = 'component:added', COMPONENT_ADDED = 'component:added',
COMPONENT_REMOVED = 'component:removed', COMPONENT_REMOVED = 'component:removed',
COMPONENT_MODIFIED = 'component:modified', COMPONENT_MODIFIED = 'component:modified',
COMPONENT_ENABLED = 'component:enabled', COMPONENT_ENABLED = 'component:enabled',
COMPONENT_DISABLED = 'component:disabled', COMPONENT_DISABLED = 'component:disabled',
// 系统相关事件 // 系统相关事件
SYSTEM_ADDED = 'system:added', SYSTEM_ADDED = 'system:added',
SYSTEM_REMOVED = 'system:removed', SYSTEM_REMOVED = 'system:removed',
@@ -29,7 +29,7 @@ export enum ECSEventType {
SYSTEM_PROCESSING_START = 'system:processing:start', SYSTEM_PROCESSING_START = 'system:processing:start',
SYSTEM_PROCESSING_END = 'system:processing:end', SYSTEM_PROCESSING_END = 'system:processing:end',
SYSTEM_ERROR = 'system:error', SYSTEM_ERROR = 'system:error',
// 场景相关事件 // 场景相关事件
SCENE_CREATED = 'scene:created', SCENE_CREATED = 'scene:created',
SCENE_DESTROYED = 'scene:destroyed', SCENE_DESTROYED = 'scene:destroyed',
@@ -37,41 +37,41 @@ export enum ECSEventType {
SCENE_DEACTIVATED = 'scene:deactivated', SCENE_DEACTIVATED = 'scene:deactivated',
SCENE_PAUSED = 'scene:paused', SCENE_PAUSED = 'scene:paused',
SCENE_RESUMED = 'scene:resumed', SCENE_RESUMED = 'scene:resumed',
// 查询相关事件 // 查询相关事件
QUERY_EXECUTED = 'query:executed', QUERY_EXECUTED = 'query:executed',
QUERY_CACHE_HIT = 'query:cache:hit', QUERY_CACHE_HIT = 'query:cache:hit',
QUERY_CACHE_MISS = 'query:cache:miss', QUERY_CACHE_MISS = 'query:cache:miss',
QUERY_OPTIMIZED = 'query:optimized', QUERY_OPTIMIZED = 'query:optimized',
// 性能相关事件 // 性能相关事件
PERFORMANCE_WARNING = 'performance:warning', PERFORMANCE_WARNING = 'performance:warning',
PERFORMANCE_CRITICAL = 'performance:critical', PERFORMANCE_CRITICAL = 'performance:critical',
MEMORY_USAGE_HIGH = 'memory:usage:high', MEMORY_USAGE_HIGH = 'memory:usage:high',
FRAME_RATE_DROP = 'frame:rate:drop', FRAME_RATE_DROP = 'frame:rate:drop',
// 索引相关事件 // 索引相关事件
INDEX_CREATED = 'index:created', INDEX_CREATED = 'index:created',
INDEX_UPDATED = 'index:updated', INDEX_UPDATED = 'index:updated',
INDEX_OPTIMIZED = 'index:optimized', INDEX_OPTIMIZED = 'index:optimized',
// Archetype相关事件 // Archetype相关事件
ARCHETYPE_CREATED = 'archetype:created', ARCHETYPE_CREATED = 'archetype:created',
ARCHETYPE_ENTITY_ADDED = 'archetype:entity:added', ARCHETYPE_ENTITY_ADDED = 'archetype:entity:added',
ARCHETYPE_ENTITY_REMOVED = 'archetype:entity:removed', ARCHETYPE_ENTITY_REMOVED = 'archetype:entity:removed',
// 脏标记相关事件 // 脏标记相关事件
DIRTY_MARK_ADDED = 'dirty:mark:added', DIRTY_MARK_ADDED = 'dirty:mark:added',
DIRTY_BATCH_PROCESSED = 'dirty:batch:processed', DIRTY_BATCH_PROCESSED = 'dirty:batch:processed',
// 错误和警告事件 // 错误和警告事件
ERROR_OCCURRED = 'error:occurred', ERROR_OCCURRED = 'error:occurred',
WARNING_ISSUED = 'warning:issued', WARNING_ISSUED = 'warning:issued',
// 生命周期事件 // 生命周期事件
FRAMEWORK_INITIALIZED = 'framework:initialized', FRAMEWORK_INITIALIZED = 'framework:initialized',
FRAMEWORK_SHUTDOWN = 'framework:shutdown', FRAMEWORK_SHUTDOWN = 'framework:shutdown',
// 调试相关事件 // 调试相关事件
DEBUG_INFO = 'debug:info', DEBUG_INFO = 'debug:info',
DEBUG_STATS_UPDATED = 'debug:stats:updated' DEBUG_STATS_UPDATED = 'debug:stats:updated'
@@ -105,7 +105,7 @@ export const EVENT_TYPES = {
TAG_REMOVED: ECSEventType.ENTITY_TAG_REMOVED, TAG_REMOVED: ECSEventType.ENTITY_TAG_REMOVED,
NAME_CHANGED: ECSEventType.ENTITY_NAME_CHANGED NAME_CHANGED: ECSEventType.ENTITY_NAME_CHANGED
}, },
// 组件事件 // 组件事件
COMPONENT: { COMPONENT: {
ADDED: ECSEventType.COMPONENT_ADDED, ADDED: ECSEventType.COMPONENT_ADDED,
@@ -114,7 +114,7 @@ export const EVENT_TYPES = {
ENABLED: ECSEventType.COMPONENT_ENABLED, ENABLED: ECSEventType.COMPONENT_ENABLED,
DISABLED: ECSEventType.COMPONENT_DISABLED DISABLED: ECSEventType.COMPONENT_DISABLED
}, },
// 系统事件 // 系统事件
SYSTEM: { SYSTEM: {
ADDED: ECSEventType.SYSTEM_ADDED, ADDED: ECSEventType.SYSTEM_ADDED,
@@ -125,7 +125,7 @@ export const EVENT_TYPES = {
PROCESSING_END: ECSEventType.SYSTEM_PROCESSING_END, PROCESSING_END: ECSEventType.SYSTEM_PROCESSING_END,
ERROR: ECSEventType.SYSTEM_ERROR ERROR: ECSEventType.SYSTEM_ERROR
}, },
// 性能事件 // 性能事件
PERFORMANCE: { PERFORMANCE: {
WARNING: ECSEventType.PERFORMANCE_WARNING, WARNING: ECSEventType.PERFORMANCE_WARNING,
@@ -147,7 +147,7 @@ export class EventTypeValidator {
...Object.values(EVENT_TYPES.SYSTEM), ...Object.values(EVENT_TYPES.SYSTEM),
...Object.values(EVENT_TYPES.PERFORMANCE) ...Object.values(EVENT_TYPES.PERFORMANCE)
]); ]);
/** /**
* 验证事件类型是否有效 * 验证事件类型是否有效
* @param eventType 事件类型 * @param eventType 事件类型
@@ -156,7 +156,7 @@ export class EventTypeValidator {
public static isValid(eventType: string): boolean { public static isValid(eventType: string): boolean {
return this.validTypes.has(eventType); return this.validTypes.has(eventType);
} }
/** /**
* 获取所有有效的事件类型 * 获取所有有效的事件类型
* @returns 事件类型数组 * @returns 事件类型数组
@@ -164,7 +164,7 @@ export class EventTypeValidator {
public static getAllValidTypes(): string[] { public static getAllValidTypes(): string[] {
return Array.from(this.validTypes); return Array.from(this.validTypes);
} }
/** /**
* 添加自定义事件类型 * 添加自定义事件类型
* @param eventType 事件类型 * @param eventType 事件类型
@@ -172,7 +172,7 @@ export class EventTypeValidator {
public static addCustomType(eventType: string): void { public static addCustomType(eventType: string): void {
this.validTypes.add(eventType); this.validTypes.add(eventType);
} }
/** /**
* 移除自定义事件类型 * 移除自定义事件类型
* @param eventType 事件类型 * @param eventType 事件类型

View File

@@ -1,6 +1,6 @@
import type {Component} from '../Component'; import type { Component } from '../Component';
import type {EntitySystem} from '../Systems'; import type { EntitySystem } from '../Systems';
import {ComponentType} from "../../Types"; import { ComponentType } from '../../Types';
/** /**
* 存储组件类型名称的Symbol键 * 存储组件类型名称的Symbol键
@@ -15,7 +15,7 @@ export const SYSTEM_TYPE_NAME = Symbol('SystemTypeName');
/** /**
* 组件类型装饰器 * 组件类型装饰器
* 用于为组件类指定固定的类型名称,避免在代码混淆后失效 * 用于为组件类指定固定的类型名称,避免在代码混淆后失效
* *
* @param typeName 组件类型名称 * @param typeName 组件类型名称
* @example * @example
* ```typescript * ```typescript
@@ -31,10 +31,10 @@ export function ECSComponent(typeName: string) {
if (!typeName || typeof typeName !== 'string') { if (!typeName || typeof typeName !== 'string') {
throw new Error('ECSComponent装饰器必须提供有效的类型名称'); throw new Error('ECSComponent装饰器必须提供有效的类型名称');
} }
// 在构造函数上存储类型名称 // 在构造函数上存储类型名称
(target as any)[COMPONENT_TYPE_NAME] = typeName; (target as any)[COMPONENT_TYPE_NAME] = typeName;
return target; return target;
}; };
} }
@@ -107,7 +107,7 @@ export function getSystemMetadata(systemType: new (...args: any[]) => EntitySyst
/** /**
* 获取组件类型的名称,优先使用装饰器指定的名称 * 获取组件类型的名称,优先使用装饰器指定的名称
* *
* @param componentType 组件构造函数 * @param componentType 组件构造函数
* @returns 组件类型名称 * @returns 组件类型名称
*/ */
@@ -119,14 +119,14 @@ export function getComponentTypeName(
if (decoratorName) { if (decoratorName) {
return decoratorName; return decoratorName;
} }
// 回退到constructor.name // 回退到constructor.name
return componentType.name || 'UnknownComponent'; return componentType.name || 'UnknownComponent';
} }
/** /**
* 获取系统类型的名称,优先使用装饰器指定的名称 * 获取系统类型的名称,优先使用装饰器指定的名称
* *
* @param systemType 系统构造函数 * @param systemType 系统构造函数
* @returns 系统类型名称 * @returns 系统类型名称
*/ */
@@ -138,14 +138,14 @@ export function getSystemTypeName<T extends EntitySystem>(
if (decoratorName) { if (decoratorName) {
return decoratorName; return decoratorName;
} }
// 回退到constructor.name // 回退到constructor.name
return systemType.name || 'UnknownSystem'; return systemType.name || 'UnknownSystem';
} }
/** /**
* 从组件实例获取类型名称 * 从组件实例获取类型名称
* *
* @param component 组件实例 * @param component 组件实例
* @returns 组件类型名称 * @returns 组件类型名称
*/ */
@@ -155,7 +155,7 @@ export function getComponentInstanceTypeName(component: Component): string {
/** /**
* 从系统实例获取类型名称 * 从系统实例获取类型名称
* *
* @param system 系统实例 * @param system 系统实例
* @returns 系统类型名称 * @returns 系统类型名称
*/ */

View File

@@ -19,4 +19,4 @@ export {
ENTITY_REF_METADATA ENTITY_REF_METADATA
} from './EntityRefDecorator'; } from './EntityRefDecorator';
export type { EntityRefMetadata } from './EntityRefDecorator'; export type { EntityRefMetadata } from './EntityRefDecorator';

View File

@@ -8,13 +8,13 @@ import type { IScene } from './IScene';
/** /**
* 实体比较器 * 实体比较器
* *
* 用于比较两个实体的优先级首先按更新顺序比较然后按ID比较。 * 用于比较两个实体的优先级首先按更新顺序比较然后按ID比较。
*/ */
export class EntityComparer { export class EntityComparer {
/** /**
* 比较两个实体 * 比较两个实体
* *
* @param self - 第一个实体 * @param self - 第一个实体
* @param other - 第二个实体 * @param other - 第二个实体
* @returns 比较结果负数表示self优先级更高正数表示other优先级更高0表示相等 * @returns 比较结果负数表示self优先级更高正数表示other优先级更高0表示相等
@@ -28,28 +28,27 @@ export class EntityComparer {
} }
/** /**
* 游戏实体类 * 游戏实体类
* *
* ECS架构中的实体Entity作为组件的容器。 * ECS架构中的实体Entity作为组件的容器。
* 实体本身不包含游戏逻辑,所有功能都通过组件来实现。 * 实体本身不包含游戏逻辑,所有功能都通过组件来实现。
* 支持父子关系,可以构建实体层次结构。 * 支持父子关系,可以构建实体层次结构。
* *
* @example * @example
* ```typescript * ```typescript
* // 创建实体 * // 创建实体
* const entity = new Entity("Player", 1); * const entity = new Entity("Player", 1);
* *
* // 添加组件 * // 添加组件
* const healthComponent = entity.addComponent(new HealthComponent(100)); * const healthComponent = entity.addComponent(new HealthComponent(100));
* *
* // 获取组件 * // 获取组件
* const health = entity.getComponent(HealthComponent); * const health = entity.getComponent(HealthComponent);
* *
* // 添加位置组件 * // 添加位置组件
* entity.addComponent(new PositionComponent(100, 200)); * entity.addComponent(new PositionComponent(100, 200));
* *
* // 添加子实体 * // 添加子实体
* const weapon = new Entity("Weapon", 2); * const weapon = new Entity("Weapon", 2);
* entity.addChild(weapon); * entity.addChild(weapon);
@@ -60,12 +59,12 @@ export class Entity {
* Entity专用日志器 * Entity专用日志器
*/ */
private static _logger = createLogger('Entity'); private static _logger = createLogger('Entity');
/** /**
* 实体比较器实例 * 实体比较器实例
*/ */
public static entityComparer: EntityComparer = new EntityComparer(); public static entityComparer: EntityComparer = new EntityComparer();
/** /**
* 全局事件总线实例 * 全局事件总线实例
* 用于发射组件相关事件 * 用于发射组件相关事件
@@ -84,17 +83,17 @@ export class Entity {
entity.scene.clearSystemEntityCaches(); entity.scene.clearSystemEntityCaches();
} }
} }
/** /**
* 实体名称 * 实体名称
*/ */
public name: string; public name: string;
/** /**
* 实体唯一标识符 * 实体唯一标识符
*/ */
public readonly id: number; public readonly id: number;
/** /**
* 所属场景引用 * 所属场景引用
*/ */
@@ -103,7 +102,16 @@ export class Entity {
/** /**
* 销毁状态标志 * 销毁状态标志
*/ */
public _isDestroyed: boolean = false; private _destroyed: boolean = false;
/**
* 设置销毁状态(仅供框架内部使用)
*
* @internal 此方法仅用于批量销毁优化,不应在外部调用
*/
public setDestroyed(value: boolean): void {
this._destroyed = value;
}
/** /**
* 父实体引用 * 父实体引用
@@ -161,7 +169,7 @@ export class Entity {
* @returns 如果实体已被销毁则返回true * @returns 如果实体已被销毁则返回true
*/ */
public get isDestroyed(): boolean { public get isDestroyed(): boolean {
return this._isDestroyed; return this._destroyed;
} }
/** /**
@@ -218,7 +226,7 @@ export class Entity {
/** /**
* 获取子实体数组的只读副本 * 获取子实体数组的只读副本
* *
* @returns 子实体数组的副本 * @returns 子实体数组的副本
*/ */
public get children(): readonly Entity[] { public get children(): readonly Entity[] {
@@ -227,7 +235,7 @@ export class Entity {
/** /**
* 获取子实体数量 * 获取子实体数量
* *
* @returns 子实体的数量 * @returns 子实体的数量
*/ */
public get childCount(): number { public get childCount(): number {
@@ -236,7 +244,7 @@ export class Entity {
/** /**
* 获取活跃状态 * 获取活跃状态
* *
* @returns 如果实体处于活跃状态则返回true * @returns 如果实体处于活跃状态则返回true
*/ */
public get active(): boolean { public get active(): boolean {
@@ -245,9 +253,9 @@ export class Entity {
/** /**
* 设置活跃状态 * 设置活跃状态
* *
* 设置实体的活跃状态,会影响子实体的有效活跃状态。 * 设置实体的活跃状态,会影响子实体的有效活跃状态。
* *
* @param value - 新的活跃状态 * @param value - 新的活跃状态
*/ */
public set active(value: boolean) { public set active(value: boolean) {
@@ -259,9 +267,9 @@ export class Entity {
/** /**
* 获取实体的有效活跃状态 * 获取实体的有效活跃状态
* *
* 考虑父实体的活跃状态只有当实体本身和所有父实体都处于活跃状态时才返回true。 * 考虑父实体的活跃状态只有当实体本身和所有父实体都处于活跃状态时才返回true。
* *
* @returns 有效的活跃状态 * @returns 有效的活跃状态
*/ */
public get activeInHierarchy(): boolean { public get activeInHierarchy(): boolean {
@@ -272,7 +280,7 @@ export class Entity {
/** /**
* 获取实体标签 * 获取实体标签
* *
* @returns 实体的数字标签 * @returns 实体的数字标签
*/ */
public get tag(): number { public get tag(): number {
@@ -281,7 +289,7 @@ export class Entity {
/** /**
* 设置实体标签 * 设置实体标签
* *
* @param value - 新的标签值 * @param value - 新的标签值
*/ */
public set tag(value: number) { public set tag(value: number) {
@@ -290,7 +298,7 @@ export class Entity {
/** /**
* 获取启用状态 * 获取启用状态
* *
* @returns 如果实体已启用则返回true * @returns 如果实体已启用则返回true
*/ */
public get enabled(): boolean { public get enabled(): boolean {
@@ -299,7 +307,7 @@ export class Entity {
/** /**
* 设置启用状态 * 设置启用状态
* *
* @param value - 新的启用状态 * @param value - 新的启用状态
*/ */
public set enabled(value: boolean) { public set enabled(value: boolean) {
@@ -308,7 +316,7 @@ export class Entity {
/** /**
* 获取更新顺序 * 获取更新顺序
* *
* @returns 实体的更新顺序值 * @returns 实体的更新顺序值
*/ */
public get updateOrder(): number { public get updateOrder(): number {
@@ -317,7 +325,7 @@ export class Entity {
/** /**
* 设置更新顺序 * 设置更新顺序
* *
* @param value - 新的更新顺序值 * @param value - 新的更新顺序值
*/ */
public set updateOrder(value: number) { public set updateOrder(value: number) {
@@ -326,7 +334,7 @@ export class Entity {
/** /**
* 获取组件位掩码 * 获取组件位掩码
* *
* @returns 实体的组件位掩码 * @returns 实体的组件位掩码
*/ */
public get componentMask(): BitMask64Data { public get componentMask(): BitMask64Data {
@@ -394,11 +402,11 @@ export class Entity {
const componentType = component.constructor as ComponentType<T>; const componentType = component.constructor as ComponentType<T>;
if (!this.scene) { if (!this.scene) {
throw new Error(`Entity must be added to Scene before adding components. Use scene.createEntity() instead of new Entity()`); throw new Error('Entity must be added to Scene before adding components. Use scene.createEntity() instead of new Entity()');
} }
if (!this.scene.componentStorageManager) { if (!this.scene.componentStorageManager) {
throw new Error(`Scene does not have componentStorageManager`); throw new Error('Scene does not have componentStorageManager');
} }
if (this.hasComponent(componentType)) { if (this.hasComponent(componentType)) {
@@ -465,8 +473,6 @@ export class Entity {
} }
/** /**
* 检查实体是否拥有指定类型的组件 * 检查实体是否拥有指定类型的组件
* *
@@ -485,7 +491,7 @@ export class Entity {
if (!ComponentRegistry.isRegistered(type)) { if (!ComponentRegistry.isRegistered(type)) {
return false; return false;
} }
const mask = ComponentRegistry.getBitMask(type); const mask = ComponentRegistry.getBitMask(type);
return BitMask64Utils.hasAny(this._componentMask, mask); return BitMask64Utils.hasAny(this._componentMask, mask);
} }
@@ -570,7 +576,7 @@ export class Entity {
/** /**
* 移除指定类型的组件 * 移除指定类型的组件
* *
* @param type - 组件类型 * @param type - 组件类型
* @returns 被移除的组件实例或null * @returns 被移除的组件实例或null
*/ */
@@ -611,13 +617,13 @@ export class Entity {
/** /**
* 批量添加组件 * 批量添加组件
* *
* @param components - 要添加的组件数组 * @param components - 要添加的组件数组
* @returns 添加的组件数组 * @returns 添加的组件数组
*/ */
public addComponents<T extends Component>(components: T[]): T[] { public addComponents<T extends Component>(components: T[]): T[] {
const addedComponents: T[] = []; const addedComponents: T[] = [];
for (const component of components) { for (const component of components) {
try { try {
addedComponents.push(this.addComponent(component)); addedComponents.push(this.addComponent(component));
@@ -625,28 +631,27 @@ export class Entity {
Entity._logger.warn(`添加组件失败 ${getComponentInstanceTypeName(component)}:`, error); Entity._logger.warn(`添加组件失败 ${getComponentInstanceTypeName(component)}:`, error);
} }
} }
return addedComponents; return addedComponents;
} }
/** /**
* 批量移除组件类型 * 批量移除组件类型
* *
* @param componentTypes - 要移除的组件类型数组 * @param componentTypes - 要移除的组件类型数组
* @returns 被移除的组件数组 * @returns 被移除的组件数组
*/ */
public removeComponentsByTypes<T extends Component>(componentTypes: ComponentType<T>[]): (T | null)[] { public removeComponentsByTypes<T extends Component>(componentTypes: ComponentType<T>[]): (T | null)[] {
const removedComponents: (T | null)[] = []; const removedComponents: (T | null)[] = [];
for (const componentType of componentTypes) { for (const componentType of componentTypes) {
removedComponents.push(this.removeComponentByType(componentType)); removedComponents.push(this.removeComponentByType(componentType));
} }
return removedComponents; return removedComponents;
} }
/** /**
* 获取所有指定类型的组件 * 获取所有指定类型的组件
* *
@@ -694,13 +699,13 @@ export class Entity {
/** /**
* 添加子实体 * 添加子实体
* *
* @param child - 要添加的子实体 * @param child - 要添加的子实体
* @returns 添加的子实体 * @returns 添加的子实体
*/ */
public addChild(child: Entity): Entity { public addChild(child: Entity): Entity {
if (child === this) { if (child === this) {
throw new Error("Entity cannot be its own child"); throw new Error('Entity cannot be its own child');
} }
if (child._parent === this) { if (child._parent === this) {
@@ -724,7 +729,7 @@ export class Entity {
/** /**
* 移除子实体 * 移除子实体
* *
* @param child - 要移除的子实体 * @param child - 要移除的子实体
* @returns 是否成功移除 * @returns 是否成功移除
*/ */
@@ -745,7 +750,7 @@ export class Entity {
*/ */
public removeAllChildren(): void { public removeAllChildren(): void {
const childrenToRemove = [...this._children]; const childrenToRemove = [...this._children];
for (const child of childrenToRemove) { for (const child of childrenToRemove) {
this.removeChild(child); this.removeChild(child);
} }
@@ -753,7 +758,7 @@ export class Entity {
/** /**
* 根据名称查找子实体 * 根据名称查找子实体
* *
* @param name - 子实体名称 * @param name - 子实体名称
* @param recursive - 是否递归查找 * @param recursive - 是否递归查找
* @returns 找到的子实体或null * @returns 找到的子实体或null
@@ -779,7 +784,7 @@ export class Entity {
/** /**
* 根据标签查找子实体 * 根据标签查找子实体
* *
* @param tag - 标签 * @param tag - 标签
* @param recursive - 是否递归查找 * @param recursive - 是否递归查找
* @returns 找到的子实体数组 * @returns 找到的子实体数组
@@ -804,7 +809,7 @@ export class Entity {
/** /**
* 获取根实体 * 获取根实体
* *
* @returns 层次结构的根实体 * @returns 层次结构的根实体
*/ */
public getRoot(): Entity { public getRoot(): Entity {
@@ -817,7 +822,7 @@ export class Entity {
/** /**
* 检查是否是指定实体的祖先 * 检查是否是指定实体的祖先
* *
* @param entity - 要检查的实体 * @param entity - 要检查的实体
* @returns 如果是祖先则返回true * @returns 如果是祖先则返回true
*/ */
@@ -834,7 +839,7 @@ export class Entity {
/** /**
* 检查是否是指定实体的后代 * 检查是否是指定实体的后代
* *
* @param entity - 要检查的实体 * @param entity - 要检查的实体
* @returns 如果是后代则返回true * @returns 如果是后代则返回true
*/ */
@@ -844,7 +849,7 @@ export class Entity {
/** /**
* 获取层次深度 * 获取层次深度
* *
* @returns 在层次结构中的深度根实体为0 * @returns 在层次结构中的深度根实体为0
*/ */
public getDepth(): number { public getDepth(): number {
@@ -859,7 +864,7 @@ export class Entity {
/** /**
* 遍历所有子实体(深度优先) * 遍历所有子实体(深度优先)
* *
* @param callback - 对每个子实体执行的回调函数 * @param callback - 对每个子实体执行的回调函数
* @param recursive - 是否递归遍历 * @param recursive - 是否递归遍历
*/ */
@@ -883,8 +888,8 @@ export class Entity {
} }
if (this.scene && this.scene.eventSystem) { if (this.scene && this.scene.eventSystem) {
this.scene.eventSystem.emitSync('entity:activeChanged', { this.scene.eventSystem.emitSync('entity:activeChanged', {
entity: this, entity: this,
active: this._active, active: this._active,
activeInHierarchy: this.activeInHierarchy activeInHierarchy: this.activeInHierarchy
}); });
@@ -898,11 +903,11 @@ export class Entity {
* 移除所有组件、子实体并标记为已销毁 * 移除所有组件、子实体并标记为已销毁
*/ */
public destroy(): void { public destroy(): void {
if (this._isDestroyed) { if (this._destroyed) {
return; return;
} }
this._isDestroyed = true; this._destroyed = true;
if (this.scene && this.scene.referenceTracker) { if (this.scene && this.scene.referenceTracker) {
this.scene.referenceTracker.clearReferencesTo(this.id); this.scene.referenceTracker.clearReferencesTo(this.id);
@@ -949,7 +954,7 @@ export class Entity {
collectChildren(this); collectChildren(this);
for (const entity of toDestroy) { for (const entity of toDestroy) {
entity._isDestroyed = true; entity.setDestroyed(true);
} }
for (const entity of toDestroy) { for (const entity of toDestroy) {
@@ -970,7 +975,7 @@ export class Entity {
/** /**
* 比较实体 * 比较实体
* *
* @param other - 另一个实体 * @param other - 另一个实体
* @returns 比较结果 * @returns 比较结果
*/ */
@@ -980,7 +985,7 @@ export class Entity {
/** /**
* 获取实体的字符串表示 * 获取实体的字符串表示
* *
* @returns 实体的字符串描述 * @returns 实体的字符串描述
*/ */
public toString(): string { public toString(): string {
@@ -989,7 +994,7 @@ export class Entity {
/** /**
* 获取实体的调试信息(包含组件缓存信息) * 获取实体的调试信息(包含组件缓存信息)
* *
* @returns 包含实体详细信息的对象 * @returns 包含实体详细信息的对象
*/ */
public getDebugInfo(): { public getDebugInfo(): {
@@ -1007,20 +1012,20 @@ export class Entity {
childIds: number[]; childIds: number[];
depth: number; depth: number;
cacheBuilt: boolean; cacheBuilt: boolean;
} { } {
return { return {
name: this.name, name: this.name,
id: this.id, id: this.id,
enabled: this._enabled, enabled: this._enabled,
active: this._active, active: this._active,
activeInHierarchy: this.activeInHierarchy, activeInHierarchy: this.activeInHierarchy,
destroyed: this._isDestroyed, destroyed: this._destroyed,
componentCount: this.components.length, componentCount: this.components.length,
componentTypes: this.components.map(c => getComponentInstanceTypeName(c)), componentTypes: this.components.map((c) => getComponentInstanceTypeName(c)),
componentMask: BitMask64Utils.toString(this._componentMask, 2), // 二进制表示 componentMask: BitMask64Utils.toString(this._componentMask, 2), // 二进制表示
parentId: this._parent?.id || null, parentId: this._parent?.id || null,
childCount: this._children.length, childCount: this._children.length,
childIds: this._children.map(c => c.id), childIds: this._children.map((c) => c.id),
depth: this.getDepth(), depth: this.getDepth(),
cacheBuilt: this._componentCache !== null cacheBuilt: this._componentCache !== null
}; };

View File

@@ -50,12 +50,12 @@ export interface IScene {
* 标识符池 * 标识符池
*/ */
readonly identifierPool: IdentifierPool; readonly identifierPool: IdentifierPool;
/** /**
* 组件存储管理器 * 组件存储管理器
*/ */
readonly componentStorageManager: ComponentStorageManager; readonly componentStorageManager: ComponentStorageManager;
/** /**
* 查询系统 * 查询系统
*/ */
@@ -316,4 +316,4 @@ export interface ISceneConfig {
* 场景名称 * 场景名称
*/ */
name?: string; name?: string;
} }

View File

@@ -8,7 +8,7 @@ import { TypeSafeEventSystem } from './Core/EventSystem';
import { EventBus } from './Core/EventBus'; import { EventBus } from './Core/EventBus';
import { ReferenceTracker } from './Core/ReferenceTracker'; import { ReferenceTracker } from './Core/ReferenceTracker';
import { IScene, ISceneConfig } from './IScene'; import { IScene, ISceneConfig } from './IScene';
import { getComponentInstanceTypeName, getSystemInstanceTypeName, getSystemMetadata } from "./Decorators"; import { getComponentInstanceTypeName, getSystemInstanceTypeName, getSystemMetadata } from './Decorators';
import { TypedQueryBuilder } from './Core/Query/TypedQuery'; import { TypedQueryBuilder } from './Core/Query/TypedQuery';
import { SceneSerializer, SceneSerializationOptions, SceneDeserializationOptions } from './Serialization/SceneSerializer'; import { SceneSerializer, SceneSerializationOptions, SceneDeserializationOptions } from './Serialization/SceneSerializer';
import { IncrementalSerializer, IncrementalSnapshot, IncrementalSerializationOptions } from './Serialization/IncrementalSerializer'; import { IncrementalSerializer, IncrementalSnapshot, IncrementalSerializationOptions } from './Serialization/IncrementalSerializer';
@@ -30,7 +30,7 @@ export class Scene implements IScene {
* *
* 用于标识和调试的友好名称。 * 用于标识和调试的友好名称。
*/ */
public name: string = ""; public name: string = '';
/** /**
* 场景自定义数据 * 场景自定义数据
@@ -45,25 +45,25 @@ export class Scene implements IScene {
* 管理场景内所有实体的生命周期。 * 管理场景内所有实体的生命周期。
*/ */
public readonly entities: EntityList; public readonly entities: EntityList;
/** /**
* 实体ID池 * 实体ID池
* *
* 用于分配和回收实体的唯一标识符。 * 用于分配和回收实体的唯一标识符。
*/ */
public readonly identifierPool: IdentifierPool; public readonly identifierPool: IdentifierPool;
/** /**
* 组件存储管理器 * 组件存储管理器
* *
* 高性能的组件存储和查询系统。 * 高性能的组件存储和查询系统。
*/ */
public readonly componentStorageManager: ComponentStorageManager; public readonly componentStorageManager: ComponentStorageManager;
/** /**
* 查询系统 * 查询系统
* *
* 基于位掩码的高性能实体查询系统。 * 基于位掩码的高性能实体查询系统。
*/ */
public readonly querySystem: QuerySystem; public readonly querySystem: QuerySystem;
@@ -239,7 +239,7 @@ export class Scene implements IScene {
/** /**
* 初始化场景 * 初始化场景
* *
* 在场景创建时调用,子类可以重写此方法来设置初始实体和组件。 * 在场景创建时调用,子类可以重写此方法来设置初始实体和组件。
*/ */
public initialize(): void { public initialize(): void {
@@ -247,7 +247,7 @@ export class Scene implements IScene {
/** /**
* 场景开始运行时的回调 * 场景开始运行时的回调
* *
* 在场景开始运行时调用,可以在此方法中执行场景启动逻辑。 * 在场景开始运行时调用,可以在此方法中执行场景启动逻辑。
*/ */
public onStart(): void { public onStart(): void {
@@ -255,7 +255,7 @@ export class Scene implements IScene {
/** /**
* 场景卸载时的回调 * 场景卸载时的回调
* *
* 在场景被销毁时调用,可以在此方法中执行清理工作。 * 在场景被销毁时调用,可以在此方法中执行清理工作。
*/ */
public unload(): void { public unload(): void {
@@ -338,10 +338,10 @@ export class Scene implements IScene {
* @param name 实体名称 * @param name 实体名称
*/ */
public createEntity(name: string) { public createEntity(name: string) {
let entity = new Entity(name, this.identifierPool.checkOut()); const entity = new Entity(name, this.identifierPool.checkOut());
this.eventSystem.emitSync('entity:created', { entityName: name, entity, scene: this }); this.eventSystem.emitSync('entity:created', { entityName: name, entity, scene: this });
return this.addEntity(entity); return this.addEntity(entity);
} }
@@ -384,27 +384,27 @@ export class Scene implements IScene {
* @param namePrefix 实体名称前缀 * @param namePrefix 实体名称前缀
* @returns 创建的实体列表 * @returns 创建的实体列表
*/ */
public createEntities(count: number, namePrefix: string = "Entity"): Entity[] { public createEntities(count: number, namePrefix: string = 'Entity'): Entity[] {
const entities: Entity[] = []; const entities: Entity[] = [];
// 批量创建实体对象,不立即添加到系统 // 批量创建实体对象,不立即添加到系统
for (let i = 0; i < count; i++) { for (let i = 0; i < count; i++) {
const entity = new Entity(`${namePrefix}_${i}`, this.identifierPool.checkOut()); const entity = new Entity(`${namePrefix}_${i}`, this.identifierPool.checkOut());
entity.scene = this; entity.scene = this;
entities.push(entity); entities.push(entity);
} }
// 批量添加到实体列表 // 批量添加到实体列表
for (const entity of entities) { for (const entity of entities) {
this.entities.add(entity); this.entities.add(entity);
} }
// 批量添加到查询系统(无重复检查,性能最优) // 批量添加到查询系统(无重复检查,性能最优)
this.querySystem.addEntitiesUnchecked(entities); this.querySystem.addEntitiesUnchecked(entities);
// 批量触发事件(可选,减少事件开销) // 批量触发事件(可选,减少事件开销)
this.eventSystem.emitSync('entities:batch_added', { entities, scene: this, count }); this.eventSystem.emitSync('entities:batch_added', { entities, scene: this, count });
return entities; return entities;
} }
@@ -416,7 +416,7 @@ export class Scene implements IScene {
if (entities.length === 0) return; if (entities.length === 0) return;
for (const entity of entities) { for (const entity of entities) {
entity._isDestroyed = true; entity.setDestroyed(true);
} }
for (const entity of entities) { for (const entity of entities) {
@@ -609,7 +609,7 @@ export class Scene implements IScene {
} else { } else {
this.logger.warn( this.logger.warn(
`Attempting to register a different instance of ${constructor.name}, ` + `Attempting to register a different instance of ${constructor.name}, ` +
`but type is already registered. Returning existing instance.` 'but type is already registered. Returning existing instance.'
); );
return existingSystem as T; return existingSystem as T;
} }
@@ -750,7 +750,7 @@ export class Scene implements IScene {
entityCount: number; entityCount: number;
processorCount: number; processorCount: number;
componentStorageStats: Map<string, any>; componentStorageStats: Map<string, any>;
} { } {
return { return {
entityCount: this.entities.count, entityCount: this.entities.count,
processorCount: this.systems.length, processorCount: this.systems.length,
@@ -779,20 +779,20 @@ export class Scene implements IScene {
entityCount: number; entityCount: number;
}>; }>;
componentStats: Map<string, any>; componentStats: Map<string, any>;
} { } {
const systems = this.systems; const systems = this.systems;
return { return {
name: this.name || this.constructor.name, name: this.name || this.constructor.name,
entityCount: this.entities.count, entityCount: this.entities.count,
processorCount: systems.length, processorCount: systems.length,
isRunning: this._didSceneBegin, isRunning: this._didSceneBegin,
entities: this.entities.buffer.map(entity => ({ entities: this.entities.buffer.map((entity) => ({
name: entity.name, name: entity.name,
id: entity.id, id: entity.id,
componentCount: entity.components.length, componentCount: entity.components.length,
componentTypes: entity.components.map(c => getComponentInstanceTypeName(c)) componentTypes: entity.components.map((c) => getComponentInstanceTypeName(c))
})), })),
processors: systems.map(processor => ({ processors: systems.map((processor) => ({
name: getSystemInstanceTypeName(processor), name: getSystemInstanceTypeName(processor),
updateOrder: processor.updateOrder, updateOrder: processor.updateOrder,
entityCount: (processor as any)._entities?.length || 0 entityCount: (processor as any)._entities?.length || 0
@@ -996,4 +996,4 @@ export class Scene implements IScene {
public hasIncrementalSnapshot(): boolean { public hasIncrementalSnapshot(): boolean {
return this._incrementalBaseSnapshot !== undefined; return this._incrementalBaseSnapshot !== undefined;
} }
} }

View File

@@ -212,7 +212,7 @@ export class ComponentSerializer {
// 数组 // 数组
if (Array.isArray(value)) { if (Array.isArray(value)) {
return value.map(item => this.serializeValue(item)); return value.map((item) => this.serializeValue(item));
} }
// Map (如果没有使用@SerializeMap装饰器) // Map (如果没有使用@SerializeMap装饰器)
@@ -276,7 +276,7 @@ export class ComponentSerializer {
// 数组 // 数组
if (Array.isArray(value)) { if (Array.isArray(value)) {
return value.map(item => this.deserializeValue(item)); return value.map((item) => this.deserializeValue(item));
} }
// 普通对象 // 普通对象
@@ -340,10 +340,10 @@ export class ComponentSerializer {
return { return {
type: metadata.options.typeId || getComponentTypeName(componentType), type: metadata.options.typeId || getComponentTypeName(componentType),
version: metadata.options.version, version: metadata.options.version,
fields: Array.from(metadata.fields.keys()).map(k => fields: Array.from(metadata.fields.keys()).map((k) =>
typeof k === 'symbol' ? k.toString() : k typeof k === 'symbol' ? k.toString() : k
), ),
ignoredFields: Array.from(metadata.ignoredFields).map(k => ignoredFields: Array.from(metadata.ignoredFields).map((k) =>
typeof k === 'symbol' ? k.toString() : k typeof k === 'symbol' ? k.toString() : k
), ),
isSerializable: true isSerializable: true

View File

@@ -696,22 +696,22 @@ export class IncrementalSerializer {
componentChanges: incremental.componentChanges.length, componentChanges: incremental.componentChanges.length,
sceneDataChanges: incremental.sceneDataChanges.length, sceneDataChanges: incremental.sceneDataChanges.length,
addedEntities: incremental.entityChanges.filter( addedEntities: incremental.entityChanges.filter(
c => c.operation === ChangeOperation.EntityAdded (c) => c.operation === ChangeOperation.EntityAdded
).length, ).length,
removedEntities: incremental.entityChanges.filter( removedEntities: incremental.entityChanges.filter(
c => c.operation === ChangeOperation.EntityRemoved (c) => c.operation === ChangeOperation.EntityRemoved
).length, ).length,
updatedEntities: incremental.entityChanges.filter( updatedEntities: incremental.entityChanges.filter(
c => c.operation === ChangeOperation.EntityUpdated (c) => c.operation === ChangeOperation.EntityUpdated
).length, ).length,
addedComponents: incremental.componentChanges.filter( addedComponents: incremental.componentChanges.filter(
c => c.operation === ChangeOperation.ComponentAdded (c) => c.operation === ChangeOperation.ComponentAdded
).length, ).length,
removedComponents: incremental.componentChanges.filter( removedComponents: incremental.componentChanges.filter(
c => c.operation === ChangeOperation.ComponentRemoved (c) => c.operation === ChangeOperation.ComponentRemoved
).length, ).length,
updatedComponents: incremental.componentChanges.filter( updatedComponents: incremental.componentChanges.filter(
c => c.operation === ChangeOperation.ComponentUpdated (c) => c.operation === ChangeOperation.ComponentUpdated
).length ).length
}; };
} }

View File

@@ -363,14 +363,14 @@ export class SceneSerializer {
// 数组 // 数组
if (Array.isArray(value)) { if (Array.isArray(value)) {
return value.map(item => this.serializeValue(item)); return value.map((item) => this.serializeValue(item));
} }
// 普通对象 // 普通对象
if (type === 'object') { if (type === 'object') {
const result: Record<string, any> = {}; const result: Record<string, any> = {};
for (const key in value) { for (const key in value) {
if (value.hasOwnProperty(key)) { if (Object.prototype.hasOwnProperty.call(value, key)) {
result[key] = this.serializeValue(value[key]); result[key] = this.serializeValue(value[key]);
} }
} }
@@ -409,14 +409,14 @@ export class SceneSerializer {
// 数组 // 数组
if (Array.isArray(value)) { if (Array.isArray(value)) {
return value.map(item => this.deserializeValue(item)); return value.map((item) => this.deserializeValue(item));
} }
// 普通对象 // 普通对象
if (type === 'object') { if (type === 'object') {
const result: Record<string, any> = {}; const result: Record<string, any> = {};
for (const key in value) { for (const key in value) {
if (value.hasOwnProperty(key)) { if (Object.prototype.hasOwnProperty.call(value, key)) {
result[key] = this.deserializeValue(value[key]); result[key] = this.deserializeValue(value[key]);
} }
} }
@@ -437,8 +437,8 @@ export class SceneSerializer {
const componentTypeSet = new Set(options.components); const componentTypeSet = new Set(options.components);
// 只返回拥有指定组件的实体 // 只返回拥有指定组件的实体
return entities.filter(entity => { return entities.filter((entity) => {
return Array.from(entity.components).some(component => return Array.from(entity.components).some((component) =>
componentTypeSet.has(component.constructor as ComponentType) componentTypeSet.has(component.constructor as ComponentType)
); );
}); });

View File

@@ -127,7 +127,7 @@ export class VersionMigrationManager {
return component; return component;
} }
let migratedData = { ...component }; const migratedData = { ...component };
let version = currentVersion; let version = currentVersion;
// 执行迁移链 // 执行迁移链
@@ -193,12 +193,12 @@ export class VersionMigrationManager {
private static migrateSceneComponents(scene: SerializedScene): SerializedScene { private static migrateSceneComponents(scene: SerializedScene): SerializedScene {
const migratedScene = { ...scene }; const migratedScene = { ...scene };
migratedScene.entities = scene.entities.map(entity => ({ migratedScene.entities = scene.entities.map((entity) => ({
...entity, ...entity,
components: entity.components.map(component => { components: entity.components.map((component) => {
// 查找组件的目标版本 // 查找组件的目标版本
const typeInfo = scene.componentTypeRegistry.find( const typeInfo = scene.componentTypeRegistry.find(
t => t.typeName === component.type (t) => t.typeName === component.type
); );
if (typeInfo && typeInfo.version !== component.version) { if (typeInfo && typeInfo.version !== component.version) {
@@ -220,10 +220,10 @@ export class VersionMigrationManager {
entities: any[], entities: any[],
typeRegistry: Array<{ typeName: string; version: number }> typeRegistry: Array<{ typeName: string; version: number }>
): any[] { ): any[] {
return entities.map(entity => ({ return entities.map((entity) => ({
...entity, ...entity,
components: entity.components.map((component: SerializedComponent) => { components: entity.components.map((component: SerializedComponent) => {
const typeInfo = typeRegistry.find(t => t.typeName === component.type); const typeInfo = typeRegistry.find((t) => t.typeName === component.type);
if (typeInfo && typeInfo.version !== component.version) { if (typeInfo && typeInfo.version !== component.version) {
return this.migrateComponent(component, typeInfo.version); return this.migrateComponent(component, typeInfo.version);

View File

@@ -9,6 +9,7 @@ import { createLogger } from '../../Utils/Logger';
import type { EventListenerConfig, TypeSafeEventSystem, EventHandler } from '../Core/EventSystem'; import type { EventListenerConfig, TypeSafeEventSystem, EventHandler } from '../Core/EventSystem';
import type { ComponentConstructor, ComponentInstance } from '../../Types/TypeHelpers'; import type { ComponentConstructor, ComponentInstance } from '../../Types/TypeHelpers';
import type { IService } from '../../Core/ServiceContainer'; import type { IService } from '../../Core/ServiceContainer';
import type { ComponentType } from '../Core/ComponentStorage';
/** /**
* 事件监听器记录 * 事件监听器记录
@@ -251,7 +252,7 @@ export abstract class EntitySystem<
/** /**
* 系统初始化回调 * 系统初始化回调
* *
* 子类可以重写此方法进行初始化操作。 * 子类可以重写此方法进行初始化操作。
*/ */
protected onInitialize(): void { protected onInitialize(): void {
@@ -259,8 +260,11 @@ export abstract class EntitySystem<
} }
/** /**
* 清除实体缓存(内部使用) * 清除实体缓存
* 当Scene中的实体发生变化时调用 *
* 当 Scene 中的实体发生变化时调用,使系统的实体缓存失效。
*
* @internal 框架内部使用,不应在外部代码中直接调用
*/ */
public clearEntityCache(): void { public clearEntityCache(): void {
this._entityCache.invalidate(); this._entityCache.invalidate();
@@ -299,7 +303,7 @@ export abstract class EntitySystem<
// 空条件返回所有实体 // 空条件返回所有实体
if (this._matcher.isEmpty()) { if (this._matcher.isEmpty()) {
currentEntities = querySystem.getAllEntities(); currentEntities = querySystem.queryAllEntities();
} else if (this.isSingleCondition(condition)) { } else if (this.isSingleCondition(condition)) {
// 单一条件优化查询 // 单一条件优化查询
currentEntities = this.executeSingleConditionQuery(condition, querySystem); currentEntities = this.executeSingleConditionQuery(condition, querySystem);
@@ -403,7 +407,7 @@ export abstract class EntitySystem<
// 6. 应用none条件 (差集) // 6. 应用none条件 (差集)
if (condition.none.length > 0) { if (condition.none.length > 0) {
if (!resultIds) { if (!resultIds) {
resultIds = this.extractEntityIds(querySystem.getAllEntities()); resultIds = this.extractEntityIds(querySystem.queryAllEntities());
} }
const noneResult = querySystem.queryAny(...condition.none); const noneResult = querySystem.queryAny(...condition.none);
@@ -411,16 +415,23 @@ export abstract class EntitySystem<
resultIds = this.differenceIdSets(resultIds, noneIds); resultIds = this.differenceIdSets(resultIds, noneIds);
} }
return resultIds ? this.idSetToEntityArray(resultIds, querySystem.getAllEntities()) : []; return resultIds ? this.idSetToEntityArray(resultIds, querySystem.queryAllEntities()) : [];
} }
/** /**
* 提取实体ID集合 * 提取实体ID集合
*
* 使用位运算 | 0 强制转换为 32 位整数,帮助 JavaScript 引擎的 JIT 编译器
* 进行整数优化,在大规模实体集合操作时可以提供微小的性能提升。
*
* @param entities 实体数组
* @returns 包含所有实体ID的集合
*/ */
private extractEntityIds(entities: readonly Entity[]): Set<number> { private extractEntityIds(entities: readonly Entity[]): Set<number> {
const len = entities.length; const len = entities.length;
const idSet = new Set<number>(); const idSet = new Set<number>();
// 使用位运算 | 0 进行整数优化JIT 友好)
for (let i = 0; i < len; i = (i + 1) | 0) { for (let i = 0; i < len; i = (i + 1) | 0) {
idSet.add(entities[i]!.id | 0); idSet.add(entities[i]!.id | 0);
} }
@@ -482,6 +493,12 @@ export abstract class EntitySystem<
/** /**
* 重建实体ID映射 * 重建实体ID映射
*
* 重新构建从实体ID到实体引用的映射表。使用位运算优化性能。
*
* @param allEntities 所有实体的数组
* @param version QuerySystem 的版本号,用于缓存失效判断
* @returns 重建后的实体ID映射表
*/ */
private rebuildEntityIdMap(allEntities: readonly Entity[], version: number): Map<number, Entity> { private rebuildEntityIdMap(allEntities: readonly Entity[], version: number): Map<number, Entity> {
let entityMap = this._entityIdMap; let entityMap = this._entityIdMap;
@@ -493,6 +510,7 @@ export abstract class EntitySystem<
} }
const len = allEntities.length; const len = allEntities.length;
// 使用位运算 | 0 进行整数优化JIT 友好)
for (let i = 0; i < len; i = (i + 1) | 0) { for (let i = 0; i < len; i = (i + 1) | 0) {
const entity = allEntities[i]!; const entity = allEntities[i]!;
entityMap.set(entity.id | 0, entity); entityMap.set(entity.id | 0, entity);
@@ -506,6 +524,12 @@ export abstract class EntitySystem<
/** /**
* 从ID集合构建Entity数组 * 从ID集合构建Entity数组
*
* 将实体ID集合转换为实体引用数组。跳过无效的实体ID已被删除的实体
*
* @param idSet 实体ID集合
* @param allEntities 所有实体的数组(用于构建映射表)
* @returns 实体引用数组
*/ */
private idSetToEntityArray(idSet: Set<number>, allEntities: readonly Entity[]): readonly Entity[] { private idSetToEntityArray(idSet: Set<number>, allEntities: readonly Entity[]): readonly Entity[] {
const entityMap = this.getEntityIdMap(allEntities); const entityMap = this.getEntityIdMap(allEntities);
@@ -518,10 +542,12 @@ export abstract class EntitySystem<
const entity = entityMap.get(id); const entity = entityMap.get(id);
if (entity !== undefined) { if (entity !== undefined) {
result[index] = entity; result[index] = entity;
// 使用位运算 | 0 进行整数优化JIT 友好)
index = (index + 1) | 0; index = (index + 1) | 0;
} }
} }
// 如果有无效ID调整数组长度
if (index < size) { if (index < size) {
result.length = index; result.length = index;
} }
@@ -531,7 +557,7 @@ export abstract class EntitySystem<
/** /**
* 执行复合查询 * 执行复合查询
* *
* 使用基于ID集合的单次扫描算法进行复杂查询 * 使用基于ID集合的单次扫描算法进行复杂查询
*/ */
private executeComplexQuery(condition: QueryCondition, querySystem: QuerySystem): readonly Entity[] { private executeComplexQuery(condition: QueryCondition, querySystem: QuerySystem): readonly Entity[] {
@@ -590,7 +616,7 @@ export abstract class EntitySystem<
/** /**
* 在系统处理开始前调用 * 在系统处理开始前调用
* *
* 子类可以重写此方法进行预处理操作。 * 子类可以重写此方法进行预处理操作。
*/ */
protected onBegin(): void { protected onBegin(): void {
@@ -599,9 +625,9 @@ export abstract class EntitySystem<
/** /**
* 处理实体列表 * 处理实体列表
* *
* 系统的核心逻辑,子类必须实现此方法来定义具体的处理逻辑。 * 系统的核心逻辑,子类必须实现此方法来定义具体的处理逻辑。
* *
* @param entities 要处理的实体列表 * @param entities 要处理的实体列表
*/ */
protected process(_entities: readonly Entity[]): void { protected process(_entities: readonly Entity[]): void {
@@ -610,9 +636,9 @@ export abstract class EntitySystem<
/** /**
* 后期处理实体列表 * 后期处理实体列表
* *
* 在主要处理逻辑之后执行,子类可以重写此方法。 * 在主要处理逻辑之后执行,子类可以重写此方法。
* *
* @param entities 要处理的实体列表 * @param entities 要处理的实体列表
*/ */
protected lateProcess(_entities: readonly Entity[]): void { protected lateProcess(_entities: readonly Entity[]): void {
@@ -621,7 +647,7 @@ export abstract class EntitySystem<
/** /**
* 系统处理完毕后调用 * 系统处理完毕后调用
* *
* 子类可以重写此方法进行后处理操作。 * 子类可以重写此方法进行后处理操作。
*/ */
protected onEnd(): void { protected onEnd(): void {
@@ -630,10 +656,10 @@ export abstract class EntitySystem<
/** /**
* 检查系统是否需要处理 * 检查系统是否需要处理
* *
* 在启用系统时有用,但仅偶尔需要处理。 * 在启用系统时有用,但仅偶尔需要处理。
* 这只影响处理,不影响事件或订阅列表。 * 这只影响处理,不影响事件或订阅列表。
* *
* @returns 如果系统应该处理则为true如果不处理则为false * @returns 如果系统应该处理则为true如果不处理则为false
*/ */
protected onCheckProcessing(): boolean { protected onCheckProcessing(): boolean {
@@ -667,7 +693,7 @@ export abstract class EntitySystem<
/** /**
* 获取系统信息的字符串表示 * 获取系统信息的字符串表示
* *
* @returns 系统信息字符串 * @returns 系统信息字符串
*/ */
public toString(): string { public toString(): string {
@@ -711,9 +737,9 @@ export abstract class EntitySystem<
/** /**
* 当实体被添加到系统时调用 * 当实体被添加到系统时调用
* *
* 子类可以重写此方法来处理实体添加事件。 * 子类可以重写此方法来处理实体添加事件。
* *
* @param entity 被添加的实体 * @param entity 被添加的实体
*/ */
protected onAdded(_entity: Entity): void { protected onAdded(_entity: Entity): void {
@@ -786,7 +812,7 @@ export abstract class EntitySystem<
this._eventListeners.push({ this._eventListeners.push({
eventSystem: this.scene.eventSystem, eventSystem: this.scene.eventSystem,
eventType, eventType,
handler, handler: handler as EventHandler,
listenerRef listenerRef
}); });
} }
@@ -803,7 +829,7 @@ export abstract class EntitySystem<
handler: EventHandler<T> handler: EventHandler<T>
): void { ): void {
const listenerIndex = this._eventListeners.findIndex( const listenerIndex = this._eventListeners.findIndex(
listener => listener.eventType === eventType && listener.handler === handler (listener) => listener.eventType === eventType && listener.handler === handler
); );
if (listenerIndex >= 0) { if (listenerIndex >= 0) {
@@ -891,7 +917,7 @@ export abstract class EntitySystem<
entity: Entity, entity: Entity,
componentType: T componentType: T
): ComponentInstance<T> { ): ComponentInstance<T> {
const component = entity.getComponent(componentType as any); const component = entity.getComponent(componentType as ComponentType);
if (!component) { if (!component) {
throw new Error( throw new Error(
`Component ${componentType.name} not found on entity ${entity.name} in ${this.systemName}` `Component ${componentType.name} not found on entity ${entity.name} in ${this.systemName}`
@@ -929,7 +955,7 @@ export abstract class EntitySystem<
): { [K in keyof T]: ComponentInstance<T[K]> } { ): { [K in keyof T]: ComponentInstance<T[K]> } {
return components.map((type) => return components.map((type) =>
this.requireComponent(entity, type) this.requireComponent(entity, type)
) as any; ) as { [K in keyof T]: ComponentInstance<T[K]> };
} }
/** /**

View File

@@ -55,4 +55,4 @@ export abstract class IntervalSystem extends EntitySystem {
protected getIntervalDelta(): number { protected getIntervalDelta(): number {
return this.interval + this.intervalRemainder; return this.interval + this.intervalRemainder;
} }
} }

View File

@@ -8,7 +8,7 @@ import { Matcher } from '../Utils/Matcher';
* 被动的实体系统不会对实体进行任何修改,只会被动地接收实体的变化事件 * 被动的实体系统不会对实体进行任何修改,只会被动地接收实体的变化事件
*/ */
export abstract class PassiveSystem extends EntitySystem { export abstract class PassiveSystem extends EntitySystem {
constructor(matcher?: Matcher) { constructor(matcher?: Matcher) {
super(matcher); super(matcher);
} }

View File

@@ -8,7 +8,7 @@ import { Matcher } from '../Utils/Matcher';
* 子类需要实现processSystem方法用于实现具体的处理逻辑 * 子类需要实现processSystem方法用于实现具体的处理逻辑
*/ */
export abstract class ProcessingSystem extends EntitySystem { export abstract class ProcessingSystem extends EntitySystem {
constructor(matcher?: Matcher) { constructor(matcher?: Matcher) {
super(matcher); super(matcher);
} }

View File

@@ -197,7 +197,7 @@ export abstract class WorkerEntitySystem<TEntityData = any> extends EntitySystem
protected sharedBuffer: SharedArrayBuffer | null = null; protected sharedBuffer: SharedArrayBuffer | null = null;
protected sharedFloatArray: Float32Array | null = null; protected sharedFloatArray: Float32Array | null = null;
private platformAdapter: IPlatformAdapter; private platformAdapter: IPlatformAdapter;
private hasLoggedSyncMode = false; private hasLoggedSyncMode = false;
constructor(matcher?: Matcher, config: WorkerSystemConfig = {}) { constructor(matcher?: Matcher, config: WorkerSystemConfig = {}) {
super(matcher); super(matcher);
@@ -414,7 +414,7 @@ export abstract class WorkerEntitySystem<TEntityData = any> extends EntitySystem
${sharedProcessFunctionBody} ${sharedProcessFunctionBody}
}; };
userProcessFunction(sharedFloatArray, startIndex, endIndex, deltaTime, systemConfig); userProcessFunction(sharedFloatArray, startIndex, endIndex, deltaTime, systemConfig);
` : ``} ` : ''}
} }
`; `;
} }
@@ -494,7 +494,7 @@ export abstract class WorkerEntitySystem<TEntityData = any> extends EntitySystem
const deltaTime = Time.deltaTime; const deltaTime = Time.deltaTime;
// 3. Worker执行阶段 // 3. Worker执行阶段
const promises = batches.map(batch => const promises = batches.map((batch) =>
this.workerPool!.execute({ this.workerPool!.execute({
entities: batch, entities: batch,
deltaTime, deltaTime,
@@ -525,7 +525,7 @@ export abstract class WorkerEntitySystem<TEntityData = any> extends EntitySystem
*/ */
private processSynchronously(entities: readonly Entity[]): void { private processSynchronously(entities: readonly Entity[]): void {
// 1. 数据提取阶段 // 1. 数据提取阶段
const entityData = entities.map(entity => this.extractEntityData(entity)); const entityData = entities.map((entity) => this.extractEntityData(entity));
// 2. 主线程处理阶段 // 2. 主线程处理阶段
const deltaTime = Time.deltaTime; const deltaTime = Time.deltaTime;
@@ -534,7 +534,7 @@ export abstract class WorkerEntitySystem<TEntityData = any> extends EntitySystem
// 3. 结果应用阶段 // 3. 结果应用阶段
// 处理Promise返回值 // 处理Promise返回值
if (results && typeof (results as any).then === 'function') { if (results && typeof (results as any).then === 'function') {
(results as Promise<TEntityData[]>).then(finalResults => { (results as Promise<TEntityData[]>).then((finalResults) => {
entities.forEach((entity, index) => { entities.forEach((entity, index) => {
this.applyResult(entity, finalResults[index]!); this.applyResult(entity, finalResults[index]!);
}); });
@@ -813,7 +813,7 @@ export abstract class WorkerEntitySystem<TEntityData = any> extends EntitySystem
sharedArrayBufferSupported: boolean; sharedArrayBufferSupported: boolean;
sharedArrayBufferEnabled: boolean; sharedArrayBufferEnabled: boolean;
currentMode: 'shared-buffer' | 'worker' | 'sync'; currentMode: 'shared-buffer' | 'worker' | 'sync';
} { } {
let currentMode: 'shared-buffer' | 'worker' | 'sync' = 'sync'; let currentMode: 'shared-buffer' | 'worker' | 'sync' = 'sync';
if (this.config.enableWorker && this.workerPool) { if (this.config.enableWorker && this.workerPool) {

View File

@@ -10,4 +10,4 @@ export type {
WorkerProcessFunction, WorkerProcessFunction,
WorkerSystemConfig, WorkerSystemConfig,
SharedArrayBufferProcessFunction SharedArrayBufferProcessFunction
} from './WorkerEntitySystem'; } from './WorkerEntitySystem';

View File

@@ -69,7 +69,7 @@ export class BitMask64Utils {
return maskSegments.some((seg, index) => { return maskSegments.some((seg, index) => {
const bitsSeg = bitsSegments[index]; const bitsSeg = bitsSegments[index];
return bitsSeg && ((seg[SegmentPart.LOW] & bitsSeg[SegmentPart.LOW]) !== 0 || (seg[SegmentPart.HIGH] & bitsSeg[SegmentPart.HIGH]) !== 0); return bitsSeg && ((seg[SegmentPart.LOW] & bitsSeg[SegmentPart.LOW]) !== 0 || (seg[SegmentPart.HIGH] & bitsSeg[SegmentPart.HIGH]) !== 0);
}) });
} }
/** /**
@@ -145,7 +145,7 @@ export class BitMask64Utils {
return baseIsZero; return baseIsZero;
} }
// 额外检查扩展区域是否都为0 // 额外检查扩展区域是否都为0
return mask.segments.every(seg => seg[SegmentPart.LOW] === 0 && seg[SegmentPart.HIGH] === 0); return mask.segments.every((seg) => seg[SegmentPart.LOW] === 0 && seg[SegmentPart.HIGH] === 0);
} }
/** /**
@@ -155,7 +155,7 @@ export class BitMask64Utils {
* @returns 如果两个掩码完全相等则返回true * @returns 如果两个掩码完全相等则返回true
*/ */
public static equals(a: BitMask64Data, b: BitMask64Data): boolean { public static equals(a: BitMask64Data, b: BitMask64Data): boolean {
let baseEquals = a.base[SegmentPart.LOW] === b.base[SegmentPart.LOW] && a.base[SegmentPart.HIGH] === b.base[SegmentPart.HIGH]; const baseEquals = a.base[SegmentPart.LOW] === b.base[SegmentPart.LOW] && a.base[SegmentPart.HIGH] === b.base[SegmentPart.HIGH];
// base不相等或ab都没有扩展区域位直接返回base比较结果 // base不相等或ab都没有扩展区域位直接返回base比较结果
if(!baseEquals || (!a.segments && !b.segments)) return baseEquals; if(!baseEquals || (!a.segments && !b.segments)) return baseEquals;
// 不能假设ab的segments都存在或长度相同. // 不能假设ab的segments都存在或长度相同.
@@ -355,7 +355,7 @@ export class BitMask64Utils {
if(!source.segments || source.segments.length == 0) return; if(!source.segments || source.segments.length == 0) return;
// 没有拓展段,则直接复制数组 // 没有拓展段,则直接复制数组
if(!target.segments){ if(!target.segments){
target.segments = source.segments.map(seg => [...seg]); target.segments = source.segments.map((seg) => [...seg]);
return; return;
} }
// source有扩展段target扩展段不足则补充长度 // source有扩展段target扩展段不足则补充长度
@@ -382,7 +382,7 @@ export class BitMask64Utils {
public static clone(mask: BitMask64Data): BitMask64Data { public static clone(mask: BitMask64Data): BitMask64Data {
return { return {
base: mask.base.slice() as BitMask64Segment, base: mask.base.slice() as BitMask64Segment,
...(mask.segments && { segments: mask.segments.map(seg => [...seg] as BitMask64Segment) }) ...(mask.segments && { segments: mask.segments.map((seg) => [...seg] as BitMask64Segment) })
}; };
} }
@@ -414,8 +414,8 @@ export class BitMask64Utils {
for (let i = -1; i < totalLength; i++) { for (let i = -1; i < totalLength; i++) {
let segResult = ''; let segResult = '';
const bitMaskData = i == -1 ? mask.base : mask.segments![i]!; const bitMaskData = i == -1 ? mask.base : mask.segments![i]!;
let hi = bitMaskData[SegmentPart.HIGH]; const hi = bitMaskData[SegmentPart.HIGH];
let lo = bitMaskData[SegmentPart.LOW]; const lo = bitMaskData[SegmentPart.LOW];
if(radix == 2){ if(radix == 2){
const hiBits = hi.toString(2).padStart(32, '0'); const hiBits = hi.toString(2).padStart(32, '0');
const loBits = lo.toString(2).padStart(32, '0'); const loBits = lo.toString(2).padStart(32, '0');
@@ -493,4 +493,4 @@ export class BitMask64Utils {
return segments[targetSegIndex] ?? null; return segments[targetSegIndex] ?? null;
} }
} }
} }

View File

@@ -1,4 +1,4 @@
import { BitMask64Data } from "./BigIntCompatibility"; import { BitMask64Data } from './BigIntCompatibility';
// FlatHashMapFast.ts // FlatHashMapFast.ts

View File

@@ -156,10 +156,10 @@ export class Bits {
if (maxBits > 64) { if (maxBits > 64) {
maxBits = 64; maxBits = 64;
} }
const result = new Bits(); const result = new Bits();
BitMask64Utils.copy(this._value, result._value); BitMask64Utils.copy(this._value, result._value);
if (maxBits <= 32) { if (maxBits <= 32) {
const mask = (1 << maxBits) - 1; const mask = (1 << maxBits) - 1;
result._value.base[SegmentPart.LOW] = (~result._value.base[SegmentPart.LOW]) & mask; result._value.base[SegmentPart.LOW] = (~result._value.base[SegmentPart.LOW]) & mask;
@@ -174,7 +174,7 @@ export class Bits {
result._value.base[SegmentPart.HIGH] = ~result._value.base[SegmentPart.HIGH]; result._value.base[SegmentPart.HIGH] = ~result._value.base[SegmentPart.HIGH];
} }
} }
return result; return result;
} }
@@ -317,7 +317,7 @@ export class Bits {
if (BitMask64Utils.isZero(this._value)) { if (BitMask64Utils.isZero(this._value)) {
return -1; return -1;
} }
if (this._value.base[SegmentPart.HIGH] !== 0) { if (this._value.base[SegmentPart.HIGH] !== 0) {
for (let i = 31; i >= 0; i--) { for (let i = 31; i >= 0; i--) {
if ((this._value.base[SegmentPart.HIGH] & (1 << i)) !== 0) { if ((this._value.base[SegmentPart.HIGH] & (1 << i)) !== 0) {
@@ -325,13 +325,13 @@ export class Bits {
} }
} }
} }
for (let i = 31; i >= 0; i--) { for (let i = 31; i >= 0; i--) {
if ((this._value.base[SegmentPart.LOW] & (1 << i)) !== 0) { if ((this._value.base[SegmentPart.LOW] & (1 << i)) !== 0) {
return i; return i;
} }
} }
return -1; return -1;
} }
@@ -343,19 +343,19 @@ export class Bits {
if (BitMask64Utils.isZero(this._value)) { if (BitMask64Utils.isZero(this._value)) {
return -1; return -1;
} }
for (let i = 0; i < 32; i++) { for (let i = 0; i < 32; i++) {
if ((this._value.base[SegmentPart.LOW] & (1 << i)) !== 0) { if ((this._value.base[SegmentPart.LOW] & (1 << i)) !== 0) {
return i; return i;
} }
} }
for (let i = 0; i < 32; i++) { for (let i = 0; i < 32; i++) {
if ((this._value.base[SegmentPart.HIGH] & (1 << i)) !== 0) { if ((this._value.base[SegmentPart.HIGH] & (1 << i)) !== 0) {
return i + 32; return i + 32;
} }
} }
return -1; return -1;
} }
} }

View File

@@ -7,14 +7,14 @@ import { IPoolable } from '../../Utils/Pool/IPoolable';
/** /**
* 可池化的实体集合 * 可池化的实体集合
* *
* 实现IPoolable接口支持对象池复用以减少内存分配开销。 * 实现IPoolable接口支持对象池复用以减少内存分配开销。
*/ */
class PoolableEntitySet extends Set<Entity> implements IPoolable { class PoolableEntitySet extends Set<Entity> implements IPoolable {
constructor(..._args: unknown[]) { constructor(..._args: unknown[]) {
super(); super();
} }
reset(): void { reset(): void {
this.clear(); this.clear();
} }
@@ -22,9 +22,9 @@ class PoolableEntitySet extends Set<Entity> implements IPoolable {
/** /**
* 组件稀疏集合实现 * 组件稀疏集合实现
* *
* 结合通用稀疏集合和组件位掩码 * 结合通用稀疏集合和组件位掩码
* *
* 存储结构: * 存储结构:
* - 稀疏集合存储实体 * - 稀疏集合存储实体
* - 位掩码数组存储组件信息 * - 位掩码数组存储组件信息
@@ -33,42 +33,42 @@ class PoolableEntitySet extends Set<Entity> implements IPoolable {
export class ComponentSparseSet { export class ComponentSparseSet {
/** /**
* 实体稀疏集合 * 实体稀疏集合
* *
* 存储所有拥有组件的实体提供O(1)的实体操作。 * 存储所有拥有组件的实体提供O(1)的实体操作。
*/ */
private _entities: SparseSet<Entity>; private _entities: SparseSet<Entity>;
/** /**
* 组件位掩码数组 * 组件位掩码数组
* *
* 与实体稀疏集合的密集数组对应,存储每个实体的组件位掩码。 * 与实体稀疏集合的密集数组对应,存储每个实体的组件位掩码。
* 数组索引与稀疏集合的密集数组索引一一对应。 * 数组索引与稀疏集合的密集数组索引一一对应。
*/ */
private _componentMasks: BitMask64Data[] = []; private _componentMasks: BitMask64Data[] = [];
/** /**
* 组件类型到实体集合的映射 * 组件类型到实体集合的映射
* *
* 维护每个组件类型对应的实体集合,用于快速的单组件查询。 * 维护每个组件类型对应的实体集合,用于快速的单组件查询。
*/ */
private _componentToEntities = new Map<ComponentType, PoolableEntitySet>(); private _componentToEntities = new Map<ComponentType, PoolableEntitySet>();
/** /**
* 实体集合对象池 * 实体集合对象池
* *
* 使用core库的Pool系统来管理PoolableEntitySet对象的复用。 * 使用core库的Pool系统来管理PoolableEntitySet对象的复用。
*/ */
private static _entitySetPool = Pool.getPool(PoolableEntitySet, 50, 512); private static _entitySetPool = Pool.getPool(PoolableEntitySet, 50, 512);
constructor() { constructor() {
this._entities = new SparseSet<Entity>(); this._entities = new SparseSet<Entity>();
} }
/** /**
* 添加实体到组件索引 * 添加实体到组件索引
* *
* 分析实体的组件组成,生成位掩码,并更新所有相关索引。 * 分析实体的组件组成,生成位掩码,并更新所有相关索引。
* *
* @param entity 要添加的实体 * @param entity 要添加的实体
*/ */
public addEntity(entity: Entity): void { public addEntity(entity: Entity): void {
@@ -76,44 +76,44 @@ export class ComponentSparseSet {
if (this._entities.has(entity)) { if (this._entities.has(entity)) {
this.removeEntity(entity); this.removeEntity(entity);
} }
let componentMask = BitMask64Utils.clone(BitMask64Utils.ZERO); const componentMask = BitMask64Utils.clone(BitMask64Utils.ZERO);
const entityComponents = new Set<ComponentType>(); const entityComponents = new Set<ComponentType>();
// 分析实体组件并构建位掩码 // 分析实体组件并构建位掩码
for (const component of entity.components) { for (const component of entity.components) {
const componentType = component.constructor as ComponentType; const componentType = component.constructor as ComponentType;
entityComponents.add(componentType); entityComponents.add(componentType);
// 确保组件类型已注册 // 确保组件类型已注册
if (!ComponentRegistry.isRegistered(componentType)) { if (!ComponentRegistry.isRegistered(componentType)) {
ComponentRegistry.register(componentType); ComponentRegistry.register(componentType);
} }
// 获取组件位掩码并合并 // 获取组件位掩码并合并
const bitMask = ComponentRegistry.getBitMask(componentType); const bitMask = ComponentRegistry.getBitMask(componentType);
BitMask64Utils.orInPlace(componentMask, bitMask); BitMask64Utils.orInPlace(componentMask, bitMask);
} }
// 添加实体到稀疏集合 // 添加实体到稀疏集合
this._entities.add(entity); this._entities.add(entity);
const entityIndex = this._entities.getIndex(entity)!; const entityIndex = this._entities.getIndex(entity)!;
// 确保位掩码数组有足够空间 // 确保位掩码数组有足够空间
while (this._componentMasks.length <= entityIndex) { while (this._componentMasks.length <= entityIndex) {
this._componentMasks.push(BitMask64Utils.clone(BitMask64Utils.ZERO)); this._componentMasks.push(BitMask64Utils.clone(BitMask64Utils.ZERO));
} }
this._componentMasks[entityIndex] = componentMask; this._componentMasks[entityIndex] = componentMask;
// 更新组件类型到实体的映射 // 更新组件类型到实体的映射
this.updateComponentMappings(entity, entityComponents, true); this.updateComponentMappings(entity, entityComponents, true);
} }
/** /**
* 从组件索引中移除实体 * 从组件索引中移除实体
* *
* 清理实体相关的所有索引数据,保持数据结构的紧凑性。 * 清理实体相关的所有索引数据,保持数据结构的紧凑性。
* *
* @param entity 要移除的实体 * @param entity 要移除的实体
*/ */
public removeEntity(entity: Entity): void { public removeEntity(entity: Entity): void {
@@ -121,16 +121,16 @@ export class ComponentSparseSet {
if (entityIndex === undefined) { if (entityIndex === undefined) {
return; // 实体不存在 return; // 实体不存在
} }
// 获取实体的组件类型集合 // 获取实体的组件类型集合
const entityComponents = this.getEntityComponentTypes(entity); const entityComponents = this.getEntityComponentTypes(entity);
// 更新组件类型到实体的映射 // 更新组件类型到实体的映射
this.updateComponentMappings(entity, entityComponents, false); this.updateComponentMappings(entity, entityComponents, false);
// 从稀疏集合中移除实体 // 从稀疏集合中移除实体
this._entities.remove(entity); this._entities.remove(entity);
// 维护位掩码数组的紧凑性 // 维护位掩码数组的紧凑性
const lastIndex = this._componentMasks.length - 1; const lastIndex = this._componentMasks.length - 1;
if (entityIndex !== lastIndex) { if (entityIndex !== lastIndex) {
@@ -139,10 +139,10 @@ export class ComponentSparseSet {
} }
this._componentMasks.pop(); this._componentMasks.pop();
} }
/** /**
* 查询包含指定组件的所有实体 * 查询包含指定组件的所有实体
* *
* @param componentType 组件类型 * @param componentType 组件类型
* @returns 包含该组件的实体集合 * @returns 包含该组件的实体集合
*/ */
@@ -150,12 +150,12 @@ export class ComponentSparseSet {
const entities = this._componentToEntities.get(componentType); const entities = this._componentToEntities.get(componentType);
return entities ? new Set(entities) : new Set<Entity>(); return entities ? new Set(entities) : new Set<Entity>();
} }
/** /**
* 多组件查询AND操作 * 多组件查询AND操作
* *
* 查找同时包含所有指定组件的实体。 * 查找同时包含所有指定组件的实体。
* *
* @param componentTypes 组件类型数组 * @param componentTypes 组件类型数组
* @returns 满足条件的实体集合 * @returns 满足条件的实体集合
*/ */
@@ -163,13 +163,13 @@ export class ComponentSparseSet {
if (componentTypes.length === 0) { if (componentTypes.length === 0) {
return new Set<Entity>(); return new Set<Entity>();
} }
if (componentTypes.length === 1) { if (componentTypes.length === 1) {
return this.queryByComponent(componentTypes[0]!); return this.queryByComponent(componentTypes[0]!);
} }
// 构建目标位掩码 // 构建目标位掩码
let targetMask = BitMask64Utils.clone(BitMask64Utils.ZERO); const targetMask = BitMask64Utils.clone(BitMask64Utils.ZERO);
for (const componentType of componentTypes) { for (const componentType of componentTypes) {
if (!ComponentRegistry.isRegistered(componentType)) { if (!ComponentRegistry.isRegistered(componentType)) {
return new Set<Entity>(); // 未注册的组件类型,结果为空 return new Set<Entity>(); // 未注册的组件类型,结果为空
@@ -177,9 +177,9 @@ export class ComponentSparseSet {
const bitMask = ComponentRegistry.getBitMask(componentType); const bitMask = ComponentRegistry.getBitMask(componentType);
BitMask64Utils.orInPlace(targetMask, bitMask); BitMask64Utils.orInPlace(targetMask, bitMask);
} }
const result = ComponentSparseSet._entitySetPool.obtain(); const result = ComponentSparseSet._entitySetPool.obtain();
// 遍历所有实体,检查位掩码匹配 // 遍历所有实体,检查位掩码匹配
this._entities.forEach((entity, index) => { this._entities.forEach((entity, index) => {
const entityMask = this._componentMasks[index]!; const entityMask = this._componentMasks[index]!;
@@ -187,15 +187,15 @@ export class ComponentSparseSet {
result.add(entity); result.add(entity);
} }
}); });
return result; return result;
} }
/** /**
* 多组件查询OR操作 * 多组件查询OR操作
* *
* 查找包含任意一个指定组件的实体。 * 查找包含任意一个指定组件的实体。
* *
* @param componentTypes 组件类型数组 * @param componentTypes 组件类型数组
* @returns 满足条件的实体集合 * @returns 满足条件的实体集合
*/ */
@@ -203,26 +203,26 @@ export class ComponentSparseSet {
if (componentTypes.length === 0) { if (componentTypes.length === 0) {
return new Set<Entity>(); return new Set<Entity>();
} }
if (componentTypes.length === 1) { if (componentTypes.length === 1) {
return this.queryByComponent(componentTypes[0]!); return this.queryByComponent(componentTypes[0]!);
} }
// 构建目标位掩码 // 构建目标位掩码
let targetMask = BitMask64Utils.clone(BitMask64Utils.ZERO); const targetMask = BitMask64Utils.clone(BitMask64Utils.ZERO);
for (const componentType of componentTypes) { for (const componentType of componentTypes) {
if (ComponentRegistry.isRegistered(componentType)) { if (ComponentRegistry.isRegistered(componentType)) {
const bitMask = ComponentRegistry.getBitMask(componentType); const bitMask = ComponentRegistry.getBitMask(componentType);
BitMask64Utils.orInPlace(targetMask, bitMask); BitMask64Utils.orInPlace(targetMask, bitMask);
} }
} }
if (BitMask64Utils.equals(targetMask, BitMask64Utils.ZERO)) { if (BitMask64Utils.equals(targetMask, BitMask64Utils.ZERO)) {
return new Set<Entity>(); // 没有有效的组件类型 return new Set<Entity>(); // 没有有效的组件类型
} }
const result = ComponentSparseSet._entitySetPool.obtain(); const result = ComponentSparseSet._entitySetPool.obtain();
// 遍历所有实体,检查位掩码匹配 // 遍历所有实体,检查位掩码匹配
this._entities.forEach((entity, index) => { this._entities.forEach((entity, index) => {
const entityMask = this._componentMasks[index]!; const entityMask = this._componentMasks[index]!;
@@ -230,13 +230,13 @@ export class ComponentSparseSet {
result.add(entity); result.add(entity);
} }
}); });
return result; return result;
} }
/** /**
* 检查实体是否包含指定组件 * 检查实体是否包含指定组件
* *
* @param entity 实体 * @param entity 实体
* @param componentType 组件类型 * @param componentType 组件类型
* @returns 是否包含该组件 * @returns 是否包含该组件
@@ -246,20 +246,20 @@ export class ComponentSparseSet {
if (entityIndex === undefined) { if (entityIndex === undefined) {
return false; return false;
} }
if (!ComponentRegistry.isRegistered(componentType)) { if (!ComponentRegistry.isRegistered(componentType)) {
return false; return false;
} }
const entityMask = this._componentMasks[entityIndex]!; const entityMask = this._componentMasks[entityIndex]!;
const componentMask = ComponentRegistry.getBitMask(componentType); const componentMask = ComponentRegistry.getBitMask(componentType);
return BitMask64Utils.hasAny(entityMask, componentMask); return BitMask64Utils.hasAny(entityMask, componentMask);
} }
/** /**
* 获取实体的组件位掩码 * 获取实体的组件位掩码
* *
* @param entity 实体 * @param entity 实体
* @returns 组件位掩码如果实体不存在则返回undefined * @returns 组件位掩码如果实体不存在则返回undefined
*/ */
@@ -270,33 +270,45 @@ export class ComponentSparseSet {
} }
return this._componentMasks[entityIndex]; return this._componentMasks[entityIndex];
} }
/** /**
* 获取所有实体 * 查询所有实体
* *
* 返回拥有此组件的所有实体。
*
* @returns 所有实体的数组 * @returns 所有实体的数组
*/ */
public getAllEntities(): Entity[] { public queryAllEntities(): Entity[] {
return this._entities.toArray(); return this._entities.toArray();
} }
/**
* 获取所有实体
*
* @deprecated 使用 queryAllEntities() 代替,以保持命名一致性
* @see {@link queryAllEntities}
*/
public getAllEntities(): Entity[] {
return this.queryAllEntities();
}
/** /**
* 获取实体数量 * 获取实体数量
*/ */
public get size(): number { public get size(): number {
return this._entities.size; return this._entities.size;
} }
/** /**
* 检查是否为空 * 检查是否为空
*/ */
public get isEmpty(): boolean { public get isEmpty(): boolean {
return this._entities.isEmpty; return this._entities.isEmpty;
} }
/** /**
* 遍历所有实体 * 遍历所有实体
* *
* @param callback 遍历回调函数 * @param callback 遍历回调函数
*/ */
public forEach(callback: (entity: Entity, mask: BitMask64Data, index: number) => void): void { public forEach(callback: (entity: Entity, mask: BitMask64Data, index: number) => void): void {
@@ -304,21 +316,21 @@ export class ComponentSparseSet {
callback(entity, this._componentMasks[index]!, index); callback(entity, this._componentMasks[index]!, index);
}); });
} }
/** /**
* 清空所有数据 * 清空所有数据
*/ */
public clear(): void { public clear(): void {
this._entities.clear(); this._entities.clear();
this._componentMasks.length = 0; this._componentMasks.length = 0;
// 清理时将所有持有的实体集合返回到池中 // 清理时将所有持有的实体集合返回到池中
for (const entitySet of this._componentToEntities.values()) { for (const entitySet of this._componentToEntities.values()) {
ComponentSparseSet._entitySetPool.release(entitySet); ComponentSparseSet._entitySetPool.release(entitySet);
} }
this._componentToEntities.clear(); this._componentToEntities.clear();
} }
/** /**
* 获取内存使用统计 * 获取内存使用统计
*/ */
@@ -327,15 +339,15 @@ export class ComponentSparseSet {
masksMemory: number; masksMemory: number;
mappingsMemory: number; mappingsMemory: number;
totalMemory: number; totalMemory: number;
} { } {
const entitiesStats = this._entities.getMemoryStats(); const entitiesStats = this._entities.getMemoryStats();
const masksMemory = this._componentMasks.length * 16; // 估计每个BigInt 16字节 const masksMemory = this._componentMasks.length * 16; // 估计每个BigInt 16字节
let mappingsMemory = this._componentToEntities.size * 16; // Map条目开销 let mappingsMemory = this._componentToEntities.size * 16; // Map条目开销
for (const entitySet of this._componentToEntities.values()) { for (const entitySet of this._componentToEntities.values()) {
mappingsMemory += entitySet.size * 8; // 每个实体引用8字节 mappingsMemory += entitySet.size * 8; // 每个实体引用8字节
} }
return { return {
entitiesMemory: entitiesStats.totalMemory, entitiesMemory: entitiesStats.totalMemory,
masksMemory, masksMemory,
@@ -343,7 +355,7 @@ export class ComponentSparseSet {
totalMemory: entitiesStats.totalMemory + masksMemory + mappingsMemory totalMemory: entitiesStats.totalMemory + masksMemory + mappingsMemory
}; };
} }
/** /**
* 验证数据结构完整性 * 验证数据结构完整性
*/ */
@@ -352,12 +364,12 @@ export class ComponentSparseSet {
if (!this._entities.validate()) { if (!this._entities.validate()) {
return false; return false;
} }
// 检查位掩码数组长度一致性 // 检查位掩码数组长度一致性
if (this._componentMasks.length !== this._entities.size) { if (this._componentMasks.length !== this._entities.size) {
return false; return false;
} }
// 检查组件映射的一致性 // 检查组件映射的一致性
const allMappedEntities = new Set<Entity>(); const allMappedEntities = new Set<Entity>();
for (const entitySet of this._componentToEntities.values()) { for (const entitySet of this._componentToEntities.values()) {
@@ -365,17 +377,17 @@ export class ComponentSparseSet {
allMappedEntities.add(entity); allMappedEntities.add(entity);
} }
} }
// 验证映射中的实体都在稀疏集合中 // 验证映射中的实体都在稀疏集合中
for (const entity of allMappedEntities) { for (const entity of allMappedEntities) {
if (!this._entities.has(entity)) { if (!this._entities.has(entity)) {
return false; return false;
} }
} }
return true; return true;
} }
/** /**
* 获取实体的组件类型集合 * 获取实体的组件类型集合
*/ */
@@ -386,18 +398,18 @@ export class ComponentSparseSet {
} }
return componentTypes; return componentTypes;
} }
/** /**
* 更新组件类型到实体的映射 * 更新组件类型到实体的映射
*/ */
private updateComponentMappings( private updateComponentMappings(
entity: Entity, entity: Entity,
componentTypes: Set<ComponentType>, componentTypes: Set<ComponentType>,
add: boolean add: boolean
): void { ): void {
for (const componentType of componentTypes) { for (const componentType of componentTypes) {
let entities = this._componentToEntities.get(componentType); let entities = this._componentToEntities.get(componentType);
if (add) { if (add) {
if (!entities) { if (!entities) {
entities = ComponentSparseSet._entitySetPool.obtain(); entities = ComponentSparseSet._entitySetPool.obtain();
@@ -415,5 +427,5 @@ export class ComponentSparseSet {
} }
} }
} }
} }

View File

@@ -45,7 +45,7 @@ export class EntityList {
this.buffer.push(entity); this.buffer.push(entity);
this._idToEntity.set(entity.id, entity); this._idToEntity.set(entity.id, entity);
// 更新名称索引 // 更新名称索引
this.updateNameIndex(entity, true); this.updateNameIndex(entity, true);
} }
@@ -67,10 +67,10 @@ export class EntityList {
if (index !== -1) { if (index !== -1) {
this.buffer.splice(index, 1); this.buffer.splice(index, 1);
this._idToEntity.delete(entity.id); this._idToEntity.delete(entity.id);
// 更新名称索引 // 更新名称索引
this.updateNameIndex(entity, false); this.updateNameIndex(entity, false);
// 回收实体ID到ID池 // 回收实体ID到ID池
if (this._scene && this._scene.identifierPool) { if (this._scene && this._scene.identifierPool) {
this._scene.identifierPool.checkIn(entity.id); this._scene.identifierPool.checkIn(entity.id);
@@ -84,19 +84,19 @@ export class EntityList {
public removeAllEntities(): void { public removeAllEntities(): void {
// 收集所有实体ID用于回收 // 收集所有实体ID用于回收
const idsToRecycle: number[] = []; const idsToRecycle: number[] = [];
for (let i = this.buffer.length - 1; i >= 0; i--) { for (let i = this.buffer.length - 1; i >= 0; i--) {
idsToRecycle.push(this.buffer[i]!.id); idsToRecycle.push(this.buffer[i]!.id);
this.buffer[i]!.destroy(); this.buffer[i]!.destroy();
} }
// 批量回收ID // 批量回收ID
if (this._scene && this._scene.identifierPool) { if (this._scene && this._scene.identifierPool) {
for (const id of idsToRecycle) { for (const id of idsToRecycle) {
this._scene.identifierPool.checkIn(id); this._scene.identifierPool.checkIn(id);
} }
} }
this.buffer.length = 0; this.buffer.length = 0;
this._idToEntity.clear(); this._idToEntity.clear();
this._nameToEntities.clear(); this._nameToEntities.clear();
@@ -170,13 +170,13 @@ export class EntityList {
*/ */
public findEntitiesByTag(tag: number): Entity[] { public findEntitiesByTag(tag: number): Entity[] {
const result: Entity[] = []; const result: Entity[] = [];
for (const entity of this.buffer) { for (const entity of this.buffer) {
if (entity.tag === tag) { if (entity.tag === tag) {
result.push(entity); result.push(entity);
} }
} }
return result; return result;
} }
@@ -187,13 +187,13 @@ export class EntityList {
*/ */
public findEntitiesWithComponent<T extends Component>(componentType: new (...args: any[]) => T): Entity[] { public findEntitiesWithComponent<T extends Component>(componentType: new (...args: any[]) => T): Entity[] {
const result: Entity[] = []; const result: Entity[] = [];
for (const entity of this.buffer) { for (const entity of this.buffer) {
if (entity.hasComponent(componentType)) { if (entity.hasComponent(componentType)) {
result.push(entity); result.push(entity);
} }
} }
return result; return result;
} }
@@ -243,7 +243,7 @@ export class EntityList {
const index = entities.indexOf(entity); const index = entities.indexOf(entity);
if (index !== -1) { if (index !== -1) {
entities.splice(index, 1); entities.splice(index, 1);
// 如果数组为空,删除映射 // 如果数组为空,删除映射
if (entities.length === 0) { if (entities.length === 0) {
this._nameToEntities.delete(entity.name); this._nameToEntities.delete(entity.name);
@@ -263,7 +263,7 @@ export class EntityList {
pendingAdd: number; pendingAdd: number;
pendingRemove: number; pendingRemove: number;
nameIndexSize: number; nameIndexSize: number;
} { } {
let activeCount = 0; let activeCount = 0;
for (const entity of this.buffer) { for (const entity of this.buffer) {
if (entity.enabled && !entity.isDestroyed) { if (entity.enabled && !entity.isDestroyed) {

View File

@@ -53,7 +53,7 @@ export class EntityProcessorList {
/** /**
* 开始处理 * 开始处理
* *
* 对所有处理器进行排序以确保正确的执行顺序。 * 对所有处理器进行排序以确保正确的执行顺序。
*/ */
public begin(): void { public begin(): void {

View File

@@ -1,22 +1,22 @@
/** /**
* 世代式ID池管理器 * 世代式ID池管理器
* *
* 用于管理实体ID的分配和回收支持世代版本控制以防止悬空引用问题。 * 用于管理实体ID的分配和回收支持世代版本控制以防止悬空引用问题。
* 世代式ID由索引和版本组成当ID被回收时版本会递增确保旧引用失效。 * 世代式ID由索引和版本组成当ID被回收时版本会递增确保旧引用失效。
* *
* 支持动态扩展理论上可以支持到65535个索引16位每个索引65535个版本16位 * 支持动态扩展理论上可以支持到65535个索引16位每个索引65535个版本16位
* 总计可以处理超过42亿个独特的ID组合完全满足ECS大规模实体需求。 * 总计可以处理超过42亿个独特的ID组合完全满足ECS大规模实体需求。
* *
* @example * @example
* ```typescript * ```typescript
* const pool = new IdentifierPool(); * const pool = new IdentifierPool();
* *
* // 分配ID * // 分配ID
* const id = pool.checkOut(); // 例如: 65536 (版本1索引0) * const id = pool.checkOut(); // 例如: 65536 (版本1索引0)
* *
* // 回收ID * // 回收ID
* pool.checkIn(id); * pool.checkIn(id);
* *
* // 验证ID是否有效 * // 验证ID是否有效
* const isValid = pool.isValid(id); // false因为版本已递增 * const isValid = pool.isValid(id); // false因为版本已递增
* ``` * ```
@@ -26,18 +26,18 @@ export class IdentifierPool {
* 下一个可用的索引 * 下一个可用的索引
*/ */
private _nextAvailableIndex = 0; private _nextAvailableIndex = 0;
/** /**
* 空闲的索引列表 * 空闲的索引列表
*/ */
private _freeIndices: number[] = []; private _freeIndices: number[] = [];
/** /**
* 每个索引对应的世代版本 * 每个索引对应的世代版本
* 动态扩展的Map按需分配内存 * 动态扩展的Map按需分配内存
*/ */
private _generations = new Map<number, number>(); private _generations = new Map<number, number>();
/** /**
* 延迟回收队列 * 延迟回收队列
* 防止在同一帧内立即重用ID避免时序问题 * 防止在同一帧内立即重用ID避免时序问题
@@ -47,30 +47,30 @@ export class IdentifierPool {
generation: number; generation: number;
timestamp: number; timestamp: number;
}> = []; }> = [];
/** /**
* 延迟回收时间(毫秒) * 延迟回收时间(毫秒)
*/ */
private _recycleDelay: number = 100; private _recycleDelay: number = 100;
/** /**
* 最大索引限制16位 * 最大索引限制16位
* 这是框架设计选择16位索引 + 16位版本 = 32位ID确保高效位操作 * 这是框架设计选择16位索引 + 16位版本 = 32位ID确保高效位操作
* 不是硬件限制,而是性能和内存效率的权衡 * 不是硬件限制,而是性能和内存效率的权衡
*/ */
private static readonly MAX_INDEX = 0xFFFF; // 65535 private static readonly MAX_INDEX = 0xFFFF; // 65535
/** /**
* 最大世代限制16位 * 最大世代限制16位
*/ */
private static readonly MAX_GENERATION = 0xFFFF; // 65535 private static readonly MAX_GENERATION = 0xFFFF; // 65535
/** /**
* 内存扩展块大小 * 内存扩展块大小
* 当需要更多内存时,一次性预分配的索引数量 * 当需要更多内存时,一次性预分配的索引数量
*/ */
private _expansionBlockSize: number; private _expansionBlockSize: number;
/** /**
* 统计信息 * 统计信息
*/ */
@@ -83,32 +83,32 @@ export class IdentifierPool {
/** /**
* 构造函数 * 构造函数
* *
* @param recycleDelay 延迟回收时间毫秒默认为100ms * @param recycleDelay 延迟回收时间毫秒默认为100ms
* @param expansionBlockSize 内存扩展块大小默认为1024 * @param expansionBlockSize 内存扩展块大小默认为1024
*/ */
constructor(recycleDelay: number = 100, expansionBlockSize: number = 1024) { constructor(recycleDelay: number = 100, expansionBlockSize: number = 1024) {
this._recycleDelay = recycleDelay; this._recycleDelay = recycleDelay;
this._expansionBlockSize = expansionBlockSize; this._expansionBlockSize = expansionBlockSize;
// 预分配第一个块的世代信息 // 预分配第一个块的世代信息
this._preAllocateGenerations(0, this._expansionBlockSize); this._preAllocateGenerations(0, this._expansionBlockSize);
} }
/** /**
* 获取一个可用的ID * 获取一个可用的ID
* *
* 返回一个32位ID高16位为世代版本低16位为索引。 * 返回一个32位ID高16位为世代版本低16位为索引。
* *
* @returns 新分配的实体ID * @returns 新分配的实体ID
* @throws {Error} 当达到索引限制时抛出错误 * @throws {Error} 当达到索引限制时抛出错误
*/ */
public checkOut(): number { public checkOut(): number {
// 处理延迟回收队列 // 处理延迟回收队列
this._processDelayedRecycle(); this._processDelayedRecycle();
let index: number; let index: number;
if (this._freeIndices.length > 0) { if (this._freeIndices.length > 0) {
// 重用回收的索引 // 重用回收的索引
index = this._freeIndices.pop()!; index = this._freeIndices.pop()!;
@@ -117,69 +117,69 @@ export class IdentifierPool {
if (this._nextAvailableIndex > IdentifierPool.MAX_INDEX) { if (this._nextAvailableIndex > IdentifierPool.MAX_INDEX) {
throw new Error( throw new Error(
`实体索引已达到框架设计限制 (${IdentifierPool.MAX_INDEX})。` + `实体索引已达到框架设计限制 (${IdentifierPool.MAX_INDEX})。` +
`这意味着您已经分配了超过65535个不同的实体索引。` + '这意味着您已经分配了超过65535个不同的实体索引。' +
`这是16位索引设计的限制考虑优化实体回收策略或升级到64位ID设计。` '这是16位索引设计的限制考虑优化实体回收策略或升级到64位ID设计。'
); );
} }
index = this._nextAvailableIndex++; index = this._nextAvailableIndex++;
// 按需扩展世代存储 // 按需扩展世代存储
this._ensureGenerationCapacity(index); this._ensureGenerationCapacity(index);
} }
const generation = this._generations.get(index) || 1; const generation = this._generations.get(index) || 1;
this._stats.totalAllocated++; this._stats.totalAllocated++;
this._stats.currentActive++; this._stats.currentActive++;
return this._packId(index, generation); return this._packId(index, generation);
} }
/** /**
* 回收一个ID * 回收一个ID
* *
* 验证ID的有效性后将其加入延迟回收队列。 * 验证ID的有效性后将其加入延迟回收队列。
* ID不会立即可重用而是在延迟时间后才真正回收。 * ID不会立即可重用而是在延迟时间后才真正回收。
* *
* @param id 要回收的实体ID * @param id 要回收的实体ID
* @returns 是否成功回收ID是否有效且未被重复回收 * @returns 是否成功回收ID是否有效且未被重复回收
*/ */
public checkIn(id: number): boolean { public checkIn(id: number): boolean {
const index = this._unpackIndex(id); const index = this._unpackIndex(id);
const generation = this._unpackGeneration(id); const generation = this._unpackGeneration(id);
// 验证ID有效性 // 验证ID有效性
if (!this._isValidId(index, generation)) { if (!this._isValidId(index, generation)) {
return false; return false;
} }
// 检查是否已经在待回收队列中 // 检查是否已经在待回收队列中
const alreadyPending = this._pendingRecycle.some( const alreadyPending = this._pendingRecycle.some(
item => item.index === index && item.generation === generation (item) => item.index === index && item.generation === generation
); );
if (alreadyPending) { if (alreadyPending) {
return false; // 已经在回收队列中,拒绝重复回收 return false; // 已经在回收队列中,拒绝重复回收
} }
// 加入延迟回收队列 // 加入延迟回收队列
this._pendingRecycle.push({ this._pendingRecycle.push({
index, index,
generation, generation,
timestamp: Date.now() timestamp: Date.now()
}); });
this._stats.currentActive--; this._stats.currentActive--;
this._stats.totalRecycled++; this._stats.totalRecycled++;
return true; return true;
} }
/** /**
* 验证ID是否有效 * 验证ID是否有效
* *
* 检查ID的索引和世代版本是否匹配当前状态。 * 检查ID的索引和世代版本是否匹配当前状态。
* *
* @param id 要验证的实体ID * @param id 要验证的实体ID
* @returns ID是否有效 * @returns ID是否有效
*/ */
@@ -191,7 +191,7 @@ export class IdentifierPool {
/** /**
* 获取统计信息 * 获取统计信息
* *
* @returns 池的当前状态统计 * @returns 池的当前状态统计
*/ */
public getStats(): { public getStats(): {
@@ -217,20 +217,20 @@ export class IdentifierPool {
averageGeneration: number; averageGeneration: number;
/** 世代存储大小 */ /** 世代存储大小 */
generationStorageSize: number; generationStorageSize: number;
} { } {
// 计算平均世代版本 // 计算平均世代版本
let totalGeneration = 0; let totalGeneration = 0;
let generationCount = 0; let generationCount = 0;
for (const [index, generation] of this._generations) { for (const [index, generation] of this._generations) {
if (index < this._nextAvailableIndex) { if (index < this._nextAvailableIndex) {
totalGeneration += generation; totalGeneration += generation;
generationCount++; generationCount++;
} }
} }
const averageGeneration = generationCount > 0 const averageGeneration = generationCount > 0
? totalGeneration / generationCount ? totalGeneration / generationCount
: 1; : 1;
return { return {
@@ -250,7 +250,7 @@ export class IdentifierPool {
/** /**
* 强制执行延迟回收处理 * 强制执行延迟回收处理
* *
* 在某些情况下可能需要立即处理延迟回收队列, * 在某些情况下可能需要立即处理延迟回收队列,
* 比如内存压力大或者需要精确的统计信息时。 * 比如内存压力大或者需要精确的统计信息时。
*/ */
@@ -260,19 +260,19 @@ export class IdentifierPool {
/** /**
* 清理过期的延迟回收项 * 清理过期的延迟回收项
* *
* 将超过延迟时间的回收项真正回收到空闲列表中。 * 将超过延迟时间的回收项真正回收到空闲列表中。
* *
* @param forceAll 是否强制处理所有延迟回收项 * @param forceAll 是否强制处理所有延迟回收项
* @private * @private
*/ */
private _processDelayedRecycle(forceAll: boolean = false): void { private _processDelayedRecycle(forceAll: boolean = false): void {
if (this._pendingRecycle.length === 0) return; if (this._pendingRecycle.length === 0) return;
const now = Date.now(); const now = Date.now();
const readyToRecycle: typeof this._pendingRecycle = []; const readyToRecycle: typeof this._pendingRecycle = [];
const stillPending: typeof this._pendingRecycle = []; const stillPending: typeof this._pendingRecycle = [];
// 分离已到期和未到期的项 // 分离已到期和未到期的项
for (const item of this._pendingRecycle) { for (const item of this._pendingRecycle) {
if (forceAll || now - item.timestamp >= this._recycleDelay) { if (forceAll || now - item.timestamp >= this._recycleDelay) {
@@ -281,33 +281,33 @@ export class IdentifierPool {
stillPending.push(item); stillPending.push(item);
} }
} }
// 处理到期的回收项 // 处理到期的回收项
for (const item of readyToRecycle) { for (const item of readyToRecycle) {
// 再次验证ID有效性防止重复回收 // 再次验证ID有效性防止重复回收
if (this._isValidId(item.index, item.generation)) { if (this._isValidId(item.index, item.generation)) {
// 递增世代版本 // 递增世代版本
let newGeneration = item.generation + 1; let newGeneration = item.generation + 1;
// 防止世代版本溢出 // 防止世代版本溢出
if (newGeneration > IdentifierPool.MAX_GENERATION) { if (newGeneration > IdentifierPool.MAX_GENERATION) {
newGeneration = 1; // 重置为1而不是0 newGeneration = 1; // 重置为1而不是0
} }
this._generations.set(item.index, newGeneration); this._generations.set(item.index, newGeneration);
// 添加到空闲列表 // 添加到空闲列表
this._freeIndices.push(item.index); this._freeIndices.push(item.index);
} }
} }
// 更新待回收队列 // 更新待回收队列
this._pendingRecycle = stillPending; this._pendingRecycle = stillPending;
} }
/** /**
* 预分配世代信息 * 预分配世代信息
* *
* @param startIndex 起始索引 * @param startIndex 起始索引
* @param count 分配数量 * @param count 分配数量
* @private * @private
@@ -324,7 +324,7 @@ export class IdentifierPool {
/** /**
* 确保指定索引的世代信息存在 * 确保指定索引的世代信息存在
* *
* @param index 索引 * @param index 索引
* @private * @private
*/ */
@@ -332,7 +332,7 @@ export class IdentifierPool {
if (!this._generations.has(index)) { if (!this._generations.has(index)) {
// 计算需要扩展的起始位置 // 计算需要扩展的起始位置
const expansionStart = Math.floor(index / this._expansionBlockSize) * this._expansionBlockSize; const expansionStart = Math.floor(index / this._expansionBlockSize) * this._expansionBlockSize;
// 预分配一个块 // 预分配一个块
this._preAllocateGenerations(expansionStart, this._expansionBlockSize); this._preAllocateGenerations(expansionStart, this._expansionBlockSize);
} }
@@ -340,7 +340,7 @@ export class IdentifierPool {
/** /**
* 计算内存使用量 * 计算内存使用量
* *
* @returns 内存使用字节数 * @returns 内存使用字节数
* @private * @private
*/ */
@@ -348,13 +348,13 @@ export class IdentifierPool {
const generationMapSize = this._generations.size * 16; // Map overhead + number pair const generationMapSize = this._generations.size * 16; // Map overhead + number pair
const freeIndicesSize = this._freeIndices.length * 8; const freeIndicesSize = this._freeIndices.length * 8;
const pendingRecycleSize = this._pendingRecycle.length * 32; const pendingRecycleSize = this._pendingRecycle.length * 32;
return generationMapSize + freeIndicesSize + pendingRecycleSize; return generationMapSize + freeIndicesSize + pendingRecycleSize;
} }
/** /**
* 打包索引和世代为32位ID * 打包索引和世代为32位ID
* *
* @param index 索引16位 * @param index 索引16位
* @param generation 世代版本16位 * @param generation 世代版本16位
* @returns 打包后的32位ID * @returns 打包后的32位ID
@@ -366,7 +366,7 @@ export class IdentifierPool {
/** /**
* 从ID中解包索引 * 从ID中解包索引
* *
* @param id 32位ID * @param id 32位ID
* @returns 索引部分16位 * @returns 索引部分16位
* @private * @private
@@ -377,7 +377,7 @@ export class IdentifierPool {
/** /**
* 从ID中解包世代版本 * 从ID中解包世代版本
* *
* @param id 32位ID * @param id 32位ID
* @returns 世代版本部分16位 * @returns 世代版本部分16位
* @private * @private
@@ -388,7 +388,7 @@ export class IdentifierPool {
/** /**
* 内部ID有效性检查 * 内部ID有效性检查
* *
* @param index 索引 * @param index 索引
* @param generation 世代版本 * @param generation 世代版本
* @returns 是否有效 * @returns 是否有效
@@ -398,8 +398,8 @@ export class IdentifierPool {
if (index < 0 || index >= this._nextAvailableIndex) { if (index < 0 || index >= this._nextAvailableIndex) {
return false; return false;
} }
const currentGeneration = this._generations.get(index); const currentGeneration = this._generations.get(index);
return currentGeneration !== undefined && currentGeneration === generation; return currentGeneration !== undefined && currentGeneration === generation;
} }
} }

View File

@@ -15,15 +15,15 @@ export interface QueryCondition {
/** /**
* 实体匹配条件描述符 * 实体匹配条件描述符
* *
* 用于描述实体查询条件,不执行实际查询 * 用于描述实体查询条件,不执行实际查询
* *
* @example * @example
* ```typescript * ```typescript
* const matcher = Matcher.all(Position, Velocity) * const matcher = Matcher.all(Position, Velocity)
* .any(Health, Shield) * .any(Health, Shield)
* .none(Dead); * .none(Dead);
* *
* // 获取查询条件 * // 获取查询条件
* const condition = matcher.getCondition(); * const condition = matcher.getCondition();
* ``` * ```
@@ -219,8 +219,8 @@ export class Matcher {
* 检查是否为空条件 * 检查是否为空条件
*/ */
public isEmpty(): boolean { public isEmpty(): boolean {
return this.condition.all.length === 0 && return this.condition.all.length === 0 &&
this.condition.any.length === 0 && this.condition.any.length === 0 &&
this.condition.none.length === 0 && this.condition.none.length === 0 &&
this.condition.tag === undefined && this.condition.tag === undefined &&
this.condition.name === undefined && this.condition.name === undefined &&
@@ -265,32 +265,32 @@ export class Matcher {
*/ */
public toString(): string { public toString(): string {
const parts: string[] = []; const parts: string[] = [];
if (this.condition.all.length > 0) { if (this.condition.all.length > 0) {
parts.push(`all(${this.condition.all.map(t => getComponentTypeName(t)).join(', ')})`); parts.push(`all(${this.condition.all.map((t) => getComponentTypeName(t)).join(', ')})`);
} }
if (this.condition.any.length > 0) { if (this.condition.any.length > 0) {
parts.push(`any(${this.condition.any.map(t => getComponentTypeName(t)).join(', ')})`); parts.push(`any(${this.condition.any.map((t) => getComponentTypeName(t)).join(', ')})`);
} }
if (this.condition.none.length > 0) { if (this.condition.none.length > 0) {
parts.push(`none(${this.condition.none.map(t => getComponentTypeName(t)).join(', ')})`); parts.push(`none(${this.condition.none.map((t) => getComponentTypeName(t)).join(', ')})`);
} }
if (this.condition.tag !== undefined) { if (this.condition.tag !== undefined) {
parts.push(`tag(${this.condition.tag})`); parts.push(`tag(${this.condition.tag})`);
} }
if (this.condition.name !== undefined) { if (this.condition.name !== undefined) {
parts.push(`name(${this.condition.name})`); parts.push(`name(${this.condition.name})`);
} }
if (this.condition.component !== undefined) { if (this.condition.component !== undefined) {
parts.push(`component(${getComponentTypeName(this.condition.component)})`); parts.push(`component(${getComponentTypeName(this.condition.component)})`);
} }
return `Matcher[${parts.join(' & ')}]`; return `Matcher[${parts.join(' & ')}]`;
} }
} }

View File

@@ -1,22 +1,22 @@
/** /**
* 稀疏集合实现 * 稀疏集合实现
* *
* 提供O(1)的插入、删除、查找操作,同时保持数据的紧凑存储。 * 提供O(1)的插入、删除、查找操作,同时保持数据的紧凑存储。
* 使用密集数组存储实际数据,稀疏映射提供快速访问 * 使用密集数组存储实际数据,稀疏映射提供快速访问
* *
* @template T 存储的数据类型 * @template T 存储的数据类型
* *
* @example * @example
* ```typescript * ```typescript
* const sparseSet = new SparseSet<Entity>(); * const sparseSet = new SparseSet<Entity>();
* *
* sparseSet.add(entity1); * sparseSet.add(entity1);
* sparseSet.add(entity2); * sparseSet.add(entity2);
* *
* if (sparseSet.has(entity1)) { * if (sparseSet.has(entity1)) {
* sparseSet.remove(entity1); * sparseSet.remove(entity1);
* } * }
* *
* sparseSet.forEach((entity, index) => { * sparseSet.forEach((entity, index) => {
* console.log(`Entity at index ${index}: ${entity.name}`); * console.log(`Entity at index ${index}: ${entity.name}`);
* }); * });
@@ -25,21 +25,21 @@
export class SparseSet<T> { export class SparseSet<T> {
/** /**
* 密集存储数组 * 密集存储数组
* *
* 连续存储所有有效数据,确保遍历时的缓存友好性。 * 连续存储所有有效数据,确保遍历时的缓存友好性。
*/ */
private _dense: T[] = []; private _dense: T[] = [];
/** /**
* 稀疏映射表 * 稀疏映射表
* *
* 将数据项映射到密集数组中的索引提供O(1)的查找性能。 * 将数据项映射到密集数组中的索引提供O(1)的查找性能。
*/ */
private _sparse = new Map<T, number>(); private _sparse = new Map<T, number>();
/** /**
* 添加元素到集合 * 添加元素到集合
* *
* @param item 要添加的元素 * @param item 要添加的元素
* @returns 是否成功添加false表示元素已存在 * @returns 是否成功添加false表示元素已存在
*/ */
@@ -47,21 +47,21 @@ export class SparseSet<T> {
if (this._sparse.has(item)) { if (this._sparse.has(item)) {
return false; // 元素已存在 return false; // 元素已存在
} }
const index = this._dense.length; const index = this._dense.length;
this._dense.push(item); this._dense.push(item);
this._sparse.set(item, index); this._sparse.set(item, index);
return true; return true;
} }
/** /**
* 从集合中移除元素 * 从集合中移除元素
* *
* 使用swap-and-pop技术保持数组紧凑性 * 使用swap-and-pop技术保持数组紧凑性
* 1. 将要删除的元素与最后一个元素交换 * 1. 将要删除的元素与最后一个元素交换
* 2. 删除最后一个元素 * 2. 删除最后一个元素
* 3. 更新映射表 * 3. 更新映射表
* *
* @param item 要移除的元素 * @param item 要移除的元素
* @returns 是否成功移除false表示元素不存在 * @returns 是否成功移除false表示元素不存在
*/ */
@@ -70,72 +70,72 @@ export class SparseSet<T> {
if (index === undefined) { if (index === undefined) {
return false; // 元素不存在 return false; // 元素不存在
} }
const lastIndex = this._dense.length - 1; const lastIndex = this._dense.length - 1;
// 如果不是最后一个元素,则与最后一个元素交换 // 如果不是最后一个元素,则与最后一个元素交换
if (index !== lastIndex) { if (index !== lastIndex) {
const lastItem = this._dense[lastIndex]!; const lastItem = this._dense[lastIndex]!;
this._dense[index] = lastItem; this._dense[index] = lastItem;
this._sparse.set(lastItem, index); this._sparse.set(lastItem, index);
} }
// 移除最后一个元素 // 移除最后一个元素
this._dense.pop(); this._dense.pop();
this._sparse.delete(item); this._sparse.delete(item);
return true; return true;
} }
/** /**
* 检查元素是否存在于集合中 * 检查元素是否存在于集合中
* *
* @param item 要检查的元素 * @param item 要检查的元素
* @returns 元素是否存在 * @returns 元素是否存在
*/ */
public has(item: T): boolean { public has(item: T): boolean {
return this._sparse.has(item); return this._sparse.has(item);
} }
/** /**
* 获取元素在密集数组中的索引 * 获取元素在密集数组中的索引
* *
* @param item 要查询的元素 * @param item 要查询的元素
* @returns 索引如果元素不存在则返回undefined * @returns 索引如果元素不存在则返回undefined
*/ */
public getIndex(item: T): number | undefined { public getIndex(item: T): number | undefined {
return this._sparse.get(item); return this._sparse.get(item);
} }
/** /**
* 根据索引获取元素 * 根据索引获取元素
* *
* @param index 索引 * @param index 索引
* @returns 元素如果索引无效则返回undefined * @returns 元素如果索引无效则返回undefined
*/ */
public getByIndex(index: number): T | undefined { public getByIndex(index: number): T | undefined {
return this._dense[index]; return this._dense[index];
} }
/** /**
* 获取集合大小 * 获取集合大小
*/ */
public get size(): number { public get size(): number {
return this._dense.length; return this._dense.length;
} }
/** /**
* 检查集合是否为空 * 检查集合是否为空
*/ */
public get isEmpty(): boolean { public get isEmpty(): boolean {
return this._dense.length === 0; return this._dense.length === 0;
} }
/** /**
* 遍历集合中的所有元素 * 遍历集合中的所有元素
* *
* 保证遍历顺序与添加顺序一致(除非中间有删除操作)。 * 保证遍历顺序与添加顺序一致(除非中间有删除操作)。
* 遍历性能优秀,因为数据在内存中连续存储。 * 遍历性能优秀,因为数据在内存中连续存储。
* *
* @param callback 遍历回调函数 * @param callback 遍历回调函数
*/ */
public forEach(callback: (item: T, index: number) => void): void { public forEach(callback: (item: T, index: number) => void): void {
@@ -143,10 +143,10 @@ export class SparseSet<T> {
callback(this._dense[i]!, i); callback(this._dense[i]!, i);
} }
} }
/** /**
* 映射集合中的所有元素 * 映射集合中的所有元素
* *
* @param callback 映射回调函数 * @param callback 映射回调函数
* @returns 映射后的新数组 * @returns 映射后的新数组
*/ */
@@ -157,10 +157,10 @@ export class SparseSet<T> {
} }
return result; return result;
} }
/** /**
* 过滤集合中的元素 * 过滤集合中的元素
* *
* @param predicate 过滤条件 * @param predicate 过滤条件
* @returns 满足条件的元素数组 * @returns 满足条件的元素数组
*/ */
@@ -173,10 +173,10 @@ export class SparseSet<T> {
} }
return result; return result;
} }
/** /**
* 查找第一个满足条件的元素 * 查找第一个满足条件的元素
* *
* @param predicate 查找条件 * @param predicate 查找条件
* @returns 找到的元素如果没有则返回undefined * @returns 找到的元素如果没有则返回undefined
*/ */
@@ -188,10 +188,10 @@ export class SparseSet<T> {
} }
return undefined; return undefined;
} }
/** /**
* 检查是否存在满足条件的元素 * 检查是否存在满足条件的元素
* *
* @param predicate 检查条件 * @param predicate 检查条件
* @returns 是否存在满足条件的元素 * @returns 是否存在满足条件的元素
*/ */
@@ -203,10 +203,10 @@ export class SparseSet<T> {
} }
return false; return false;
} }
/** /**
* 检查是否所有元素都满足条件 * 检查是否所有元素都满足条件
* *
* @param predicate 检查条件 * @param predicate 检查条件
* @returns 是否所有元素都满足条件 * @returns 是否所有元素都满足条件
*/ */
@@ -218,26 +218,26 @@ export class SparseSet<T> {
} }
return true; return true;
} }
/** /**
* 获取密集数组的只读副本 * 获取密集数组的只读副本
* *
* 返回数组的浅拷贝,确保外部无法直接修改内部数据。 * 返回数组的浅拷贝,确保外部无法直接修改内部数据。
*/ */
public getDenseArray(): readonly T[] { public getDenseArray(): readonly T[] {
return [...this._dense]; return [...this._dense];
} }
/** /**
* 获取密集数组的直接引用(内部使用) * 获取密集数组的直接引用(内部使用)
* *
* 警告:直接修改返回的数组会破坏数据结构的完整性。 * 警告:直接修改返回的数组会破坏数据结构的完整性。
* 仅在性能关键场景下使用,并确保不会修改数组内容。 * 仅在性能关键场景下使用,并确保不会修改数组内容。
*/ */
public getDenseArrayUnsafe(): readonly T[] { public getDenseArrayUnsafe(): readonly T[] {
return this._dense; return this._dense;
} }
/** /**
* 清空集合 * 清空集合
*/ */
@@ -245,21 +245,21 @@ export class SparseSet<T> {
this._dense.length = 0; this._dense.length = 0;
this._sparse.clear(); this._sparse.clear();
} }
/** /**
* 转换为数组 * 转换为数组
*/ */
public toArray(): T[] { public toArray(): T[] {
return [...this._dense]; return [...this._dense];
} }
/** /**
* 转换为Set * 转换为Set
*/ */
public toSet(): Set<T> { public toSet(): Set<T> {
return new Set(this._dense); return new Set(this._dense);
} }
/** /**
* 获取内存使用统计信息 * 获取内存使用统计信息
*/ */
@@ -267,20 +267,20 @@ export class SparseSet<T> {
denseArraySize: number; denseArraySize: number;
sparseMapSize: number; sparseMapSize: number;
totalMemory: number; totalMemory: number;
} { } {
const denseArraySize = this._dense.length * 8; // 估计每个引用8字节 const denseArraySize = this._dense.length * 8; // 估计每个引用8字节
const sparseMapSize = this._sparse.size * 16; // 估计每个Map条目16字节 const sparseMapSize = this._sparse.size * 16; // 估计每个Map条目16字节
return { return {
denseArraySize, denseArraySize,
sparseMapSize, sparseMapSize,
totalMemory: denseArraySize + sparseMapSize totalMemory: denseArraySize + sparseMapSize
}; };
} }
/** /**
* 验证数据结构的完整性 * 验证数据结构的完整性
* *
* 调试用方法,检查内部数据结构是否一致。 * 调试用方法,检查内部数据结构是否一致。
*/ */
public validate(): boolean { public validate(): boolean {
@@ -288,7 +288,7 @@ export class SparseSet<T> {
if (this._dense.length !== this._sparse.size) { if (this._dense.length !== this._sparse.size) {
return false; return false;
} }
// 检查映射关系的正确性 // 检查映射关系的正确性
for (let i = 0; i < this._dense.length; i++) { for (let i = 0; i < this._dense.length; i++) {
const item = this._dense[i]!; const item = this._dense[i]!;
@@ -297,14 +297,14 @@ export class SparseSet<T> {
return false; return false;
} }
} }
// 检查稀疏映射中的所有项都在密集数组中 // 检查稀疏映射中的所有项都在密集数组中
for (const [item, index] of this._sparse) { for (const [item, index] of this._sparse) {
if (index >= this._dense.length || this._dense[index] !== item) { if (index >= this._dense.length || this._dense[index] !== item) {
return false; return false;
} }
} }
return true; return true;
} }
} }

View File

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

View File

@@ -13,22 +13,22 @@ export interface IGlobalSystem {
* 系统名称 * 系统名称
*/ */
readonly name: string; readonly name: string;
/** /**
* 初始化系统 * 初始化系统
*/ */
initialize?(): void; initialize?(): void;
/** /**
* 更新系统 * 更新系统
*/ */
update(deltaTime?: number): void; update(deltaTime?: number): void;
/** /**
* 重置系统 * 重置系统
*/ */
reset?(): void; reset?(): void;
/** /**
* 销毁系统 * 销毁系统
*/ */
@@ -43,17 +43,17 @@ export interface IWorldConfig {
* World名称 * World名称
*/ */
name?: string; name?: string;
/** /**
* 是否启用调试模式 * 是否启用调试模式
*/ */
debug?: boolean; debug?: boolean;
/** /**
* 最大Scene数量限制 * 最大Scene数量限制
*/ */
maxScenes?: number; maxScenes?: number;
/** /**
* 是否自动清理空Scene * 是否自动清理空Scene
*/ */
@@ -62,22 +62,22 @@ export interface IWorldConfig {
/** /**
* World类 - ECS世界管理器 * World类 - ECS世界管理器
* *
* World是Scene的容器每个World可以管理多个Scene。 * World是Scene的容器每个World可以管理多个Scene。
* 这种设计允许创建独立的游戏世界,如: * 这种设计允许创建独立的游戏世界,如:
* - 游戏房间每个房间一个World * - 游戏房间每个房间一个World
* - 不同的游戏模式 * - 不同的游戏模式
* - 独立的模拟环境 * - 独立的模拟环境
* *
* @example * @example
* ```typescript * ```typescript
* // 创建游戏房间的World * // 创建游戏房间的World
* const roomWorld = new World({ name: 'Room_001' }); * const roomWorld = new World({ name: 'Room_001' });
* *
* // 在World中创建Scene * // 在World中创建Scene
* const gameScene = roomWorld.createScene('game', new Scene()); * const gameScene = roomWorld.createScene('game', new Scene());
* const uiScene = roomWorld.createScene('ui', new Scene()); * const uiScene = roomWorld.createScene('ui', new Scene());
* *
* // 更新整个World * // 更新整个World
* roomWorld.update(deltaTime); * roomWorld.update(deltaTime);
* ``` * ```
@@ -99,7 +99,7 @@ export class World {
autoCleanup: true, autoCleanup: true,
...config ...config
}; };
this.name = this._config.name!; this.name = this._config.name!;
this._createdAt = Date.now(); this._createdAt = Date.now();
} }
@@ -120,7 +120,7 @@ export class World {
// 如果没有提供Scene实例创建默认Scene // 如果没有提供Scene实例创建默认Scene
const scene = sceneInstance || (new Scene() as unknown as T); const scene = sceneInstance || (new Scene() as unknown as T);
// 设置Scene的标识 // 设置Scene的标识
if ('id' in scene) { if ('id' in scene) {
(scene as any).id = sceneId; (scene as any).id = sceneId;
@@ -154,7 +154,7 @@ export class World {
// 清理Scene资源 // 清理Scene资源
scene.end(); scene.end();
this._scenes.delete(sceneId); this._scenes.delete(sceneId);
logger.info(`从World '${this.name}' 中移除Scene: ${sceneId}`); logger.info(`从World '${this.name}' 中移除Scene: ${sceneId}`);
return true; return true;
} }
@@ -244,7 +244,7 @@ export class World {
if (system.initialize) { if (system.initialize) {
system.initialize(); system.initialize();
} }
logger.debug(`在World '${this.name}' 中添加全局System: ${system.name}`); logger.debug(`在World '${this.name}' 中添加全局System: ${system.name}`);
return system; return system;
} }
@@ -262,7 +262,7 @@ export class World {
if (system.reset) { if (system.reset) {
system.reset(); system.reset();
} }
logger.debug(`从World '${this.name}' 中移除全局System: ${system.name}`); logger.debug(`从World '${this.name}' 中移除全局System: ${system.name}`);
return true; return true;
} }
@@ -290,14 +290,14 @@ export class World {
} }
this._isActive = true; this._isActive = true;
// 启动所有全局System // 启动所有全局System
for (const system of this._globalSystems) { for (const system of this._globalSystems) {
if (system.initialize) { if (system.initialize) {
system.initialize(); system.initialize();
} }
} }
logger.info(`启动World: ${this.name}`); logger.info(`启动World: ${this.name}`);
} }
@@ -408,7 +408,7 @@ export class World {
globalSystemCount: this._globalSystems.length, globalSystemCount: this._globalSystems.length,
createdAt: this._createdAt, createdAt: this._createdAt,
config: { ...this._config }, config: { ...this._config },
scenes: Array.from(this._scenes.keys()).map(sceneId => ({ scenes: Array.from(this._scenes.keys()).map((sceneId) => ({
id: sceneId, id: sceneId,
isActive: this._activeScenes.has(sceneId), isActive: this._activeScenes.has(sceneId),
name: this._scenes.get(sceneId)?.name || sceneId name: this._scenes.get(sceneId)?.name || sceneId
@@ -454,8 +454,8 @@ export class World {
const cleanupThreshold = 5 * 60 * 1000; // 5分钟 const cleanupThreshold = 5 * 60 * 1000; // 5分钟
for (const [sceneId, scene] of this._scenes) { for (const [sceneId, scene] of this._scenes) {
if (!this._activeScenes.has(sceneId) && if (!this._activeScenes.has(sceneId) &&
scene.entities && scene.entities &&
scene.entities.count === 0 && scene.entities.count === 0 &&
(currentTime - this._createdAt) > cleanupThreshold) { (currentTime - this._createdAt) > cleanupThreshold) {
return true; return true;
@@ -472,15 +472,15 @@ export class World {
const sceneIds = Array.from(this._scenes.keys()); const sceneIds = Array.from(this._scenes.keys());
const currentTime = Date.now(); const currentTime = Date.now();
const cleanupThreshold = 5 * 60 * 1000; // 5分钟 const cleanupThreshold = 5 * 60 * 1000; // 5分钟
for (const sceneId of sceneIds) { for (const sceneId of sceneIds) {
const scene = this._scenes.get(sceneId); const scene = this._scenes.get(sceneId);
if (scene && if (scene &&
!this._activeScenes.has(sceneId) && !this._activeScenes.has(sceneId) &&
scene.entities && scene.entities &&
scene.entities.count === 0 && scene.entities.count === 0 &&
(currentTime - this._createdAt) > cleanupThreshold) { (currentTime - this._createdAt) > cleanupThreshold) {
this.removeScene(sceneId); this.removeScene(sceneId);
logger.debug(`自动清理空Scene: ${sceneId} from World ${this.name}`); logger.debug(`自动清理空Scene: ${sceneId} from World ${this.name}`);
} }
@@ -509,4 +509,4 @@ export class World {
public get createdAt(): number { public get createdAt(): number {
return this._createdAt; return this._createdAt;
} }
} }

View File

@@ -12,17 +12,17 @@ export interface IWorldManagerConfig {
* 最大World数量 * 最大World数量
*/ */
maxWorlds?: number; maxWorlds?: number;
/** /**
* 是否自动清理空World * 是否自动清理空World
*/ */
autoCleanup?: boolean; autoCleanup?: boolean;
/** /**
* 清理间隔(毫秒) * 清理间隔(毫秒)
*/ */
cleanupInterval?: number; cleanupInterval?: number;
/** /**
* 是否启用调试模式 * 是否启用调试模式
*/ */
@@ -242,11 +242,11 @@ export class WorldManager implements IService {
*/ */
public startAll(): void { public startAll(): void {
this._isRunning = true; this._isRunning = true;
for (const worldId of this._worlds.keys()) { for (const worldId of this._worlds.keys()) {
this.setWorldActive(worldId, true); this.setWorldActive(worldId, true);
} }
logger.info('启动所有World'); logger.info('启动所有World');
} }
@@ -255,11 +255,11 @@ export class WorldManager implements IService {
*/ */
public stopAll(): void { public stopAll(): void {
this._isRunning = false; this._isRunning = false;
for (const worldId of this._activeWorlds) { for (const worldId of this._activeWorlds) {
this.setWorldActive(worldId, false); this.setWorldActive(worldId, false);
} }
logger.info('停止所有World'); logger.info('停止所有World');
} }
@@ -432,7 +432,7 @@ export class WorldManager implements IService {
// 1. World未激活 // 1. World未激活
// 2. 没有Scene或所有Scene都是空的 // 2. 没有Scene或所有Scene都是空的
// 3. 创建时间超过10分钟 // 3. 创建时间超过10分钟
if (world.isActive) { if (world.isActive) {
return false; return false;
} }
@@ -444,7 +444,7 @@ export class WorldManager implements IService {
// 检查是否所有Scene都是空的 // 检查是否所有Scene都是空的
const allScenes = world.getAllScenes(); const allScenes = world.getAllScenes();
const hasEntities = allScenes.some(scene => const hasEntities = allScenes.some((scene) =>
scene.entities && scene.entities.count > 0 scene.entities && scene.entities.count > 0
); );
@@ -485,4 +485,4 @@ export class WorldManager implements IService {
public get config(): IWorldManagerConfig { public get config(): IWorldManagerConfig {
return { ...this._config }; return { ...this._config };
} }
} }

View File

@@ -17,4 +17,4 @@ export * from './Serialization';
export { ReferenceTracker, getSceneByEntityId } from './Core/ReferenceTracker'; export { ReferenceTracker, getSceneByEntityId } from './Core/ReferenceTracker';
export type { EntityRefRecord } from './Core/ReferenceTracker'; export type { EntityRefRecord } from './Core/ReferenceTracker';
export { ReactiveQuery, ReactiveQueryChangeType } from './Core/ReactiveQuery'; export { ReactiveQuery, ReactiveQueryChangeType } from './Core/ReactiveQuery';
export type { ReactiveQueryChange, ReactiveQueryListener, ReactiveQueryConfig } from './Core/ReactiveQuery'; export type { ReactiveQueryChange, ReactiveQueryListener, ReactiveQueryConfig } from './Core/ReactiveQuery';

View File

@@ -235,4 +235,4 @@ export class PlatformDetector {
return info; return info;
} }
} }

View File

@@ -98,7 +98,7 @@ export class PlatformManager {
platformSupportsSharedArrayBuffer: boolean; platformSupportsSharedArrayBuffer: boolean;
platformMaxWorkerCount: number; platformMaxWorkerCount: number;
platformLimitations: any; platformLimitations: any;
} { } {
if (!this.adapter) { if (!this.adapter) {
return { return {
platformSupportsWorker: false, platformSupportsWorker: false,
@@ -134,4 +134,4 @@ export class PlatformManager {
// 否则返回同步配置 // 否则返回同步配置
return this.adapter.getPlatformConfig(); return this.adapter.getPlatformConfig();
} }
} }

View File

@@ -44,4 +44,4 @@ export function supportsFeature(feature: 'worker' | 'shared-array-buffer' | 'tra
export function hasAdapter() { export function hasAdapter() {
return PlatformManager.getInstance().hasAdapter(); return PlatformManager.getInstance().hasAdapter();
} }

View File

@@ -208,8 +208,8 @@ export class DebugPlugin implements IPlugin, IService {
return { return {
name: scene.name, name: scene.name,
entityCount: entities.length, entityCount: entities.length,
systems: systems.map(sys => this.getSystemInfo(sys)), systems: systems.map((sys) => this.getSystemInfo(sys)),
entities: entities.map(entity => this.getEntityInfo(entity)) entities: entities.map((entity) => this.getEntityInfo(entity))
}; };
} }
@@ -246,7 +246,7 @@ export class DebugPlugin implements IPlugin, IService {
enabled: entity.enabled, enabled: entity.enabled,
tag: entity.tag, tag: entity.tag,
componentCount: components.length, componentCount: components.length,
components: components.map(comp => this.getComponentInfo(comp)) components: components.map((comp) => this.getComponentInfo(comp))
}; };
} }
@@ -304,7 +304,7 @@ export class DebugPlugin implements IPlugin, IService {
if (filter.hasComponent) { if (filter.hasComponent) {
const hasComp = entity.components.some( const hasComp = entity.components.some(
c => c.constructor.name === filter.hasComponent (c) => c.constructor.name === filter.hasComponent
); );
if (!hasComp) { if (!hasComp) {
continue; continue;

View File

@@ -28,7 +28,7 @@ export interface IComponent {
/** /**
* 系统基础接口 * 系统基础接口
* *
* 为现有的EntitySystem类提供类型定义 * 为现有的EntitySystem类提供类型定义
*/ */
export interface ISystemBase { export interface ISystemBase {
@@ -38,7 +38,7 @@ export interface ISystemBase {
updateOrder: number; updateOrder: number;
/** 系统启用状态 */ /** 系统启用状态 */
enabled: boolean; enabled: boolean;
/** 系统初始化 */ /** 系统初始化 */
initialize(): void; initialize(): void;
/** 更新系统(主要处理阶段) */ /** 更新系统(主要处理阶段) */
@@ -49,7 +49,7 @@ export interface ISystemBase {
/** /**
* 组件类型定义 * 组件类型定义
* *
* 用于类型安全的组件操作 * 用于类型安全的组件操作
* 支持任意构造函数签名,提供更好的类型安全性 * 支持任意构造函数签名,提供更好的类型安全性
*/ */
@@ -66,14 +66,14 @@ export interface IEventBus {
* @param data 事件数据 * @param data 事件数据
*/ */
emit<T>(eventType: string, data: T): void; emit<T>(eventType: string, data: T): void;
/** /**
* 异步发射事件 * 异步发射事件
* @param eventType 事件类型 * @param eventType 事件类型
* @param data 事件数据 * @param data 事件数据
*/ */
emitAsync<T>(eventType: string, data: T): Promise<void>; emitAsync<T>(eventType: string, data: T): Promise<void>;
/** /**
* 监听事件 * 监听事件
* @param eventType 事件类型 * @param eventType 事件类型
@@ -82,7 +82,7 @@ export interface IEventBus {
* @returns 监听器ID * @returns 监听器ID
*/ */
on<T>(eventType: string, handler: (data: T) => void, config?: IEventListenerConfig): string; on<T>(eventType: string, handler: (data: T) => void, config?: IEventListenerConfig): string;
/** /**
* 监听事件(一次性) * 监听事件(一次性)
* @param eventType 事件类型 * @param eventType 事件类型
@@ -91,7 +91,7 @@ export interface IEventBus {
* @returns 监听器ID * @returns 监听器ID
*/ */
once<T>(eventType: string, handler: (data: T) => void, config?: IEventListenerConfig): string; once<T>(eventType: string, handler: (data: T) => void, config?: IEventListenerConfig): string;
/** /**
* 异步监听事件 * 异步监听事件
* @param eventType 事件类型 * @param eventType 事件类型
@@ -100,32 +100,32 @@ export interface IEventBus {
* @returns 监听器ID * @returns 监听器ID
*/ */
onAsync<T>(eventType: string, handler: (data: T) => Promise<void>, config?: IEventListenerConfig): string; onAsync<T>(eventType: string, handler: (data: T) => Promise<void>, config?: IEventListenerConfig): string;
/** /**
* 移除事件监听器 * 移除事件监听器
* @param eventType 事件类型 * @param eventType 事件类型
* @param listenerId 监听器ID * @param listenerId 监听器ID
*/ */
off(eventType: string, listenerId: string): boolean; off(eventType: string, listenerId: string): boolean;
/** /**
* 移除指定事件类型的所有监听器 * 移除指定事件类型的所有监听器
* @param eventType 事件类型 * @param eventType 事件类型
*/ */
offAll(eventType: string): void; offAll(eventType: string): void;
/** /**
* 检查是否有指定事件的监听器 * 检查是否有指定事件的监听器
* @param eventType 事件类型 * @param eventType 事件类型
*/ */
hasListeners(eventType: string): boolean; hasListeners(eventType: string): boolean;
/** /**
* 获取事件统计信息 * 获取事件统计信息
* @param eventType 事件类型(可选) * @param eventType 事件类型(可选)
*/ */
getStats(eventType?: string): IEventStats | Map<string, IEventStats>; getStats(eventType?: string): IEventStats | Map<string, IEventStats>;
/** /**
* 清空所有监听器 * 清空所有监听器
*/ */
@@ -499,4 +499,4 @@ export interface ISceneDebugData {
sceneMemory: number; sceneMemory: number;
/** 场景启动时间 */ /** 场景启动时间 */
sceneUptime: number; sceneUptime: number;
} }

View File

@@ -47,18 +47,18 @@ export class ComponentDataCollector {
}); });
// 获取池利用率信息 // 获取池利用率信息
let poolUtilizations = new Map<string, number>(); const poolUtilizations = new Map<string, number>();
let poolSizes = new Map<string, number>(); const poolSizes = new Map<string, number>();
try { try {
const poolManager = ComponentPoolManager.getInstance(); const poolManager = ComponentPoolManager.getInstance();
const poolStats = poolManager.getPoolStats(); const poolStats = poolManager.getPoolStats();
const utilizations = poolManager.getPoolUtilization(); const utilizations = poolManager.getPoolUtilization();
for (const [typeName, stats] of poolStats.entries()) { for (const [typeName, stats] of poolStats.entries()) {
poolSizes.set(typeName, stats.maxSize); poolSizes.set(typeName, stats.maxSize);
} }
for (const [typeName, util] of utilizations.entries()) { for (const [typeName, util] of utilizations.entries()) {
poolUtilizations.set(typeName, util.utilization); poolUtilizations.set(typeName, util.utilization);
} }
@@ -74,7 +74,7 @@ export class ComponentDataCollector {
const poolUtilization = poolUtilizations.get(typeName) || 0; const poolUtilization = poolUtilizations.get(typeName) || 0;
// 使用预估的基础内存大小,避免每帧计算 // 使用预估的基础内存大小,避免每帧计算
const memoryPerInstance = this.getEstimatedComponentSize(typeName, scene); const memoryPerInstance = this.getEstimatedComponentSize(typeName, scene);
return { return {
typeName, typeName,
instanceCount: stats.count, instanceCount: stats.count,
@@ -97,12 +97,12 @@ export class ComponentDataCollector {
} }
if (!scene) return 64; if (!scene) return 64;
const entityList = (scene as any).entities; const entityList = (scene as any).entities;
if (!entityList?.buffer) return 64; if (!entityList?.buffer) return 64;
let calculatedSize = 64; let calculatedSize = 64;
try { try {
for (const entity of entityList.buffer) { for (const entity of entityList.buffer) {
if (entity.components) { if (entity.components) {
@@ -116,25 +116,25 @@ export class ComponentDataCollector {
} catch (error) { } catch (error) {
calculatedSize = 64; calculatedSize = 64;
} }
ComponentDataCollector.componentSizeCache.set(typeName, calculatedSize); ComponentDataCollector.componentSizeCache.set(typeName, calculatedSize);
return calculatedSize; return calculatedSize;
} }
private calculateQuickObjectSize(obj: any): number { private calculateQuickObjectSize(obj: any): number {
if (!obj || typeof obj !== 'object') return 8; if (!obj || typeof obj !== 'object') return 8;
let size = 32; let size = 32;
const visited = new WeakSet(); const visited = new WeakSet();
const calculate = (item: any, depth: number = 0): number => { const calculate = (item: any, depth: number = 0): number => {
if (!item || typeof item !== 'object' || visited.has(item) || depth > 3) { if (!item || typeof item !== 'object' || visited.has(item) || depth > 3) {
return 0; return 0;
} }
visited.add(item); visited.add(item);
let itemSize = 0; let itemSize = 0;
try { try {
const keys = Object.keys(item); const keys = Object.keys(item);
for (let i = 0; i < Math.min(keys.length, 20); i++) { for (let i = 0; i < Math.min(keys.length, 20); i++) {
@@ -143,7 +143,7 @@ export class ComponentDataCollector {
const value = item[key]; const value = item[key];
itemSize += key.length * 2; itemSize += key.length * 2;
if (typeof value === 'string') { if (typeof value === 'string') {
itemSize += Math.min(value.length * 2, 200); itemSize += Math.min(value.length * 2, 200);
} else if (typeof value === 'number') { } else if (typeof value === 'number') {
@@ -157,10 +157,10 @@ export class ComponentDataCollector {
} catch (error) { } catch (error) {
return 32; return 32;
} }
return itemSize; return itemSize;
}; };
size += calculate(obj); size += calculate(obj);
return Math.max(size, 32); return Math.max(size, 32);
} }
@@ -176,7 +176,7 @@ export class ComponentDataCollector {
const entityList = (scene as any).entities; const entityList = (scene as any).entities;
if (!entityList?.buffer) return this.getEstimatedComponentSize(typeName, scene); if (!entityList?.buffer) return this.getEstimatedComponentSize(typeName, scene);
try { try {
// 找到第一个包含此组件的实体,分析组件大小 // 找到第一个包含此组件的实体,分析组件大小
for (const entity of entityList.buffer) { for (const entity of entityList.buffer) {
@@ -190,7 +190,7 @@ export class ComponentDataCollector {
} catch (error) { } catch (error) {
// 忽略错误,使用估算值 // 忽略错误,使用估算值
} }
return this.getEstimatedComponentSize(typeName, scene); return this.getEstimatedComponentSize(typeName, scene);
} }
@@ -201,10 +201,10 @@ export class ComponentDataCollector {
private estimateObjectSize(obj: any, visited = new WeakSet(), depth = 0): number { private estimateObjectSize(obj: any, visited = new WeakSet(), depth = 0): number {
if (obj === null || obj === undefined || depth > 10) return 0; if (obj === null || obj === undefined || depth > 10) return 0;
if (visited.has(obj)) return 0; if (visited.has(obj)) return 0;
let size = 0; let size = 0;
const type = typeof obj; const type = typeof obj;
switch (type) { switch (type) {
case 'boolean': case 'boolean':
size = 4; size = 4;
@@ -217,7 +217,7 @@ export class ComponentDataCollector {
break; break;
case 'object': case 'object':
visited.add(obj); visited.add(obj);
if (Array.isArray(obj)) { if (Array.isArray(obj)) {
size = 40 + (obj.length * 8); size = 40 + (obj.length * 8);
const maxElements = Math.min(obj.length, 50); const maxElements = Math.min(obj.length, 50);
@@ -226,11 +226,11 @@ export class ComponentDataCollector {
} }
} else { } else {
size = 32; size = 32;
try { try {
const ownKeys = Object.getOwnPropertyNames(obj); const ownKeys = Object.getOwnPropertyNames(obj);
const maxProps = Math.min(ownKeys.length, 30); const maxProps = Math.min(ownKeys.length, 30);
for (let i = 0; i < maxProps; i++) { for (let i = 0; i < maxProps; i++) {
const key = ownKeys[i]; const key = ownKeys[i];
if (!key) continue; if (!key) continue;
@@ -263,11 +263,11 @@ export class ComponentDataCollector {
default: default:
size = 8; size = 8;
} }
return Math.ceil(size / 8) * 8; return Math.ceil(size / 8) * 8;
} }
public static clearCache(): void { public static clearCache(): void {
ComponentDataCollector.componentSizeCache.clear(); ComponentDataCollector.componentSizeCache.clear();
} }
} }

View File

@@ -135,7 +135,7 @@ export class DebugManager implements IService, IUpdatable {
* 格式化日志消息 * 格式化日志消息
*/ */
private formatLogMessage(args: unknown[]): string { private formatLogMessage(args: unknown[]): string {
return args.map(arg => { return args.map((arg) => {
if (typeof arg === 'string') return arg; if (typeof arg === 'string') return arg;
if (arg instanceof Error) return `${arg.name}: ${arg.message}`; if (arg instanceof Error) return `${arg.name}: ${arg.message}`;
if (arg === null) return 'null'; if (arg === null) return 'null';
@@ -173,7 +173,7 @@ export class DebugManager implements IService, IUpdatable {
seen.add(value); seen.add(value);
if (Array.isArray(value)) { if (Array.isArray(value)) {
const result = value.map(item => stringify(item, depth + 1)); const result = value.map((item) => stringify(item, depth + 1));
seen.delete(value); seen.delete(value);
return result; return result;
} }
@@ -436,9 +436,6 @@ export class DebugManager implements IService, IUpdatable {
} }
/** /**
* 处理内存快照请求 * 处理内存快照请求
*/ */
@@ -519,7 +516,7 @@ export class DebugManager implements IService, IUpdatable {
jsHeapSizeLimit: number; jsHeapSizeLimit: number;
} | null; } | null;
detailedMemory?: unknown; detailedMemory?: unknown;
} { } {
const memoryInfo = { const memoryInfo = {
totalMemory: 0, totalMemory: 0,
usedMemory: 0, usedMemory: 0,
@@ -575,7 +572,6 @@ export class DebugManager implements IService, IUpdatable {
} }
/** /**
* 收集组件内存统计(仅用于内存快照) * 收集组件内存统计(仅用于内存快照)
*/ */
@@ -672,7 +668,7 @@ export class DebugManager implements IService, IUpdatable {
enabled: boolean; enabled: boolean;
updateOrder: number; updateOrder: number;
}>; }>;
} { } {
const scene = this.sceneManager.currentScene; const scene = this.sceneManager.currentScene;
let totalSystemMemory = 0; let totalSystemMemory = 0;
const systemBreakdown: Array<{ const systemBreakdown: Array<{
@@ -766,7 +762,7 @@ export class DebugManager implements IService, IUpdatable {
utilization: number; utilization: number;
hitRate?: number; hitRate?: number;
}>; }>;
} { } {
let totalPoolMemory = 0; let totalPoolMemory = 0;
const poolBreakdown: Array<{ const poolBreakdown: Array<{
typeName: string; typeName: string;
@@ -845,7 +841,7 @@ export class DebugManager implements IService, IUpdatable {
samples: number; samples: number;
}>; }>;
error?: string; error?: string;
} { } {
try { try {
if (!this.performanceMonitor) { if (!this.performanceMonitor) {
return { enabled: false }; return { enabled: false };
@@ -959,4 +955,4 @@ export class DebugManager implements IService, IUpdatable {
console.warn = this.originalConsole.warn; console.warn = this.originalConsole.warn;
console.error = this.originalConsole.error; console.error = this.originalConsole.error;
} }
} }

View File

@@ -39,7 +39,7 @@ export class EntityDataCollector {
} }
const archetypeData = this.collectArchetypeData(scene); const archetypeData = this.collectArchetypeData(scene);
return { return {
totalEntities: stats.totalEntities, totalEntities: stats.totalEntities,
activeEntities: stats.activeEntities, activeEntities: stats.activeEntities,
@@ -140,7 +140,7 @@ export class EntityDataCollector {
private getSceneInfo(scene: any): { name: string; type: string } { private getSceneInfo(scene: any): { name: string; type: string } {
let sceneName = '当前场景'; let sceneName = '当前场景';
let sceneType = 'Scene'; let sceneType = 'Scene';
try { try {
if (scene.name && typeof scene.name === 'string' && scene.name.trim()) { if (scene.name && typeof scene.name === 'string' && scene.name.trim()) {
sceneName = scene.name.trim(); sceneName = scene.name.trim();
@@ -159,7 +159,7 @@ export class EntityDataCollector {
} catch (error) { } catch (error) {
sceneName = '场景名获取失败'; sceneName = '场景名获取失败';
} }
return { name: sceneName, type: sceneType }; return { name: sceneName, type: sceneType };
} }
@@ -182,20 +182,20 @@ export class EntityDataCollector {
try { try {
stats = entityList.getStats ? entityList.getStats() : this.calculateFallbackEntityStats(entityList); stats = entityList.getStats ? entityList.getStats() : this.calculateFallbackEntityStats(entityList);
} catch (error) { } catch (error) {
return { return {
totalEntities: 0, totalEntities: 0,
activeEntities: 0, activeEntities: 0,
pendingAdd: 0, pendingAdd: 0,
pendingRemove: 0, pendingRemove: 0,
entitiesPerArchetype: [], entitiesPerArchetype: [],
topEntitiesByComponents: [], topEntitiesByComponents: [],
entityHierarchy: [], entityHierarchy: [],
entityDetailsMap: {} entityDetailsMap: {}
}; };
} }
const archetypeData = this.collectArchetypeDataWithMemory(scene); const archetypeData = this.collectArchetypeDataWithMemory(scene);
return { return {
totalEntities: stats.totalEntities, totalEntities: stats.totalEntities,
activeEntities: stats.activeEntities, activeEntities: stats.activeEntities,
@@ -294,7 +294,7 @@ export class EntityDataCollector {
archetypes.forEach((archetype: any) => { archetypes.forEach((archetype: any) => {
const signature = archetype.componentTypes?.map((type: any) => type.name).join(',') || 'Unknown'; const signature = archetype.componentTypes?.map((type: any) => type.name).join(',') || 'Unknown';
const entityCount = archetype.entities?.length || 0; const entityCount = archetype.entities?.length || 0;
distribution.push({ distribution.push({
signature, signature,
count: entityCount, count: entityCount,
@@ -336,11 +336,11 @@ export class EntityDataCollector {
if (archetype.entities && archetype.entities.length > 0) { if (archetype.entities && archetype.entities.length > 0) {
const sampleSize = Math.min(5, archetype.entities.length); const sampleSize = Math.min(5, archetype.entities.length);
let sampleMemory = 0; let sampleMemory = 0;
for (let i = 0; i < sampleSize; i++) { for (let i = 0; i < sampleSize; i++) {
sampleMemory += this.estimateEntityMemoryUsage(archetype.entities[i]); sampleMemory += this.estimateEntityMemoryUsage(archetype.entities[i]);
} }
actualMemory = (sampleMemory / sampleSize) * entityCount; actualMemory = (sampleMemory / sampleSize) * entityCount;
} }
@@ -369,7 +369,6 @@ export class EntityDataCollector {
} }
private getArchetypeDistributionWithMemory(entityContainer: any): Array<{ signature: string; count: number; memory: number }> { private getArchetypeDistributionWithMemory(entityContainer: any): Array<{ signature: string; count: number; memory: number }> {
const distribution = new Map<string, { count: number; memory: number; componentTypes: string[] }>(); const distribution = new Map<string, { count: number; memory: number; componentTypes: string[] }>();
@@ -437,7 +436,7 @@ export class EntityDataCollector {
private calculateFallbackEntityStats(entityList: any): any { private calculateFallbackEntityStats(entityList: any): any {
const allEntities = entityList.buffer || []; const allEntities = entityList.buffer || [];
const activeEntities = allEntities.filter((entity: any) => const activeEntities = allEntities.filter((entity: any) =>
entity.enabled && !entity._isDestroyed entity.enabled && !entity.isDestroyed
); );
return { return {
@@ -476,24 +475,24 @@ export class EntityDataCollector {
public calculateObjectSize(obj: any, excludeKeys: string[] = []): number { public calculateObjectSize(obj: any, excludeKeys: string[] = []): number {
if (!obj || typeof obj !== 'object') return 0; if (!obj || typeof obj !== 'object') return 0;
const visited = new WeakSet(); const visited = new WeakSet();
const maxDepth = 2; const maxDepth = 2;
const calculate = (item: any, depth: number = 0): number => { const calculate = (item: any, depth: number = 0): number => {
if (!item || typeof item !== 'object' || depth >= maxDepth) { if (!item || typeof item !== 'object' || depth >= maxDepth) {
return 0; return 0;
} }
if (visited.has(item)) return 0; if (visited.has(item)) return 0;
visited.add(item); visited.add(item);
let itemSize = 32; let itemSize = 32;
try { try {
const keys = Object.keys(item); const keys = Object.keys(item);
const maxKeys = Math.min(keys.length, 20); const maxKeys = Math.min(keys.length, 20);
for (let i = 0; i < maxKeys; i++) { for (let i = 0; i < maxKeys; i++) {
const key = keys[i]; const key = keys[i];
if (!key || excludeKeys.includes(key) || if (!key || excludeKeys.includes(key) ||
@@ -506,7 +505,7 @@ export class EntityDataCollector {
const value = item[key]; const value = item[key];
itemSize += key.length * 2; itemSize += key.length * 2;
if (typeof value === 'string') { if (typeof value === 'string') {
itemSize += Math.min(value.length * 2, 200); itemSize += Math.min(value.length * 2, 200);
} else if (typeof value === 'number') { } else if (typeof value === 'number') {
@@ -522,10 +521,10 @@ export class EntityDataCollector {
} catch (error) { } catch (error) {
return 64; return 64;
} }
return itemSize; return itemSize;
}; };
try { try {
const size = calculate(obj); const size = calculate(obj);
return Math.max(size, 32); return Math.max(size, 32);
@@ -630,7 +629,7 @@ export class EntityDataCollector {
entity.getDebugInfo() : entity.getDebugInfo() :
this.buildFallbackEntityInfo(entity, scene); this.buildFallbackEntityInfo(entity, scene);
const componentCacheStats = (entity as any).getComponentCacheStats ? const componentCacheStats = (entity as any).getComponentCacheStats ?
(entity as any).getComponentCacheStats() : null; (entity as any).getComponentCacheStats() : null;
const componentDetails = this.extractComponentDetails(entity.components); const componentDetails = this.extractComponentDetails(entity.components);
@@ -639,7 +638,7 @@ export class EntityDataCollector {
...baseDebugInfo, ...baseDebugInfo,
parentName: entity.parent?.name || null, parentName: entity.parent?.name || null,
components: componentDetails, components: componentDetails,
componentTypes: baseDebugInfo.componentTypes || componentTypes: baseDebugInfo.componentTypes ||
componentDetails.map((comp) => comp.typeName), componentDetails.map((comp) => comp.typeName),
cachePerformance: componentCacheStats ? { cachePerformance: componentCacheStats ? {
hitRate: componentCacheStats.cacheStats.hitRate, hitRate: componentCacheStats.cacheStats.hitRate,
@@ -658,7 +657,7 @@ export class EntityDataCollector {
*/ */
private buildFallbackEntityInfo(entity: Entity, scene?: IScene | null): any { private buildFallbackEntityInfo(entity: Entity, scene?: IScene | null): any {
const sceneInfo = this.getSceneInfo(scene); const sceneInfo = this.getSceneInfo(scene);
return { return {
name: entity.name || `Entity_${entity.id}`, name: entity.name || `Entity_${entity.id}`,
id: entity.id, id: entity.id,
@@ -691,10 +690,10 @@ export class EntityDataCollector {
return components.map((component: Component) => { return components.map((component: Component) => {
const typeName = getComponentInstanceTypeName(component); const typeName = getComponentInstanceTypeName(component);
const properties: Record<string, any> = {}; const properties: Record<string, any> = {};
try { try {
const propertyKeys = Object.keys(component); const propertyKeys = Object.keys(component);
propertyKeys.forEach(propertyKey => { propertyKeys.forEach((propertyKey) => {
if (!propertyKey.startsWith('_') && propertyKey !== 'entity' && propertyKey !== 'constructor') { if (!propertyKey.startsWith('_') && propertyKey !== 'entity' && propertyKey !== 'constructor') {
const propertyValue = (component as any)[propertyKey]; const propertyValue = (component as any)[propertyKey];
if (propertyValue !== undefined && propertyValue !== null) { if (propertyValue !== undefined && propertyValue !== null) {
@@ -702,7 +701,7 @@ export class EntityDataCollector {
} }
} }
}); });
// 如果没有找到任何属性,添加一些调试信息 // 如果没有找到任何属性,添加一些调试信息
if (Object.keys(properties).length === 0) { if (Object.keys(properties).length === 0) {
properties['_info'] = '该组件没有公开属性'; properties['_info'] = '该组件没有公开属性';
@@ -712,7 +711,7 @@ export class EntityDataCollector {
properties['_error'] = '属性提取失败'; properties['_error'] = '属性提取失败';
properties['_componentId'] = getComponentInstanceTypeName(component); properties['_componentId'] = getComponentInstanceTypeName(component);
} }
return { return {
typeName: typeName, typeName: typeName,
properties: properties properties: properties
@@ -739,20 +738,20 @@ export class EntityDataCollector {
const component = entity.components[componentIndex]; const component = entity.components[componentIndex];
const properties: Record<string, any> = {}; const properties: Record<string, any> = {};
const propertyKeys = Object.keys(component); const propertyKeys = Object.keys(component);
propertyKeys.forEach(propertyKey => { propertyKeys.forEach((propertyKey) => {
if (!propertyKey.startsWith('_') && propertyKey !== 'entity') { if (!propertyKey.startsWith('_') && propertyKey !== 'entity') {
const propertyValue = (component as any)[propertyKey]; const propertyValue = (component as any)[propertyKey];
if (propertyValue !== undefined && propertyValue !== null) { if (propertyValue !== undefined && propertyValue !== null) {
properties[propertyKey] = this.formatPropertyValue(propertyValue); properties[propertyKey] = this.formatPropertyValue(propertyValue);
} }
} }
}); });
return properties; return properties;
} catch (error) { } catch (error) {
return { _error: '属性提取失败' }; return { _error: '属性提取失败' };
} }
} }
/** /**
@@ -786,7 +785,7 @@ export class EntityDataCollector {
if (obj.length === 0) return []; if (obj.length === 0) return [];
if (obj.length > 10) { if (obj.length > 10) {
const sample = obj.slice(0, 3).map(item => this.formatPropertyValue(item, 1)); const sample = obj.slice(0, 3).map((item) => this.formatPropertyValue(item, 1));
return { return {
_isLazyArray: true, _isLazyArray: true,
_arrayLength: obj.length, _arrayLength: obj.length,
@@ -795,7 +794,7 @@ export class EntityDataCollector {
}; };
} }
return obj.map(item => this.formatPropertyValue(item, 1)); return obj.map((item) => this.formatPropertyValue(item, 1));
} }
const keys = Object.keys(obj); const keys = Object.keys(obj);
@@ -842,8 +841,8 @@ export class EntityDataCollector {
try { try {
const typeName = obj.constructor?.name || 'Object'; const typeName = obj.constructor?.name || 'Object';
const summary = this.getObjectSummary(obj, typeName); const summary = this.getObjectSummary(obj, typeName);
return { return {
_isLazyObject: true, _isLazyObject: true,
_typeName: typeName, _typeName: typeName,
_summary: summary, _summary: summary,
@@ -983,4 +982,4 @@ export class EntityDataCollector {
return current; return current;
} }
} }

View File

@@ -17,11 +17,11 @@ export class PerformanceDataCollector {
const frameTimeSeconds = Time.deltaTime; const frameTimeSeconds = Time.deltaTime;
const engineFrameTimeMs = frameTimeSeconds * 1000; const engineFrameTimeMs = frameTimeSeconds * 1000;
const currentFps = frameTimeSeconds > 0 ? Math.round(1 / frameTimeSeconds) : 0; const currentFps = frameTimeSeconds > 0 ? Math.round(1 / frameTimeSeconds) : 0;
const ecsPerformanceData = this.getECSPerformanceData(performanceMonitor); const ecsPerformanceData = this.getECSPerformanceData(performanceMonitor);
const ecsExecutionTimeMs = ecsPerformanceData.totalExecutionTime; const ecsExecutionTimeMs = ecsPerformanceData.totalExecutionTime;
const ecsPercentage = engineFrameTimeMs > 0 ? (ecsExecutionTimeMs / engineFrameTimeMs * 100) : 0; const ecsPercentage = engineFrameTimeMs > 0 ? (ecsExecutionTimeMs / engineFrameTimeMs * 100) : 0;
let memoryUsage = 0; let memoryUsage = 0;
if ((performance as any).memory) { if ((performance as any).memory) {
memoryUsage = (performance as any).memory.usedJSHeapSize / 1024 / 1024; memoryUsage = (performance as any).memory.usedJSHeapSize / 1024 / 1024;
@@ -32,9 +32,9 @@ export class PerformanceDataCollector {
if (this.frameTimeHistory.length > this.maxHistoryLength) { if (this.frameTimeHistory.length > this.maxHistoryLength) {
this.frameTimeHistory.shift(); this.frameTimeHistory.shift();
} }
// 计算ECS执行时间统计 // 计算ECS执行时间统计
const history = this.frameTimeHistory.filter(t => t >= 0); const history = this.frameTimeHistory.filter((t) => t >= 0);
const averageECSTime = history.length > 0 ? history.reduce((a, b) => a + b, 0) / history.length : ecsExecutionTimeMs; const averageECSTime = history.length > 0 ? history.reduce((a, b) => a + b, 0) / history.length : ecsExecutionTimeMs;
const minECSTime = history.length > 0 ? Math.min(...history) : ecsExecutionTimeMs; const minECSTime = history.length > 0 ? Math.min(...history) : ecsExecutionTimeMs;
const maxECSTime = history.length > 0 ? Math.max(...history) : ecsExecutionTimeMs; const maxECSTime = history.length > 0 ? Math.max(...history) : ecsExecutionTimeMs;
@@ -77,20 +77,20 @@ export class PerformanceDataCollector {
try { try {
let totalTime = 0; let totalTime = 0;
const systemBreakdown = []; const systemBreakdown = [];
const stats = performanceMonitor.getAllSystemStats(); const stats = performanceMonitor.getAllSystemStats();
if (stats.size === 0) { if (stats.size === 0) {
return { totalExecutionTime: 0, systemBreakdown: [] }; return { totalExecutionTime: 0, systemBreakdown: [] };
} }
// 计算各系统的执行时间 // 计算各系统的执行时间
for (const [systemName, stat] of stats.entries()) { for (const [systemName, stat] of stats.entries()) {
// 使用最近的执行时间而不是平均时间,这样更能反映当前状态 // 使用最近的执行时间而不是平均时间,这样更能反映当前状态
const systemTime = stat.recentTimes && stat.recentTimes.length > 0 ? const systemTime = stat.recentTimes && stat.recentTimes.length > 0 ?
stat.recentTimes[stat.recentTimes.length - 1] : stat.recentTimes[stat.recentTimes.length - 1] :
(stat.averageTime || 0); (stat.averageTime || 0);
totalTime += systemTime; totalTime += systemTime;
systemBreakdown.push({ systemBreakdown.push({
systemName: systemName, systemName: systemName,
@@ -98,15 +98,15 @@ export class PerformanceDataCollector {
percentage: 0 // 后面计算 percentage: 0 // 后面计算
}); });
} }
// 计算各系统占ECS总时间的百分比 // 计算各系统占ECS总时间的百分比
systemBreakdown.forEach(system => { systemBreakdown.forEach((system) => {
system.percentage = totalTime > 0 ? (system.executionTime / totalTime * 100) : 0; system.percentage = totalTime > 0 ? (system.executionTime / totalTime * 100) : 0;
}); });
// 按执行时间排序 // 按执行时间排序
systemBreakdown.sort((a, b) => b.executionTime - a.executionTime); systemBreakdown.sort((a, b) => b.executionTime - a.executionTime);
return { return {
totalExecutionTime: totalTime, totalExecutionTime: totalTime,
systemBreakdown: systemBreakdown systemBreakdown: systemBreakdown
@@ -127,7 +127,7 @@ export class PerformanceDataCollector {
try { try {
const stats = performanceMonitor.getAllSystemStats(); const stats = performanceMonitor.getAllSystemStats();
const systemData = performanceMonitor.getAllSystemData(); const systemData = performanceMonitor.getAllSystemData();
return Array.from(stats.entries() as Iterable<[string, any]>).map(([systemName, stat]) => { return Array.from(stats.entries() as Iterable<[string, any]>).map(([systemName, stat]) => {
const data = systemData.get(systemName); const data = systemData.get(systemName);
return { return {
@@ -167,7 +167,7 @@ export class PerformanceDataCollector {
memoryInfo.totalMemory = perfMemory.jsHeapSizeLimit || 512 * 1024 * 1024; memoryInfo.totalMemory = perfMemory.jsHeapSizeLimit || 512 * 1024 * 1024;
memoryInfo.usedMemory = perfMemory.usedJSHeapSize || 0; memoryInfo.usedMemory = perfMemory.usedJSHeapSize || 0;
memoryInfo.freeMemory = memoryInfo.totalMemory - memoryInfo.usedMemory; memoryInfo.freeMemory = memoryInfo.totalMemory - memoryInfo.usedMemory;
// 检测GC如果使用的内存突然大幅减少可能发生了GC // 检测GC如果使用的内存突然大幅减少可能发生了GC
if (this.lastMemoryCheck > 0) { if (this.lastMemoryCheck > 0) {
const memoryDrop = this.lastMemoryCheck - memoryInfo.usedMemory; const memoryDrop = this.lastMemoryCheck - memoryInfo.usedMemory;
@@ -207,16 +207,16 @@ export class PerformanceDataCollector {
// 实际的GC检测需要更复杂的逻辑 // 实际的GC检测需要更复杂的逻辑
return this.gcCollections; return this.gcCollections;
} }
// 如果有其他GC检测API可以在这里添加 // 如果有其他GC检测API可以在这里添加
if ((performance as any).measureUserAgentSpecificMemory) { if ((performance as any).measureUserAgentSpecificMemory) {
// 实验性API可能不可用 // 实验性API可能不可用
return this.gcCollections; return this.gcCollections;
} }
return this.gcCollections; return this.gcCollections;
} catch (error) { } catch (error) {
return this.gcCollections; return this.gcCollections;
} }
} }
} }

View File

@@ -47,4 +47,4 @@ export class SceneDataCollector {
public setSceneStartTime(time: number): void { public setSceneStartTime(time: number): void {
this.sceneStartTime = time; this.sceneStartTime = time;
} }
} }

View File

@@ -28,11 +28,11 @@ export class SystemDataCollector {
} }
const systems = entityProcessors.processors || []; const systems = entityProcessors.processors || [];
// 获取性能监控数据 // 获取性能监控数据
let systemStats: Map<string, any> = new Map(); let systemStats: Map<string, any> = new Map();
let systemData: Map<string, any> = new Map(); let systemData: Map<string, any> = new Map();
if (performanceMonitor) { if (performanceMonitor) {
try { try {
systemStats = performanceMonitor.getAllSystemStats(); systemStats = performanceMonitor.getAllSystemStats();
@@ -41,14 +41,14 @@ export class SystemDataCollector {
// 忽略错误使用空的Map // 忽略错误使用空的Map
} }
} }
return { return {
totalSystems: systems.length, totalSystems: systems.length,
systemsInfo: systems.map((system: any) => { systemsInfo: systems.map((system: any) => {
const systemName = system.systemName || getSystemInstanceTypeName(system); const systemName = system.systemName || getSystemInstanceTypeName(system);
const stats = systemStats.get(systemName); const stats = systemStats.get(systemName);
const data = systemData.get(systemName); const data = systemData.get(systemName);
return { return {
name: systemName, name: systemName,
type: getSystemInstanceTypeName(system), type: getSystemInstanceTypeName(system),
@@ -64,4 +64,4 @@ export class SystemDataCollector {
}) })
}; };
} }
} }

View File

@@ -33,7 +33,7 @@ export class WebSocketManager {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
try { try {
this.ws = new WebSocket(this.url); this.ws = new WebSocket(this.url);
this.ws.onopen = (event) => { this.ws.onopen = (event) => {
this.handleOpen(event); this.handleOpen(event);
resolve(); resolve();
@@ -82,7 +82,8 @@ export class WebSocketManager {
try { try {
const message = typeof data === 'string' ? data : JSON.stringify(data); const message = typeof data === 'string' ? data : JSON.stringify(data);
this.ws.send(message); this.ws.send(message);
} catch (error) { } catch (_error) {
// 发送失败时静默忽略WebSocket 断开会触发 error 事件
} }
} }
@@ -112,7 +113,7 @@ export class WebSocketManager {
this.reconnectAttempts++; this.reconnectAttempts++;
this.reconnectTimer = setTimeout(() => { this.reconnectTimer = setTimeout(() => {
this.connect().catch(_error => { this.connect().catch((_error) => {
if (this.reconnectAttempts < this.maxReconnectAttempts) { if (this.reconnectAttempts < this.maxReconnectAttempts) {
this.scheduleReconnect(); this.scheduleReconnect();
} }
@@ -130,14 +131,15 @@ export class WebSocketManager {
if (this.messageHandler) { if (this.messageHandler) {
this.messageHandler(message); this.messageHandler(message);
} }
} catch (error) { } catch (_error) {
// 解析失败时静默忽略,避免非 JSON 消息导致错误
} }
} }
private handleOpen(event: Event): void { private handleOpen(event: Event): void {
this.isConnected = true; this.isConnected = true;
this.reconnectAttempts = 0; this.reconnectAttempts = 0;
if (this.onOpen) { if (this.onOpen) {
this.onOpen(event); this.onOpen(event);
} }
@@ -145,11 +147,11 @@ export class WebSocketManager {
private handleClose(event: CloseEvent): void { private handleClose(event: CloseEvent): void {
this.isConnected = false; this.isConnected = false;
if (this.onClose) { if (this.onClose) {
this.onClose(event); this.onClose(event);
} }
if (this.autoReconnect && this.reconnectAttempts < this.maxReconnectAttempts) { if (this.autoReconnect && this.reconnectAttempts < this.maxReconnectAttempts) {
this.scheduleReconnect(); this.scheduleReconnect();
} }
@@ -166,4 +168,4 @@ export class WebSocketManager {
this.onError(error); this.onError(error);
} }
} }
} }

View File

@@ -5,4 +5,4 @@ export { ComponentDataCollector } from './ComponentDataCollector';
export { SceneDataCollector } from './SceneDataCollector'; export { SceneDataCollector } from './SceneDataCollector';
export { WebSocketManager } from './WebSocketManager'; export { WebSocketManager } from './WebSocketManager';
export { DebugManager } from './DebugManager'; export { DebugManager } from './DebugManager';
export { DebugConfigService } from './DebugConfigService'; export { DebugConfigService } from './DebugConfigService';

View File

@@ -1,13 +1,15 @@
type EventHandler = (...args: unknown[]) => void;
/** /**
* 用于包装事件的一个小类 * 用于包装事件的一个小类
*/ */
export class FuncPack<TContext = unknown> { export class FuncPack<TContext = unknown> {
/** 函数 */ /** 函数 */
public func: Function; public func: EventHandler;
/** 上下文 */ /** 上下文 */
public context: TContext; public context: TContext;
constructor(func: Function, context: TContext) { constructor(func: EventHandler, context: TContext) {
this.func = func; this.func = func;
this.context = context; this.context = context;
} }
@@ -29,7 +31,7 @@ export class Emitter<T, TContext = unknown> {
* @param handler 监听函数 * @param handler 监听函数
* @param context 监听上下文 * @param context 监听上下文
*/ */
public addObserver(eventType: T, handler: Function, context: TContext) { public addObserver(eventType: T, handler: EventHandler, context: TContext) {
let list = this._messageTable.get(eventType); let list = this._messageTable.get(eventType);
if (!list) { if (!list) {
list = []; list = [];
@@ -46,10 +48,10 @@ export class Emitter<T, TContext = unknown> {
* @param eventType 事件类型 * @param eventType 事件类型
* @param handler 事件函数 * @param handler 事件函数
*/ */
public removeObserver(eventType: T, handler: Function) { public removeObserver(eventType: T, handler: EventHandler) {
let messageData = this._messageTable.get(eventType); const messageData = this._messageTable.get(eventType);
if (messageData) { if (messageData) {
let index = messageData.findIndex(data => data.func == handler); const index = messageData.findIndex((data) => data.func == handler);
if (index != -1) if (index != -1)
messageData.splice(index, 1); messageData.splice(index, 1);
} }
@@ -61,9 +63,9 @@ export class Emitter<T, TContext = unknown> {
* @param data 事件数据 * @param data 事件数据
*/ */
public emit<TData = unknown>(eventType: T, ...data: TData[]) { public emit<TData = unknown>(eventType: T, ...data: TData[]) {
let list = this._messageTable.get(eventType); const list = this._messageTable.get(eventType);
if (list) { if (list) {
for (let observer of list) { for (const observer of list) {
observer.func.call(observer.context, ...data); observer.func.call(observer.context, ...data);
} }
} }
@@ -74,9 +76,9 @@ export class Emitter<T, TContext = unknown> {
* @param eventType 事件类型 * @param eventType 事件类型
* @param handler 事件函数 * @param handler 事件函数
*/ */
public hasObserver(eventType: T, handler: Function): boolean { public hasObserver(eventType: T, handler: EventHandler): boolean {
let list = this._messageTable.get(eventType); const list = this._messageTable.get(eventType);
return list ? list.some(observer => observer.func === handler) : false; return list ? list.some((observer) => observer.func === handler) : false;
} }
/** /**

View File

@@ -12,4 +12,4 @@ export class NumberExtension {
if (value == undefined) return 0; if (value == undefined) return 0;
return Number(value); return Number(value);
} }
} }

View File

@@ -11,4 +11,4 @@ export class TypeUtils {
public static getType(obj: any) { public static getType(obj: any) {
return obj.constructor; return obj.constructor;
} }
} }

View File

@@ -1,3 +1,3 @@
// 扩展工具类导出 // 扩展工具类导出
export { TypeUtils } from './TypeUtils'; export { TypeUtils } from './TypeUtils';
export { NumberExtension } from './NumberExtension'; export { NumberExtension } from './NumberExtension';

View File

@@ -1,5 +1,5 @@
import { Colors, LogLevel } from "./Constants"; import { Colors, LogLevel } from './Constants';
import { ILogger, LoggerColorConfig, LoggerConfig } from "./Types"; import { ILogger, LoggerColorConfig, LoggerConfig } from './Types';
/** /**
@@ -138,7 +138,7 @@ export class ConsoleLogger implements ILogger {
*/ */
private outputToConsole(level: LogLevel, message: string, ...args: unknown[]): void { private outputToConsole(level: LogLevel, message: string, ...args: unknown[]): void {
const colors = this._config.enableColors ? this.getColors() : null; const colors = this._config.enableColors ? this.getColors() : null;
switch (level) { switch (level) {
case LogLevel.Debug: case LogLevel.Debug:
if (colors) { if (colors) {

View File

@@ -23,7 +23,7 @@ export const Colors = {
MAGENTA: '\x1b[35m', MAGENTA: '\x1b[35m',
CYAN: '\x1b[36m', CYAN: '\x1b[36m',
WHITE: '\x1b[37m', WHITE: '\x1b[37m',
// 亮色版本 // 亮色版本
BRIGHT_BLACK: '\x1b[90m', BRIGHT_BLACK: '\x1b[90m',
BRIGHT_RED: '\x1b[91m', BRIGHT_RED: '\x1b[91m',
@@ -33,7 +33,7 @@ export const Colors = {
BRIGHT_MAGENTA: '\x1b[95m', BRIGHT_MAGENTA: '\x1b[95m',
BRIGHT_CYAN: '\x1b[96m', BRIGHT_CYAN: '\x1b[96m',
BRIGHT_WHITE: '\x1b[97m', BRIGHT_WHITE: '\x1b[97m',
// 特殊 // 特殊
RESET: '\x1b[0m', RESET: '\x1b[0m',
BOLD: '\x1b[1m', BOLD: '\x1b[1m',

View File

@@ -1,6 +1,6 @@
import { ConsoleLogger } from "./ConsoleLogger"; import { ConsoleLogger } from './ConsoleLogger';
import { LogLevel } from "./Constants"; import { LogLevel } from './Constants';
import { ILogger, LoggerColorConfig } from "./Types"; import { ILogger, LoggerColorConfig } from './Types';
/** /**
* 日志管理器 * 日志管理器
@@ -186,7 +186,7 @@ export function setGlobalLogLevel(level: LogLevel): void {
} }
/** /**
* 设置日志器工厂方法 * 设置日志器工厂方法
* @param factory 日志器工厂方法 * @param factory 日志器工厂方法
*/ */
export function setLoggerFactory(factory: (name?: string) => ILogger): void { export function setLoggerFactory(factory: (name?: string) => ILogger): void {

View File

@@ -1,4 +1,4 @@
import type { LogLevel } from "./Constants"; import type { LogLevel } from './Constants';
/** /**
* 日志接口 * 日志接口

View File

@@ -183,7 +183,7 @@ export class PerformanceMonitor implements IService {
*/ */
private updateStats(systemName: string, executionTime: number): void { private updateStats(systemName: string, executionTime: number): void {
let stats = this._systemStats.get(systemName); let stats = this._systemStats.get(systemName);
if (!stats) { if (!stats) {
stats = { stats = {
totalTime: 0, totalTime: 0,
@@ -231,7 +231,7 @@ export class PerformanceMonitor implements IService {
// 计算百分位数 // 计算百分位数
const sortedTimes = [...stats.recentTimes].sort((a, b) => a - b); const sortedTimes = [...stats.recentTimes].sort((a, b) => a - b);
const len = sortedTimes.length; const len = sortedTimes.length;
stats.percentile95 = sortedTimes[Math.floor(len * 0.95)] || 0; stats.percentile95 = sortedTimes[Math.floor(len * 0.95)] || 0;
stats.percentile99 = sortedTimes[Math.floor(len * 0.99)] || 0; stats.percentile99 = sortedTimes[Math.floor(len * 0.99)] || 0;
} }
@@ -276,12 +276,12 @@ export class PerformanceMonitor implements IService {
*/ */
public getPerformanceReport(): string { public getPerformanceReport(): string {
if (!this._isEnabled) { if (!this._isEnabled) {
return "Performance monitoring is disabled."; return 'Performance monitoring is disabled.';
} }
const lines: string[] = []; const lines: string[] = [];
lines.push("=== ECS Performance Report ==="); lines.push('=== ECS Performance Report ===');
lines.push(""); lines.push('');
// 按平均执行时间排序 // 按平均执行时间排序
const sortedSystems = Array.from(this._systemStats.entries()) const sortedSystems = Array.from(this._systemStats.entries())
@@ -289,24 +289,24 @@ export class PerformanceMonitor implements IService {
for (const [systemName, stats] of sortedSystems) { for (const [systemName, stats] of sortedSystems) {
const data = this._systemData.get(systemName); const data = this._systemData.get(systemName);
lines.push(`System: ${systemName}`); lines.push(`System: ${systemName}`);
lines.push(` Current: ${data?.executionTime.toFixed(2)}ms (${data?.entityCount} entities)`); lines.push(` Current: ${data?.executionTime.toFixed(2)}ms (${data?.entityCount} entities)`);
lines.push(` Average: ${stats.averageTime.toFixed(2)}ms`); lines.push(` Average: ${stats.averageTime.toFixed(2)}ms`);
lines.push(` Min/Max: ${stats.minTime.toFixed(2)}ms / ${stats.maxTime.toFixed(2)}ms`); lines.push(` Min/Max: ${stats.minTime.toFixed(2)}ms / ${stats.maxTime.toFixed(2)}ms`);
lines.push(` Total: ${stats.totalTime.toFixed(2)}ms (${stats.executionCount} calls)`); lines.push(` Total: ${stats.totalTime.toFixed(2)}ms (${stats.executionCount} calls)`);
if (data?.averageTimePerEntity && data.averageTimePerEntity > 0) { if (data?.averageTimePerEntity && data.averageTimePerEntity > 0) {
lines.push(` Per Entity: ${data.averageTimePerEntity.toFixed(4)}ms`); lines.push(` Per Entity: ${data.averageTimePerEntity.toFixed(4)}ms`);
} }
lines.push(""); lines.push('');
} }
// 总体统计 // 总体统计
const totalCurrentTime = Array.from(this._systemData.values()) const totalCurrentTime = Array.from(this._systemData.values())
.reduce((sum, data) => sum + data.executionTime, 0); .reduce((sum, data) => sum + data.executionTime, 0);
lines.push(`Total Frame Time: ${totalCurrentTime.toFixed(2)}ms`); lines.push(`Total Frame Time: ${totalCurrentTime.toFixed(2)}ms`);
lines.push(`Systems Count: ${this._systemData.size}`); lines.push(`Systems Count: ${this._systemData.size}`);
@@ -337,13 +337,13 @@ export class PerformanceMonitor implements IService {
*/ */
public getPerformanceWarnings(thresholdMs: number = 16.67): string[] { public getPerformanceWarnings(thresholdMs: number = 16.67): string[] {
const warnings: string[] = []; const warnings: string[] = [];
for (const [systemName, data] of this._systemData.entries()) { for (const [systemName, data] of this._systemData.entries()) {
if (data.executionTime > thresholdMs) { if (data.executionTime > thresholdMs) {
warnings.push(`${systemName}: ${data.executionTime.toFixed(2)}ms (>${thresholdMs}ms)`); warnings.push(`${systemName}: ${data.executionTime.toFixed(2)}ms (>${thresholdMs}ms)`);
} }
} }
return warnings; return warnings;
} }
@@ -370,4 +370,4 @@ export class PerformanceMonitor implements IService {
this._systemStats.clear(); this._systemStats.clear();
this._isEnabled = false; this._isEnabled = false;
} }
} }

View File

@@ -26,4 +26,4 @@ export interface PoolStats {
hitRate: number; hitRate: number;
/** 内存使用估算(字节) */ /** 内存使用估算(字节) */
estimatedMemoryUsage: number; estimatedMemoryUsage: number;
} }

View File

@@ -1,12 +1,14 @@
import { IPoolable, PoolStats } from './IPoolable'; import { IPoolable, PoolStats } from './IPoolable';
type Constructor<T = unknown> = new (...args: unknown[]) => T;
/** /**
* 高性能通用对象池 * 高性能通用对象池
* 支持任意类型的对象池化,包含详细的统计信息 * 支持任意类型的对象池化,包含详细的统计信息
*/ */
export class Pool<T extends IPoolable> { export class Pool<T extends IPoolable> {
private static _pools = new Map<Function, Pool<any>>(); private static _pools = new Map<Constructor, Pool<IPoolable>>();
private _objects: T[] = []; private _objects: T[] = [];
private _createFn: () => T; private _createFn: () => T;
private _maxSize: number; private _maxSize: number;
@@ -42,17 +44,17 @@ export class Pool<T extends IPoolable> {
* @returns 对象池实例 * @returns 对象池实例
*/ */
public static getPool<T extends IPoolable>( public static getPool<T extends IPoolable>(
type: new (...args: unknown[]) => T, type: new (...args: unknown[]) => T,
maxSize: number = 100, maxSize: number = 100,
estimatedObjectSize: number = 1024 estimatedObjectSize: number = 1024
): Pool<T> { ): Pool<T> {
let pool = this._pools.get(type); let pool = this._pools.get(type) as Pool<T> | undefined;
if (!pool) { if (!pool) {
pool = new Pool<T>(() => new type(), maxSize, estimatedObjectSize); pool = new Pool<T>(() => new type(), maxSize, estimatedObjectSize);
this._pools.set(type, pool); this._pools.set(type, pool as Pool<IPoolable>);
} }
return pool; return pool;
} }
@@ -62,7 +64,7 @@ export class Pool<T extends IPoolable> {
*/ */
public obtain(): T { public obtain(): T {
this._stats.totalObtained++; this._stats.totalObtained++;
if (this._objects.length > 0) { if (this._objects.length > 0) {
const obj = this._objects.pop()!; const obj = this._objects.pop()!;
this._stats.size--; this._stats.size--;
@@ -70,7 +72,7 @@ export class Pool<T extends IPoolable> {
this._updateMemoryUsage(); this._updateMemoryUsage();
return obj; return obj;
} }
// 池中没有可用对象,创建新对象 // 池中没有可用对象,创建新对象
this._stats.totalCreated++; this._stats.totalCreated++;
this._updateHitRate(); this._updateHitRate();
@@ -83,9 +85,9 @@ export class Pool<T extends IPoolable> {
*/ */
public release(obj: T): void { public release(obj: T): void {
if (!obj) return; if (!obj) return;
this._stats.totalReleased++; this._stats.totalReleased++;
// 如果池未满,将对象放回池中 // 如果池未满,将对象放回池中
if (this._stats.size < this._maxSize) { if (this._stats.size < this._maxSize) {
// 重置对象状态 // 重置对象状态
@@ -113,7 +115,7 @@ export class Pool<T extends IPoolable> {
for (const obj of this._objects) { for (const obj of this._objects) {
obj.reset(); obj.reset();
} }
this._objects.length = 0; this._objects.length = 0;
this._stats.size = 0; this._stats.size = 0;
this._updateMemoryUsage(); this._updateMemoryUsage();
@@ -125,7 +127,7 @@ export class Pool<T extends IPoolable> {
*/ */
public compact(targetSize?: number): void { public compact(targetSize?: number): void {
const target = targetSize ?? Math.floor(this._objects.length / 2); const target = targetSize ?? Math.floor(this._objects.length / 2);
while (this._objects.length > target) { while (this._objects.length > target) {
const obj = this._objects.pop(); const obj = this._objects.pop();
if (obj) { if (obj) {
@@ -133,7 +135,7 @@ export class Pool<T extends IPoolable> {
this._stats.size--; this._stats.size--;
} }
} }
this._updateMemoryUsage(); this._updateMemoryUsage();
} }
@@ -143,7 +145,7 @@ export class Pool<T extends IPoolable> {
*/ */
public prewarm(count: number): void { public prewarm(count: number): void {
const actualCount = Math.min(count, this._maxSize - this._objects.length); const actualCount = Math.min(count, this._maxSize - this._objects.length);
for (let i = 0; i < actualCount; i++) { for (let i = 0; i < actualCount; i++) {
const obj = this._createFn(); const obj = this._createFn();
obj.reset(); obj.reset();
@@ -151,7 +153,7 @@ export class Pool<T extends IPoolable> {
this._stats.totalCreated++; this._stats.totalCreated++;
this._stats.size++; this._stats.size++;
} }
this._updateMemoryUsage(); this._updateMemoryUsage();
} }
@@ -162,7 +164,7 @@ export class Pool<T extends IPoolable> {
public setMaxSize(maxSize: number): void { public setMaxSize(maxSize: number): void {
this._maxSize = maxSize; this._maxSize = maxSize;
this._stats.maxSize = maxSize; this._stats.maxSize = maxSize;
// 如果当前池大小超过新的最大值,进行压缩 // 如果当前池大小超过新的最大值,进行压缩
if (this._objects.length > maxSize) { if (this._objects.length > maxSize) {
this.compact(maxSize); this.compact(maxSize);
@@ -197,7 +199,7 @@ export class Pool<T extends IPoolable> {
* 获取所有已注册的池类型 * 获取所有已注册的池类型
* @returns 所有池类型的数组 * @returns 所有池类型的数组
*/ */
public static getAllPoolTypes(): Function[] { public static getAllPoolTypes(): Constructor[] {
return Array.from(this._pools.keys()); return Array.from(this._pools.keys());
} }
@@ -207,12 +209,12 @@ export class Pool<T extends IPoolable> {
*/ */
public static getAllPoolStats(): Record<string, PoolStats> { public static getAllPoolStats(): Record<string, PoolStats> {
const stats: Record<string, PoolStats> = {}; const stats: Record<string, PoolStats> = {};
for (const [type, pool] of this._pools) { for (const [type, pool] of this._pools) {
const typeName = type.name || type.toString(); const typeName = type.name || type.toString();
stats[typeName] = pool.getStats(); stats[typeName] = pool.getStats();
} }
return stats; return stats;
} }
@@ -242,12 +244,12 @@ export class Pool<T extends IPoolable> {
public static getGlobalStatsString(): string { public static getGlobalStatsString(): string {
const stats = this.getAllPoolStats(); const stats = this.getAllPoolStats();
const lines: string[] = ['=== Object Pool Global Statistics ===', '']; const lines: string[] = ['=== Object Pool Global Statistics ===', ''];
if (Object.keys(stats).length === 0) { if (Object.keys(stats).length === 0) {
lines.push('No pools registered'); lines.push('No pools registered');
return lines.join('\n'); return lines.join('\n');
} }
for (const [typeName, stat] of Object.entries(stats)) { for (const [typeName, stat] of Object.entries(stats)) {
lines.push(`${typeName}:`); lines.push(`${typeName}:`);
lines.push(` Size: ${stat.size}/${stat.maxSize}`); lines.push(` Size: ${stat.size}/${stat.maxSize}`);
@@ -257,7 +259,7 @@ export class Pool<T extends IPoolable> {
lines.push(` Memory: ${(stat.estimatedMemoryUsage / 1024).toFixed(1)} KB`); lines.push(` Memory: ${(stat.estimatedMemoryUsage / 1024).toFixed(1)} KB`);
lines.push(''); lines.push('');
} }
return lines.join('\n'); return lines.join('\n');
} }
@@ -279,4 +281,4 @@ export class Pool<T extends IPoolable> {
private _updateMemoryUsage(): void { private _updateMemoryUsage(): void {
this._stats.estimatedMemoryUsage = this._stats.size * this._objectSize; this._stats.estimatedMemoryUsage = this._stats.size * this._objectSize;
} }
} }

View File

@@ -7,7 +7,7 @@ import type { IService } from '../../Core/ServiceContainer';
* 统一管理所有对象池 * 统一管理所有对象池
*/ */
export class PoolManager implements IService { export class PoolManager implements IService {
private pools = new Map<string, Pool<any>>(); private pools = new Map<string, Pool<IPoolable>>();
private autoCompactInterval = 60000; // 60秒 private autoCompactInterval = 60000; // 60秒
private lastCompactTime = 0; private lastCompactTime = 0;
@@ -30,7 +30,7 @@ export class PoolManager implements IService {
* @returns 池实例 * @returns 池实例
*/ */
public getPool<T extends IPoolable>(name: string): Pool<T> | null { public getPool<T extends IPoolable>(name: string): Pool<T> | null {
return this.pools.get(name) || null; return (this.pools.get(name) as Pool<T> | undefined) || null;
} }
/** /**
@@ -38,7 +38,7 @@ export class PoolManager implements IService {
*/ */
public update(): void { public update(): void {
const now = Date.now(); const now = Date.now();
if (now - this.lastCompactTime > this.autoCompactInterval) { if (now - this.lastCompactTime > this.autoCompactInterval) {
this.compactAllPools(); this.compactAllPools();
this.lastCompactTime = now; this.lastCompactTime = now;
@@ -60,12 +60,12 @@ export class PoolManager implements IService {
estimatedObjectSize: number = 1024 estimatedObjectSize: number = 1024
): Pool<T> { ): Pool<T> {
let pool = this.pools.get(name) as Pool<T>; let pool = this.pools.get(name) as Pool<T>;
if (!pool) { if (!pool) {
pool = new Pool(createFn, maxSize, estimatedObjectSize); pool = new Pool(createFn, maxSize, estimatedObjectSize);
this.pools.set(name, pool); this.pools.set(name, pool);
} }
return pool; return pool;
} }
@@ -125,11 +125,11 @@ export class PoolManager implements IService {
*/ */
public getAllStats(): Map<string, PoolStats> { public getAllStats(): Map<string, PoolStats> {
const stats = new Map<string, PoolStats>(); const stats = new Map<string, PoolStats>();
for (const [name, pool] of this.pools) { for (const [name, pool] of this.pools) {
stats.set(name, pool.getStats()); stats.set(name, pool.getStats());
} }
return stats; return stats;
} }
@@ -144,7 +144,7 @@ export class PoolManager implements IService {
let totalObtained = 0; let totalObtained = 0;
let totalReleased = 0; let totalReleased = 0;
let totalMemoryUsage = 0; let totalMemoryUsage = 0;
for (const pool of this.pools.values()) { for (const pool of this.pools.values()) {
const stats = pool.getStats(); const stats = pool.getStats();
totalSize += stats.size; totalSize += stats.size;
@@ -154,9 +154,9 @@ export class PoolManager implements IService {
totalReleased += stats.totalReleased; totalReleased += stats.totalReleased;
totalMemoryUsage += stats.estimatedMemoryUsage; totalMemoryUsage += stats.estimatedMemoryUsage;
} }
const hitRate = totalObtained === 0 ? 0 : (totalObtained - totalCreated) / totalObtained; const hitRate = totalObtained === 0 ? 0 : (totalObtained - totalCreated) / totalObtained;
return { return {
size: totalSize, size: totalSize,
maxSize: totalMaxSize, maxSize: totalMaxSize,
@@ -174,18 +174,18 @@ export class PoolManager implements IService {
*/ */
public getStatsString(): string { public getStatsString(): string {
const lines: string[] = ['=== Pool Manager Statistics ===', '']; const lines: string[] = ['=== Pool Manager Statistics ===', ''];
if (this.pools.size === 0) { if (this.pools.size === 0) {
lines.push('No pools registered'); lines.push('No pools registered');
return lines.join('\n'); return lines.join('\n');
} }
const globalStats = this.getGlobalStats(); const globalStats = this.getGlobalStats();
lines.push(`Total Pools: ${this.pools.size}`); lines.push(`Total Pools: ${this.pools.size}`);
lines.push(`Global Hit Rate: ${(globalStats.hitRate * 100).toFixed(1)}%`); lines.push(`Global Hit Rate: ${(globalStats.hitRate * 100).toFixed(1)}%`);
lines.push(`Global Memory Usage: ${(globalStats.estimatedMemoryUsage / 1024).toFixed(1)} KB`); lines.push(`Global Memory Usage: ${(globalStats.estimatedMemoryUsage / 1024).toFixed(1)} KB`);
lines.push(''); lines.push('');
for (const [name, pool] of this.pools) { for (const [name, pool] of this.pools) {
const stats = pool.getStats(); const stats = pool.getStats();
lines.push(`${name}:`); lines.push(`${name}:`);
@@ -194,7 +194,7 @@ export class PoolManager implements IService {
lines.push(` Memory: ${(stats.estimatedMemoryUsage / 1024).toFixed(1)} KB`); lines.push(` Memory: ${(stats.estimatedMemoryUsage / 1024).toFixed(1)} KB`);
lines.push(''); lines.push('');
} }
return lines.join('\n'); return lines.join('\n');
} }
@@ -233,4 +233,4 @@ export class PoolManager implements IService {
public dispose(): void { public dispose(): void {
this.reset(); this.reset();
} }
} }

View File

@@ -1,3 +1,3 @@
export * from './IPoolable'; export * from './IPoolable';
export * from './Pool'; export * from './Pool';
export * from './PoolManager'; export * from './PoolManager';

View File

@@ -7,27 +7,27 @@ export class Time {
* 上一帧到当前帧的时间间隔(秒) * 上一帧到当前帧的时间间隔(秒)
*/ */
public static deltaTime: number = 0; public static deltaTime: number = 0;
/** /**
* 未缩放的帧时间间隔(秒) * 未缩放的帧时间间隔(秒)
*/ */
public static unscaledDeltaTime: number = 0; public static unscaledDeltaTime: number = 0;
/** /**
* 游戏开始以来的总时间(秒) * 游戏开始以来的总时间(秒)
*/ */
public static totalTime: number = 0; public static totalTime: number = 0;
/** /**
* 未缩放的总时间(秒) * 未缩放的总时间(秒)
*/ */
public static unscaledTotalTime: number = 0; public static unscaledTotalTime: number = 0;
/** /**
* 时间缩放比例 * 时间缩放比例
*/ */
public static timeScale: number = 1; public static timeScale: number = 1;
/** /**
* 当前帧数 * 当前帧数
*/ */
@@ -70,4 +70,4 @@ export class Time {
public static checkEvery(interval: number, lastTime: number): boolean { public static checkEvery(interval: number, lastTime: number): boolean {
return this.totalTime - lastTime >= interval; return this.totalTime - lastTime >= interval;
} }
} }

View File

@@ -15,4 +15,4 @@ export interface ITimer<TContext = unknown> {
* 返回投向T的上下文作为方便 * 返回投向T的上下文作为方便
*/ */
getContext<T>(): T; getContext<T>(): T;
} }

View File

@@ -67,4 +67,4 @@ export class Timer<TContext = unknown> implements ITimer<TContext>{
this.context = null as unknown as TContext; this.context = null as unknown as TContext;
this._onTime = null!; this._onTime = null!;
} }
} }

View File

@@ -30,7 +30,7 @@ export class TimerManager implements IService, IUpdatable {
* @param onTime * @param onTime
*/ */
public schedule<TContext = unknown>(timeInSeconds: number, repeats: boolean, context: TContext, onTime: (timer: ITimer<TContext>)=>void): Timer<TContext> { public schedule<TContext = unknown>(timeInSeconds: number, repeats: boolean, context: TContext, onTime: (timer: ITimer<TContext>)=>void): Timer<TContext> {
let timer = new Timer<TContext>(); const timer = new Timer<TContext>();
timer.initialize(timeInSeconds, repeats, context, onTime); timer.initialize(timeInSeconds, repeats, context, onTime);
this._timers.push(timer as Timer<unknown>); this._timers.push(timer as Timer<unknown>);
@@ -46,4 +46,4 @@ export class TimerManager implements IService, IUpdatable {
} }
this._timers = []; this._timers = [];
} }
} }

View File

@@ -6,4 +6,4 @@ export * from './PerformanceMonitor';
export { Time } from './Time'; export { Time } from './Time';
export * from './Debug'; export * from './Debug';
export * from './Logger'; export * from './Logger';
export * from './BinarySerializer'; export * from './BinarySerializer';

View File

@@ -36,13 +36,13 @@ export { ITimer } from './Utils/Timers/ITimer';
export { Timer } from './Utils/Timers/Timer'; export { Timer } from './Utils/Timers/Timer';
// 日志系统 // 日志系统
export { export {
LoggerManager, LoggerManager,
ConsoleLogger, ConsoleLogger,
Logger, Logger,
createLogger, createLogger,
setGlobalLogLevel, setGlobalLogLevel,
LogLevel LogLevel
} from './Utils/Logger'; } from './Utils/Logger';
export type { ILogger, LoggerConfig } from './Utils/Logger'; export type { ILogger, LoggerConfig } from './Utils/Logger';
@@ -64,4 +64,4 @@ export * from './Types';
export { ComponentPool, ComponentPoolManager } from './ECS/Core/Storage'; export { ComponentPool, ComponentPoolManager } from './ECS/Core/Storage';
// 平台适配 // 平台适配
export * from './Platform'; export * from './Platform';

View File

@@ -27,7 +27,6 @@ describe('Component - 组件基类测试', () => {
let scene: Scene; let scene: Scene;
beforeEach(() => { beforeEach(() => {
Component._idGenerator = 0;
component = new TestComponent(); component = new TestComponent();
scene = new Scene(); scene = new Scene();
entity = scene.createEntity('TestEntity'); entity = scene.createEntity('TestEntity');
@@ -51,7 +50,7 @@ describe('Component - 组件基类测试', () => {
}); });
test('组件ID应该递增分配', () => { test('组件ID应该递增分配', () => {
const startId = Component._idGenerator; const startId = Component.nextComponentId;
const component1 = new TestComponent(); const component1 = new TestComponent();
const component2 = new TestComponent(); const component2 = new TestComponent();