Skip to content

Add UUID-based caching of geometry and materials #115

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
gizatt wants to merge 1 commit into from
Closed

Add UUID-based caching of geometry and materials #115

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.

31 changes: 22 additions & 9 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,17 @@ function handle_special_geometry(geom) {
// using the THREE.js native mesh loaders
// * Converting "_text" textures into text by drawing the
// requested text onto a canvas.
//
// This class also differs from the standard ObjectLoader
// in that it caches geometry and materials by UUID, enabling
// reuse of geometries across multiple JSON parses.
class ExtensibleObjectLoader extends THREE.ObjectLoader {
constructor( manager ) {
super( manager );
this.geometries = {};
this.materials = {};
}

delegate(special_handler, base_handler, json, additional_objects) {
let result = {};
if (json === undefined) {
Expand Down Expand Up @@ -158,6 +168,9 @@ class ExtensibleObjectLoader extends THREE.ObjectLoader {
}

parseObject(json, geometries, materials) {
// Merge these geometries and materials into our cache.
Object.assign(this.geometries, geometries);
Object.assign(this.materials, materials);
if (json.type == "_meshfile_object") {
let geometry;
let material;
Expand Down Expand Up @@ -241,7 +254,7 @@ class ExtensibleObjectLoader extends THREE.ObjectLoader {

return object;
} else {
return super.parseObject(json, geometries, materials);
return super.parseObject(json, this.geometries, this.materials);
}
}
}
Expand Down Expand Up @@ -717,6 +730,9 @@ function gradient_texture(top_color, bottom_color) {
class Viewer {
constructor(dom_element, animate, renderer) {
this.dom_element = dom_element;

this.loader = new ExtensibleObjectLoader();

if (renderer === undefined) {
this.renderer = new THREE.WebGLRenderer({antialias: true, alpha: true});
this.renderer.shadowMap.enabled = true;
Expand Down Expand Up @@ -928,8 +944,7 @@ class Viewer {
}

set_camera_from_json(data) {
let loader = new ExtensibleObjectLoader();
loader.parse(data, (obj) => {
this.loader.parse(data, (obj) => {
this.set_camera(obj);
});
}
Expand All @@ -943,9 +958,8 @@ class Viewer {
}

set_object_from_json(path, object_json) {
let loader = new ExtensibleObjectLoader();
loader.onTextureLoad = () => {this.set_dirty();}
loader.parse(object_json, (obj) => {
this.loader.onTextureLoad = () => {this.set_dirty();}
this.loader.parse(object_json, (obj) => {
if (obj.geometry !== undefined && obj.geometry.type == "BufferGeometry") {
if ((obj.geometry.attributes.normal === undefined) || obj.geometry.attributes.normal.count === 0) {
obj.geometry.computeVertexNormals();
Expand Down Expand Up @@ -1088,10 +1102,9 @@ class Viewer {
}

load_scene_from_json(json) {
let loader = new ExtensibleObjectLoader();
loader.onTextureLoad = () => {this.set_dirty();}
this.loader.onTextureLoad = () => {this.set_dirty();}
this.scene_tree.dispose_recursive();
this.scene = loader.parse(json);
this.scene = this.loader.parse(json);
this.show_background();
this.create_scene_tree();
let cam_node = this.scene_tree.find(["Cameras", "default", "rotated", "<object>"]);
Expand Down