Fix texture boundaries in makeRing_compound

makeRing changes propagated over to makeRing_compound.

Author: wigie

lib/glow/mesh.js

@@ -311,7 +311,6 @@
                 var s = c*offset
              	for (var i=0; i<offset; i++) {
              		var inext = (i+1) % offset
-             		var cnext = (c+1) % NC
              		var v0 = shape[i]
              		m.pos.push( v0.x,v0.y,v0.z )
 
@@ -355,7 +354,7 @@
             var x=0, z=R2, newx, newz
             //var k = 1/Math.cos(dphi/2) // multiply z by k to stretch along the joint; only 1.00121, so approximate by 1
             var shape = [] // list of x,z points in the xz plane representing the shape at a joint
-            for (var i=0; i<N; i++) {
+            for (var i=0; i<N+1; i++) {
             	//shape.push(vec(x,0,k*z-k*R2)) 
             	shape.push(vec(x,0,z-R2)) // oval starts at outer edge of ring
             	newx = x*cosd + z*sind
@@ -367,11 +366,11 @@
             var y=0, z=0.5, newy, newz
         	var pts = []
         	var normals = []
-            for (var c=0; c<NC; c++) {
+            for (var c=0; c<NC+1; c++) {
             	var r = vec(0, y*size.y, z*size.z) // vector from origin to outer edge of oval cross section
             	var n = vec(0, y, z).norm()  // outward-going normal to cross section
             	var center = r.sub(n.multiply(R2))   // center of cross section
-                for (var i=0; i<N; i++) {
+                for (var i=0; i<N+1; i++) {
                 	var xc = shape[i].x
                 	var zc = shape[i].z
                 	var p = vec(xc,0,0).add(n.multiply(zc)).add(r)
@@ -385,14 +384,16 @@
             }
 
             var m = new Mesh()
-            for (var c=0; c<NC; c++) {
-             	for (var i=0; i<N; i++) {
-             		var inext = (i+1) % N
+            var offset = N+1
+            for (var c=0; c<NC+1; c++) {
+                var s = c*offset
+             	for (var i=0; i<offset; i++) {
+             		var inext = (i+1) % offset
              		var cnext = (c+1) % NC
-             		var v0 = pts[c*N+i]
+             		var v0 = pts[s+i]
              		m.pos.push( v0.x,v0.y,v0.z )
 
-             		v0 = normals[c*N+i]
+             		v0 = normals[s+i]
              		m.normal.push( v0.x,v0.y,v0.z )
 
           		    m.color.push( 1, 1, 1 )
@@ -402,12 +403,14 @@
 
           		    m.texpos.push( i/N, c/NC )
 
-          		    v0 = pts[c*N+inext].sub(pts[c*N+i])
+          		    v0 = pts[s+inext].sub(pts[s+i])
           		    m.bumpaxis.push( v0.x,v0.y,v0.z )
 
-          		    m.index.push( N*c+i,N*cnext+i,N*cnext+inext,   N*c+i,N*cnext+inext,N*c+inext )
+          		    m.index.push( s+i,s+i+offset,s+i+offset+1,   s+i,s+i+offset+1,s+i+1 )
              	}
+                m.index.length -= 6 // discard last set of indices
             }
+            m.index.length -= 6*(offset-1) // discard entire last band of indices
             return m
         },