Skip to content
Open
Show file tree
Hide file tree
Changes from 13 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5445,6 +5445,8 @@ export declare interface IEditorService extends IServiceEvents {
export declare interface IEngineService extends IServiceEvents {
init(): Promise<void>;
repaintInEditMode(): Promise<void>;
pause(): void;
resume(): void;
}
export declare interface IExecuteComponentMethodOptions {
path: string;
Expand Down Expand Up @@ -5627,6 +5629,20 @@ export declare interface IPrefabStateInfo {
isNested: boolean;
assetUuid: string;
}
export declare interface IPreviewInstance {
onMouseDown(event: any): void;
onMouseMove(event: any): void;
onMouseUp(event: any): void;
onMouseWheel(event: any): void;
viewToggle(): void;
is2DView(): boolean;
resetCameraView(): void;
hide(): void;
}
export declare interface IPreviewService {
open(uuid: string): Promise<IPreviewInstance | null>;
generateThumbnail(uuid: string, assetType: string, width?: number, height?: number): Promise<any>;
}
export declare interface IProperty {
value: { [key: string]: IPropertyValueType } | IPropertyValueType;
default?: any;
Expand Down Expand Up @@ -5759,8 +5775,8 @@ export declare interface ISceneViewService {
saveConfig(): Promise<void>;
setSceneLightOn(enable: boolean): void;
querySceneLightOn(): boolean;
onSceneOpened(scene: any): void;
onSceneClosed(): void;
onEditorOpened(): void;
onEditorClosed(): void;
onComponentAdded(comp: Component): void;
onComponentRemoved(comp: Component): void;
}
Expand Down Expand Up @@ -5826,6 +5842,7 @@ export declare interface IServiceManager {
Camera: ICameraService;
Gizmo: IGizmoService;
SceneView: ISceneViewService;
Preview: IPreviewService;
UI: IUIService;
}
export declare interface ISetPropertyOptions {
Expand Down Expand Up @@ -7450,6 +7467,8 @@ export declare interface IEngineProjectConfig extends Exclude<IEngineConfig, 'in
export declare interface IEngineService extends IServiceEvents {
init(): Promise<void>;
repaintInEditMode(): Promise<void>;
pause(): void;
resume(): void;
}
export declare interface IExecuteComponentMethodOptions {
path: string;
Expand Down Expand Up @@ -7720,6 +7739,20 @@ export declare interface IPrefabStateInfo {
isNested: boolean;
assetUuid: string;
}
export declare interface IPreviewInstance {
onMouseDown(event: any): void;
onMouseMove(event: any): void;
onMouseUp(event: any): void;
onMouseWheel(event: any): void;
viewToggle(): void;
is2DView(): boolean;
resetCameraView(): void;
hide(): void;
}
export declare interface IPreviewService {
open(uuid: string): Promise<IPreviewInstance | null>;
generateThumbnail(uuid: string, assetType: string, width?: number, height?: number): Promise<any>;
}
export declare interface IProject {
get path(): string;
get type(): '2d' | '3d';
Expand Down Expand Up @@ -7865,8 +7898,8 @@ export declare interface ISceneViewService {
saveConfig(): Promise<void>;
setSceneLightOn(enable: boolean): void;
querySceneLightOn(): boolean;
onSceneOpened(scene: any): void;
onSceneClosed(): void;
onEditorOpened(): void;
onEditorClosed(): void;
onComponentAdded(comp: Component): void;
onComponentRemoved(comp: Component): void;
}
Expand Down Expand Up @@ -7932,6 +7965,7 @@ export declare interface IServiceManager {
Camera: ICameraService;
Gizmo: IGizmoService;
SceneView: ISceneViewService;
Preview: IPreviewService;
UI: IUIService;
}
export declare interface ISetPropertyOptions {
Expand Down
40 changes: 36 additions & 4 deletions src/core/assets/asset-handler/assets/effect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
buildLayoutGraphData,
getLayoutGraphDataVersion,
} from 'cc/editor/custom-pipeline';
import { existsSync, readFileSync, writeFileSync, ensureDir, readJSON, writeFile } from 'fs-extra';
import { existsSync, readFileSync, readdirSync, writeFileSync, ensureDir, readJSON, writeFile } from 'fs-extra';
import { basename, dirname, extname, join, relative, resolve } from 'path';
import { buildEffect, options, addChunk } from '../../effect-compiler';

Expand Down Expand Up @@ -276,11 +276,43 @@ export async function afterImport(force?: boolean) {
}
});
});
if (!effectList.length) {
console.debug('no effect to compile');
if (effectList.length) {
await recompileAllEffects(effectList, force);
return;
}
await recompileAllEffects(effectList, force);
// Fallback: scan pre-built .effect.meta files from each DB's target directory.
// The internal DB ships with a pre-built library so effect.bin can be generated
// even when the full import pipeline hasn't processed .effect files.
const fallbackEffects = collectPrebuiltEffects();
if (fallbackEffects.length) {
console.debug(`[effect] Using ${fallbackEffects.length} pre-built effect library files`);
await recompileAllEffects(fallbackEffects as any, force);
return;
}
console.debug('no effect to compile');
}

function collectPrebuiltEffects(): Array<{ imported: boolean; library: string }> {
const effects: Array<{ imported: boolean; library: string }> = [];
for (const dbInfo of assetConfig.data.assetDBList) {
if (!dbInfo.library) continue;
const effectsDir = join(dbInfo.target, 'effects');
if (!existsSync(effectsDir)) continue;
try {
const allFiles = readdirSync(effectsDir, { recursive: true, encoding: 'utf-8' });
for (const relFile of allFiles) {
if (!relFile.endsWith('.effect.meta')) continue;
try {
const meta = JSON.parse(readFileSync(join(effectsDir, relFile), 'utf-8'));
if (meta.importer !== 'effect' || !meta.imported || !meta.uuid) continue;
const libraryPath = join(dbInfo.library!, meta.uuid.substring(0, 2), meta.uuid);
if (!existsSync(libraryPath + '.json')) continue;
effects.push({ imported: true, library: libraryPath });
} catch { /* skip invalid meta */ }
}
} catch { /* skip inaccessible dirs */ }
}
return effects;
}

function forceRecompileEffects(file: string): boolean {
Expand Down
14 changes: 10 additions & 4 deletions src/core/assets/asset-handler/index.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
export async function compileEffect(force?: boolean) {
// TODO 暂不支持 effect 导入
// 需要做好容错,要保证能执行这个返回数据的函数,否则后续流启动程会被中断
const { afterImport } = await import('./assets/effect');
const { afterImport, autoGenEffectBinInfo } = await import('./assets/effect');
try {
await afterImport(force);
const { existsSync, statSync } = await import('fs-extra');
const binPath = autoGenEffectBinInfo.effectBinPath;
if (existsSync(binPath)) {
const size = statSync(binPath).size;
console.log(`[compileEffect] effect.bin generated: ${binPath} (${size} bytes)`);
} else {
console.warn(`[compileEffect] effect.bin NOT generated at: ${binPath}`);
}
} catch (error) {
console.error(error);
console.error('[compileEffect] Failed:', error);
}
}

Expand Down
2 changes: 2 additions & 0 deletions src/core/engine/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,8 @@ class EngineManager implements IEngine {
rendering: {
renderMode: 2,
highQualityMode: highQuality,
customPipeline: true,
effectSettingsPath: `${serverURL}/scripting/effect-settings`,
},
physics: {
...physicsConfig,
Expand Down
4 changes: 2 additions & 2 deletions src/core/scene/common/editor/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ export * from './scene';
* 事件类型
*/
export interface IEditorEvents {
'editor:open': [];
'editor:open': [scene?: any];
'editor:close': [];
'editor:save': [];
'editor:reload': [];
'editor:reload': [scene?: any];
}

/**
Expand Down
3 changes: 3 additions & 0 deletions src/core/scene/common/engine.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,7 @@ export interface IEngineService extends IServiceEvents {
* 让引擎执行一帧
*/
repaintInEditMode(): Promise<void>;

pause(): void;
resume(): void;
}
1 change: 1 addition & 0 deletions src/core/scene/common/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ export * from './undo';
export * from './camera';
export * from './gizmo';
export * from './scene-view';
export * from './preview';
export * from './ui';
37 changes: 37 additions & 0 deletions src/core/scene/common/preview.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
export interface IPreviewInstance {
onMouseDown(event: any): void;
onMouseMove(event: any): void;
onMouseUp(event: any): void;
onMouseWheel(event: any): void;
viewToggle(): void;
is2DView(): boolean;
resetCameraView(): void;
hide(): void;
}

export interface IMaterialPreviewInstance extends IPreviewInstance {
switchPrimitive(type: string): void;
setLightEnable(enabled: boolean): void;
}

export interface ISpinePreviewInstance extends IPreviewInstance {
play(): void;
pause(): void;
stop(): void;
setSkinIndex(index: number): void;
setAnimationIndex(index: number): void;
close(): void;
}

export interface IPreviewService {
open(uuid: string): Promise<IPreviewInstance | null>;
generateThumbnail(uuid: string, assetType: string, width?: number, height?: number): Promise<any>;
}

export type IPublicPreviewService = Pick<IPreviewService,
'open' | 'generateThumbnail'
>;

// eslint-disable-next-line @typescript-eslint/no-empty-object-type
export interface IPreviewEvents {
}
4 changes: 2 additions & 2 deletions src/core/scene/common/scene-view.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ export interface ISceneViewService {
saveConfig(): Promise<void>;
setSceneLightOn(enable: boolean): void;
querySceneLightOn(): boolean;
onSceneOpened(scene: any): void;
onSceneClosed(): void;
onEditorOpened(): void;
onEditorClosed(): void;
onComponentAdded(comp: Component): void;
onComponentRemoved(comp: Component): void;
}
Expand Down
8 changes: 7 additions & 1 deletion src/core/scene/main-process/proxy/engine-proxy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,11 @@ export const EngineProxy: IPublicEngineService = {
},
repaintInEditMode() {
return Rpc.getInstance().request('Engine', 'repaintInEditMode');
}
},
pause() {
Rpc.getInstance().request('Engine', 'pause');
},
resume() {
Rpc.getInstance().request('Engine', 'resume');
},
};
Loading
Loading