repo: janusweb action: commit revision: path_from: revision_from: 58040059d1d74191a076464b14f640f3eb5944d8: path_to: revision_to:
commit 58040059d1d74191a076464b14f640f3eb5944d8 Author: James BaicoianuDate: Thu May 9 15:14:48 2019 -0700 Added object.lights attribute diff --git a/scripts/object.js b/scripts/object.js
--- a/scripts/object.js
+++ b/scripts/object.js
@@ -18,6 +18,7 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
shadow: { type: 'boolean', default: false, set: this.updateMaterial },
shadow_receive: { type: 'boolean', default: true, set: this.updateMaterial },
shadow_cast: { type: 'boolean', default: true, set: this.updateMaterial },
+ lights: { type: 'boolean', default: false },
cull_face: { type: 'string', default: 'back', set: this.updateMaterial },
blend_src: { type: 'string', default: 'src_alpha', set: this.updateMaterial },
blend_dest: { type: 'string', default: 'one_minus_src_alpha', set: this.updateMaterial },
@@ -595,7 +596,7 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
m.vertexColors = THREE.VertexColors;
}
}
- } else if (n instanceof THREE.Light) {
+ } else if (n instanceof THREE.Light && !this.lights) {
remove.push(n);
}
}));
-----END OF PAGE-----