giers10/webeditor3d
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Filter out starter environment image assets during project save and load

Browse Source
This commit is contained in:
Victor Giers
2026-04-15 04:25:56 +02:00
parent 38862af7f5
commit 80a3c4bc2a
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/serialization/project-package.ts
View File

@@ -1,6 +1,7 @@
import { strFromU8, strToU8, unzipSync, Zip, ZipDeflate } from "fflate"; import { strFromU8, strToU8, unzipSync, Zip, ZipDeflate } from "fflate";
import type { ProjectDocument } from "../document/scene-document"; import type { ProjectDocument } from "../document/scene-document";
import { isStarterEnvironmentImageAsset } from "../assets/starter-environment-assets";
import { getProjectAssetKindLabel, type ProjectAssetRecord } from "../assets/project-assets"; import { getProjectAssetKindLabel, type ProjectAssetRecord } from "../assets/project-assets";
import type { ProjectAssetStorage, ProjectAssetStoragePackageRecord } from "../assets/project-asset-storage"; import type { ProjectAssetStorage, ProjectAssetStoragePackageRecord } from "../assets/project-asset-storage";
import { import {
@@ -257,8 +258,9 @@ export async function saveProjectPackage(
): Promise<Uint8Array> { ): Promise<Uint8Array> {
const sceneJson = serializeProjectDocument(document); const sceneJson = serializeProjectDocument(document);
const assets = Object.values(document.assets).sort((left, right) => left.id.localeCompare(right.id)); const assets = Object.values(document.assets).sort((left, right) => left.id.localeCompare(right.id));
const bundledAssets = assets.filter((asset) => !isStarterEnvironmentImageAsset(asset));
if (assets.length > 0 && storage === null) { if (bundledAssets.length > 0 && storage === null) {
throw new Error("Project save failed: project asset storage is unavailable for asset-backed scenes."); throw new Error("Project save failed: project asset storage is unavailable for asset-backed scenes.");
} }
@@ -266,7 +268,7 @@ export async function saveProjectPackage(
setPackagedFile(packageEntries, PROJECT_PACKAGE_SCENE_PATH, strToU8(sceneJson)); setPackagedFile(packageEntries, PROJECT_PACKAGE_SCENE_PATH, strToU8(sceneJson));
const missingAssetDiagnostics: string[] = []; const missingAssetDiagnostics: string[] = [];
for (const asset of assets) { for (const asset of bundledAssets) {
let storedAsset: ProjectAssetStoragePackageRecord | null; let storedAsset: ProjectAssetStoragePackageRecord | null;
try { try {
@@ -334,18 +336,19 @@ export async function loadProjectPackage(
} }
const assets = Object.values(document.assets).sort((left, right) => left.id.localeCompare(right.id)); const assets = Object.values(document.assets).sort((left, right) => left.id.localeCompare(right.id));
const bundledAssets = assets.filter((asset) => !isStarterEnvironmentImageAsset(asset));
if (assets.length === 0) { if (assets.length === 0) {
return document; return document;
} }
if (storage === null) { if (bundledAssets.length > 0 && storage === null) {
throw new Error("Project load failed: project asset storage is unavailable for asset-backed scenes."); throw new Error("Project load failed: project asset storage is unavailable for asset-backed scenes.");
} }
const packagedAssetRecords = buildStoredAssetRecordsFromPackage(entries, document); const packagedAssetRecords = buildStoredAssetRecordsFromPackage(entries, document);
for (const asset of assets) { for (const asset of bundledAssets) {
const packagedAsset = packagedAssetRecords.get(asset.id); const packagedAsset = packagedAssetRecords.get(asset.id);
if (packagedAsset === undefined || Object.keys(packagedAsset.files).length === 0) { if (packagedAsset === undefined || Object.keys(packagedAsset.files).length === 0) {
@@ -357,7 +360,7 @@ export async function loadProjectPackage(
const writtenStorageKeys: string[] = []; const writtenStorageKeys: string[] = [];
try { try {
for (const asset of assets) { for (const asset of bundledAssets) {
const packagedAsset = packagedAssetRecords.get(asset.id); const packagedAsset = packagedAssetRecords.get(asset.id);
if (packagedAsset === undefined) { if (packagedAsset === undefined) {