Fixed bug in cloning of objects, including cloning of compounds

Author: BruceSherwood

lib/glow/primitives.js

@@ -470,35 +470,36 @@
 	        			__show_start_face:this.__show_start_face, __show_end_face:this.__show_end_face,
 	        			__start_face_color:this.__start_face_color, __end_face_color:this.__end_face_color,
 	        			__descender:this.__descender, __shininess:this.__shininess, __emissive:this.__emissive,
-	            		__pickable:this.__pickable}
+	        			visible:true, __pickable:this.__pickable}
         		var newtext = new text(newargs)
         		for (var attr in args) newtext[attr] = args[attr] // apply the args attributes to the clone
 	        	newtext.__update()
         		return newtext
         	} else if (this instanceof curve) {
-        		var newargs = {origin:this.__origin, pos:this.pos, color:this.__color, radius:this.__radius,
-            			size:this.__size, axis:this.__axis,
-                		shininess:this.__shininess, emissive:this.__emissive, 
-                		visible:true, pickable:this.__pickable}
+        		var newargs = {__origin:this.__origin, __pos:this.pos, __color:this.__color, 
+        				__radius:this.__radius, __size:this.__size, __axis:this.__axis,
+        				__shininess:this.__shininess, __emissive:this.__emissive, 
+                		visible:true, __pickable:this.__pickable}
         	} else if (this instanceof helix) {
-        		var newargs = {pos:this.pos, color:this.__color,
-        				thickness:this.__thickness, coils:this.__coils,
-            			size:this.__size, axis:this.__axis,
-                		shininess:this.__shininess, emissive:this.__emissive, 
-                		visible:true, pickable:this.__pickable}
+        		var newargs = {__pos:this.pos, __color:this.__color,
+        				__thickness:this.__thickness, __coils:this.__coils,
+        				__size:this.__size, __axis:this.__axis,
+        				__shininess:this.__shininess, __emissive:this.__emissive, 
+                		visible:true, __pickable:this.__pickable}
         	} else {
-	        	var newargs = {pos:this.__pos, color:this.__color, opacity:this.__opacity, 
-	        			size:this.__size, axis:this.__axis, __tex:this.__tex,
-	            		shininess:this.__shininess, emissive:this.__emissive,
-	            		visible:true, pickable:this.__pickable}
+	        	var newargs = {__pos:this.__pos, __color:this.__color, __opacity:this.__opacity, 
+	        			__size:this.__size, __axis:this.__axis, __tex:this.__tex, __up:this.__up,
+	        			__shininess:this.__shininess, __emissive:this.__emissive,
+	        			visible:true, __pickable:this.__pickable}
 	        	if (this instanceof arrow || this instanceof vp_arrow) {
 	        		newargs.shaftwidth = this.__shaftwidth
 	        		newargs.headwidth = this.__headwidth
 	        		newargs.headlength = this.__headlength
 	        	}
         	}
-        	var ret = new this.constructor(newargs) // newargs does NOT contain newargs.up, to avoid up affecting axis in constructor
-        	for (var attr in args) ret[attr] = args[attr] // includes setting up
+        	// The newargs are in terms of __attr to avoid axis/up/size interconnections
+        	var ret = new this.constructor(newargs)
+        	for (var attr in args) ret[attr] = args[attr] // apply the args attributes to the clone
         	return ret
         },
         __change: function() { if (this.__id) this.canvas.__changed[this.__id] = this },
@@ -547,12 +548,13 @@
             // But when rotating an object, we must break this linkage and rotate both axis and up in the same way.
             // The global variable window.__adjustupaxis is normally true, but here we set it temporarilty to false.
             // The object axis and up attributes in vectors.js check this global variable.
+            // (Another way to deal with this would be to set __axis and __up, and then call __update.)
             window.__adjustupaxis = false // unlink axis and up temporarily
             if (diff_angle(obj.__axis,rotaxis) > 1e-6) {
             	// change axis, which will also change up
 	            if (isarrow) obj.axis_and_length = obj.axis_and_length.rotate({angle:angle, axis:rotaxis})
 	            else obj.axis = obj.__axis.rotate({angle:angle, axis:rotaxis}) // maintain special character of VPython axis
-            	obj.up = obj.up.rotate({angle:angle, axis:rotaxis})
+            	obj.up = obj.__up.rotate({angle:angle, axis:rotaxis})
             } else {
             	obj.up = obj.__up.rotate({angle:angle, axis:rotaxis})
             }
@@ -1441,15 +1443,17 @@
     subclass(compound, box)
     property.declare( compound.prototype, {    	
         clone: function(args) { // cloning a compound object
-        	var newargs = {pos:this.__pos, color:this.__color, opacity:this.__opacity, 
-        			size:this.__size, axis:this.__axis, up:this.__up,
-            		shininess:this.__shininess, emissive:this.__emissive,
-            		visible:true, pickable:this.__pickable,
+        	var newargs = {__pos:this.__pos, __color:this.__color, __opacity:this.__opacity, 
+        			__size:this.__size, __axis:this.__axis, __up:this.__up,
+        			__shininess:this.__shininess, __emissive:this.__emissive,
+            		visible:true, __pickable:this.__pickable,
             		__center:this.__center, __pseudosize:this.__pseudosize}
         	if (this.texture.file !== null) newargs.texture = this.texture
-        	for (var attr in args) newargs[attr] = args[attr]
+        	// The newargs are in terms of __attr to avoid axis/up/size interconnections
         	newargs.__cloning = this.__mesh
-        	return new this.constructor([], newargs)
+        	var ret = new this.constructor([], newargs)
+        	for (var attr in args) ret[attr] = args[attr] // apply the args attributes to the clone
+        	return ret
         },
         _world_zaxis: function() {
 	        return this.__axis.cross(this.__up).norm()