Skip to content

Fix DAE texture loading in _meshfile_object #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jwnimmer-tri wants to merge 1 commit into from
Closed

Fix DAE texture loading in _meshfile_object #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion dist/main.min.js
View file
Open in desktop

Large diffs are not rendered by default.

21 changes: 14 additions & 7 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,13 +263,6 @@ class ExtensibleObjectLoader extends THREE.ObjectLoader {
geometry = merge_geometries(obj, true);
geometry.uuid = json.uuid;
material = geometry.material;
} else if (json.format == "dae") {
let loader = new ColladaLoader(manager);
loader.onTextureLoad = this.onTextureLoad;
let obj = loader.parse(json.data, path);
geometry = merge_geometries(obj.scene, true);
geometry.uuid = json.uuid;
material = geometry.material;
} else if (json.format == "stl") {
let loader = new STLLoader();
geometry = loader.parse(json.data.buffer, path);
Expand Down Expand Up @@ -1390,6 +1383,20 @@ class Viewer {
configure_obj(scene);
}
});
} else if (object_json.object.type == "_meshfile_object" && object_json.object.format == "dae") {
let manager = new THREE.LoadingManager();
if (object_json.object.resources !== undefined) {
let resources = object_json.object.resources;
manager.setURLModifier(url => {
if (resources[url] !== undefined) {
return resources[url];
}
return url;
});
}
let loader = new ColladaLoader(manager);
let dae = loader.parse(object_json.object.data, "");
configure_obj(dae.scene);
} else {
let loader = new ExtensibleObjectLoader();
loader.onTextureLoad = () => { this.set_dirty(); }
Expand Down