From 11461f0b5d1aef87ddb107c357a01fa1447accb0 Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Tue, 31 May 2011 04:09:01 +0100 Subject: [PATCH] Brought back automatic centroid computation. --- src/extras/io/JSONLoader.js | 3 ++- src/extras/io/SceneLoader.js | 16 ++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/extras/io/JSONLoader.js b/src/extras/io/JSONLoader.js index 83fdb83a1c..5e9459dde3 100644 --- a/src/extras/io/JSONLoader.js +++ b/src/extras/io/JSONLoader.js @@ -56,8 +56,9 @@ THREE.JSONLoader.prototype.createModel = function ( json, callback, texture_path parseMorphing( scale ); parseEdges(); + geometry.computeCentroids(); geometry.computeFaceNormals(); - // geometry.computeCentroids(); + // geometry.computeEdgeFaces(); function parseModel( scale ) { diff --git a/src/extras/io/SceneLoader.js b/src/extras/io/SceneLoader.js index 50316abe5b..d23afdb330 100644 --- a/src/extras/io/SceneLoader.js +++ b/src/extras/io/SceneLoader.js @@ -7,7 +7,7 @@ THREE.SceneLoader = function () { this.onLoadStart = function () {}; this.onLoadProgress = function() {}; this.onLoadComplete = function () {}; - + this.callbackSync = function () {}; this.callbackProgress = function () {}; @@ -60,24 +60,24 @@ THREE.SceneLoader.prototype = { }; // find out if there are some colliders - + var hasColliders = false; - + for( dd in data.objects ) { - + o = data.objects[ dd ]; if ( o.meshCollider ) { - + hasColliders = true; break; } - + } - + if ( hasColliders ) { - + result.scene.collisions = new THREE.CollisionSystem(); } -- GitLab