repo: janusweb
action: commit
revision: 
path_from: 
revision_from: f6a2da0d21a0c4ac4f72adad7e0da73fede6442d:
path_to: 
revision_to: 

commit f6a2da0d21a0c4ac4f72adad7e0da73fede6442d
Author: James Baicoianu 
Date:   Sun Mar 26 15:09:55 2017 -0700

    Fixed texture assignment problem

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

--- a/scripts/object.js
+++ b/scripts/object.js
@@ -204,6 +204,7 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
           if (textureasset.ou3d) {
             texture.repeat.y = 0.5;
           }
+          this.assignTextureParameters(texture, modelasset);
         }
       }
       if (this.properties.video_id) {
@@ -224,6 +225,7 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
           texture.magFilter = THREE.LinearFilter;
           elation.events.add(texture, 'videoframe', elation.bind(this, this.refresh));
           this.videotexture = texture;
+          this.assignTextureParameters(texture, modelasset);
           if (videoasset.auto_play) {
             texture.image.play();
           } else {
@@ -313,17 +315,10 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
                   m.alphaTest = 0.01;
                 }
                 m.map = asset.getInstance();
-                texture = m.map;
+                this.assignTextureParameters(m.map, modelasset);
                 elation.events.add(m.map, 'asset_update', elation.bind(this, function(ev) { m.map = ev.data; }));
               }
             }
-            if (texture) {
-              var linear = (modelasset.tex_linear && modelasset.tex_linear !== 'false');
-              texture.minFilter = (linear ? THREE.LinearMipMapLinearFilter : THREE.NearestFilter);
-              texture.magFilter = (linear ? THREE.LinearMipMapLinearFilter : THREE.NearestFilter);
-              texture.anisotropy = (linear ? elation.config.get('engine.assets.image.anisotropy', 4) : 1);
-              texture.generateMipmaps = linear;
-            }
             if (m.normalMap) {
               var imagesrc = m.normalMap.sourceFile;
               var asset = this.getAsset('image', imagesrc);
@@ -389,6 +384,13 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {

       return m;
     }
+    this.assignTextureParameters = function(texture, modelasset) {
+      var linear = (modelasset.tex_linear && modelasset.tex_linear !== 'false');
+      texture.minFilter = (linear ? THREE.LinearMipMapLinearFilter : THREE.NearestFilter);
+      texture.magFilter = (linear ? THREE.LinearMipMapLinearFilter : THREE.NearestFilter);
+      texture.anisotropy = (linear ? elation.config.get('engine.assets.image.anisotropy', 4) : 1);
+      texture.generateMipmaps = linear;
+    }
     this.pauseVideo = function() {
       if (this.videotexture) {
         var video = this.videotexture.image;

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