Simplify creation of ring vertices

Author: wigie

lib/glow/mesh.js

@@ -284,7 +284,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 c=0; c<N; c++) {
+            for (var i=0; i<N; 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
@@ -293,43 +293,37 @@
             	z = newz
             }
 
-            var m = new Mesh()
             var y=0, z=R1+R2, newy, newz
-        	var pts = []
         	var normals = []
             for (var c=0; c<NC; c++) {
             	var r = vec(0, y, z) // vector from origin to outer edge of oval cross section
-                for (var i=0; i<N; i++) {
-                	pts.push(shape[i])
-                	normals.push(r) // use normal to contain the vector from origin to outer edge of the oval
-                }
+                normals.push(r) // use normal to contain the vector from origin to outer edge of the oval
+
             	newy = y*cphi + z*sphi
             	newz = z*cphi - y*sphi
             	y = newy
             	z = newz
             }
-                
+ 
+            var m = new Mesh()
             for (var c=0; c<NC; c++) {
              	for (var i=0; i<N; i++) {
              		var inext = (i+1) % N
              		var cnext = (c+1) % NC
-             		var v0 = pts[c*N+i]
+             		var v0 = shape[i]
              		m.pos.push( v0.x,v0.y,v0.z )
 
-             		v0 = normals[c*N+i]
+             		v0 = normals[c]
              		m.normal.push( v0.x,v0.y,v0.z )
 
           		    m.color.push( 1,1,1 )
-          		    
           		    m.opacity.push( 1 )
-          		    
           		    m.shininess.push( 1 )
-          		    
           		    m.emissive.push( 0 )
 
           		    m.texpos.push( i/N, c/NC )
 
-          		    v0 = pts[c*N+inext].sub(pts[c*N+i])
+          		    v0 = shape[inext].sub(shape[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 )
@@ -357,7 +351,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 c=0; c<N; c++) {
+            for (var i=0; i<N; 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
@@ -398,11 +392,8 @@
              		m.normal.push( v0.x,v0.y,v0.z )
 
           		    m.color.push( 1,1,1 )
-          		    
           		    m.opacity.push( 1 )
-          		    
           		    m.shininess.push( 1 )
-          		    
           		    m.emissive.push( 0 )
 
           		    m.texpos.push( i/N, c/NC )