repo: janusweb
action: commit
revision: 
path_from: 
revision_from: 901a3328f0d5e539da591922400e2f3ef7261ed3:
path_to: 
revision_to: 

commit 901a3328f0d5e539da591922400e2f3ef7261ed3
Author: James Baicoianu 
Date:   Fri Apr 6 13:28:22 2018 -0700

    Resolved merge conflict

diff --git a/css/janusweb.css b/css/janusweb.css

--- a/css/janusweb.css
+++ b/css/janusweb.css
@@ -55,6 +55,10 @@ body.dark .ui_window:after {
   width: 1000px;
   height: 1000px;
 }
+.engine_view {
+  background: url(https://cdn.discordapp.com/attachments/296481684495532043/405547351009263626/unknown.png);
+  background-size: cover;
+}
 .engine_view .engine_systems_render_css3d {
   position: absolute;
   top: 0;
diff --git a/scripts/janusbase.js b/scripts/janusbase.js

--- a/scripts/janusbase.js
+++ b/scripts/janusbase.js
@@ -104,10 +104,12 @@ elation.require(['engine.things.generic', 'utils.template'], function() {
         } else if (collision_id == 'cube') {
           var halfsize = collision_scale.clone().multiplyScalar(.5);
           this.setCollider('box', {min: halfsize.clone().negate().add(this.collision_pos), max: halfsize.add(this.collision_pos)});
+/*
         } else if (collision_id == 'plane') {
           var halfsize = collision_scale.clone().multiplyScalar(.5).add(this.collision_pos);
           halfsize.z = .1;
           this.setCollider('box', {min: halfsize.clone().negate(), max: halfsize});
+*/
         } else if (collision_id == 'cylinder') {
           this.setCollider('cylinder', {height: 1, radius: .5, offset: new THREE.Vector3(0, 0.5, 0)});
         } else {
@@ -126,10 +128,11 @@ elation.require(['engine.things.generic', 'utils.template'], function() {
                   n.userData.thing = this;
                 }));
                 this.colliders.add(collider);
-                //this.setCollider('mesh', {mesh: collider.children[0], scale: this.properties.scale});

+                //this.setCollider('mesh', {mesh: collider.children[0], scale: this.properties.scale});
             });
             var collider = colliderasset.getInstance();
+console.log('got collider', collider, collision_id);
             this.collidermesh = collider;
             if (collider.userData.loaded) {
               //this.colliders.add(collider);
diff --git a/scripts/object.js b/scripts/object.js

--- a/scripts/object.js
+++ b/scripts/object.js
@@ -418,7 +418,7 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
             } else {
               m.blending = THREE.NormalBlending;
             }
-            m.needsUpdate = true;
+            //m.needsUpdate = true;
             m.skinning = useSkinning;
           }
         } else if (n instanceof THREE.Light) {
@@ -431,6 +431,7 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
       this.refresh();
     }
     this.copyMaterial = function(oldmat) {
+console.log('cloning material', oldmat);
       if (elation.utils.isArray(oldmat)) {
         var materials = [];
         for (var i = 0; i < oldmat.length; i++) {

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