daniel543x/artcraft
1
0 Fork 0
mirror of https://github.com/storytold/artcraft.git synced 2026-11-03 08:57:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Feature/bugfix saving (#447)

Browse Source 
Fixes saving and loading for new scenes.
This commit is contained in:
Miles Ryan authored and GitHub committed 2024-05-30 19:25:44 -04:00
1 parent d0eb92984f
commit 323e8ce386
2 files changed
+42 -29
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/pages/PageEnigma/Editor/scene.ts
+7 -7
View File
@@ -415,13 +415,13 @@ class Scene {
if (auto_add) {
glb.scene.name = "Scene";
glb.userData["name"] = "Scene";
glb.userData["media_id"] = media_id;
glb.userData["color"] = "#FFFFFF";
glb.userData["metalness"] = 0.0;
glb.userData["shininess"] = 0.5;
glb.userData["specular"] = 0.5;
glb.userData["locked"] = false;
glb.scene.userData["name"] = "Scene";
glb.scene.userData["media_id"] = media_id;
glb.scene.userData["color"] = "#FFFFFF";
glb.scene.userData["metalness"] = 0.0;
glb.scene.userData["shininess"] = 0.5;
glb.scene.userData["specular"] = 0.5;
glb.scene.userData["locked"] = false;
this.scene.add(glb.scene);
}
app/pages/PageEnigma/proxy/storyteller_proxy_scene.ts
+35 -22
View File
@@ -26,32 +26,45 @@ export class StoryTellerProxyScene {
this.sceneItemProxy = [];
}
async getChildren(child: THREE.Object3D) {
if (this.lookUpDictionary[child.uuid] == null) {
this.lookUpDictionary[child.uuid] = new StoryTellerProxy3DObject(
this.version,
child.userData["media_id"],
);
}
const proxyObject3D: StoryTellerProxy3DObject =
this.lookUpDictionary[child.uuid];
proxyObject3D.position.copy(child.position);
proxyObject3D.rotation.copy(child.rotation);
proxyObject3D.scale.copy(child.scale);
proxyObject3D.object_user_data_name = child.userData.name;
proxyObject3D.object_name = child.name;
proxyObject3D.object_uuid = child.uuid;
proxyObject3D.color = child.userData["color"];
proxyObject3D.metalness = child.userData["metalness"];
proxyObject3D.shininess = child.userData["shininess"];
proxyObject3D.specular = child.userData["specular"];
proxyObject3D.locked = child.userData["locked"];
const json_data = await proxyObject3D.toJSON();
return json_data
}
public async saveToScene(): Promise<any> {
const results: ObjectJSON[] = [];
if (this.scene.scene != null) {
for (const child of this.scene.scene.children) {
if (child.userData["media_id"] != undefined) {
if (this.lookUpDictionary[child.uuid] == null) {
this.lookUpDictionary[child.uuid] = new StoryTellerProxy3DObject(
this.version,
child.userData["media_id"],
);
for (let pchild of this.scene.scene.children) {
if (pchild.type == "Group") {
for (let child of pchild.children) {
if (child.userData["media_id"] != undefined) {
results.push(await this.getChildren(child));
}
}
}
else {
if (pchild.userData["media_id"] != undefined) {
results.push(await this.getChildren(pchild));
}
const proxyObject3D: StoryTellerProxy3DObject =
this.lookUpDictionary[child.uuid];
proxyObject3D.position.copy(child.position);
proxyObject3D.rotation.copy(child.rotation);
proxyObject3D.scale.copy(child.scale);
proxyObject3D.object_user_data_name = child.userData.name;
proxyObject3D.object_name = child.name;
proxyObject3D.object_uuid = child.uuid;
proxyObject3D.color = child.userData["color"];
proxyObject3D.metalness = child.userData["metalness"];
proxyObject3D.shininess = child.userData["shininess"];
proxyObject3D.specular = child.userData["specular"];
proxyObject3D.locked = child.userData["locked"];
const json_data = await proxyObject3D.toJSON();
results.push(json_data);
}
}
} else {