A fast 2D and 3D game engine — TypeScript SDK, C++/WebAssembly core, visual editor. Ship one project to web, desktop, WeChat MiniGames, playable ads, and native Android / iOS.
TypeScript 2d-game-engine3d3d-game-engineandroidcppecsgame-editorgame-enginegamedeviostypescriptwebassemblywebglwebgpuwechat-minigame
feat: implement asset importer pipeline with per-platform overrides
esengine66cbe2ce5ef4
diff --git a/editor/src/asset/AssetDatabase.ts b/editor/src/asset/AssetDatabase.tsindex 7ceb7a04f..74f4b0d4c 100644--- a/editor/src/asset/AssetDatabase.ts+++ b/editor/src/asset/AssetDatabase.ts@@ -10,6 +10,7 @@ import type { NativeFS, FileStats } from '../types/NativeFS';import { ASSET_EXTENSIONS, getAssetType } from './AssetTypes';import {type AssetMeta,+ type ImporterData,type TextureImporterSettings,createDefaultMeta,upgradeMeta,@@ -29,8 +30,8 @@ export interface AssetEntry {labels: Set<string>;address: string | null;group: string;- importer: Record<string, unknown>;- platformOverrides: Record<string, Record<string, unknown>>;+ importer: ImporterData;+ platformOverrides: Record<string, ImporterData>;fileSize: number;lastModified: number;}@@ -45,6 +46,8 @@ export function isUUID(value: string): boolean {// AssetDatabase// =============================================================================+export type AssetReimportListener = (uuid: string, path: string) => void;+export class AssetDatabase {private uuidToEntry_ = new Map<string, AssetEntry>();private pathToUuid_ = new Map<string, string>();@@ -54,6 +57,21 @@ export class AssetDatabase {private fs_: NativeFS | null = null;private projectDir_ = '';private groupService_: AssetGroupService | null = null;+ private reimportListeners_: AssetReimportListener[] = [];++ onReimport(listener: AssetReimportListener): () => void {+ this.reimportListeners_.push(listener);+ return () => {+ const idx = this.reimportListeners_.indexOf(listener);+ if (idx >= 0) this.reimportListeners_.splice(idx, 1);+ };+ }++ private emitReimport(uuid: string, path: string): void {+ for (const listener of this.reimportListeners_) {+ listener(uuid, path);+ }+ }async initialize(projectDir: string, fs: NativeFS): Promise<void> {console.log(`[AssetDatabase] initialize: projectDir="${projectDir}"`);@@ -231,7 +249,11 @@ export class AssetDatabase {this.groupIndex_.get(updates.group)!.add(uuid);}+ let importerChanged = false;if (updates.importer !== undefined) {+ const oldJson = JSON.stringify(entry.importer);+ const newJson = JSON.stringify(updates.importer);+ importerChanged = oldJson !== newJson;entry.importer = updates.importer;}@@ -240,6 +262,10 @@ export class AssetDatabase {}await this.writeMetaFile(entry);++ if (importerChanged) {+ this.emitReimport(uuid, entry.path);+ }}// =========================================================================@@ -352,7 +378,7 @@ export class AssetDatabase {getSliceBorder(uuid: string): { left: number; right: number; top: number; bottom: number } | null {const entry = this.uuidToEntry_.get(uuid);if (!entry || entry.type !== 'texture') return null;- const importer = entry.importer as unknown as TextureImporterSettings;+ const importer = entry.importer as TextureImporterSettings;return importer.sliceBorder ?? null;}diff --git a/editor/src/asset/AssetDependencyAnalyzer.ts b/editor/src/asset/AssetDependencyAnalyzer.tsindex a0a90e5ec..cd3ae590a 100644--- a/editor/src/asset/AssetDependencyAnalyzer.ts+++ b/editor/src/asset/AssetDependencyAnalyzer.ts@@ -9,6 +9,7 @@ import { looksLikeAssetPath } from './AssetTypes';import { joinPath, isAbsolutePath, getDirName } from '../utils/path';import type { NativeFS } from '../types/NativeFS';import { getAssetTypeEntry } from 'esengine';+import { parseAtlasTextures } from './importers/SpineAtlasParser';// =============================================================================// Types@@ -251,13 +252,10 @@ export class AssetDependencyAnalyzer {if (!content) return;const atlasDir = getDirName(atlasPath);- for (const rawLine of content.split('\n')) {- const line = rawLine.trim();- if (line && line.indexOf(':') === -1 && (/\.png$/i.test(line) || /\.jpg$/i.test(line))) {- const texturePath = atlasDir ? `${atlasDir}/${line}` : line;- const texUuid = this.assetDb_.getUuid(texturePath) ?? texturePath;- this.addEdge(dependencies, dependents, atlasUuid, texUuid);- }+ for (const texName of parseAtlasTextures(content)) {+ const texturePath = atlasDir ? `${atlasDir}/${texName}` : texName;+ const texUuid = this.assetDb_.getUuid(texturePath) ?? texturePath;+ this.addEdge(dependencies, dependents, atlasUuid, texUuid);}}diff --git a/editor/src/asset/AssetLoader.ts b/editor/src/asset/AssetLoader.tsindex b6c6370d2..e31b319b1 100644--- a/editor/src/asset/AssetLoader.ts+++ b/editor/src/asset/AssetLoader.ts@@ -8,6 +8,7 @@ import type { SpineModuleController } from 'esengine/spine';import type { AssetPathResolver } from './AssetPathResolver';import { getEditorContext } from '../context/EditorContext';import type { NativeFS } from '../types/NativeFS';+import { parseAtlasTextures } from './importers/SpineAtlasParser';interface DecodedImage {width: number;@@ -115,7 +116,7 @@ export class AssetLoader {state.atlas = true;const atlasDir = atlasPath.substring(0, atlasPath.lastIndexOf('/'));- const textureNames = this.parseAtlasTextures(atlasContent);+ const textureNames = parseAtlasTextures(atlasContent);for (const texName of textureNames) {const texPath = atlasDir ? `${atlasDir}/${texName}` : texName;@@ -169,7 +170,7 @@ export class AssetLoader {}const atlasDir = atlasPath.substring(0, atlasPath.lastIndexOf('/'));- const textureNames = this.parseAtlasTextures(atlasContent);+ const textureNames = parseAtlasTextures(atlasContent);const textureResults: { path: string; handle: number; width: number; height: number }[] = [];for (const texName of textureNames) {@@ -305,20 +306,6 @@ export class AssetLoader {}}- private parseAtlasTextures(atlasContent: string): string[] {- const textures: string[] = [];- const lines = atlasContent.split('\n');-- for (const line of lines) {- const trimmed = line.trim();- if (trimmed && !trimmed.includes(':') &&- (trimmed.endsWith('.png') || trimmed.endsWith('.jpg'))) {- textures.push(trimmed);- }- }-- return textures;- }private getNativeFS(): NativeFS | null {return getEditorContext().fs ?? null;diff --git a/editor/src/asset/ImporterRegistry.ts b/editor/src/asset/ImporterRegistry.tsindex 5b897f81c..3e5ea5134 100644--- a/editor/src/asset/ImporterRegistry.ts+++ b/editor/src/asset/ImporterRegistry.ts@@ -4,8 +4,15 @@*/import type { AssetEntry } from './AssetDatabase';+import type { ImporterData } from './ImporterTypes';import { TextureImporter } from './importers/TextureImporter';import { AudioImporter } from './importers/AudioImporter';+import { SpineImporter } from './importers/SpineImporter';+import { MaterialImporter } from './importers/MaterialImporter';+import { ShaderImporter } from './importers/ShaderImporter';+import { BitmapFontImporter } from './importers/BitmapFontImporter';+import { SceneImporter } from './importers/SceneImporter';+import { PrefabImporter } from './importers/PrefabImporter';// =============================================================================// Types@@ -24,7 +31,7 @@ export interface ImporterField {step?: number;}-export interface AssetImporter<T = Record<string, unknown>> {+export interface AssetImporter<T = ImporterData> {type: string;extensions: string[];defaultSettings(): T;@@ -32,6 +39,17 @@ export interface AssetImporter<T = Record<string, unknown>> {apply?(asset: AssetEntry, settings: T): void;}+// =============================================================================+// DefaultImporter+// =============================================================================++const defaultImporter: AssetImporter<ImporterData> = {+ type: 'default',+ extensions: [],+ defaultSettings() { return {}; },+ settingsUI() { return []; },+};+// =============================================================================// ImporterRegistry// =============================================================================@@ -51,21 +69,27 @@ class ImporterRegistryImpl {return this.importers_.get(type);}+ getOrDefault(type: string): AssetImporter<any> {+ return this.importers_.get(type) ?? defaultImporter;+ }+getByExtension(ext: string): AssetImporter<any> | undefined {const type = this.extToType_.get(ext);return type ? this.importers_.get(type) : undefined;}- getDefaultSettings(type: string): Record<string, unknown> {- const importer = this.importers_.get(type);- if (!importer) return {};- return importer.defaultSettings() as Record<string, unknown>;+ getByExtensionOrDefault(ext: string): AssetImporter<any> {+ return this.getByExtension(ext) ?? defaultImporter;+ }++ getDefaultSettings(type: string): ImporterData {+ return this.getOrDefault(type).defaultSettings();}- getSettingsUI(type: string, current: Record<string, unknown>): ImporterField[] {+ getSettingsUI(type: string, current: ImporterData): ImporterField[] {const importer = this.importers_.get(type);if (!importer) return [];- return importer.settingsUI(current as any);+ return importer.settingsUI(current);}getAllTypes(): string[] {@@ -84,6 +108,12 @@ export function getImporterRegistry(): ImporterRegistryImpl {registry = new ImporterRegistryImpl();registry.register(new TextureImporter());registry.register(new AudioImporter());+ registry.register(new SpineImporter());+ registry.register(new MaterialImporter());+ registry.register(new ShaderImporter());+ registry.register(new BitmapFontImporter());+ registry.register(new SceneImporter());+ registry.register(new PrefabImporter());}return registry;}diff --git a/editor/src/asset/ImporterTypes.ts b/editor/src/asset/ImporterTypes.tsindex c4d5c99a4..4f921ba8f 100644--- a/editor/src/asset/ImporterTypes.ts+++ b/editor/src/asset/ImporterTypes.ts@@ -21,11 +21,65 @@ export interface AudioImporterSettings {quality: number;}+export interface SpineImporterSettings {+ defaultSkin: string;+ premultiplyAlpha: boolean;+ scale: number;+}++export interface MaterialImporterSettings {+ // reserved+}++export interface ShaderImporterSettings {+ // reserved+}++export interface BitmapFontImporterSettings {+ fontSize: number;+}++export interface SceneImporterSettings {+ autoMigrate: boolean;+}++export interface PrefabImporterSettings {+ autoMigrate: boolean;+}+export type ImporterSettings =| TextureImporterSettings| AudioImporterSettings+ | SpineImporterSettings+ | BitmapFontImporterSettings+ | SceneImporterSettings+ | PrefabImporterSettings| Record<string, unknown>;+// eslint-disable-next-line @typescript-eslint/no-explicit-any+export type ImporterData = Record<string, any>;++// =============================================================================+// Platform Override+// =============================================================================++export type ImporterPlatform = 'playable' | 'wechat';++export const IMPORTER_PLATFORMS: { id: ImporterPlatform; label: string }[] = [+ { id: 'playable', label: 'Playable' },+ { id: 'wechat', label: 'WeChat' },+];++export function getEffectiveImporter(+ base: ImporterData,+ platformOverrides: Record<string, ImporterData>,+ platform: string,+): ImporterData {+ const override = platformOverrides[platform];+ if (!override || Object.keys(override).length === 0) return base;+ return { ...base, ...override };+}+// =============================================================================// Default Settings Factories// =============================================================================@@ -48,12 +102,47 @@ export function createDefaultAudioImporter(): AudioImporterSettings {};}-export function getDefaultImporterForType(type: string): Record<string, unknown> {+export function createDefaultSpineImporter(): SpineImporterSettings {+ return {+ defaultSkin: 'default',+ premultiplyAlpha: false,+ scale: 1,+ };+}++export function createDefaultBitmapFontImporter(): BitmapFontImporterSettings {+ return {+ fontSize: 32,+ };+}++export function createDefaultSceneImporter(): SceneImporterSettings {+ return {+ autoMigrate: true,+ };+}++export function createDefaultPrefabImporter(): PrefabImporterSettings {+ return {+ autoMigrate: true,+ };+}++export function getDefaultImporterForType(type: string): ImporterData {switch (type) {case 'texture':- return createDefaultTextureImporter() as unknown as Record<string, unknown>;+ return createDefaultTextureImporter();case 'audio':- return createDefaultAudioImporter() as unknown as Record<string, unknown>;+ return createDefaultAudioImporter();+ case 'spine-skeleton':+ case 'spine-atlas':+ return createDefaultSpineImporter();+ case 'bitmap-font':+ return createDefaultBitmapFontImporter();+ case 'scene':+ return createDefaultSceneImporter();+ case 'prefab':+ return createDefaultPrefabImporter();default:return {};}@@ -69,8 +158,8 @@ export interface AssetMeta {type: string;labels: string[];address: string | null;- importer: Record<string, unknown>;- platformOverrides: Record<string, Record<string, unknown>>;+ importer: ImporterData;+ platformOverrides: Record<string, ImporterData>;sliceBorder?: { left: number; right: number; top: number; bottom: number };}@@ -102,14 +191,14 @@ export function upgradeMeta(raw: Record<string, unknown>): AssetMeta {meta.address = raw.address;}if (raw.importer && typeof raw.importer === 'object') {- meta.importer = { ...meta.importer, ...(raw.importer as Record<string, unknown>) };+ meta.importer = { ...meta.importer, ...(raw.importer as ImporterData) };}if (raw.platformOverrides && typeof raw.platformOverrides === 'object') {- meta.platformOverrides = raw.platformOverrides as Record<string, Record<string, unknown>>;+ meta.platformOverrides = raw.platformOverrides as Record<string, ImporterData>;}if (type === 'texture' && raw.sliceBorder && typeof raw.sliceBorder === 'object') {- (meta.importer as unknown as TextureImporterSettings).sliceBorder =+ (meta.importer as TextureImporterSettings).sliceBorder =raw.sliceBorder as TextureImporterSettings['sliceBorder'];}diff --git a/editor/src/asset/importers/BitmapFontImporter.ts b/editor/src/asset/importers/BitmapFontImporter.tsnew file mode 100644index 000000000..90ff4e6bf--- /dev/null+++ b/editor/src/asset/importers/BitmapFontImporter.ts@@ -0,0 +1,31 @@+/**+ * @file BitmapFontImporter.ts+ * @brief Importer for bitmap font assets (.fnt, .bmfont)+ */++import type { AssetImporter, ImporterField } from '../ImporterRegistry';+import type { BitmapFontImporterSettings } from '../ImporterTypes';+import { createDefaultBitmapFontImporter } from '../ImporterTypes';++export class BitmapFontImporter implements AssetImporter<BitmapFontImporterSettings> {+ readonly type = 'bitmap-font';+ readonly extensions = ['.fnt', '.bmfont'];++ defaultSettings(): BitmapFontImporterSettings {+ return createDefaultBitmapFontImporter();+ }++ settingsUI(current: BitmapFontImporterSettings): ImporterField[] {+ return [+ {+ name: 'fontSize',+ label: 'Font Size',+ type: 'number',+ value: current.fontSize,+ min: 1,+ max: 256,+ step: 1,+ },+ ];+ }+}diff --git a/editor/src/asset/importers/MaterialImporter.ts b/editor/src/asset/importers/MaterialImporter.tsnew file mode 100644index 000000000..79e8eb1e3--- /dev/null+++ b/editor/src/asset/importers/MaterialImporter.ts@@ -0,0 +1,20 @@+/**+ * @file MaterialImporter.ts+ * @brief Importer for material assets (.esmaterial)+ */++import type { AssetImporter, ImporterField } from '../ImporterRegistry';+import type { ImporterData } from '../ImporterTypes';++export class MaterialImporter implements AssetImporter<ImporterData> {+ readonly type = 'material';+ readonly extensions = ['.esmaterial'];++ defaultSettings(): ImporterData {+ return {};+ }++ settingsUI(): ImporterField[] {+ return [];+ }+}diff --git a/editor/src/asset/importers/PrefabImporter.ts b/editor/src/asset/importers/PrefabImporter.tsnew file mode 100644index 000000000..cc727d9e6--- /dev/null+++ b/editor/src/asset/importers/PrefabImporter.ts@@ -0,0 +1,28 @@+/**+ * @file PrefabImporter.ts+ * @brief Importer for prefab assets (.esprefab)+ */++import type { AssetImporter, ImporterField } from '../ImporterRegistry';+import type { PrefabImporterSettings } from '../ImporterTypes';+import { createDefaultPrefabImporter } from '../ImporterTypes';++export class PrefabImporter implements AssetImporter<PrefabImporterSettings> {+ readonly type = 'prefab';+ readonly extensions = ['.esprefab'];++ defaultSettings(): PrefabImporterSettings {+ return createDefaultPrefabImporter();+ }++ settingsUI(current: PrefabImporterSettings): ImporterField[] {+ return [+ {+ name: 'autoMigrate',+ label: 'Auto Migrate',+ type: 'boolean',+ value: current.autoMigrate,+ },+ ];+ }+}diff --git a/editor/src/asset/importers/SceneImporter.ts b/editor/src/asset/importers/SceneImporter.tsnew file mode 100644index 000000000..2a07a5605--- /dev/null+++ b/editor/src/asset/importers/SceneImporter.ts@@ -0,0 +1,28 @@+/**+ * @file SceneImporter.ts+ * @brief Importer for scene assets (.esscene)+ */++import type { AssetImporter, ImporterField } from '../ImporterRegistry';+import type { SceneImporterSettings } from '../ImporterTypes';+import { createDefaultSceneImporter } from '../ImporterTypes';++export class SceneImporter implements AssetImporter<SceneImporterSettings> {+ readonly type = 'scene';+ readonly extensions = ['.esscene'];++ defaultSettings(): SceneImporterSettings {+ return createDefaultSceneImporter();+ }++ settingsUI(current: SceneImporterSettings): ImporterField[] {+ return [+ {+ name: 'autoMigrate',+ label: 'Auto Migrate',+ type: 'boolean',+ value: current.autoMigrate,+ },+ ];+ }+}diff --git a/editor/src/asset/importers/ShaderImporter.ts b/editor/src/asset/importers/ShaderImporter.tsnew file mode 100644index 000000000..bf173fcd6--- /dev/null+++ b/editor/src/asset/importers/ShaderImporter.ts@@ -0,0 +1,20 @@+/**+ * @file ShaderImporter.ts+ * @brief Importer for shader assets (.esshader)+ */++import type { AssetImporter, ImporterField } from '../ImporterRegistry';+import type { ImporterData } from '../ImporterTypes';++export class ShaderImporter implements AssetImporter<ImporterData> {+ readonly type = 'shader';+ readonly extensions = ['.esshader'];++ defaultSettings(): ImporterData {+ return {};+ }++ settingsUI(): ImporterField[] {+ return [];+ }+}diff --git a/editor/src/asset/importers/SpineAtlasParser.ts b/editor/src/asset/importers/SpineAtlasParser.tsnew file mode 100644index 000000000..4d10ba421--- /dev/null+++ b/editor/src/asset/importers/SpineAtlasParser.ts@@ -0,0 +1,17 @@+/**+ * @file SpineAtlasParser.ts+ * @brief Shared Spine atlas texture name extraction+ */++const TEXTURE_EXT_PATTERN = /\.(png|jpg|jpeg)$/i;++export function parseAtlasTextures(atlasContent: string): string[] {+ const textures: string[] = [];+ for (const rawLine of atlasContent.split('\n')) {+ const line = rawLine.trim();+ if (line && line.indexOf(':') === -1 && TEXTURE_EXT_PATTERN.test(line)) {+ textures.push(line);+ }+ }+ return textures;+}diff --git a/editor/src/asset/importers/SpineImporter.ts b/editor/src/asset/importers/SpineImporter.tsnew file mode 100644index 000000000..59768b0ad--- /dev/null+++ b/editor/src/asset/importers/SpineImporter.ts@@ -0,0 +1,46 @@+/**+ * @file SpineImporter.ts+ * @brief Importer for Spine skeleton and atlas assets+ */++import type { AssetImporter, ImporterField } from '../ImporterRegistry';+import type { SpineImporterSettings } from '../ImporterTypes';+import { createDefaultSpineImporter } from '../ImporterTypes';++export class SpineImporter implements AssetImporter<SpineImporterSettings> {+ readonly type = 'spine';+ readonly extensions = ['.skel', '.atlas'];++ defaultSettings(): SpineImporterSettings {+ return createDefaultSpineImporter();+ }++ settingsUI(current: SpineImporterSettings): ImporterField[] {+ return [+ {+ name: 'defaultSkin',+ label: 'Default Skin',+ type: 'select',+ value: current.defaultSkin,+ options: [+ { label: 'default', value: 'default' },+ ],+ },+ {+ name: 'premultiplyAlpha',+ label: 'Premultiply Alpha',+ type: 'boolean',+ value: current.premultiplyAlpha,+ },+ {+ name: 'scale',+ label: 'Scale',+ type: 'number',+ value: current.scale,+ min: 0.01,+ max: 10,+ step: 0.01,+ },+ ];+ }+}diff --git a/editor/src/builder/ArtifactBuilder.ts b/editor/src/builder/ArtifactBuilder.tsindex a76016890..28459cfef 100644--- a/editor/src/builder/ArtifactBuilder.ts+++ b/editor/src/builder/ArtifactBuilder.ts@@ -11,6 +11,7 @@ import { BuildProgressReporter } from './BuildProgress';import { AssetExportConfigService, BuildAssetCollector } from './AssetCollector';import { TextureAtlasPacker } from './TextureAtlas';import { AssetLibrary, isUUID, getComponentRefFields } from '../asset/AssetLibrary';+import { type TextureImporterSettings, getEffectiveImporter } from '../asset/ImporterTypes';import { BuildCache } from './BuildCache';import { getAssetType, toAddressableType } from '../asset/AssetTypes';import { compileMaterials } from './MaterialCompiler';@@ -70,7 +71,7 @@ export async function buildArtifact(}}- const packer = new TextureAtlasPacker(fs, projectDir, assetLibrary);+ const packer = new TextureAtlasPacker(fs, projectDir, assetLibrary, config.platform);const atlasMaxSize = parseInt(getSettingsValue<string>('build.atlasMaxSize') ?? '2048', 10) || 2048;const atlasPadding = getSettingsValue<number>('build.atlasPadding') ?? 2;@@ -85,7 +86,17 @@ export async function buildArtifact(Object.assign(allTextureMetadata, meta);}}- atlasInputHash = await buildCache.computeAtlasInputHash(imagePaths, allTextureMetadata);+ const importerEntries = imagePaths.map(p => {+ const uuid = assetLibrary.getUuid(p);+ const entry = uuid ? assetLibrary.getEntry(uuid) : null;+ const effective = entry+ ? getEffectiveImporter(entry.importer, entry.platformOverrides, config.platform)+ : {};+ return { path: p, importer: effective };+ });+ const importerHash = await buildCache.computeImporterSettingsHash(importerEntries);+ const combinedMetadata = { ...allTextureMetadata, __importerHash: importerHash };+ atlasInputHash = await buildCache.computeAtlasInputHash(imagePaths, combinedMetadata);let cachedAtlas = null;if (cacheData?.atlasPages) {@@ -136,6 +147,7 @@ export async function buildArtifact(for (const { name, data } of sceneDataList) {packer.rewriteSceneData(data, atlasResult, '');resolveSceneUUIDs(data, assetLibrary);+ embedTextureImporterSettings(data, assetLibrary, config.platform);scenes.set(name, data);}@@ -196,6 +208,47 @@ function resolveSceneUUIDs(sceneData: Record<string, unknown>, assetLibrary: Ass}}+function embedTextureImporterSettings(sceneData: Record<string, unknown>, assetLibrary: AssetLibrary, platform: string): void {+ const entities = sceneData.entities as Array<{+ components: Array<{ type: string; data: Record<string, unknown> }>;+ }> | undefined;+ if (!entities) return;++ const settings: Record<string, { filterMode?: string; wrapMode?: string }> = {};++ for (const entity of entities) {+ for (const comp of entity.components || []) {+ const refFields = getComponentRefFields(comp.type);+ if (!refFields || !comp.data) continue;+ for (const field of refFields) {+ const value = comp.data[field];+ if (typeof value !== 'string' || !value) continue;+ if (settings[value]) continue;++ const uuid = isUUID(value) ? value : assetLibrary.getUuid(value);+ if (!uuid) continue;+ const entry = assetLibrary.getEntry(uuid);+ if (!entry || entry.type !== 'texture') continue;++ const effective = getEffectiveImporter(entry.importer, entry.platformOverrides, platform) as TextureImporterSettings;++ const hasNonDefault = (effective.filterMode && effective.filterMode !== 'linear') ||+ (effective.wrapMode && effective.wrapMode !== 'repeat');+ if (hasNonDefault) {+ settings[entry.path] = {+ filterMode: effective.filterMode,+ wrapMode: effective.wrapMode,+ };+ }+ }+ }+ }++ if (Object.keys(settings).length > 0) {+ sceneData.textureImporterSettings = settings;+ }+}+// =============================================================================// Shared esbuild utilities// =============================================================================diff --git a/editor/src/builder/AssetCollector.ts b/editor/src/builder/AssetCollector.tsindex 0e418013a..7617ebcf6 100644--- a/editor/src/builder/AssetCollector.ts+++ b/editor/src/builder/AssetCollector.ts@@ -10,6 +10,7 @@ import type { NativeFS } from '../types/NativeFS';import { looksLikeAssetPath } from '../asset/AssetTypes';import { getComponentRefFields } from '../asset/AssetDatabase';import { getAssetTypeEntry } from 'esengine';+import { parseAtlasTextures } from '../asset/importers/SpineAtlasParser';type AssetLibrary = AssetDatabase;@@ -321,13 +322,9 @@ export class AssetReferenceCollector {if (!content) return;const atlasDir = getDirName(atlasPath);- const lines = content.split('\n');- for (const rawLine of lines) {- const line = rawLine.trim();- if (line && line.indexOf(':') === -1 && (/\.png$/i.test(line) || /\.jpg$/i.test(line))) {- const texturePath = atlasDir ? `${atlasDir}/${line}` : line;- refs.add(texturePath);- }+ for (const texName of parseAtlasTextures(content)) {+ const texturePath = atlasDir ? `${atlasDir}/${texName}` : texName;+ refs.add(texturePath);}}}diff --git a/editor/src/builder/BuildCache.ts b/editor/src/builder/BuildCache.tsindex 6764a0605..f2f0d6715 100644--- a/editor/src/builder/BuildCache.ts+++ b/editor/src/builder/BuildCache.ts@@ -4,6 +4,7 @@*/import type { NativeFS } from '../scripting/types';+import type { ImporterData } from '../asset/ImporterTypes';import { getEditorContext } from '../context/EditorContext';// =============================================================================@@ -39,6 +40,7 @@ export interface BuildCacheData {compiledScriptsHash?: string;atlasPages?: AtlasPageCache[];atlasInputHash?: string;+ importerSettingsHash?: Record<string, string>;}export interface FileChangeResult {@@ -301,6 +303,31 @@ export class BuildCache {return null;}}++ async computeImporterSettingsHash(+ entries: Array<{ path: string; importer: ImporterData }>+ ): Promise<Record<string, string>> {+ const result: Record<string, string> = {};+ for (const entry of entries) {+ const json = JSON.stringify(entry.importer);+ result[entry.path] = await computeHash(json);+ }+ return result;+ }++ getImporterChangedPaths(+ current: Record<string, string>,+ cached: Record<string, string> | undefined+ ): string[] {+ if (!cached) return Object.keys(current);+ const changed: string[] = [];+ for (const [path, hash] of Object.entries(current)) {+ if (cached[path] !== hash) {+ changed.push(path);+ }+ }+ return changed;+ }}export { computeHash };diff --git a/editor/src/builder/MaterialCompiler.ts b/editor/src/builder/MaterialCompiler.tsindex 279ee3c8a..b51720723 100644--- a/editor/src/builder/MaterialCompiler.ts+++ b/editor/src/builder/MaterialCompiler.ts@@ -30,15 +30,24 @@ export async function compileMaterials(try {const matData = JSON.parse(content);- if (matData.type !== 'material' || !matData.shader) continue;+ if (matData.type !== 'material' || !matData.shader) {+ console.warn(`[MaterialCompiler] Invalid material (missing type or shader): ${relativePath}`);+ continue;+ }const shaderRelPath = resolveShaderPath(relativePath, matData.shader);const shaderFullPath = joinPath(projectDir, shaderRelPath);const shaderContent = await fs.readFile(shaderFullPath);- if (!shaderContent) continue;+ if (!shaderContent) {+ console.error(`[MaterialCompiler] Shader not found: ${shaderRelPath} (referenced by ${relativePath})`);+ continue;+ }const parsed = parseEsShader(shaderContent);- if (!parsed.vertex || !parsed.fragment) continue;+ if (!parsed.vertex || !parsed.fragment) {+ console.error(`[MaterialCompiler] Shader missing vertex or fragment block: ${shaderRelPath}`);+ continue;+ }const compiled = {type: 'material',@@ -54,8 +63,8 @@ export async function compileMaterials(uuid,json: JSON.stringify(compiled),});- } catch {- console.warn(`[MaterialCompiler] Failed to compile material: ${relativePath}`);+ } catch (err) {+ console.error(`[MaterialCompiler] Failed to compile material: ${relativePath}`, err);}}diff --git a/editor/src/builder/TextureAtlas.ts b/editor/src/builder/TextureAtlas.tsindex 0ebca64bf..664bfbb41 100644--- a/editor/src/builder/TextureAtlas.ts+++ b/editor/src/builder/TextureAtlas.ts@@ -4,8 +4,10 @@*/import { type AssetLibrary, isUUID } from '../asset/AssetLibrary';+import { type TextureImporterSettings, getEffectiveImporter } from '../asset/ImporterTypes';import { joinPath } from '../utils/path';import type { NativeFS } from '../types/NativeFS';+import { parseAtlasTextures } from '../asset/importers/SpineAtlasParser';// =============================================================================// Types@@ -180,11 +182,13 @@ export class TextureAtlasPacker {private fs_: NativeFS;private projectDir_: string;private assetLibrary_: AssetLibrary | null;+ private platform_: string;- constructor(fs: NativeFS, projectDir: string, assetLibrary?: AssetLibrary) {+ constructor(fs: NativeFS, projectDir: string, assetLibrary?: AssetLibrary, platform?: string) {this.fs_ = fs;this.projectDir_ = projectDir;this.assetLibrary_ = assetLibrary ?? null;+ this.platform_ = platform ?? '';}private resolveRef(ref: string): string {@@ -207,7 +211,7 @@ export class TextureAtlasPacker {if (eligiblePaths.length === 0) return result;const spineTextures = await this.collectSpineTextures(sceneDataList, allAssetPaths);- const nineSliceTextures = this.collectNineSliceTextures(sceneDataList);+ const nineSliceTextures = this.collectNineSliceTextures(sceneDataList, eligiblePaths);const images: Array<{ path: string; width: number; height: number; data: Uint8Array }> = [];@@ -221,7 +225,20 @@ export class TextureAtlasPacker {const size = this.getImageSize(data, relPath);if (!size) continue;- if (size.width > maxSize / 2 || size.height > maxSize / 2) continue;+ let texMaxSize = maxSize;+ if (this.assetLibrary_) {+ const uuid = this.assetLibrary_.getUuid(relPath);+ if (uuid) {+ const entry = this.assetLibrary_.getEntry(uuid);+ const effective = entry ? getEffectiveImporter(entry.importer, entry.platformOverrides, this.platform_) as TextureImporterSettings : undefined;+ const perTexMax = effective?.maxSize;+ if (perTexMax && perTexMax < texMaxSize) {+ texMaxSize = perTexMax;+ }+ }+ }++ if (size.width > texMaxSize / 2 || size.height > texMaxSize / 2) continue;images.push({ path: relPath, width: size.width, height: size.height, data });}@@ -407,13 +424,9 @@ export class TextureAtlasPacker {if (!content) continue;const atlasDir = atlasRelPath.substring(0, atlasRelPath.lastIndexOf('/'));- const lines = content.split('\n');- for (const line of lines) {- const trimmed = line.trim();- if (trimmed && !trimmed.includes(':') && (/\.png$/i.test(trimmed) || /\.jpg$/i.test(trimmed))) {- const texPath = atlasDir ? `${atlasDir}/${trimmed}` : trimmed;- result.add(texPath);- }+ for (const texName of parseAtlasTextures(content)) {+ const texPath = atlasDir ? `${atlasDir}/${texName}` : texName;+ result.add(texPath);}}return result;@@ -442,9 +455,11 @@ export class TextureAtlasPacker {}private collectNineSliceTextures(- sceneDataList: Array<{ name: string; data: Record<string, unknown> }>+ sceneDataList: Array<{ name: string; data: Record<string, unknown> }>,+ imagePaths: string[]): Set<string> {const result = new Set<string>();+for (const { data } of sceneDataList) {const textureMetadata = data.textureMetadata as Record<string, { sliceBorder?: { left: number; right: number; top: number; bottom: number } }> | undefined;if (!textureMetadata) continue;@@ -458,6 +473,21 @@ export class TextureAtlasPacker {}}}++ if (this.assetLibrary_) {+ for (const imgPath of imagePaths) {+ if (result.has(imgPath)) continue;+ const uuid = this.assetLibrary_.getUuid(imgPath);+ if (!uuid) continue;+ const entry = this.assetLibrary_.getEntry(uuid);+ const effective = entry ? getEffectiveImporter(entry.importer, entry.platformOverrides, this.platform_) as TextureImporterSettings : undefined;+ const border = effective?.sliceBorder;+ if (border && (border.left > 0 || border.right > 0 || border.top > 0 || border.bottom > 0)) {+ result.add(imgPath);+ }+ }+ }+return result;}diff --git a/editor/src/panels/InspectorPanel.ts b/editor/src/panels/InspectorPanel.tsindex 40a7b4652..af539082c 100644--- a/editor/src/panels/InspectorPanel.ts+++ b/editor/src/panels/InspectorPanel.ts@@ -13,6 +13,7 @@ import { renderEntityHeader, renderComponent, renderAddComponentButton, renderEnimport type { InspectorSectionInstance } from './inspector/InspectorRegistry';import { type MaterialPreviewState, renderMaterialPreview, hideMaterialPreview } from './inspector/MaterialPreviewSection';import { renderAssetHeader, renderAddressableSection } from './inspector/AssetInspector';+import { renderImporterSettingsSection } from './inspector/ImporterSettingsSection';import { type ImageUrlRef, renderImageInspector } from './inspector/ImageInspector';import { renderMaterialInspector } from './inspector/MaterialInspector';import { renderBitmapFontInspector } from './inspector/BitmapFontInspector';@@ -80,8 +81,9 @@ export class InspectorPanel {const pms = getPlayModeService();this.playModeCleanups_.push(pms.onStateChange((state) => {- this.playMode_ = state === 'playing';- if (this.playMode_) {+ const isPlaying = state === 'playing' && !pms.isSharedMode;+ this.playMode_ = isPlaying;+ if (isPlaying) {this.container_.classList.add('es-play-mode');hideMaterialPreview(this.materialPreviewState_);if (pms.bridge) {@@ -341,6 +343,7 @@ export class InspectorPanel {renderAssetHeader(this.contentContainer_, asset);renderAddressableSection(this.contentContainer_, asset.path);+ renderImporterSettingsSection(this.contentContainer_, asset.path);switch (asset.type) {case 'image':diff --git a/editor/src/panels/inspector/BitmapFontInspector.ts b/editor/src/panels/inspector/BitmapFontInspector.tsindex f8cab4f58..d5a836f03 100644--- a/editor/src/panels/inspector/BitmapFontInspector.ts+++ b/editor/src/panels/inspector/BitmapFontInspector.ts@@ -21,7 +21,6 @@ export async function renderBitmapFontInspector(path: string): Promise<void> {const fs = getNativeFS();- const platform = getPlatformAdapter();if (!fs) {renderError(container, 'File system not available');return;@@ -33,6 +32,12 @@ export async function renderBitmapFontInspector(return;}+ const ext = getFileExtension(path).toLowerCase();+ if (ext === '.fnt') {+ renderFntInspector(container, content, path);+ return;+ }+let fontData: Record<string, unknown>;try {fontData = JSON.parse(content);@@ -48,7 +53,7 @@ export async function renderBitmapFontInspector(const save = async () => {try {- await platform.writeTextFile(path, JSON.stringify(fontData, null, 2));+ await getPlatformAdapter().writeTextFile(path, JSON.stringify(fontData, null, 2));} catch (err) {console.error('Failed to save bitmap font:', err);}@@ -154,6 +159,136 @@ export async function renderBitmapFontInspector(container.appendChild(section);}+// =============================================================================+// .fnt (BMFont text format) Inspector+// =============================================================================++interface FntInfo {+ face: string;+ size: number;+ lineHeight: number;+ scaleW: number;+ scaleH: number;+ pages: string[];+ charCount: number;+}++function parseFntFile(content: string): FntInfo {+ const info: FntInfo = {+ face: '',+ size: 0,+ lineHeight: 0,+ scaleW: 0,+ scaleH: 0,+ pages: [],+ charCount: 0,+ };++ for (const line of content.split('\n')) {+ const trimmed = line.trim();++ if (trimmed.startsWith('info ')) {+ const faceMatch = trimmed.match(/face="([^"]*)"/);+ if (faceMatch) info.face = faceMatch[1];+ const sizeMatch = trimmed.match(/size=(-?\d+)/);+ if (sizeMatch) info.size = Math.abs(parseInt(sizeMatch[1]));+ } else if (trimmed.startsWith('common ')) {+ const lhMatch = trimmed.match(/lineHeight=(\d+)/);+ if (lhMatch) info.lineHeight = parseInt(lhMatch[1]);+ const swMatch = trimmed.match(/scaleW=(\d+)/);+ if (swMatch) info.scaleW = parseInt(swMatch[1]);+ const shMatch = trimmed.match(/scaleH=(\d+)/);+ if (shMatch) info.scaleH = parseInt(shMatch[1]);+ } else if (trimmed.startsWith('page ')) {+ const fileMatch = trimmed.match(/file="([^"]*)"/);+ if (fileMatch) info.pages.push(fileMatch[1]);+ } else if (trimmed.startsWith('chars ')) {+ const countMatch = trimmed.match(/count=(\d+)/);+ if (countMatch) info.charCount = parseInt(countMatch[1]);+ }+ }++ return info;+}++function renderFntInspector(container: HTMLElement, content: string, path: string): void {+ const info = parseFntFile(content);++ const section = document.createElement('div');+ section.className = 'es-component-section es-collapsible es-expanded';++ const rows: { label: string; value: string }[] = [+ { label: 'Format', value: 'BMFont (.fnt)' },+ { label: 'Face', value: info.face || 'Unknown' },+ { label: 'Size', value: String(info.size) },+ { label: 'Line Height', value: String(info.lineHeight) },+ { label: 'Atlas Size', value: `${info.scaleW} \u00d7 ${info.scaleH}` },+ { label: 'Characters', value: String(info.charCount) },+ ];++ for (const page of info.pages) {+ rows.push({ label: 'Page', value: page });+ }++ const rowsHtml = rows.map(r =>+ `<div class="es-property-row">+ <label class="es-property-label">${escapeHtml(r.label)}</label>+ <div class="es-property-value">${escapeHtml(r.value)}</div>+ </div>`+ ).join('');++ section.innerHTML = `+ <div class="es-component-header es-collapsible-header">+ <span class="es-collapse-icon">${icons.chevronDown(12)}</span>+ <span class="es-component-icon">${icons.type(14)}</span>+ <span class="es-component-title">BitmapFont</span>+ </div>+ <div class="es-component-properties es-collapsible-content">${rowsHtml}</div>+ `;++ const header = section.querySelector('.es-collapsible-header');+ header?.addEventListener('click', () => {+ section.classList.toggle('es-expanded');+ });++ if (info.pages.length > 0) {+ const fontDir = path.substring(0, path.lastIndexOf('/'));+ const propsContainer = section.querySelector('.es-component-properties') as HTMLElement;+ renderFntPagePreview(propsContainer, fontDir, info.pages[0]);+ }++ container.appendChild(section);+}++function renderFntPagePreview(container: HTMLElement, fontDir: string, pageName: string): void {+ const fs = getNativeFS();+ if (!fs) return;++ const fullPath = `${fontDir}/${pageName}`;++ fs.readBinaryFile(fullPath).then(data => {+ if (!data) return;++ const ext = getFileExtension(pageName);+ const blob = new Blob([new Uint8Array(data).buffer], { type: getMimeType(ext) });+ const url = URL.createObjectURL(blob);++ const previewDiv = document.createElement('div');+ previewDiv.className = 'es-asset-preview-section';+ previewDiv.innerHTML = `+ <div class="es-image-preview-container">+ <img class="es-image-preview" src="${url}" alt="${escapeHtml(pageName)}">+ </div>+ `;++ container.appendChild(previewDiv);+ }).catch(() => {});+}++// =============================================================================+// .bmfont (JSON) helpers+// =============================================================================+async function buildBitmapFontAtlas(fontDir: string,baseName: string,diff --git a/editor/src/panels/inspector/ImageInspector.ts b/editor/src/panels/inspector/ImageInspector.tsindex fda261217..d64ca1301 100644--- a/editor/src/panels/inspector/ImageInspector.ts+++ b/editor/src/panels/inspector/ImageInspector.ts@@ -3,15 +3,6 @@* @brief Image asset inspector with preview and nine-slice editing*/-import { getPlatformAdapter } from '../../platform/PlatformAdapter';-import {- type SliceBorder,- type TextureMetadata,- getMetaFilePath,- parseTextureMetadata,- serializeTextureMetadata,- createDefaultTextureMetadata,-} from '../../types/TextureMetadata';import { icons } from '../../utils/icons';import { getNativeFS, getFileName, getFileExtension, getMimeType, formatFileSize, formatDate, renderError } from './InspectorHelpers';@@ -53,7 +44,6 @@ export async function renderImageInspector(container: HTMLElement, path: string,const img = previewSection.querySelector('.es-image-preview') as HTMLImageElement;img.onload = async () => {await renderImageMetadata(container, path, img.naturalWidth, img.naturalHeight);- await renderNineSliceSection(container, path, img.naturalWidth, img.naturalHeight, imageUrlRef);};} catch (err) {console.error('Failed to load image:', err);@@ -101,189 +91,3 @@ async function renderImageMetadata(container: HTMLElement, path: string, width:container.appendChild(section);}-async function renderNineSliceSection(- container: HTMLElement,- path: string,- texWidth: number,- texHeight: number,- imageUrlRef: ImageUrlRef-): Promise<void> {- const platform = getPlatformAdapter();- const metaPath = getMetaFilePath(path);-- let metadata: TextureMetadata = createDefaultTextureMetadata();-- try {- if (await platform.exists(metaPath)) {- const content = await platform.readTextFile(metaPath);- const parsed = parseTextureMetadata(content);- if (parsed) {- metadata = parsed;- }- }- } catch (err) {- console.warn('Failed to load texture metadata:', err);- }-- const border = metadata.sliceBorder;-- const section = document.createElement('div');- section.className = 'es-component-section es-collapsible es-expanded';- section.innerHTML = `- <div class="es-component-header es-collapsible-header">- <span class="es-collapse-icon">${icons.chevronDown(12)}</span>- <span class="es-component-icon">${icons.grid(14)}</span>- <span class="es-component-title">Nine-Slice</span>- </div>- <div class="es-component-properties es-collapsible-content">- <div class="es-nine-slice-editor">- <div class="es-nine-slice-preview">- <img class="es-nine-slice-image" src="${imageUrlRef.current || ''}">- <div class="es-nine-slice-line es-nine-slice-left"></div>- <div class="es-nine-slice-line es-nine-slice-right"></div>- <div class="es-nine-slice-line es-nine-slice-top"></div>- <div class="es-nine-slice-line es-nine-slice-bottom"></div>- </div>- </div>- <div class="es-nine-slice-inputs">- <div class="es-property-row">- <label class="es-property-label">Left</label>- <div class="es-property-editor">- <input type="number" class="es-input es-input-number es-slice-input-left" value="${border.left}" min="0" max="${texWidth}" step="1">- </div>- </div>- <div class="es-property-row">- <label class="es-property-label">Right</label>- <div class="es-property-editor">- <input type="number" class="es-input es-input-number es-slice-input-right" value="${border.right}" min="0" max="${texWidth}" step="1">- </div>- </div>- <div class="es-property-row">- <label class="es-property-label">Top</label>- <div class="es-property-editor">- <input type="number" class="es-input es-input-number es-slice-input-top" value="${border.top}" min="0" max="${texHeight}" step="1">- </div>- </div>- <div class="es-property-row">- <label class="es-property-label">Bottom</label>- <div class="es-property-editor">- <input type="number" class="es-input es-input-number es-slice-input-bottom" value="${border.bottom}" min="0" max="${texHeight}" step="1">- </div>- </div>- </div>- </div>- `;-- const headerEl = section.querySelector('.es-collapsible-header');- headerEl?.addEventListener('click', () => {- section.classList.toggle('es-expanded');- });-- const preview = section.querySelector('.es-nine-slice-preview') as HTMLElement;- const leftLine = section.querySelector('.es-nine-slice-left') as HTMLElement;- const rightLine = section.querySelector('.es-nine-slice-right') as HTMLElement;- const topLine = section.querySelector('.es-nine-slice-top') as HTMLElement;- const bottomLine = section.querySelector('.es-nine-slice-bottom') as HTMLElement;- const leftInput = section.querySelector('.es-slice-input-left') as HTMLInputElement;- const rightInput = section.querySelector('.es-slice-input-right') as HTMLInputElement;- const topInput = section.querySelector('.es-slice-input-top') as HTMLInputElement;- const bottomInput = section.querySelector('.es-slice-input-bottom') as HTMLInputElement;-- const updateLines = () => {- const previewRect = preview.getBoundingClientRect();- const scaleX = previewRect.width / texWidth;- const scaleY = previewRect.height / texHeight;-- const left = parseFloat(leftInput.value) || 0;- const right = parseFloat(rightInput.value) || 0;- const top = parseFloat(topInput.value) || 0;- const bottom = parseFloat(bottomInput.value) || 0;-- leftLine.style.left = `${left * scaleX}px`;- rightLine.style.right = `${right * scaleX}px`;- topLine.style.top = `${top * scaleY}px`;- bottomLine.style.bottom = `${bottom * scaleY}px`;- };-- const saveMetadata = async () => {- const newBorder: SliceBorder = {- left: parseFloat(leftInput.value) || 0,- right: parseFloat(rightInput.value) || 0,- top: parseFloat(topInput.value) || 0,- bottom: parseFloat(bottomInput.value) || 0,- };-- metadata.sliceBorder = newBorder;-- try {- const json = serializeTextureMetadata(metadata);- await platform.writeTextFile(metaPath, json);- } catch (err) {- console.error('Failed to save texture metadata:', err);- }- };-- leftInput.addEventListener('input', updateLines);- rightInput.addEventListener('input', updateLines);- topInput.addEventListener('input', updateLines);- bottomInput.addEventListener('input', updateLines);- leftInput.addEventListener('change', saveMetadata);- rightInput.addEventListener('change', saveMetadata);- topInput.addEventListener('change', saveMetadata);- bottomInput.addEventListener('change', saveMetadata);-- const setupDrag = (line: HTMLElement, input: HTMLInputElement, isHorizontal: boolean, isInverse: boolean) => {- let isDragging = false;- let startPos = 0;- let startValue = 0;-- line.addEventListener('mousedown', (e) => {- isDragging = true;- startPos = isHorizontal ? e.clientX : e.clientY;- startValue = parseFloat(input.value) || 0;- e.preventDefault();- document.body.style.cursor = isHorizontal ? 'ew-resize' : 'ns-resize';- });-- document.addEventListener('mousemove', (e) => {- if (!isDragging) return;-- const previewRect = preview.getBoundingClientRect();- const scale = isHorizontal ? (previewRect.width / texWidth) : (previewRect.height / texHeight);- const delta = isHorizontal ? (e.clientX - startPos) : (e.clientY - startPos);- const pixelDelta = delta / scale;-- let newValue = isInverse ? (startValue - pixelDelta) : (startValue + pixelDelta);- const maxValue = isHorizontal ? texWidth : texHeight;- newValue = Math.max(0, Math.min(maxValue, Math.round(newValue)));-- input.value = String(newValue);- updateLines();- });-- document.addEventListener('mouseup', () => {- if (isDragging) {- isDragging = false;- document.body.style.cursor = '';- saveMetadata();- }- });- };-- setupDrag(leftLine, leftInput, true, false);- setupDrag(rightLine, rightInput, true, true);- setupDrag(topLine, topInput, false, false);- setupDrag(bottomLine, bottomInput, false, true);-- const img = section.querySelector('.es-nine-slice-image') as HTMLImageElement;- if (img.complete) {- setTimeout(updateLines, 0);- } else {- img.onload = updateLines;- }-- const resizeObserver = new ResizeObserver(updateLines);- resizeObserver.observe(preview);-- container.appendChild(section);-}diff --git a/editor/src/panels/inspector/ImporterSettingsSection.ts b/editor/src/panels/inspector/ImporterSettingsSection.tsnew file mode 100644index 000000000..7364499f4--- /dev/null+++ b/editor/src/panels/inspector/ImporterSettingsSection.ts@@ -0,0 +1,577 @@+/**+ * @file ImporterSettingsSection.ts+ * @brief Generic importer settings UI driven by ImporterRegistry.settingsUI()+ */++import { getAssetDatabase } from '../../asset/AssetDatabase';+import { getImporterRegistry } from '../../asset/ImporterRegistry';+import type { ImporterField } from '../../asset/ImporterRegistry';+import { type ImporterData, IMPORTER_PLATFORMS } from '../../asset/ImporterTypes';+import { icons } from '../../utils/icons';+import { resolveAssetEntry } from './AssetInspector';+import { escapeHtml, getNativeFS, getFileExtension, getMimeType } from './InspectorHelpers';++export function renderImporterSettingsSection(container: HTMLElement, assetPath: string): void {+ const entry = resolveAssetEntry(assetPath);+ if (!entry) return;++ const registry = getImporterRegistry();+ const fields = registry.getSettingsUI(entry.type, entry.importer);+ if (fields.length === 0) return;++ const section = document.createElement('div');+ section.className = 'es-component-section es-collapsible es-expanded';+ section.innerHTML = `+ <div class="es-component-header es-collapsible-header">+ <span class="es-collapse-icon">${icons.chevronDown(12)}</span>+ <span class="es-component-icon">${icons.settings(14)}</span>+ <span class="es-component-title">Import Settings</span>+ </div>+ <div class="es-component-properties es-collapsible-content"></div>+ `;++ const header = section.querySelector('.es-collapsible-header')!;+ header.addEventListener('click', () => {+ section.classList.toggle('es-expanded');+ });++ const content = section.querySelector('.es-collapsible-content') as HTMLElement;++ const tabBar = buildPlatformTabBar(content, entry.uuid, entry.importer, entry.platformOverrides, assetPath, entry.type);+ content.appendChild(tabBar);++ const fieldsContainer = document.createElement('div');+ fieldsContainer.className = 'es-importer-fields';+ content.appendChild(fieldsContainer);++ renderFieldsForPlatform(fieldsContainer, entry.uuid, entry.type, entry.importer, null, assetPath);++ container.appendChild(section);+}++function buildPlatformTabBar(+ parent: HTMLElement,+ uuid: string,+ baseImporter: ImporterData,+ platformOverrides: Record<string, ImporterData>,+ assetPath: string,+ assetType: string,+): HTMLElement {+ const bar = document.createElement('div');+ bar.className = 'es-platform-tabs';++ const tabs = [+ { id: '', label: 'Default' },+ ...IMPORTER_PLATFORMS,+ ];++ let activeId = '';++ for (const tab of tabs) {+ const btn = document.createElement('button');+ btn.className = 'es-platform-tab' + (tab.id === '' ? ' es-active' : '');+ btn.textContent = tab.label;++ if (tab.id !== '' && platformOverrides[tab.id] && Object.keys(platformOverrides[tab.id]).length > 0) {+ btn.classList.add('es-has-override');+ }++ btn.addEventListener('click', () => {+ activeId = tab.id;+ bar.querySelectorAll('.es-platform-tab').forEach(b => b.classList.remove('es-active'));+ btn.classList.add('es-active');++ const fieldsContainer = parent.querySelector('.es-importer-fields') as HTMLElement;+ if (!fieldsContainer) return;++ const latestEntry = resolveAssetEntry(assetPath);+ if (!latestEntry) return;++ const platformData = tab.id ? (latestEntry.platformOverrides[tab.id] ?? null) : null;+ renderFieldsForPlatform(fieldsContainer, uuid, assetType, latestEntry.importer, platformData, assetPath, tab.id || undefined);+ });+ bar.appendChild(btn);+ }++ return bar;+}++function renderFieldsForPlatform(+ container: HTMLElement,+ uuid: string,+ assetType: string,+ baseImporter: ImporterData,+ platformData: ImporterData | null,+ assetPath: string,+ platformId?: string,+): void {+ container.innerHTML = '';+ const registry = getImporterRegistry();++ if (!platformId) {+ const fields = registry.getSettingsUI(assetType, baseImporter);+ for (const field of fields) {+ container.appendChild(renderField(field, uuid, baseImporter, assetPath));+ }+ return;+ }++ const merged = { ...baseImporter, ...(platformData ?? {}) };+ const fields = registry.getSettingsUI(assetType, merged);++ for (const field of fields) {+ const isOverridden = platformData != null && field.name in platformData;+ const row = renderPlatformField(field, uuid, baseImporter, platformData ?? {}, platformId, isOverridden, assetPath);+ container.appendChild(row);+ }+}++function renderField(field: ImporterField, uuid: string, importer: ImporterData, assetPath: string): HTMLElement {+ switch (field.type) {+ case 'boolean':+ return renderBooleanField(field, uuid, importer);+ case 'select':+ return renderSelectField(field, uuid, importer);+ case 'number':+ return renderNumberField(field, uuid, importer);+ case 'slider':+ return renderSliderField(field, uuid, importer);+ case 'sliceBorder':+ return renderSliceBorderField(field, uuid, importer, assetPath);+ default:+ return renderNumberField(field, uuid, importer);+ }+}++function saveField(uuid: string, importer: ImporterData, name: string, value: unknown): void {+ const updated = { ...importer, [name]: value };+ getAssetDatabase().updateMeta(uuid, { importer: updated });+}++function savePlatformField(uuid: string, platformId: string, overrideData: ImporterData, name: string, value: unknown): void {+ const entry = getAssetDatabase().getEntry(uuid);+ if (!entry) return;+ const overrides = { ...entry.platformOverrides };+ overrides[platformId] = { ...(overrides[platformId] ?? {}), ...overrideData, [name]: value };+ getAssetDatabase().updateMeta(uuid, { platformOverrides: overrides });+}++function removePlatformField(uuid: string, platformId: string, name: string): void {+ const entry = getAssetDatabase().getEntry(uuid);+ if (!entry) return;+ const overrides = { ...entry.platformOverrides };+ const platformData = { ...(overrides[platformId] ?? {}) };+ delete platformData[name];+ if (Object.keys(platformData).length === 0) {+ delete overrides[platformId];+ } else {+ overrides[platformId] = platformData;+ }+ getAssetDatabase().updateMeta(uuid, { platformOverrides: overrides });+}++function renderPlatformField(+ field: ImporterField,+ uuid: string,+ baseImporter: ImporterData,+ overrideData: ImporterData,+ platformId: string,+ isOverridden: boolean,+ assetPath: string,+): HTMLElement {+ const wrapper = document.createElement('div');+ wrapper.className = 'es-platform-field' + (isOverridden ? ' es-overridden' : '');++ const checkbox = document.createElement('input');+ checkbox.type = 'checkbox';+ checkbox.className = 'es-override-toggle';+ checkbox.checked = isOverridden;+ checkbox.title = isOverridden ? 'Remove override' : 'Override for this platform';+ wrapper.appendChild(checkbox);++ const fieldContainer = document.createElement('div');+ fieldContainer.className = 'es-platform-field-content';+ fieldContainer.style.flex = '1';+ wrapper.appendChild(fieldContainer);++ const renderInner = (active: boolean) => {+ fieldContainer.innerHTML = '';+ if (active) {+ const overrideImporter = { ...baseImporter, ...overrideData };+ const overrideField = { ...field, value: overrideImporter[field.name] ?? field.value };+ const el = renderField(overrideField, uuid, overrideImporter, assetPath);+ fieldContainer.appendChild(el);++ const inputs = el.querySelectorAll('input, select');+ inputs.forEach(input => {+ input.addEventListener('change', () => {+ let value: unknown;+ const inputEl = input as HTMLInputElement;+ if (inputEl.type === 'checkbox') {+ value = inputEl.checked;+ } else if (inputEl.type === 'number' || inputEl.type === 'range') {+ value = parseFloat(inputEl.value);+ } else if (inputEl.tagName === 'SELECT') {+ const selectEl = input as HTMLSelectElement;+ const numVal = parseFloat(selectEl.value);+ value = isNaN(numVal) ? selectEl.value : numVal;+ } else {+ value = inputEl.value;+ }+ savePlatformField(uuid, platformId, overrideData, field.name, value);+ });+ });+ } else {+ const defaultField = { ...field, value: baseImporter[field.name] ?? field.value };+ const el = renderField(defaultField, uuid, baseImporter, assetPath);+ el.style.opacity = '0.5';+ el.style.pointerEvents = 'none';+ fieldContainer.appendChild(el);+ }+ };++ renderInner(isOverridden);++ checkbox.addEventListener('change', () => {+ if (checkbox.checked) {+ savePlatformField(uuid, platformId, overrideData, field.name, baseImporter[field.name] ?? field.value);+ wrapper.classList.add('es-overridden');+ renderInner(true);+ } else {+ removePlatformField(uuid, platformId, field.name);+ wrapper.classList.remove('es-overridden');+ renderInner(false);+ }+ });++ return wrapper;+}++function renderBooleanField(field: ImporterField, uuid: string, importer: ImporterData): HTMLElement {+ const row = document.createElement('div');+ row.className = 'es-property-row';+ row.innerHTML = `+ <label class="es-property-label">${escapeHtml(field.label)}</label>+ <div class="es-property-editor">+ <input type="checkbox" class="es-checkbox" ${field.value ? 'checked' : ''}>+ </div>+ `;+ const input = row.querySelector('input')!;+ input.addEventListener('change', () => {+ saveField(uuid, importer, field.name, input.checked);+ });+ return row;+}++function renderSelectField(field: ImporterField, uuid: string, importer: ImporterData): HTMLElement {+ const row = document.createElement('div');+ row.className = 'es-property-row';+ const optionsHtml = (field.options ?? []).map(o =>+ `<option value="${escapeHtml(String(o.value))}"${o.value === field.value ? ' selected' : ''}>${escapeHtml(o.label)}</option>`+ ).join('');+ row.innerHTML = `+ <label class="es-property-label">${escapeHtml(field.label)}</label>+ <div class="es-property-editor">+ <select class="es-input">${optionsHtml}</select>+ </div>+ `;+ const select = row.querySelector('select')!;+ select.addEventListener('change', () => {+ const opt = field.options?.find(o => String(o.value) === select.value);+ saveField(uuid, importer, field.name, opt ? opt.value : select.value);+ });+ return row;+}++function renderNumberField(field: ImporterField, uuid: string, importer: ImporterData): HTMLElement {+ const row = document.createElement('div');+ row.className = 'es-property-row';+ row.innerHTML = `+ <label class="es-property-label">${escapeHtml(field.label)}</label>+ <div class="es-property-editor">+ <input type="number" class="es-input es-input-number"+ value="${field.value}"+ ${field.min !== undefined ? `min="${field.min}"` : ''}+ ${field.max !== undefined ? `max="${field.max}"` : ''}+ ${field.step !== undefined ? `step="${field.step}"` : ''}>+ </div>+ `;+ const input = row.querySelector('input')!;+ input.addEventListener('change', () => {+ saveField(uuid, importer, field.name, parseFloat(input.value));+ });+ return row;+}++function renderSliderField(field: ImporterField, uuid: string, importer: ImporterData): HTMLElement {+ const row = document.createElement('div');+ row.className = 'es-property-row';+ row.innerHTML = `+ <label class="es-property-label">${escapeHtml(field.label)}</label>+ <div class="es-property-editor es-slider-editor">+ <input type="range" class="es-slider"+ value="${field.value}"+ min="${field.min ?? 0}" max="${field.max ?? 1}" step="${field.step ?? 0.01}">+ <span class="es-slider-value">${field.value}</span>+ </div>+ `;+ const slider = row.querySelector('input')!;+ const valueLabel = row.querySelector('.es-slider-value')!;+ slider.addEventListener('input', () => {+ valueLabel.textContent = slider.value;+ });+ slider.addEventListener('change', () => {+ saveField(uuid, importer, field.name, parseFloat(slider.value));+ });+ return row;+}++// =============================================================================+// Nine-Slice Visual Editor+// =============================================================================++type SliceSide = 'left' | 'right' | 'top' | 'bottom';++interface SliceBorder {+ left: number;+ right: number;+ top: number;+ bottom: number;+}++function renderSliceBorderField(field: ImporterField, uuid: string, importer: ImporterData, assetPath: string): HTMLElement {+ const border = { ...(field.value as SliceBorder) };+ const editor = document.createElement('div');+ editor.className = 'es-nine-slice-editor';++ editor.innerHTML = `+ <div class="es-nine-slice-preview">+ <div class="es-nine-slice-loading">Loading...</div>+ <div class="es-nine-slice-line es-nine-slice-left"></div>+ <div class="es-nine-slice-line es-nine-slice-right"></div>+ <div class="es-nine-slice-line es-nine-slice-top"></div>+ <div class="es-nine-slice-line es-nine-slice-bottom"></div>+ </div>+ <div class="es-nine-slice-inputs">+ <div class="es-property-row">+ <label class="es-property-label">Left</label>+ <div class="es-property-editor">+ <input type="number" class="es-input es-input-number es-slice-left" value="${border.left}" min="0" step="1">+ </div>+ </div>+ <div class="es-property-row">+ <label class="es-property-label">Right</label>+ <div class="es-property-editor">+ <input type="number" class="es-input es-input-number es-slice-right" value="${border.right}" min="0" step="1">+ </div>+ </div>+ <div class="es-property-row">+ <label class="es-property-label">Top</label>+ <div class="es-property-editor">+ <input type="number" class="es-input es-input-number es-slice-top" value="${border.top}" min="0" step="1">+ </div>+ </div>+ <div class="es-property-row">+ <label class="es-property-label">Bottom</label>+ <div class="es-property-editor">+ <input type="number" class="es-input es-input-number es-slice-bottom" value="${border.bottom}" min="0" step="1">+ </div>+ </div>+ </div>+ `;++ const preview = editor.querySelector('.es-nine-slice-preview') as HTMLElement;+ const lines = {+ left: editor.querySelector('.es-nine-slice-left') as HTMLElement,+ right: editor.querySelector('.es-nine-slice-right') as HTMLElement,+ top: editor.querySelector('.es-nine-slice-top') as HTMLElement,+ bottom: editor.querySelector('.es-nine-slice-bottom') as HTMLElement,+ };+ const inputs = {+ left: editor.querySelector('.es-slice-left') as HTMLInputElement,+ right: editor.querySelector('.es-slice-right') as HTMLInputElement,+ top: editor.querySelector('.es-slice-top') as HTMLInputElement,+ bottom: editor.querySelector('.es-slice-bottom') as HTMLInputElement,+ };++ let imageWidth = 0;+ let imageHeight = 0;+ let objectUrl: string | null = null;++ const updateLinePositions = () => {+ if (imageWidth === 0 || imageHeight === 0) return;+ lines.left.style.left = `${(border.left / imageWidth) * 100}%`;+ lines.right.style.right = `${(border.right / imageWidth) * 100}%`;+ lines.top.style.top = `${(border.top / imageHeight) * 100}%`;+ lines.bottom.style.bottom = `${(border.bottom / imageHeight) * 100}%`;+ };++ const saveBorder = () => {+ saveField(uuid, importer, field.name, { ...border });+ };++ const updateFromInputs = () => {+ border.left = Math.max(0, parseInt(inputs.left.value) || 0);+ border.right = Math.max(0, parseInt(inputs.right.value) || 0);+ border.top = Math.max(0, parseInt(inputs.top.value) || 0);+ border.bottom = Math.max(0, parseInt(inputs.bottom.value) || 0);+ updateLinePositions();+ saveBorder();+ };++ for (const side of ['left', 'right', 'top', 'bottom'] as SliceSide[]) {+ inputs[side].addEventListener('change', updateFromInputs);+ }++ loadPreviewImage(assetPath).then(result => {+ if (!result) {+ preview.querySelector('.es-nine-slice-loading')!.textContent = 'Preview unavailable';+ return;+ }++ objectUrl = result.url;+ imageWidth = result.width;+ imageHeight = result.height;++ const img = document.createElement('img');+ img.className = 'es-nine-slice-image';+ img.src = result.url;+ preview.insertBefore(img, preview.firstChild);+ preview.querySelector('.es-nine-slice-loading')?.remove();++ inputs.left.max = String(imageWidth);+ inputs.right.max = String(imageWidth);+ inputs.top.max = String(imageHeight);+ inputs.bottom.max = String(imageHeight);++ updateLinePositions();+ setupDragHandlers(preview, lines, border, inputs, imageWidth, imageHeight, saveBorder);+ });++ const cleanup = new MutationObserver((mutations) => {+ for (const m of mutations) {+ for (const node of m.removedNodes) {+ if (node === editor || (node as Element).contains?.(editor)) {+ if (objectUrl) URL.revokeObjectURL(objectUrl);+ cleanup.disconnect();+ return;+ }+ }+ }+ });+ if (editor.parentElement) {+ cleanup.observe(editor.parentElement, { childList: true });+ } else {+ requestAnimationFrame(() => {+ if (editor.parentElement) {+ cleanup.observe(editor.parentElement, { childList: true });+ }+ });+ }++ return editor;+}++async function loadPreviewImage(assetPath: string): Promise<{ url: string; width: number; height: number } | null> {+ const fs = getNativeFS();+ if (!fs) return null;++ try {+ const data = await fs.readBinaryFile(assetPath);+ if (!data) return null;++ const ext = getFileExtension(assetPath);+ const mimeType = getMimeType(ext);+ const blob = new Blob([new Uint8Array(data).buffer], { type: mimeType });+ const url = URL.createObjectURL(blob);++ return new Promise<{ url: string; width: number; height: number }>((resolve) => {+ const img = new Image();+ img.onload = () => resolve({ url, width: img.naturalWidth, height: img.naturalHeight });+ img.onerror = () => {+ URL.revokeObjectURL(url);+ resolve(null!);+ };+ img.src = url;+ });+ } catch {+ return null;+ }+}++function setupDragHandlers(+ preview: HTMLElement,+ lines: Record<SliceSide, HTMLElement>,+ border: SliceBorder,+ inputs: Record<SliceSide, HTMLInputElement>,+ imageWidth: number,+ imageHeight: number,+ onSave: () => void,+): void {+ const sides: SliceSide[] = ['left', 'right', 'top', 'bottom'];++ for (const side of sides) {+ const line = lines[side];+ const isHorizontal = side === 'left' || side === 'right';++ line.addEventListener('mousedown', (e: MouseEvent) => {+ e.preventDefault();+ e.stopPropagation();++ const previewRect = preview.getBoundingClientRect();++ const onMouseMove = (moveEvent: MouseEvent) => {+ let value: number;++ if (isHorizontal) {+ const relX = moveEvent.clientX - previewRect.left;+ const ratio = Math.max(0, Math.min(1, relX / previewRect.width));+ if (side === 'left') {+ value = Math.round(ratio * imageWidth);+ } else {+ value = Math.round((1 - ratio) * imageWidth);+ }+ } else {+ const relY = moveEvent.clientY - previewRect.top;+ const ratio = Math.max(0, Math.min(1, relY / previewRect.height));+ if (side === 'top') {+ value = Math.round(ratio * imageHeight);+ } else {+ value = Math.round((1 - ratio) * imageHeight);+ }+ }++ value = Math.max(0, value);+ border[side] = value;+ inputs[side].value = String(value);++ if (isHorizontal) {+ if (side === 'left') {+ line.style.left = `${(value / imageWidth) * 100}%`;+ } else {+ line.style.right = `${(value / imageWidth) * 100}%`;+ }+ } else {+ if (side === 'top') {+ line.style.top = `${(value / imageHeight) * 100}%`;+ } else {+ line.style.bottom = `${(value / imageHeight) * 100}%`;+ }+ }+ };++ const onMouseUp = () => {+ document.removeEventListener('mousemove', onMouseMove);+ document.removeEventListener('mouseup', onMouseUp);+ document.body.style.cursor = '';+ preview.classList.remove('es-nine-slice-dragging');+ onSave();+ };++ document.body.style.cursor = isHorizontal ? 'ew-resize' : 'ns-resize';+ preview.classList.add('es-nine-slice-dragging');+ document.addEventListener('mousemove', onMouseMove);+ document.addEventListener('mouseup', onMouseUp);+ });+ }+}diff --git a/editor/src/styles/inspector.css b/editor/src/styles/inspector.cssindex e8d3d62e1..9fc3d5fd1 100644--- a/editor/src/styles/inspector.css+++ b/editor/src/styles/inspector.css@@ -816,10 +816,76 @@bottom: -4px;}+.es-nine-slice-loading {+ padding: 20px;+ text-align: center;+ color: var(--es-text-secondary);+ font-size: 11px;+}++.es-nine-slice-dragging .es-nine-slice-line {+ background: #00ff88;+}+.es-nine-slice-inputs {margin-top: 8px;}+/* =============================================================================+ * Platform Tabs & Override Fields+ * ============================================================================= */++.es-platform-tabs {+ display: flex;+ gap: 0;+ margin-bottom: 8px;+ border-bottom: 1px solid var(--es-border);+}++.es-platform-tab {+ flex: 1;+ padding: 4px 8px;+ border: none;+ background: transparent;+ color: var(--es-text-secondary);+ font-size: 11px;+ cursor: pointer;+ border-bottom: 2px solid transparent;+ transition: color 0.15s, border-color 0.15s;+}++.es-platform-tab:hover {+ color: var(--es-text-primary);+}++.es-platform-tab.es-active {+ color: var(--es-text-primary);+ border-bottom-color: var(--es-accent);+}++.es-platform-tab.es-has-override::after {+ content: '';+ display: inline-block;+ width: 5px;+ height: 5px;+ border-radius: 50%;+ background: var(--es-accent);+ margin-left: 4px;+ vertical-align: middle;+}++.es-platform-field {+ display: flex;+ align-items: flex-start;+ gap: 4px;+}++.es-override-toggle {+ margin-top: 6px;+ flex-shrink: 0;+ cursor: pointer;+}+/* =============================================================================* Texture Editor* ============================================================================= */diff --git a/sdk/src/runtimeLoader.ts b/sdk/src/runtimeLoader.tsindex 8bdda3ed0..aa97d724a 100644--- a/sdk/src/runtimeLoader.ts+++ b/sdk/src/runtimeLoader.ts@@ -34,15 +34,33 @@ export interface RuntimeAssetProvider {// Texture Helpers// =============================================================================+const FILTER_MODE_MAP: Record<string, number> = { 'nearest': 0, 'linear': 1 };+const WRAP_MODE_MAP: Record<string, number> = { 'repeat': 0, 'clamp': 1, 'mirror': 2 };++interface TextureParams {+ filterMode?: string;+ wrapMode?: string;+}+function createTextureFromPixels(module: ESEngineModule,result: { width: number; height: number; pixels: Uint8Array },flipY: boolean = true,+ params?: TextureParams,): number {const rm = module.getResourceManager();const ptr = module._malloc(result.pixels.length);module.HEAPU8.set(result.pixels, ptr);- const handle = rm.createTexture(result.width, result.height, ptr, result.pixels.length, 1, flipY);++ let handle: number;+ if (params && (params.filterMode || params.wrapMode) && rm.createTextureEx) {+ const filter = FILTER_MODE_MAP[params.filterMode ?? 'linear'] ?? 1;+ const wrap = WRAP_MODE_MAP[params.wrapMode ?? 'clamp'] ?? 1;+ handle = rm.createTextureEx(result.width, result.height, ptr, result.pixels.length, 1, flipY, filter, wrap);+ } else {+ handle = rm.createTexture(result.width, result.height, ptr, result.pixels.length, 1, flipY);+ }+module._free(ptr);return handle;}@@ -53,6 +71,7 @@ async function loadTextures(provider: RuntimeAssetProvider,): Promise<Record<string, number>> {const cache: Record<string, number> = {};+ const texSettings = (sceneData as any).textureImporterSettings as Record<string, TextureParams> | undefined;for (const entity of sceneData.entities) {for (const comp of entity.components) {const descriptors = getComponentAssetFieldDescriptors(comp.type);@@ -62,7 +81,8 @@ async function loadTextures(if (typeof ref !== 'string' || !ref) continue;if (cache[ref] !== undefined) continue;try {- cache[ref] = createTextureFromPixels(module, await provider.loadPixels(ref));+ const params = texSettings?.[ref];+ cache[ref] = createTextureFromPixels(module, await provider.loadPixels(ref), true, params);} catch {cache[ref] = 0;}diff --git a/sdk/src/wasm.ts b/sdk/src/wasm.tsindex cc03c5b22..d720806ed 100644--- a/sdk/src/wasm.ts+++ b/sdk/src/wasm.ts@@ -23,6 +23,7 @@ export interface CppRegistry extends GeneratedRegistry {export interface CppResourceManager {createTexture(width: number, height: number, pixels: number, pixelsLen: number, format: number, flipY: boolean): number;+ createTextureEx(width: number, height: number, pixels: number, pixelsLen: number, format: number, flipY: boolean, filterMode: number, wrapMode: number): number;createShader(vertSrc: string, fragSrc: string): number;registerExternalTexture(glTextureId: number, width: number, height: number): number;getTextureGLId(handle: number): number;diff --git a/src/esengine/bindings/ResourceManagerBindings.cpp b/src/esengine/bindings/ResourceManagerBindings.cppindex a3f5d1d7d..4a7de6195 100644--- a/src/esengine/bindings/ResourceManagerBindings.cpp+++ b/src/esengine/bindings/ResourceManagerBindings.cpp@@ -22,6 +22,45 @@ u32 rm_createTexture(resource::ResourceManager& rm, u32 width, u32 height,return handle.id();}+u32 rm_createTextureEx(resource::ResourceManager& rm, u32 width, u32 height,+ uintptr_t pixelsPtr, u32 pixelsLen, i32 format, bool flipY,+ i32 filterMode, i32 wrapMode) {+ const u8* pixels = reinterpret_cast<const u8*>(pixelsPtr);++ TextureFormat texFormat = TextureFormat::RGBA8;+ if (format == 0) texFormat = TextureFormat::RGB8;+ else if (format == 1) texFormat = TextureFormat::RGBA8;++ TextureSpecification spec;+ spec.width = width;+ spec.height = height;+ spec.format = texFormat;+ spec.generateMips = false;++ spec.minFilter = (filterMode == 0) ? TextureFilter::Nearest : TextureFilter::Linear;+ spec.magFilter = spec.minFilter;++ switch (wrapMode) {+ case 0: spec.wrapS = TextureWrap::Repeat; spec.wrapT = TextureWrap::Repeat; break;+ case 1: spec.wrapS = TextureWrap::ClampToEdge; spec.wrapT = TextureWrap::ClampToEdge; break;+ case 2: spec.wrapS = TextureWrap::MirroredRepeat; spec.wrapT = TextureWrap::MirroredRepeat; break;+ default: spec.wrapS = TextureWrap::ClampToEdge; spec.wrapT = TextureWrap::ClampToEdge; break;+ }++ auto handle = rm.createTexture(spec);+ if (!handle.isValid()) {+ return 0;+ }++ auto* texture = rm.getTexture(handle);+ if (texture && pixels) {+ u32 dataSize = width * height * (texFormat == TextureFormat::RGBA8 ? 4 : 3);+ texture->setDataRaw(pixels, dataSize, flipY);+ }++ return handle.id();+}+u32 rm_createShader(resource::ResourceManager& rm,const std::string& vertSrc, const std::string& fragSrc) {auto handle = rm.createShader(vertSrc, fragSrc);diff --git a/src/esengine/bindings/ResourceManagerBindings.hpp b/src/esengine/bindings/ResourceManagerBindings.hppindex e7531e4f1..f05746f34 100644--- a/src/esengine/bindings/ResourceManagerBindings.hpp+++ b/src/esengine/bindings/ResourceManagerBindings.hpp@@ -14,6 +14,9 @@ namespace esengine {u32 rm_createTexture(resource::ResourceManager& rm, u32 width, u32 height,uintptr_t pixelsPtr, u32 pixelsLen, i32 format, bool flipY);+u32 rm_createTextureEx(resource::ResourceManager& rm, u32 width, u32 height,+ uintptr_t pixelsPtr, u32 pixelsLen, i32 format, bool flipY,+ i32 filterMode, i32 wrapMode);u32 rm_createShader(resource::ResourceManager& rm,const std::string& vertSrc, const std::string& fragSrc);u32 rm_registerExternalTexture(resource::ResourceManager& rm, u32 glTextureId,diff --git a/src/esengine/bindings/WebSDKEntry.cpp b/src/esengine/bindings/WebSDKEntry.cppindex 07ed548ae..754dd2220 100644--- a/src/esengine/bindings/WebSDKEntry.cpp+++ b/src/esengine/bindings/WebSDKEntry.cpp@@ -288,6 +288,7 @@ EMSCRIPTEN_BINDINGS(esengine_renderer) {emscripten::class_<esengine::resource::ResourceManager>("ResourceManager").function("createTexture", &esengine::rm_createTexture)+ .function("createTextureEx", &esengine::rm_createTextureEx).function("createShader", &esengine::rm_createShader).function("registerExternalTexture", &esengine::rm_registerExternalTexture).function("releaseTexture", &esengine::rm_releaseTexture)