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

commit f559181f01deffdc9e1ee31b963b179d25b42623
Author: James Baicoianu 
Date:   Sun Mar 26 14:27:05 2017 -0700

    Set texture anisotropy to 1 if nearest mapping is used

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

--- a/scripts/object.js
+++ b/scripts/object.js
@@ -303,9 +303,17 @@ elation.require(['janusweb.janusbase', 'janusweb.websurface'], function() {
                   m.alphaTest = 0.01;
                 }
                 m.map = asset.getInstance();
+                texture = m.map;
                 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);

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