fix(build): 修复 Web 构建组件注册和用户脚本打包问题 (#302)
* refactor(build): 重构 Web 构建管线,支持配置驱动的 Import Maps - 重构 WebBuildPipeline 支持 split-bundles 和 single-bundle 两种构建模式 - 使用 module.json 的 isCore 字段识别核心模块,消除硬编码列表 - 动态生成 Import Map,从模块清单的 name 字段获取包名映射 - 动态扫描 module.json 文件,不再依赖固定模块列表 - 添加 HTTP 服务器启动脚本 (start-server.bat/sh) 支持 ESM 模块 - 更新 BuildSettingsPanel UI 支持新的构建模式选项 - 添加多语言支持 (zh/en/es) * fix(build): 修复 Web 构建组件注册和用户脚本打包问题 主要修复: - 修复组件反序列化时找不到类型的问题 - @ECSComponent 装饰器现在自动注册到 ComponentRegistry - 添加未使用装饰器的组件警告 - 构建管线自动扫描用户脚本(无需入口文件) 架构改进: - 解决 Decorators ↔ ComponentRegistry 循环依赖 - 新建 ComponentTypeUtils.ts 作为底层无依赖模块 - 移除冗余的防御性 register 调用 - 统一 ComponentType 定义位置 * refactor(build): 统一 WASM 配置架构,移除硬编码 - 新增 wasmConfig 统一配置替代 wasmPaths/wasmBindings - wasmConfig.files 支持多候选源路径和明确目标路径 - wasmConfig.runtimePath 指定运行时加载路径 - 重构 _copyWasmFiles 使用统一配置 - HTML 生成使用配置中的 runtimePath - 移除 physics-rapier2d 的冗余 WASM 配置(由 rapier2d 负责) - IBuildFileSystem 新增 deleteFile 方法 * feat(build): 单文件构建模式完善和场景配置驱动 ## 主要改动 ### 单文件构建(single-file mode) - 修复 WASM 初始化问题,支持 initSync 同步初始化 - 配置驱动的 WASM 识别,通过 wasmConfig.isEngineCore 标识核心引擎模块 - 从 wasmConfig.files 动态获取 JS 绑定路径,消除硬编码 ### 场景配置 - 构建验证:必须选择至少一个场景才能构建 - 自动扫描:项目加载时扫描 scenes 目录 - 抽取 _filterScenesByWhitelist 公共方法统一过滤逻辑 ### 构建面板优化 - availableScenes prop 传递场景列表 - 场景复选框可点击切换启用状态 - 移除动态 import,使用 prop 传入数据 * chore(build): 补充构建相关的辅助改动 - 添加 BuildFileSystemService 的 listFilesByExtension 优化 - 更新 module.json 添加 externalDependencies 配置 - BrowserRuntime 支持 wasmModule 参数传递 - GameRuntime 添加 loadSceneFromData 方法 - Rust 构建命令更新 - 国际化文案更新 * feat(build): 持久化构建设置到项目配置 ## 设计架构 ### ProjectService 扩展 - 新增 BuildSettingsConfig 接口定义构建配置字段 - ProjectConfig 添加 buildSettings 字段 - 新增 getBuildSettings / updateBuildSettings 方法 ### BuildSettingsPanel - 组件挂载时从 projectService 加载已保存配置 - 设置变化时自动保存(500ms 防抖) - 场景选择状态与项目配置同步 ### 配置保存位置 保存在项目的 ecs-editor.config.json 中: - scenes: 选中的场景列表 - buildMode: 构建模式 - companyName/productName/version: 产品信息 - developmentBuild/sourceMap: 构建选项 * fix(editor): Ctrl+S 仅在主编辑区域触发保存场景 - 模态窗口打开时跳过(构建设置、设置、关于等) - 焦点在 input/textarea/contenteditable 时跳过 * fix(tests): 修复 ECS 测试中 Component 注册问题 - 为所有测试 Component 类添加 @ECSComponent 装饰器 - 移除 beforeEach 中的 ComponentRegistry.reset() 调用 - 将内联 Component 类移到文件顶层以支持装饰器 - 更新测试预期值匹配新的组件类型名称 - 添加缺失的 HierarchyComponent 导入 所有 1388 个测试现已通过。
This commit is contained in:
@@ -10,11 +10,7 @@
|
||||
".": {
|
||||
"types": "./dist/index.d.ts",
|
||||
"import": "./dist/index.mjs",
|
||||
"require": "./dist/index.cjs",
|
||||
"development": {
|
||||
"types": "./src/index.ts",
|
||||
"import": "./src/index.ts"
|
||||
}
|
||||
"require": "./dist/index.cjs"
|
||||
}
|
||||
},
|
||||
"files": [
|
||||
|
||||
@@ -271,9 +271,6 @@ export class ArchetypeSystem {
|
||||
private generateArchetypeId(componentTypes: ComponentType[]): ArchetypeId {
|
||||
const mask = BitMask64Utils.clone(BitMask64Utils.ZERO);
|
||||
for (const type of componentTypes) {
|
||||
if (!ComponentRegistry.isRegistered(type)) {
|
||||
ComponentRegistry.register(type);
|
||||
}
|
||||
const bitMask = ComponentRegistry.getBitMask(type);
|
||||
BitMask64Utils.orInPlace(mask, bitMask);
|
||||
}
|
||||
|
||||
@@ -2,11 +2,12 @@ import { Component } from '../Component';
|
||||
import { BitMask64Utils, BitMask64Data } from '../Utils/BigIntCompatibility';
|
||||
import { SoAStorage, SupportedTypedArray } from './SoAStorage';
|
||||
import { createLogger } from '../../Utils/Logger';
|
||||
import { getComponentTypeName } from '../Decorators';
|
||||
import { ComponentRegistry, ComponentType } from './ComponentStorage/ComponentRegistry';
|
||||
import { getComponentTypeName, ComponentType } from '../Decorators';
|
||||
import { ComponentRegistry } from './ComponentStorage/ComponentRegistry';
|
||||
|
||||
// 导出核心类型
|
||||
export { ComponentRegistry, ComponentType };
|
||||
export { ComponentRegistry };
|
||||
export type { ComponentType };
|
||||
|
||||
|
||||
/**
|
||||
@@ -20,11 +21,6 @@ export class ComponentStorage<T extends Component> {
|
||||
|
||||
constructor(componentType: ComponentType<T>) {
|
||||
this.componentType = componentType;
|
||||
|
||||
// 确保组件类型已注册
|
||||
if (!ComponentRegistry.isRegistered(componentType)) {
|
||||
ComponentRegistry.register(componentType);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
import { Component } from '../../Component';
|
||||
import { BitMask64Utils, BitMask64Data } from '../../Utils/BigIntCompatibility';
|
||||
import { createLogger } from '../../../Utils/Logger';
|
||||
import { getComponentTypeName } from '../../Decorators';
|
||||
|
||||
/**
|
||||
* 组件类型定义
|
||||
*/
|
||||
export type ComponentType<T extends Component = Component> = new (...args: any[]) => T;
|
||||
import {
|
||||
ComponentType,
|
||||
getComponentTypeName,
|
||||
hasECSComponentDecorator
|
||||
} from './ComponentTypeUtils';
|
||||
|
||||
/**
|
||||
* 组件注册表
|
||||
@@ -29,14 +28,33 @@ export class ComponentRegistry {
|
||||
*/
|
||||
private static hotReloadEnabled = false;
|
||||
|
||||
/**
|
||||
* 已警告过的组件类型集合,避免重复警告
|
||||
* Set of warned component types to avoid duplicate warnings
|
||||
*/
|
||||
private static warnedComponents = new Set<Function>();
|
||||
|
||||
/**
|
||||
* 注册组件类型并分配位掩码
|
||||
* Register component type and allocate bitmask
|
||||
*
|
||||
* @param componentType 组件类型
|
||||
* @returns 分配的位索引
|
||||
*/
|
||||
public static register<T extends Component>(componentType: ComponentType<T>): number {
|
||||
const typeName = getComponentTypeName(componentType);
|
||||
|
||||
// 检查是否使用了 @ECSComponent 装饰器
|
||||
// Check if @ECSComponent decorator is used
|
||||
if (!hasECSComponentDecorator(componentType) && !this.warnedComponents.has(componentType)) {
|
||||
this.warnedComponents.add(componentType);
|
||||
console.warn(
|
||||
`[ComponentRegistry] Component "${typeName}" is missing @ECSComponent decorator. ` +
|
||||
`This may cause issues with serialization and code minification. ` +
|
||||
`Please add: @ECSComponent('${typeName}')`
|
||||
);
|
||||
}
|
||||
|
||||
if (this.componentTypes.has(componentType)) {
|
||||
const existingIndex = this.componentTypes.get(componentType)!;
|
||||
return existingIndex;
|
||||
@@ -324,6 +342,7 @@ export class ComponentRegistry {
|
||||
this.componentNameToType.clear();
|
||||
this.componentNameToId.clear();
|
||||
this.maskCache.clear();
|
||||
this.warnedComponents.clear();
|
||||
this.nextBitIndex = 0;
|
||||
this.hotReloadEnabled = false;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,83 @@
|
||||
/**
|
||||
* Component Type Utilities
|
||||
* 组件类型工具函数
|
||||
*
|
||||
* This module contains low-level utilities for component type handling.
|
||||
* It has NO dependencies on other ECS modules to avoid circular imports.
|
||||
*
|
||||
* 此模块包含组件类型处理的底层工具函数。
|
||||
* 它不依赖其他 ECS 模块,以避免循环导入。
|
||||
*/
|
||||
|
||||
import type { Component } from '../../Component';
|
||||
|
||||
/**
|
||||
* 组件类型定义
|
||||
* Component type definition
|
||||
*/
|
||||
export type ComponentType<T extends Component = Component> = new (...args: any[]) => T;
|
||||
|
||||
/**
|
||||
* 存储组件类型名称的 Symbol 键
|
||||
* Symbol key for storing component type name
|
||||
*/
|
||||
export const COMPONENT_TYPE_NAME = Symbol('ComponentTypeName');
|
||||
|
||||
/**
|
||||
* 存储组件依赖的 Symbol 键
|
||||
* Symbol key for storing component dependencies
|
||||
*/
|
||||
export const COMPONENT_DEPENDENCIES = Symbol('ComponentDependencies');
|
||||
|
||||
/**
|
||||
* 检查组件是否使用了 @ECSComponent 装饰器
|
||||
* Check if component has @ECSComponent decorator
|
||||
*
|
||||
* @param componentType 组件构造函数
|
||||
* @returns 是否有装饰器
|
||||
*/
|
||||
export function hasECSComponentDecorator(componentType: ComponentType): boolean {
|
||||
return !!(componentType as any)[COMPONENT_TYPE_NAME];
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取组件类型的名称,优先使用装饰器指定的名称
|
||||
* Get component type name, preferring decorator-specified name
|
||||
*
|
||||
* @param componentType 组件构造函数
|
||||
* @returns 组件类型名称
|
||||
*/
|
||||
export function getComponentTypeName(componentType: ComponentType): string {
|
||||
// 优先使用装饰器指定的名称
|
||||
// Prefer decorator-specified name
|
||||
const decoratorName = (componentType as any)[COMPONENT_TYPE_NAME];
|
||||
if (decoratorName) {
|
||||
return decoratorName;
|
||||
}
|
||||
|
||||
// 回退到 constructor.name
|
||||
// Fallback to constructor.name
|
||||
return componentType.name || 'UnknownComponent';
|
||||
}
|
||||
|
||||
/**
|
||||
* 从组件实例获取类型名称
|
||||
* Get type name from component instance
|
||||
*
|
||||
* @param component 组件实例
|
||||
* @returns 组件类型名称
|
||||
*/
|
||||
export function getComponentInstanceTypeName(component: Component): string {
|
||||
return getComponentTypeName(component.constructor as ComponentType);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取组件的依赖列表
|
||||
* Get component dependencies
|
||||
*
|
||||
* @param componentType 组件构造函数
|
||||
* @returns 依赖的组件名称列表
|
||||
*/
|
||||
export function getComponentDependencies(componentType: ComponentType): string[] | undefined {
|
||||
return (componentType as any)[COMPONENT_DEPENDENCIES];
|
||||
}
|
||||
@@ -821,13 +821,9 @@ export class QuerySystem {
|
||||
return cached;
|
||||
}
|
||||
|
||||
// 使用ComponentRegistry而不是ComponentTypeManager,确保bitIndex一致
|
||||
// 使用ComponentRegistry确保bitIndex一致
|
||||
const mask = BitMask64Utils.clone(BitMask64Utils.ZERO);
|
||||
for (const type of componentTypes) {
|
||||
// 确保组件已注册
|
||||
if (!ComponentRegistry.isRegistered(type)) {
|
||||
ComponentRegistry.register(type);
|
||||
}
|
||||
const bitMask = ComponentRegistry.getBitMask(type);
|
||||
BitMask64Utils.orInPlace(mask, bitMask);
|
||||
}
|
||||
|
||||
@@ -1,36 +1,48 @@
|
||||
/**
|
||||
* Type Decorators for ECS Components and Systems
|
||||
* ECS 组件和系统的类型装饰器
|
||||
*
|
||||
* Provides decorators to mark component/system types with stable names
|
||||
* that survive code minification.
|
||||
*
|
||||
* 提供装饰器为组件/系统类型标记稳定的名称,使其在代码混淆后仍然有效。
|
||||
*/
|
||||
|
||||
import type { Component } from '../Component';
|
||||
import type { EntitySystem } from '../Systems';
|
||||
import { ComponentType } from '../../Types';
|
||||
|
||||
/**
|
||||
* 存储组件类型名称的Symbol键
|
||||
*/
|
||||
export const COMPONENT_TYPE_NAME = Symbol('ComponentTypeName');
|
||||
|
||||
/**
|
||||
* 存储组件依赖的Symbol键
|
||||
*/
|
||||
export const COMPONENT_DEPENDENCIES = Symbol('ComponentDependencies');
|
||||
import { ComponentRegistry } from '../Core/ComponentStorage/ComponentRegistry';
|
||||
import {
|
||||
COMPONENT_TYPE_NAME,
|
||||
COMPONENT_DEPENDENCIES
|
||||
} from '../Core/ComponentStorage/ComponentTypeUtils';
|
||||
|
||||
/**
|
||||
* 存储系统类型名称的Symbol键
|
||||
* Symbol key for storing system type name
|
||||
*/
|
||||
export const SYSTEM_TYPE_NAME = Symbol('SystemTypeName');
|
||||
|
||||
/**
|
||||
* 组件装饰器配置选项
|
||||
* Component decorator options
|
||||
*/
|
||||
export interface ComponentOptions {
|
||||
/** 依赖的其他组件名称列表 */
|
||||
/** 依赖的其他组件名称列表 | List of required component names */
|
||||
requires?: string[];
|
||||
}
|
||||
|
||||
/**
|
||||
* 组件类型装饰器
|
||||
* 用于为组件类指定固定的类型名称,避免在代码混淆后失效
|
||||
* Component type decorator
|
||||
*
|
||||
* @param typeName 组件类型名称
|
||||
* @param options 组件配置选项
|
||||
* 用于为组件类指定固定的类型名称,避免在代码混淆后失效。
|
||||
* 装饰器执行时会自动注册到 ComponentRegistry,使组件可以通过名称反序列化。
|
||||
*
|
||||
* Assigns a stable type name to component classes that survives minification.
|
||||
* The decorator automatically registers to ComponentRegistry, enabling deserialization by name.
|
||||
*
|
||||
* @param typeName 组件类型名称 | Component type name
|
||||
* @param options 组件配置选项 | Component options
|
||||
* @example
|
||||
* ```typescript
|
||||
* @ECSComponent('Position')
|
||||
@@ -39,7 +51,7 @@ export interface ComponentOptions {
|
||||
* y: number = 0;
|
||||
* }
|
||||
*
|
||||
* // 带依赖声明
|
||||
* // 带依赖声明 | With dependency declaration
|
||||
* @ECSComponent('SpriteAnimator', { requires: ['Sprite'] })
|
||||
* class SpriteAnimatorComponent extends Component {
|
||||
* // ...
|
||||
@@ -53,48 +65,52 @@ export function ECSComponent(typeName: string, options?: ComponentOptions) {
|
||||
}
|
||||
|
||||
// 在构造函数上存储类型名称
|
||||
// Store type name on constructor
|
||||
(target as any)[COMPONENT_TYPE_NAME] = typeName;
|
||||
|
||||
// 存储依赖关系
|
||||
// Store dependencies
|
||||
if (options?.requires) {
|
||||
(target as any)[COMPONENT_DEPENDENCIES] = options.requires;
|
||||
}
|
||||
|
||||
// 自动注册到 ComponentRegistry,使组件可以通过名称查找
|
||||
// Auto-register to ComponentRegistry, enabling lookup by name
|
||||
ComponentRegistry.register(target);
|
||||
|
||||
return target;
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取组件的依赖列表
|
||||
*/
|
||||
export function getComponentDependencies(componentType: ComponentType): string[] | undefined {
|
||||
return (componentType as any)[COMPONENT_DEPENDENCIES];
|
||||
}
|
||||
|
||||
/**
|
||||
* System元数据配置
|
||||
* System 元数据配置
|
||||
* System metadata configuration
|
||||
*/
|
||||
export interface SystemMetadata {
|
||||
/**
|
||||
* 更新顺序(数值越小越先执行,默认0)
|
||||
* Update order (lower values execute first, default 0)
|
||||
*/
|
||||
updateOrder?: number;
|
||||
|
||||
/**
|
||||
* 是否默认启用(默认true)
|
||||
* Whether enabled by default (default true)
|
||||
*/
|
||||
enabled?: boolean;
|
||||
}
|
||||
|
||||
/**
|
||||
* 系统类型装饰器
|
||||
* 用于为系统类指定固定的类型名称,避免在代码混淆后失效
|
||||
* System type decorator
|
||||
*
|
||||
* @param typeName 系统类型名称
|
||||
* @param metadata 系统元数据配置
|
||||
* 用于为系统类指定固定的类型名称,避免在代码混淆后失效。
|
||||
* Assigns a stable type name to system classes that survives minification.
|
||||
*
|
||||
* @param typeName 系统类型名称 | System type name
|
||||
* @param metadata 系统元数据配置 | System metadata configuration
|
||||
* @example
|
||||
* ```typescript
|
||||
* // 基本使用
|
||||
* @ECSSystem('Movement')
|
||||
* class MovementSystem extends EntitySystem {
|
||||
* protected process(entities: Entity[]): void {
|
||||
@@ -102,16 +118,9 @@ export interface SystemMetadata {
|
||||
* }
|
||||
* }
|
||||
*
|
||||
* // 配置更新顺序和依赖注入
|
||||
* @Injectable()
|
||||
* @ECSSystem('Physics', { updateOrder: 10 })
|
||||
* class PhysicsSystem extends EntitySystem {
|
||||
* @InjectProperty(CollisionSystem)
|
||||
* private collision!: CollisionSystem;
|
||||
*
|
||||
* constructor() {
|
||||
* super(Matcher.empty().all(Transform, RigidBody));
|
||||
* }
|
||||
* // ...
|
||||
* }
|
||||
* ```
|
||||
*/
|
||||
@@ -122,9 +131,11 @@ export function ECSSystem(typeName: string, metadata?: SystemMetadata) {
|
||||
}
|
||||
|
||||
// 在构造函数上存储类型名称
|
||||
// Store type name on constructor
|
||||
(target as any)[SYSTEM_TYPE_NAME] = typeName;
|
||||
|
||||
// 存储元数据
|
||||
// Store metadata
|
||||
if (metadata) {
|
||||
(target as any).__systemMetadata__ = metadata;
|
||||
}
|
||||
@@ -134,67 +145,37 @@ export function ECSSystem(typeName: string, metadata?: SystemMetadata) {
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取System的元数据
|
||||
* 获取 System 的元数据
|
||||
* Get System metadata
|
||||
*/
|
||||
export function getSystemMetadata(systemType: new (...args: any[]) => EntitySystem): SystemMetadata | undefined {
|
||||
return (systemType as any).__systemMetadata__;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取组件类型的名称,优先使用装饰器指定的名称
|
||||
*
|
||||
* @param componentType 组件构造函数
|
||||
* @returns 组件类型名称
|
||||
*/
|
||||
export function getComponentTypeName(
|
||||
componentType: ComponentType
|
||||
): string {
|
||||
// 优先使用装饰器指定的名称
|
||||
const decoratorName = (componentType as any)[COMPONENT_TYPE_NAME];
|
||||
if (decoratorName) {
|
||||
return decoratorName;
|
||||
}
|
||||
|
||||
// 回退到constructor.name
|
||||
return componentType.name || 'UnknownComponent';
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取系统类型的名称,优先使用装饰器指定的名称
|
||||
* Get system type name, preferring decorator-specified name
|
||||
*
|
||||
* @param systemType 系统构造函数
|
||||
* @returns 系统类型名称
|
||||
* @param systemType 系统构造函数 | System constructor
|
||||
* @returns 系统类型名称 | System type name
|
||||
*/
|
||||
export function getSystemTypeName<T extends EntitySystem>(
|
||||
systemType: new (...args: any[]) => T
|
||||
): string {
|
||||
// 优先使用装饰器指定的名称
|
||||
const decoratorName = (systemType as any)[SYSTEM_TYPE_NAME];
|
||||
if (decoratorName) {
|
||||
return decoratorName;
|
||||
}
|
||||
|
||||
// 回退到constructor.name
|
||||
return systemType.name || 'UnknownSystem';
|
||||
}
|
||||
|
||||
/**
|
||||
* 从组件实例获取类型名称
|
||||
*
|
||||
* @param component 组件实例
|
||||
* @returns 组件类型名称
|
||||
*/
|
||||
export function getComponentInstanceTypeName(component: Component): string {
|
||||
return getComponentTypeName(component.constructor as ComponentType);
|
||||
}
|
||||
|
||||
/**
|
||||
* 从系统实例获取类型名称
|
||||
* Get type name from system instance
|
||||
*
|
||||
* @param system 系统实例
|
||||
* @returns 系统类型名称
|
||||
* @param system 系统实例 | System instance
|
||||
* @returns 系统类型名称 | System type name
|
||||
*/
|
||||
export function getSystemInstanceTypeName(system: EntitySystem): string {
|
||||
return getSystemTypeName(system.constructor as new (...args: any[]) => EntitySystem);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,19 +1,37 @@
|
||||
// ============================================================================
|
||||
// Component Type Utilities (from ComponentTypeUtils - no circular deps)
|
||||
// 组件类型工具(来自 ComponentTypeUtils - 无循环依赖)
|
||||
// ============================================================================
|
||||
export {
|
||||
COMPONENT_TYPE_NAME,
|
||||
COMPONENT_DEPENDENCIES,
|
||||
getComponentTypeName,
|
||||
getComponentInstanceTypeName,
|
||||
getComponentDependencies,
|
||||
hasECSComponentDecorator
|
||||
} from '../Core/ComponentStorage/ComponentTypeUtils';
|
||||
|
||||
export type { ComponentType } from '../Core/ComponentStorage/ComponentTypeUtils';
|
||||
|
||||
// ============================================================================
|
||||
// Type Decorators (ECSComponent, ECSSystem)
|
||||
// 类型装饰器
|
||||
// ============================================================================
|
||||
export {
|
||||
ECSComponent,
|
||||
ECSSystem,
|
||||
getComponentTypeName,
|
||||
getSystemTypeName,
|
||||
getComponentInstanceTypeName,
|
||||
getSystemInstanceTypeName,
|
||||
getSystemMetadata,
|
||||
getComponentDependencies,
|
||||
COMPONENT_TYPE_NAME,
|
||||
COMPONENT_DEPENDENCIES,
|
||||
SYSTEM_TYPE_NAME
|
||||
} from './TypeDecorators';
|
||||
|
||||
export type { SystemMetadata, ComponentOptions } from './TypeDecorators';
|
||||
|
||||
// ============================================================================
|
||||
// Entity Reference Decorator
|
||||
// 实体引用装饰器
|
||||
// ============================================================================
|
||||
export {
|
||||
EntityRef,
|
||||
getEntityRefMetadata,
|
||||
@@ -23,6 +41,10 @@ export {
|
||||
|
||||
export type { EntityRefMetadata } from './EntityRefDecorator';
|
||||
|
||||
// ============================================================================
|
||||
// Property Decorator
|
||||
// 属性装饰器
|
||||
// ============================================================================
|
||||
export {
|
||||
Property,
|
||||
getPropertyMetadata,
|
||||
@@ -30,4 +52,11 @@ export {
|
||||
PROPERTY_METADATA
|
||||
} from './PropertyDecorator';
|
||||
|
||||
export type { PropertyOptions, PropertyType, PropertyControl, PropertyAction, AssetType, EnumOption } from './PropertyDecorator';
|
||||
export type {
|
||||
PropertyOptions,
|
||||
PropertyType,
|
||||
PropertyControl,
|
||||
PropertyAction,
|
||||
AssetType,
|
||||
EnumOption
|
||||
} from './PropertyDecorator';
|
||||
|
||||
@@ -368,11 +368,8 @@ export class Entity {
|
||||
private addComponentInternal<T extends Component>(component: T): T {
|
||||
const componentType = component.constructor as ComponentType<T>;
|
||||
|
||||
if (!ComponentRegistry.isRegistered(componentType)) {
|
||||
ComponentRegistry.register(componentType);
|
||||
}
|
||||
|
||||
// 更新位掩码
|
||||
// 更新位掩码(组件已通过 @ECSComponent 装饰器自动注册)
|
||||
// Update bitmask (component already registered via @ECSComponent decorator)
|
||||
const componentMask = ComponentRegistry.getBitMask(componentType);
|
||||
BitMask64Utils.orInPlace(this._componentMask, componentMask);
|
||||
|
||||
|
||||
@@ -672,10 +672,6 @@ export class Scene implements IScene {
|
||||
* @param system 系统 | System
|
||||
*/
|
||||
private addSystemToComponentIndex(componentType: ComponentType, system: EntitySystem): void {
|
||||
if (!ComponentRegistry.isRegistered(componentType)) {
|
||||
ComponentRegistry.register(componentType);
|
||||
}
|
||||
|
||||
const componentId = ComponentRegistry.getBitIndex(componentType);
|
||||
let systems = this._componentIdToSystems.get(componentId);
|
||||
|
||||
|
||||
@@ -85,11 +85,6 @@ export class ComponentSparseSet {
|
||||
const componentType = component.constructor as ComponentType;
|
||||
entityComponents.add(componentType);
|
||||
|
||||
// 确保组件类型已注册
|
||||
if (!ComponentRegistry.isRegistered(componentType)) {
|
||||
ComponentRegistry.register(componentType);
|
||||
}
|
||||
|
||||
// 获取组件位掩码并合并
|
||||
const bitMask = ComponentRegistry.getBitMask(componentType);
|
||||
BitMask64Utils.orInPlace(componentMask, bitMask);
|
||||
|
||||
@@ -49,14 +49,6 @@ export interface ISystemBase {
|
||||
lateUpdate?(): void;
|
||||
}
|
||||
|
||||
/**
|
||||
* 组件类型定义
|
||||
*
|
||||
* 用于类型安全的组件操作
|
||||
* 支持任意构造函数签名,提供更好的类型安全性
|
||||
*/
|
||||
export type ComponentType<T extends IComponent = IComponent> = new (...args: any[]) => T;
|
||||
|
||||
/**
|
||||
* 事件总线接口
|
||||
* 提供类型安全的事件发布订阅机制
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
import { Component } from '../../src/ECS/Component';
|
||||
import { Entity } from '../../src/ECS/Entity';
|
||||
import { Scene } from '../../src/ECS/Scene';
|
||||
import { ECSComponent } from '../../src/ECS/Decorators';
|
||||
|
||||
// 测试组件
|
||||
@ECSComponent('ComponentTest_TestComponent')
|
||||
class TestComponent extends Component {
|
||||
public value: number = 100;
|
||||
public onAddedCalled = false;
|
||||
@@ -17,6 +19,7 @@ class TestComponent extends Component {
|
||||
}
|
||||
}
|
||||
|
||||
@ECSComponent('ComponentTest_AnotherTestComponent')
|
||||
class AnotherTestComponent extends Component {
|
||||
public name: string = 'test';
|
||||
}
|
||||
|
||||
@@ -4,8 +4,10 @@ import { Component } from '../../../src/ECS/Component';
|
||||
import { Scene } from '../../../src/ECS/Scene';
|
||||
import { EntitySystem } from '../../../src/ECS/Systems/EntitySystem';
|
||||
import { Matcher } from '../../../src/ECS/Utils/Matcher';
|
||||
import { ECSComponent } from '../../../src/ECS/Decorators';
|
||||
|
||||
// 测试组件
|
||||
@ECSComponent('CmdBuf_HealthComponent')
|
||||
class HealthComponent extends Component {
|
||||
public value: number = 100;
|
||||
|
||||
@@ -16,10 +18,12 @@ class HealthComponent extends Component {
|
||||
}
|
||||
}
|
||||
|
||||
@ECSComponent('CmdBuf_MarkerComponent')
|
||||
class MarkerComponent extends Component {
|
||||
public marked: boolean = true;
|
||||
}
|
||||
|
||||
@ECSComponent('CmdBuf_VelocityComponent')
|
||||
class VelocityComponent extends Component {
|
||||
public vx: number = 0;
|
||||
public vy: number = 0;
|
||||
|
||||
@@ -3,9 +3,10 @@ import { Entity } from '../../../src/ECS/Entity';
|
||||
import { Component } from '../../../src/ECS/Component';
|
||||
import { EntitySystem } from '../../../src/ECS/Systems/EntitySystem';
|
||||
import { Matcher } from '../../../src/ECS/Utils/Matcher';
|
||||
import { ComponentRegistry } from '../../../src/ECS/Core/ComponentStorage';
|
||||
import { ECSComponent } from '../../../src/ECS/Decorators';
|
||||
|
||||
// 简单的测试组件
|
||||
@ECSComponent('MinSysInit_HealthComponent')
|
||||
class HealthComponent extends Component {
|
||||
public health: number;
|
||||
|
||||
@@ -34,7 +35,6 @@ describe('MinimalSystemInit - 最小化系统初始化测试', () => {
|
||||
let scene: Scene;
|
||||
|
||||
beforeEach(() => {
|
||||
ComponentRegistry.reset();
|
||||
scene = new Scene();
|
||||
});
|
||||
|
||||
@@ -52,7 +52,6 @@ describe('MinimalSystemInit - 最小化系统初始化测试', () => {
|
||||
entity.addComponent(new HealthComponent(100));
|
||||
|
||||
console.log('[Test] Entity created with HealthComponent');
|
||||
console.log('[Test] ComponentRegistry registered types:', ComponentRegistry.getRegisteredCount());
|
||||
|
||||
// 2. 验证QuerySystem能查询到实体
|
||||
const queryResult = scene.querySystem.queryAll(HealthComponent);
|
||||
|
||||
@@ -3,9 +3,10 @@ import { Entity } from '../../../src/ECS/Entity';
|
||||
import { Component } from '../../../src/ECS/Component';
|
||||
import { EntitySystem } from '../../../src/ECS/Systems/EntitySystem';
|
||||
import { Matcher } from '../../../src/ECS/Utils/Matcher';
|
||||
import { ComponentRegistry } from '../../../src/ECS/Core/ComponentStorage';
|
||||
import { ECSComponent } from '../../../src/ECS/Decorators';
|
||||
|
||||
// 测试组件
|
||||
@ECSComponent('MultiSysInit_PositionComponent')
|
||||
class PositionComponent extends Component {
|
||||
public x: number;
|
||||
public y: number;
|
||||
@@ -18,6 +19,7 @@ class PositionComponent extends Component {
|
||||
}
|
||||
}
|
||||
|
||||
@ECSComponent('MultiSysInit_VelocityComponent')
|
||||
class VelocityComponent extends Component {
|
||||
public vx: number;
|
||||
public vy: number;
|
||||
@@ -30,6 +32,7 @@ class VelocityComponent extends Component {
|
||||
}
|
||||
}
|
||||
|
||||
@ECSComponent('MultiSysInit_HealthComponent')
|
||||
class HealthComponent extends Component {
|
||||
public health: number;
|
||||
|
||||
@@ -71,7 +74,6 @@ describe('MultiSystemInit - 多系统初始化测试', () => {
|
||||
let scene: Scene;
|
||||
|
||||
beforeEach(() => {
|
||||
ComponentRegistry.reset();
|
||||
scene = new Scene();
|
||||
});
|
||||
|
||||
@@ -91,7 +93,6 @@ describe('MultiSystemInit - 多系统初始化测试', () => {
|
||||
entity.addComponent(new HealthComponent(100));
|
||||
|
||||
console.log('[Test] Entity created with Position, Velocity, Health');
|
||||
console.log('[Test] ComponentRegistry registered types:', ComponentRegistry.getRegisteredCount());
|
||||
|
||||
// 2. 验证QuerySystem能查询到实体
|
||||
const movementQuery = scene.querySystem.queryAll(PositionComponent, VelocityComponent);
|
||||
|
||||
@@ -3,12 +3,14 @@ import { Entity } from '../../../src/ECS/Entity';
|
||||
import { Component } from '../../../src/ECS/Component';
|
||||
import { ComponentRegistry, ComponentType } from '../../../src/ECS/Core/ComponentStorage';
|
||||
import { Scene } from '../../../src/ECS/Scene';
|
||||
import { ECSComponent } from '../../../src/ECS/Decorators';
|
||||
|
||||
// 测试组件
|
||||
@ECSComponent('QuerySys_PositionComponent')
|
||||
class PositionComponent extends Component {
|
||||
public x: number;
|
||||
public y: number;
|
||||
|
||||
|
||||
constructor(...args: unknown[]) {
|
||||
super();
|
||||
const [x = 0, y = 0] = args as [number?, number?];
|
||||
@@ -17,10 +19,11 @@ class PositionComponent extends Component {
|
||||
}
|
||||
}
|
||||
|
||||
@ECSComponent('QuerySys_VelocityComponent')
|
||||
class VelocityComponent extends Component {
|
||||
public vx: number;
|
||||
public vy: number;
|
||||
|
||||
|
||||
constructor(...args: unknown[]) {
|
||||
super();
|
||||
const [vx = 0, vy = 0] = args as [number?, number?];
|
||||
@@ -29,10 +32,11 @@ class VelocityComponent extends Component {
|
||||
}
|
||||
}
|
||||
|
||||
@ECSComponent('QuerySys_HealthComponent')
|
||||
class HealthComponent extends Component {
|
||||
public health: number;
|
||||
public maxHealth: number;
|
||||
|
||||
|
||||
constructor(...args: unknown[]) {
|
||||
super();
|
||||
const [health = 100, maxHealth = 100] = args as [number?, number?];
|
||||
@@ -41,10 +45,11 @@ class HealthComponent extends Component {
|
||||
}
|
||||
}
|
||||
|
||||
@ECSComponent('QuerySys_RenderComponent')
|
||||
class RenderComponent extends Component {
|
||||
public visible: boolean;
|
||||
public layer: number;
|
||||
|
||||
|
||||
constructor(...args: unknown[]) {
|
||||
super();
|
||||
const [visible = true, layer = 0] = args as [boolean?, number?];
|
||||
@@ -53,9 +58,10 @@ class RenderComponent extends Component {
|
||||
}
|
||||
}
|
||||
|
||||
@ECSComponent('QuerySys_AIComponent')
|
||||
class AIComponent extends Component {
|
||||
public behavior: string;
|
||||
|
||||
|
||||
constructor(...args: unknown[]) {
|
||||
super();
|
||||
const [behavior = 'idle'] = args as [string?];
|
||||
@@ -63,9 +69,10 @@ class AIComponent extends Component {
|
||||
}
|
||||
}
|
||||
|
||||
@ECSComponent('QuerySys_PhysicsComponent')
|
||||
class PhysicsComponent extends Component {
|
||||
public mass: number;
|
||||
|
||||
|
||||
constructor(...args: unknown[]) {
|
||||
super();
|
||||
const [mass = 1.0] = args as [number?];
|
||||
|
||||
@@ -3,7 +3,9 @@ import { ReferenceTracker } from '../../../src/ECS/Core/ReferenceTracker';
|
||||
import { Component } from '../../../src/ECS/Component';
|
||||
import { Entity } from '../../../src/ECS/Entity';
|
||||
import { Scene } from '../../../src/ECS/Scene';
|
||||
import { ECSComponent } from '../../../src/ECS/Decorators';
|
||||
|
||||
@ECSComponent('RefTrackerTestComponent')
|
||||
class TestComponent extends Component {
|
||||
public target: Entity | null = null;
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ import { Entity } from '../../../src/ECS/Entity';
|
||||
import { Component } from '../../../src/ECS/Component';
|
||||
import { EntitySystem } from '../../../src/ECS/Systems/EntitySystem';
|
||||
import { Matcher } from '../../../src/ECS/Utils/Matcher';
|
||||
import { ECSComponent } from '../../../src/ECS/Decorators';
|
||||
|
||||
/**
|
||||
* System初始化测试套件
|
||||
@@ -15,6 +16,7 @@ import { Matcher } from '../../../src/ECS/Utils/Matcher';
|
||||
*/
|
||||
|
||||
// 测试组件
|
||||
@ECSComponent('SysInit_PositionComponent')
|
||||
class PositionComponent extends Component {
|
||||
public x: number;
|
||||
public y: number;
|
||||
@@ -27,6 +29,7 @@ class PositionComponent extends Component {
|
||||
}
|
||||
}
|
||||
|
||||
@ECSComponent('SysInit_VelocityComponent')
|
||||
class VelocityComponent extends Component {
|
||||
public vx: number;
|
||||
public vy: number;
|
||||
@@ -39,6 +42,7 @@ class VelocityComponent extends Component {
|
||||
}
|
||||
}
|
||||
|
||||
@ECSComponent('SysInit_HealthComponent')
|
||||
class HealthComponent extends Component {
|
||||
public health: number;
|
||||
|
||||
@@ -49,6 +53,7 @@ class HealthComponent extends Component {
|
||||
}
|
||||
}
|
||||
|
||||
@ECSComponent('SysInit_TagComponent')
|
||||
class TagComponent extends Component {
|
||||
public tag: string;
|
||||
|
||||
@@ -59,6 +64,7 @@ class TagComponent extends Component {
|
||||
}
|
||||
}
|
||||
|
||||
@ECSComponent('SysInit_TestComponent')
|
||||
class TestComponent extends Component {
|
||||
public value: number;
|
||||
|
||||
|
||||
@@ -7,8 +7,10 @@ import { EntitySystem } from '../../../src/ECS/Systems/EntitySystem';
|
||||
import { Component } from '../../../src/ECS/Component';
|
||||
import { Matcher } from '../../../src/ECS/Utils/Matcher';
|
||||
import { Entity } from '../../../src/ECS/Entity';
|
||||
import { ECSComponent } from '../../../src/ECS/Decorators';
|
||||
|
||||
// 测试用组件
|
||||
@ECSComponent('WorldCore_TestComponent')
|
||||
class TestComponent extends Component {
|
||||
public value: number = 0;
|
||||
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
import { Entity } from '../../src/ECS/Entity';
|
||||
import { Component } from '../../src/ECS/Component';
|
||||
import { Scene } from '../../src/ECS/Scene';
|
||||
import { ECSComponent } from '../../src/ECS/Decorators';
|
||||
|
||||
// 测试组件类
|
||||
@ECSComponent('EntityTest_PositionComponent')
|
||||
class TestPositionComponent extends Component {
|
||||
public x: number = 0;
|
||||
public y: number = 0;
|
||||
|
||||
|
||||
constructor(...args: unknown[]) {
|
||||
super();
|
||||
const [x = 0, y = 0] = args as [number?, number?];
|
||||
@@ -15,9 +17,10 @@ class TestPositionComponent extends Component {
|
||||
}
|
||||
}
|
||||
|
||||
@ECSComponent('EntityTest_HealthComponent')
|
||||
class TestHealthComponent extends Component {
|
||||
public health: number = 100;
|
||||
|
||||
|
||||
constructor(...args: unknown[]) {
|
||||
super();
|
||||
const [health = 100] = args as [number?];
|
||||
@@ -25,10 +28,11 @@ class TestHealthComponent extends Component {
|
||||
}
|
||||
}
|
||||
|
||||
@ECSComponent('EntityTest_VelocityComponent')
|
||||
class TestVelocityComponent extends Component {
|
||||
public vx: number = 0;
|
||||
public vy: number = 0;
|
||||
|
||||
|
||||
constructor(...args: unknown[]) {
|
||||
super();
|
||||
const [vx = 0, vy = 0] = args as [number?, number?];
|
||||
@@ -37,9 +41,10 @@ class TestVelocityComponent extends Component {
|
||||
}
|
||||
}
|
||||
|
||||
@ECSComponent('EntityTest_RenderComponent')
|
||||
class TestRenderComponent extends Component {
|
||||
public visible: boolean = true;
|
||||
|
||||
|
||||
constructor(...args: unknown[]) {
|
||||
super();
|
||||
const [visible = true] = args as [boolean?];
|
||||
@@ -267,8 +272,8 @@ describe('Entity - 组件缓存优化测试', () => {
|
||||
expect(debugInfo.name).toBe('TestEntity');
|
||||
expect(debugInfo.id).toBeGreaterThanOrEqual(0);
|
||||
expect(debugInfo.componentCount).toBe(2);
|
||||
expect(debugInfo.componentTypes).toContain('TestPositionComponent');
|
||||
expect(debugInfo.componentTypes).toContain('TestHealthComponent');
|
||||
expect(debugInfo.componentTypes).toContain('EntityTest_PositionComponent');
|
||||
expect(debugInfo.componentTypes).toContain('EntityTest_HealthComponent');
|
||||
expect(debugInfo.cacheBuilt).toBe(true);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -6,20 +6,23 @@ import { Matcher } from '../../src/ECS/Utils/Matcher';
|
||||
import { Injectable, InjectProperty } from '../../src/Core/DI';
|
||||
import { Core } from '../../src/Core';
|
||||
import type { IService } from '../../src/Core/ServiceContainer';
|
||||
import { ECSSystem } from '../../src/ECS/Decorators';
|
||||
import { ECSSystem, ECSComponent } from '../../src/ECS/Decorators';
|
||||
|
||||
@ECSComponent('DI_Transform')
|
||||
class Transform extends Component {
|
||||
constructor(public x: number = 0, public y: number = 0) {
|
||||
super();
|
||||
}
|
||||
}
|
||||
|
||||
@ECSComponent('DI_Velocity')
|
||||
class Velocity extends Component {
|
||||
constructor(public vx: number = 0, public vy: number = 0) {
|
||||
super();
|
||||
}
|
||||
}
|
||||
|
||||
@ECSComponent('DI_Health')
|
||||
class Health extends Component {
|
||||
constructor(public value: number = 100) {
|
||||
super();
|
||||
|
||||
@@ -3,8 +3,10 @@ import { Component } from '../../src/ECS/Component';
|
||||
import { Scene } from '../../src/ECS/Scene';
|
||||
import { SceneManager } from '../../src/ECS/SceneManager';
|
||||
import { EEntityLifecyclePolicy } from '../../src/ECS/Core/EntityLifecyclePolicy';
|
||||
import { ECSComponent } from '../../src/ECS/Decorators';
|
||||
|
||||
// 测试组件
|
||||
@ECSComponent('Persistent_PositionComponent')
|
||||
class PositionComponent extends Component {
|
||||
public x: number;
|
||||
public y: number;
|
||||
@@ -16,6 +18,7 @@ class PositionComponent extends Component {
|
||||
}
|
||||
}
|
||||
|
||||
@ECSComponent('Persistent_PlayerComponent')
|
||||
class PlayerComponent extends Component {
|
||||
public name: string;
|
||||
public score: number;
|
||||
@@ -27,6 +30,7 @@ class PlayerComponent extends Component {
|
||||
}
|
||||
}
|
||||
|
||||
@ECSComponent('Persistent_EnemyComponent')
|
||||
class EnemyComponent extends Component {
|
||||
public type: string;
|
||||
|
||||
|
||||
@@ -3,12 +3,14 @@ import { Entity } from '../../src/ECS/Entity';
|
||||
import { Component } from '../../src/ECS/Component';
|
||||
import { EntitySystem } from '../../src/ECS/Systems/EntitySystem';
|
||||
import { Matcher } from '../../src/ECS/Utils/Matcher';
|
||||
import { ECSComponent } from '../../src/ECS/Decorators';
|
||||
|
||||
// 测试组件
|
||||
@ECSComponent('SceneTest_PositionComponent')
|
||||
class PositionComponent extends Component {
|
||||
public x: number;
|
||||
public y: number;
|
||||
|
||||
|
||||
constructor(...args: unknown[]) {
|
||||
super();
|
||||
const [x = 0, y = 0] = args as [number?, number?];
|
||||
@@ -17,10 +19,11 @@ class PositionComponent extends Component {
|
||||
}
|
||||
}
|
||||
|
||||
@ECSComponent('SceneTest_VelocityComponent')
|
||||
class VelocityComponent extends Component {
|
||||
public vx: number;
|
||||
public vy: number;
|
||||
|
||||
|
||||
constructor(...args: unknown[]) {
|
||||
super();
|
||||
const [vx = 0, vy = 0] = args as [number?, number?];
|
||||
@@ -29,9 +32,10 @@ class VelocityComponent extends Component {
|
||||
}
|
||||
}
|
||||
|
||||
@ECSComponent('SceneTest_HealthComponent')
|
||||
class HealthComponent extends Component {
|
||||
public health: number;
|
||||
|
||||
|
||||
constructor(...args: unknown[]) {
|
||||
super();
|
||||
const [health = 100] = args as [number?];
|
||||
@@ -39,9 +43,10 @@ class HealthComponent extends Component {
|
||||
}
|
||||
}
|
||||
|
||||
@ECSComponent('SceneTest_RenderComponent')
|
||||
class RenderComponent extends Component {
|
||||
public visible: boolean;
|
||||
|
||||
|
||||
constructor(...args: unknown[]) {
|
||||
super();
|
||||
const [visible = true] = args as [boolean?];
|
||||
@@ -387,7 +392,7 @@ describe('Scene - 场景管理系统测试', () => {
|
||||
entity.addComponent(new PositionComponent(10, 20));
|
||||
|
||||
expect(componentAddedEvent).toBeDefined();
|
||||
expect(componentAddedEvent.componentType).toBe('PositionComponent');
|
||||
expect(componentAddedEvent.componentType).toBe('SceneTest_PositionComponent');
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@ import { SceneSerializer } from '../../../src/ECS/Serialization/SceneSerializer'
|
||||
import { Scene } from '../../../src/ECS/Scene';
|
||||
import { Component } from '../../../src/ECS/Component';
|
||||
import { HierarchySystem } from '../../../src/ECS/Systems/HierarchySystem';
|
||||
import { HierarchyComponent } from '../../../src/ECS/Components/HierarchyComponent';
|
||||
import { ECSComponent } from '../../../src/ECS/Decorators';
|
||||
import { ComponentRegistry, ComponentType } from '../../../src/ECS/Core/ComponentStorage';
|
||||
import { Serializable, Serialize } from '../../../src/ECS/Serialization';
|
||||
@@ -37,10 +38,6 @@ describe('SceneSerializer', () => {
|
||||
let componentRegistry: Map<string, ComponentType>;
|
||||
|
||||
beforeEach(() => {
|
||||
ComponentRegistry.reset();
|
||||
ComponentRegistry.register(PositionComponent);
|
||||
ComponentRegistry.register(VelocityComponent);
|
||||
|
||||
scene = new Scene({ name: 'SceneSerializerTestScene' });
|
||||
|
||||
componentRegistry = ComponentRegistry.getAllComponentNames() as Map<string, ComponentType>;
|
||||
|
||||
@@ -5,8 +5,10 @@ import { Scene } from '../../../src/ECS/Scene';
|
||||
import { Matcher } from '../../../src/ECS/Utils/Matcher';
|
||||
import { GlobalEventBus } from '../../../src/ECS/Core/EventBus';
|
||||
import { TypeSafeEventSystem } from '../../../src/ECS/Core/EventSystem';
|
||||
import { ECSComponent } from '../../../src/ECS/Decorators';
|
||||
|
||||
// 测试组件
|
||||
@ECSComponent('EntitySysTest_TestComponent')
|
||||
class TestComponent extends Component {
|
||||
public value: number = 0;
|
||||
|
||||
@@ -17,6 +19,45 @@ class TestComponent extends Component {
|
||||
}
|
||||
}
|
||||
|
||||
// 额外测试组件 - 用于内联测试
|
||||
@ECSComponent('EntitySysTest_TagComponent2')
|
||||
class TagComponent2 extends Component {}
|
||||
|
||||
@ECSComponent('EntitySysTest_NonExistent')
|
||||
class NonExistentComponent extends Component {}
|
||||
|
||||
@ECSComponent('EntitySysTest_ClickComponent')
|
||||
class ClickComponent extends Component {
|
||||
public element: string;
|
||||
constructor(element: string = '') {
|
||||
super();
|
||||
this.element = element;
|
||||
}
|
||||
}
|
||||
|
||||
@ECSComponent('EntitySysTest_A')
|
||||
class AComponent extends Component {}
|
||||
|
||||
@ECSComponent('EntitySysTest_B')
|
||||
class BComponent extends Component {}
|
||||
|
||||
@ECSComponent('EntitySysTest_C')
|
||||
class CComponent extends Component {
|
||||
public aId: number;
|
||||
public bId: number;
|
||||
constructor(aId: number = 0, bId: number = 0) {
|
||||
super();
|
||||
this.aId = aId;
|
||||
this.bId = bId;
|
||||
}
|
||||
}
|
||||
|
||||
@ECSComponent('EntitySysTest_D')
|
||||
class DComponent extends Component {}
|
||||
|
||||
@ECSComponent('EntitySysTest_TagComponent')
|
||||
class TagComponent extends TestComponent {}
|
||||
|
||||
// 测试事件
|
||||
interface TestEvent {
|
||||
id: number;
|
||||
@@ -441,13 +482,8 @@ describe('EntitySystem', () => {
|
||||
});
|
||||
|
||||
it('在系统 process 中添加组件时应立即触发其他系统的 onAdded', () => {
|
||||
// 使用独立的场景,避免 beforeEach 创建的实体干扰
|
||||
// Use independent scene to avoid interference from beforeEach entities
|
||||
const testScene = new Scene();
|
||||
|
||||
// 组件定义
|
||||
class TagComponent extends TestComponent {}
|
||||
|
||||
// SystemA: 匹配 TestComponent + TagComponent
|
||||
class SystemA extends EntitySystem {
|
||||
public onAddedEntities: Entity[] = [];
|
||||
@@ -499,12 +535,8 @@ describe('EntitySystem', () => {
|
||||
});
|
||||
|
||||
it('同一帧内添加后移除组件,onAdded 和 onRemoved 都应触发', () => {
|
||||
// 使用独立的场景,避免 beforeEach 创建的实体干扰
|
||||
// Use independent scene to avoid interference from beforeEach entities
|
||||
const testScene = new Scene();
|
||||
|
||||
class TagComponent extends TestComponent {}
|
||||
|
||||
class TrackingSystemWithTag extends EntitySystem {
|
||||
public onAddedEntities: Entity[] = [];
|
||||
public onRemovedEntities: Entity[] = [];
|
||||
@@ -585,9 +617,8 @@ describe('EntitySystem', () => {
|
||||
// Use independent scene to avoid interference from beforeEach entities
|
||||
const testScene = new Scene();
|
||||
|
||||
// 使用独立的组件类,避免继承带来的问题
|
||||
// Use independent component class to avoid inheritance issues
|
||||
class TagComponent2 extends Component {}
|
||||
// 使用文件顶部定义的 TagComponent2
|
||||
// Use TagComponent2 defined at file top
|
||||
|
||||
class SystemA extends EntitySystem {
|
||||
public onAddedEntities: Entity[] = [];
|
||||
@@ -747,8 +778,7 @@ describe('EntitySystem', () => {
|
||||
});
|
||||
|
||||
it('requireComponent 应该在组件不存在时抛出错误', () => {
|
||||
class NonExistentComponent extends Component {}
|
||||
|
||||
// 使用文件顶部定义的 NonExistentComponent
|
||||
expect(() => {
|
||||
helperSystem.testRequireComponent(entity, NonExistentComponent);
|
||||
}).toThrow();
|
||||
@@ -834,13 +864,7 @@ describe('EntitySystem', () => {
|
||||
// 使用独立场景 | Use independent scene
|
||||
const testScene = new Scene();
|
||||
|
||||
class ClickComponent extends Component {
|
||||
public element: string;
|
||||
constructor(element: string) {
|
||||
super();
|
||||
this.element = element;
|
||||
}
|
||||
}
|
||||
// 使用文件顶部定义的 ClickComponent
|
||||
|
||||
const testEntity = testScene.createEntity('panel');
|
||||
|
||||
@@ -858,13 +882,7 @@ describe('EntitySystem', () => {
|
||||
// 使用独立场景 | Use independent scene
|
||||
const testScene = new Scene();
|
||||
|
||||
class ClickComponent extends Component {
|
||||
public element: string;
|
||||
constructor(element: string) {
|
||||
super();
|
||||
this.element = element;
|
||||
}
|
||||
}
|
||||
// 使用文件顶部定义的 ClickComponent
|
||||
|
||||
// 添加一个监听该组件的系统 | Add a system that listens to this component
|
||||
class ClickSystem extends EntitySystem {
|
||||
@@ -903,13 +921,7 @@ describe('EntitySystem', () => {
|
||||
// 使用独立场景 | Use independent scene
|
||||
const testScene = new Scene();
|
||||
|
||||
class ClickComponent extends Component {
|
||||
public element: string;
|
||||
constructor(element: string) {
|
||||
super();
|
||||
this.element = element;
|
||||
}
|
||||
}
|
||||
// 使用文件顶部定义的 ClickComponent
|
||||
|
||||
// 这个系统在 onAdded 中移除组件(模拟可能的用户代码)
|
||||
// This system removes component in onAdded (simulating possible user code)
|
||||
@@ -950,25 +962,14 @@ describe('EntitySystem', () => {
|
||||
// 模拟 lawn-mower-demo 的场景 | Simulate lawn-mower-demo scenario
|
||||
const testScene = new Scene();
|
||||
|
||||
// 组件定义 | Component definitions
|
||||
class A extends Component {}
|
||||
class B extends Component {}
|
||||
class C extends Component {
|
||||
public aId: number;
|
||||
public bId: number;
|
||||
constructor(aId: number, bId: number) {
|
||||
super();
|
||||
this.aId = aId;
|
||||
this.bId = bId;
|
||||
}
|
||||
}
|
||||
class D extends Component {}
|
||||
// 使用顶层已装饰的组件类 | Use top-level decorated component classes
|
||||
// AComponent, BComponent, CComponent, DComponent
|
||||
|
||||
// ASystem: 匹配 A + D | Matches A + D
|
||||
class ASystem extends EntitySystem {
|
||||
public onAddedEntities: Entity[] = [];
|
||||
constructor() {
|
||||
super(Matcher.all(A, D));
|
||||
super(Matcher.all(AComponent, DComponent));
|
||||
}
|
||||
protected override onAdded(entity: Entity): void {
|
||||
console.log('ASystem onAdded:', entity.name);
|
||||
@@ -980,7 +981,7 @@ describe('EntitySystem', () => {
|
||||
class BSystem extends EntitySystem {
|
||||
public onAddedEntities: Entity[] = [];
|
||||
constructor() {
|
||||
super(Matcher.all(B, D));
|
||||
super(Matcher.all(BComponent, DComponent));
|
||||
}
|
||||
protected override onAdded(entity: Entity): void {
|
||||
console.log('BSystem onAdded:', entity.name);
|
||||
@@ -992,21 +993,21 @@ describe('EntitySystem', () => {
|
||||
// CSystem: Adds D component to A and B entities in process
|
||||
class CSystem extends EntitySystem {
|
||||
constructor() {
|
||||
super(Matcher.all(C));
|
||||
super(Matcher.all(CComponent));
|
||||
}
|
||||
protected override process(entities: readonly Entity[]): void {
|
||||
for (const entity of entities) {
|
||||
const c = entity.getComponent(C);
|
||||
const c = entity.getComponent(CComponent);
|
||||
if (c) {
|
||||
const a = this.scene!.findEntityById(c.aId);
|
||||
if (a && !a.hasComponent(D)) {
|
||||
if (a && !a.hasComponent(DComponent)) {
|
||||
console.log('CSystem: Adding D to Entity A');
|
||||
a.addComponent(new D());
|
||||
a.addComponent(new DComponent());
|
||||
}
|
||||
const b = this.scene!.findEntityById(c.bId);
|
||||
if (b && !b.hasComponent(D)) {
|
||||
if (b && !b.hasComponent(DComponent)) {
|
||||
console.log('CSystem: Adding D to Entity B');
|
||||
b.addComponent(new D());
|
||||
b.addComponent(new DComponent());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1015,17 +1016,17 @@ describe('EntitySystem', () => {
|
||||
|
||||
// DSystem: 在 lateProcess 中移除 D 组件
|
||||
// DSystem: Removes D component in lateProcess
|
||||
class DSystem extends EntitySystem {
|
||||
class DSystemImpl extends EntitySystem {
|
||||
public lateProcessEntities: Entity[] = [];
|
||||
constructor() {
|
||||
super(Matcher.all(D));
|
||||
super(Matcher.all(DComponent));
|
||||
}
|
||||
protected override lateProcess(entities: readonly Entity[]): void {
|
||||
console.log('DSystem lateProcess, entities count:', entities.length);
|
||||
for (const entity of entities) {
|
||||
console.log('DSystem removing D from:', entity.name);
|
||||
this.lateProcessEntities.push(entity);
|
||||
const d = entity.getComponent(D);
|
||||
const d = entity.getComponent(DComponent);
|
||||
if (d) {
|
||||
entity.removeComponent(d);
|
||||
}
|
||||
@@ -1038,7 +1039,7 @@ describe('EntitySystem', () => {
|
||||
const aSystem = new ASystem();
|
||||
const bSystem = new BSystem();
|
||||
const cSystem = new CSystem();
|
||||
const dSystem = new DSystem();
|
||||
const dSystem = new DSystemImpl();
|
||||
|
||||
testScene.addSystem(aSystem);
|
||||
testScene.addSystem(bSystem);
|
||||
@@ -1047,13 +1048,13 @@ describe('EntitySystem', () => {
|
||||
|
||||
// 创建实体 | Create entities
|
||||
const entity1 = testScene.createEntity('Entity1');
|
||||
entity1.addComponent(new A());
|
||||
entity1.addComponent(new AComponent());
|
||||
|
||||
const entity2 = testScene.createEntity('Entity2');
|
||||
entity2.addComponent(new B());
|
||||
entity2.addComponent(new BComponent());
|
||||
|
||||
const entity3 = testScene.createEntity('Entity3');
|
||||
entity3.addComponent(new C(entity1.id, entity2.id));
|
||||
entity3.addComponent(new CComponent(entity1.id, entity2.id));
|
||||
|
||||
// 执行一帧 | Execute one frame
|
||||
testScene.update();
|
||||
@@ -1071,8 +1072,8 @@ describe('EntitySystem', () => {
|
||||
|
||||
// D 组件应该在 lateProcess 中被移除
|
||||
// D component should be removed in lateProcess
|
||||
expect(entity1.hasComponent(D)).toBe(false);
|
||||
expect(entity2.hasComponent(D)).toBe(false);
|
||||
expect(entity1.hasComponent(DComponent)).toBe(false);
|
||||
expect(entity2.hasComponent(DComponent)).toBe(false);
|
||||
|
||||
testScene.removeSystem(aSystem);
|
||||
testScene.removeSystem(bSystem);
|
||||
|
||||
@@ -2,26 +2,31 @@ import { ComponentSparseSet } from '../../../src/ECS/Utils/ComponentSparseSet';
|
||||
import { Entity } from '../../../src/ECS/Entity';
|
||||
import { Component } from '../../../src/ECS/Component';
|
||||
import { Scene } from '../../../src/ECS/Scene';
|
||||
import { ECSComponent } from '../../../src/ECS/Decorators';
|
||||
|
||||
// 测试组件类
|
||||
@ECSComponent('SparseSet_PositionComponent')
|
||||
class PositionComponent extends Component {
|
||||
constructor(public x: number = 0, public y: number = 0) {
|
||||
super();
|
||||
}
|
||||
}
|
||||
|
||||
@ECSComponent('SparseSet_VelocityComponent')
|
||||
class VelocityComponent extends Component {
|
||||
constructor(public dx: number = 0, public dy: number = 0) {
|
||||
super();
|
||||
}
|
||||
}
|
||||
|
||||
@ECSComponent('SparseSet_HealthComponent')
|
||||
class HealthComponent extends Component {
|
||||
constructor(public health: number = 100, public maxHealth: number = 100) {
|
||||
super();
|
||||
}
|
||||
}
|
||||
|
||||
@ECSComponent('SparseSet_RenderComponent')
|
||||
class RenderComponent extends Component {
|
||||
constructor(public visible: boolean = true) {
|
||||
super();
|
||||
|
||||
@@ -5,20 +5,23 @@ import { Entity } from '../../src/ECS/Entity';
|
||||
import { Component } from '../../src/ECS/Component';
|
||||
import { Matcher } from '../../src/ECS/Utils/Matcher';
|
||||
import { IService } from '../../src/Core/ServiceContainer';
|
||||
import { ECSComponent } from '../../src/ECS/Decorators';
|
||||
|
||||
// 测试用组件
|
||||
@ECSComponent('WorldTest_TestComponent')
|
||||
class TestComponent extends Component {
|
||||
public value: number = 0;
|
||||
|
||||
|
||||
constructor(value: number = 0) {
|
||||
super();
|
||||
this.value = value;
|
||||
}
|
||||
}
|
||||
|
||||
@ECSComponent('WorldTest_PlayerComponent')
|
||||
class PlayerComponent extends Component {
|
||||
public playerId: string;
|
||||
|
||||
|
||||
constructor(playerId: string) {
|
||||
super();
|
||||
this.playerId = playerId;
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
import { WorldManager, IWorldManagerConfig } from '../../src/ECS/WorldManager';
|
||||
import { IWorldConfig, World } from '../../src/ECS/World';
|
||||
import { Component } from '../../src/ECS/Component';
|
||||
import { ECSComponent } from '../../src/ECS/Decorators';
|
||||
|
||||
// 测试用组件
|
||||
@ECSComponent('WorldMgr_TestComponent')
|
||||
class TestComponent extends Component {
|
||||
public value: number = 0;
|
||||
|
||||
|
||||
@@ -5,14 +5,16 @@ import { Component } from '../../src/ECS/Component';
|
||||
import { Matcher } from '../../src/ECS/Utils/Matcher';
|
||||
import { DebugPlugin } from '../../src/Plugins/DebugPlugin';
|
||||
import { Injectable } from '../../src/Core/DI';
|
||||
import { ECSSystem } from '../../src/ECS/Decorators';
|
||||
import { ECSSystem, ECSComponent } from '../../src/ECS/Decorators';
|
||||
import { EntitySystem } from '../../src/ECS/Systems/EntitySystem';
|
||||
|
||||
@ECSComponent('Debug_HealthComponent')
|
||||
class HealthComponent extends Component {
|
||||
public health: number = 100;
|
||||
public maxHealth: number = 100;
|
||||
}
|
||||
|
||||
@ECSComponent('Debug_PositionComponent')
|
||||
class PositionComponent extends Component {
|
||||
public x: number = 0;
|
||||
public y: number = 0;
|
||||
|
||||
@@ -5,7 +5,7 @@ import { HierarchySystem } from '../../../src/ECS/Systems/HierarchySystem';
|
||||
import { HierarchyComponent } from '../../../src/ECS/Components/HierarchyComponent';
|
||||
import { ECSComponent } from '../../../src/ECS/Decorators';
|
||||
|
||||
@ECSComponent('TestPosition')
|
||||
@ECSComponent('EDC_Position')
|
||||
class PositionComponent extends Component {
|
||||
public x: number = 0;
|
||||
public y: number = 0;
|
||||
@@ -17,12 +17,38 @@ class PositionComponent extends Component {
|
||||
}
|
||||
}
|
||||
|
||||
@ECSComponent('TestVelocity')
|
||||
@ECSComponent('EDC_Velocity')
|
||||
class VelocityComponent extends Component {
|
||||
public vx: number = 0;
|
||||
public vy: number = 0;
|
||||
}
|
||||
|
||||
@ECSComponent('EDC_ComponentWithPrivate')
|
||||
class ComponentWithPrivate extends Component {
|
||||
public publicValue: number = 1;
|
||||
private _privateValue: number = 2;
|
||||
}
|
||||
|
||||
@ECSComponent('EDC_ComponentWithNested')
|
||||
class ComponentWithNested extends Component {
|
||||
public nested = { value: 42 };
|
||||
}
|
||||
|
||||
@ECSComponent('EDC_ComponentWithArray')
|
||||
class ComponentWithArray extends Component {
|
||||
public items = [{ id: 1 }, { id: 2 }];
|
||||
}
|
||||
|
||||
@ECSComponent('EDC_ComponentWithLongString')
|
||||
class ComponentWithLongString extends Component {
|
||||
public longText = 'x'.repeat(300);
|
||||
}
|
||||
|
||||
@ECSComponent('EDC_ComponentWithLargeArray')
|
||||
class ComponentWithLargeArray extends Component {
|
||||
public items = Array.from({ length: 20 }, (_, i) => i);
|
||||
}
|
||||
|
||||
describe('EntityDataCollector', () => {
|
||||
let collector: EntityDataCollector;
|
||||
let scene: Scene;
|
||||
@@ -266,7 +292,7 @@ describe('EntityDataCollector', () => {
|
||||
const details = collector.extractComponentDetails([component]);
|
||||
|
||||
expect(details.length).toBe(1);
|
||||
expect(details[0].typeName).toBe('TestPosition');
|
||||
expect(details[0].typeName).toBe('EDC_Position');
|
||||
expect(details[0].properties.x).toBe(100);
|
||||
expect(details[0].properties.y).toBe(200);
|
||||
});
|
||||
@@ -277,11 +303,6 @@ describe('EntityDataCollector', () => {
|
||||
});
|
||||
|
||||
test('should skip private properties', () => {
|
||||
class ComponentWithPrivate extends Component {
|
||||
public publicValue: number = 1;
|
||||
private _privateValue: number = 2;
|
||||
}
|
||||
|
||||
const component = new ComponentWithPrivate();
|
||||
const details = collector.extractComponentDetails([component]);
|
||||
|
||||
@@ -340,10 +361,6 @@ describe('EntityDataCollector', () => {
|
||||
});
|
||||
|
||||
test('should expand object at path', () => {
|
||||
class ComponentWithNested extends Component {
|
||||
public nested = { value: 42 };
|
||||
}
|
||||
|
||||
const entity = scene.createEntity('Entity');
|
||||
entity.addComponent(new ComponentWithNested());
|
||||
|
||||
@@ -354,10 +371,6 @@ describe('EntityDataCollector', () => {
|
||||
});
|
||||
|
||||
test('should handle array index in path', () => {
|
||||
class ComponentWithArray extends Component {
|
||||
public items = [{ id: 1 }, { id: 2 }];
|
||||
}
|
||||
|
||||
const entity = scene.createEntity('Entity');
|
||||
entity.addComponent(new ComponentWithArray());
|
||||
|
||||
@@ -380,10 +393,6 @@ describe('EntityDataCollector', () => {
|
||||
});
|
||||
|
||||
test('should handle entity with long string properties', () => {
|
||||
class ComponentWithLongString extends Component {
|
||||
public longText = 'x'.repeat(300);
|
||||
}
|
||||
|
||||
const entity = scene.createEntity('Entity');
|
||||
entity.addComponent(new ComponentWithLongString());
|
||||
|
||||
@@ -393,10 +402,6 @@ describe('EntityDataCollector', () => {
|
||||
});
|
||||
|
||||
test('should handle entity with large arrays', () => {
|
||||
class ComponentWithLargeArray extends Component {
|
||||
public items = Array.from({ length: 20 }, (_, i) => i);
|
||||
}
|
||||
|
||||
const entity = scene.createEntity('Entity');
|
||||
entity.addComponent(new ComponentWithLargeArray());
|
||||
|
||||
|
||||
Reference in New Issue
Block a user