repo: janusweb
action: commit
revision: 
path_from: 
revision_from: 4f554071d8b031bf42f26d3c25e2c64272dcc101:
path_to: 
revision_to: 

commit 4f554071d8b031bf42f26d3c25e2c64272dcc101
Author: James Baicoianu 
Date:   Tue Oct 31 05:04:31 2017 -0700

    Mesh collider processing

diff --git a/scripts/janusbase.js b/scripts/janusbase.js

--- a/scripts/janusbase.js
+++ b/scripts/janusbase.js
@@ -107,16 +107,9 @@ elation.require(['engine.things.generic', 'utils.template'], function() {
         } else {
           var colliderasset = this.getAsset('model', collision_id);
           if (colliderasset) {
-            var collider = colliderasset.getInstance();
-            this.collidermesh = collider;
-            if (collider.userData.loaded) {
+            var processMeshCollider = elation.bind(this, function(collider) {
               this.extractColliders(collider, true);
-              collider.userData.thing = this;
-              this.colliders.add(collider);
-            } else {
-              elation.events.add(collider, 'asset_load', elation.bind(this, function(ev) {
-                collider.userData.thing = this;
-                this.extractColliders(collider, true);
+                //collider.userData.thing = this;

                 //collider.bindPosition(this.position);
                 //collider.bindQuaternion(this.orientation);
@@ -127,7 +120,17 @@ elation.require(['engine.things.generic', 'utils.template'], function() {
                   n.userData.thing = this;
                 }));
                 this.colliders.add(collider);
+              //this.setCollider('threejs', {mesh: collider.children[0], scale: this.properties.scale});

+            });
+            var collider = colliderasset.getInstance();
+            this.collidermesh = collider;
+            if (collider.userData.loaded) {
+              //this.colliders.add(collider);
+              processMeshCollider(collider);
+            } else {
+              elation.events.add(collider, 'asset_load', elation.bind(this, function(ev) {
+                processMeshCollider(collider);
               }) );
             }
           }

-----END OF PAGE-----