Merge branch 'master' of github.com:Arelius/BurleyBRDF

ScatteredRay · Jul 19, 2016 · eaad9d6 · eaad9d6
2 parents f464038 + fd3ad36
commit eaad9d6
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/data/Materials/udims.mtlx b/data/Materials/udims.mtlx
@@ -24,9 +24,15 @@
     <input name="clearcoat" type="float" value="0.0" />
     <input name="clearcoatGloss" type="float" value="1.0" />
   </shader>
-  <geominfo udim="1001" />
-  <geominfo udim="1002" />
-  <geominfo udim="1011" />
+  <geominfo name="default_1001" geom="default">
+    <geomattr name="udim" type="integer" value="1001" />
+  </geominfo>
+  <geominfo name="default_1002" geom="default">
+    <geomattr name="udim" type="integer" value="1002" />
+  </geominfo>
+  <geominfo name="default_1011" geom="default">
+    <geomattr name="udim" type="integer" value="1011" />
+  </geominfo>
   <material name="default">
     <shaderref name="disney" shadertype="Surface" />
   </material>

diff --git a/webgl/materialx.js b/webgl/materialx.js
@@ -25,14 +25,6 @@ function parse_materialx(mtlx, mtls) {
 
     var udims = [];
 
-    for(var i = 0; i < geominfos.length; i++) {
-        var geominfo = geominfos[i];
-        var udim = geominfo.getAttribute('udim');
-        if(!!udim) {
-            udims.push(udim);
-        }
-    }
-
     function get_named(array, name) {
         for(var i = 0; i < array.length; i++) {
             if(array[i].getAttribute('name') === name) {
@@ -67,6 +59,16 @@ function parse_materialx(mtlx, mtls) {
         }
     }
 
+    for(var i = 0; i < geominfos.length; i++) {
+        var geominfo = geominfos[i];
+        var attrs = geominfo.getElementsByTagName('geomattr');
+        var udimattr = get_named(attrs, 'udim');
+        var udim = udimattr.getAttribute('value');
+        if(!!udim) {
+            udims.push(udim);
+        }
+    }
+
     var materialList = {};
     if(typeof mtls !== 'undefined')
         materialList = mtls;
@@ -279,6 +281,8 @@ if(typeof THREE !== 'undefined') {
                     return function(image) {
                         texture.image = image;
                         texture.magFilter = THREE.NearestFilter;
+                        texture.wrapS = THREE.RepeatWrapping;
+                        texture.wrapT = THREE.RepeatWrapping;
                         uniforms[u].value = texture;
                         texture.needsUpdate = true;
                         maybeCB();