mohanki/titan3d_react_node_sqllite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix modelData saving and error catching
Build and Deploy / build-and-push (push) Successful in 44s
Details

Browse Source
This commit is contained in:
AI Bot
2026-09-02 17:46:10 +05:30
parent d530801b84
commit a89efe1f7b
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/Editor.tsx
+23 -21
View File
@@ -706,22 +706,16 @@ export default function Editor() {
const zipObj: Record<string, Uint8Array> = {}; const zipObj: Record<string, Uint8Array> = {};
if (sceneData.modelData && sceneData.modelData.data && typeof sceneData.modelData.data === 'string') { if (sceneData.modelData && sceneData.modelData.data && typeof sceneData.modelData.data === 'string') {
if (sceneData.modelData.data.startsWith('data:')) { if (sceneData.modelData.data.startsWith('data:') || sceneData.modelData.data.startsWith('blob:') || sceneData.modelData.data.startsWith('http')) {
const dataUrl = sceneData.modelData.data; try {
const base64 = dataUrl.split(',')[1]; const res = await fetch(sceneData.modelData.data);
const binaryStr = atob(base64); const buf = await res.arrayBuffer();
const len = binaryStr.length; zipObj['model.glb'] = new Uint8Array(buf);
const bytes = new Uint8Array(len); sceneData.modelData.data = 'model.glb';
for (let i = 0; i < len; i++) { } catch (fetchErr) {
bytes[i] = binaryStr.charCodeAt(i); console.error("Failed to fetch modelData for zipping", fetchErr);
} throw fetchErr;
zipObj['model.glb'] = bytes; }
sceneData.modelData.data = 'model.glb';
} else if (sceneData.modelData.data.startsWith('blob:') || sceneData.modelData.data.startsWith('http')) {
const res = await fetch(sceneData.modelData.data);
const buf = await res.arrayBuffer();
zipObj['model.glb'] = new Uint8Array(buf);
sceneData.modelData.data = 'model.glb';
} }
} }
@@ -989,7 +983,14 @@ export default function Editor() {
setIsLoading(true); setIsLoading(true);
setImportStatus("Restoring model..."); setImportStatus("Restoring model...");
try { try {
if (modelInfo.data === 'model.glb') {
throw new Error("Model data is missing from the project file.");
}
const response = await fetch(modelInfo.data); const response = await fetch(modelInfo.data);
if (!response.ok) {
throw new Error(`Failed to fetch model: ${response.statusText}`);
}
const blob = await response.blob(); const blob = await response.blob();
const url = URL.createObjectURL(blob); const url = URL.createObjectURL(blob);
@@ -1074,11 +1075,12 @@ export default function Editor() {
setLoadedModel(object); setLoadedModel(object);
setBlobURLs(prev => [...prev, url]); setBlobURLs(prev => [...prev, url]);
} }
setIsLoading(false); setIsLoading(false);
} catch (error) { } catch (error: any) {
console.error('Error re-importing model:', error); console.error('Error re-importing model:', error);
setIsLoading(false); setImportError(error.message || "Failed to load model from project file.");
} setIsLoading(false);
}
}; };
const handleTextureUpload = (event: React.ChangeEvent<HTMLInputElement>, type: 'map' | 'normalMap' | 'specularMap' | 'alphaMap' = 'map') => { const handleTextureUpload = (event: React.ChangeEvent<HTMLInputElement>, type: 'map' | 'normalMap' | 'specularMap' | 'alphaMap' = 'map') => {