repo: janusweb action: commit revision: path_from: revision_from: 62e1c91f7d59c0f153e5f9a796c3d52d3b9605a6: path_to: revision_to:
commit 62e1c91f7d59c0f153e5f9a796c3d52d3b9605a6 Author: James BaicoianuDate: Thu Sep 29 03:04:28 2016 -0700 Use mesh colliders if specified diff --git a/scripts/object.js b/scripts/object.js
--- a/scripts/object.js
+++ b/scripts/object.js
@@ -67,8 +67,8 @@ elation.require(['janusweb.janusbase'], function() {
} else {
elation.events.add(collider, 'asset_load', elation.bind(this, function(ev) {
collider.userData.thing = this;
- this.extractColliders(collider, true);
-/*
+ //this.extractColliders(collider, true);
+
//collider.bindPosition(this.position);
//collider.bindQuaternion(this.orientation);
//collider.bindScale(this.properties.scale);
@@ -76,12 +76,13 @@ elation.require(['janusweb.janusbase'], function() {
collider.traverse(elation.bind(this, function(n) {
if (n.geometry) {
n.geometry.computeVertexNormals();
+ n.geometry.computeFaceNormals();
}
if (n.material) n.material = new THREE.MeshLambertMaterial({color: 0x999900, opacity: .2, transparent: true, emissive: 0x444400, alphaTest: .01, depthTest: false, depthWrite: false});
n.userData.thing = this;
}));
this.colliders.add(collider);
-*/
+
}) );
}
}
-----END OF PAGE-----