Fixed some nasty bugs associated with assigning a compound to the correct canvas

Author: BruceSherwood

docs/VPythonDocs/index.html

@@ -92,7 +92,7 @@
       <p class="Normal">VPython makes it unusually easy to write programs that generate navigable real-time 3D animations. It is based on the Python programming language which is widely used in introductory programming courses thanks to its clean design, and it is also widely used in science and business.</p>
       <p class="Normal">VPython was originated by David Scherer in 2000. In 2011 David Scherer and Bruce Sherwood initiated the development of GlowScript, a similar programming environment but which runs in a browser. In 2014 it became possible to use RapydScript, a programming language very similar to Python, to support VPython programs in  the GlowScript  environment. This
         documentation describes VPython and includes notes on what is not currently available in the GlowScript version. </p>
-      <p class="Normal">The version of VPython that runs with a standard installed Python is referred to as &quot;classic&quot; VPython. John Coady has implemented VPython to run in <strong><a href="http://ipython.org/" target="_blank">iPython</a></strong> notebooks, with his <strong><a href="https://pypi.python.org/pypi/IVisual/0.1.87" target="_blank">ivisual</a></strong> module.</p>
+      <p class="Normal">The version of VPython that runs with a standard installed Python is referred to as &quot;classic&quot; VPython. John Coady has implemented VPython to run in <strong><a href="http://ipython.org/" target="_blank">iPython</a></strong> notebooks, with his <strong><a href="https://pypi.python.org/pypi/IVisual/0.1.87" target="_blank">ivisual</a></strong> module. Aaron Titus has posted a useful summary of the various ways to <strong><a href="http://physicslogos.blogspot.com/2015/04/vpython-anaconda-and-ivisual.html" target="_blank">install and use VPython</a></strong>. </p>
       <p class="Normal">For a quick introduction, see the following YouTube videos. These were created for classic VPython but are just as useful for learning the browser version. </p>
       <blockquote>
         <p class="Normal"><a href="http://vpython.org/video01.html" target="_blank"><strong>3D Objects</strong></a></p>

lib/glow/api_misc.js

@@ -353,7 +353,6 @@
         degrees: function degrees(rad) { return (rad * 180 / Math.PI) },
 
         sleep: sleep,
-        //rate: rate,
         update: update,
         print: print,
         print_options: print_options,

lib/glow/primitives.js

@@ -624,7 +624,7 @@
             this.canvas = args.canvas
             delete args.canvas
         } else if (args.display !== undefined) {
-            obj.canvas = obj.display = args.display
+            this.canvas = args.display
             delete args.display
         } else {
             this.canvas = canvas.selected
@@ -669,7 +669,10 @@
         		this.__opacity = value
         		this.canvas.__vertex_changed[this.__id] = this
         	}
-        	
+        },
+        display: {
+        	get: function() { return this.canvas },
+        	set: function(value) { throw new Error('Cannot change display of existing object')}
         },
         texpos: new attributeVector(null, 0,0,0),
         bumpaxis: new attributeVector(null, 1,0,0),
@@ -741,6 +744,10 @@
     			this.__change()
     			}
     	},
+        display: {
+        	get: function() { return this.canvas },
+        	set: function(value) { throw new Error('Cannot change display of existing object')}
+        },
     	pos: {
     		get: function() { tri_quad_error('triangle', 'pos') },
     		set: function(value) { tri_quad_error('triangle', 'pos') }
@@ -857,6 +864,10 @@
     		get: function() { tri_quad_error('quad', 'shininess') },
     		set: function(value) { tri_quad_error('quad', 'shininess') }
     	},
+        display: {
+        	get: function() { return this.canvas },
+        	set: function(value) { throw new Error('Cannot change display of existing object')}
+        },
     	__prev_texture: null,
     	__prev_bumpmap: null,
         __update: function () { this.__model.id_object[this.__id] = this },
@@ -1038,6 +1049,14 @@
     	},
     	origin: new attributeVector(null, 0,0,0),
         radius: 0,
+        display: {
+        	get: function() { return this.canvas },
+        	set: function(value) { throw new Error('Cannot change display of existing object')}
+        },
+        display: {
+        	get: function() { return this.canvas },
+        	set: function(value) { throw new Error('Cannot change display of existing object')}
+        },
         __no_autoscale: false,
         __get_extent: function (ext) {
         	if (this.__no_autoscale) return
@@ -1335,7 +1354,7 @@
                 if (this.__curve !== undefined) {
                     this.__curve.clear()
                 } else {
-                    this.__curve = curve({__no_autoscale:true})
+                    this.__curve = curve({canvas:this.canvas, __no_autoscale:true})
                 }
             }
 
@@ -1376,6 +1395,10 @@
     property.declare( vp_helix.prototype, {
         axis: new attributeVectorAxis(null, 1,0,0),
         size: new attributeVectorSize(null, 1,2,2),
+        display: {
+        	get: function() { return this.canvas },
+        	set: function(value) { throw new Error('Cannot change display of existing object')}
+        },
         radius: {
         	get: function() { return this.__size.__y/2 },
         	set: function(value) {
@@ -1493,12 +1516,13 @@
 	}
 
 	function make_extrusion(args) {
-	    var center, pos, shapelist, col, up, opacity
+	    var center, pos, shapelist, col, up, opacity, can
+	    can = args.canvas
 	    pos = (args.pos === undefined) ? vec(0,0,0) : args.pos
 	    if (args.shape === undefined) {
 	        throw new Error('An extrusion object needs a shape attribute.')
 	    } else shapelist = args.shape
-	    up = (args.up === undefined) ? canvas.selected.up : args.up
+	    up = (args.up === undefined) ? can.up : args.up
 	    col = (args.color === undefined) ? color.white : args.color
 	    opacity = (args.opacity === undefined) ? 1 : args.opacity
 
@@ -1612,7 +1636,11 @@
 	        }
 	        i++
 	    }
-	    return compound(quads)
+	    var current = canvas.selected
+	    canvas.selected = can
+	    var comp = compound(quads)
+	    canvas.selected = current
+	    return comp
 	}
 
 	function extrusion(args) {return initObject(this, extrusion, args) }
@@ -1626,6 +1654,10 @@
         	get: function() {throw new Error("An extrusion has no radius.")},
         	set: function(val) {throw new Error("An extrusion has no radius.")}
         },
+        display: {
+        	get: function() { return this.canvas },
+        	set: function(value) { throw new Error('Cannot change display of existing object')}
+        },
     	origin: new attributeVector(null, 0,0,0),
         __initialize: true,
         pos: {
@@ -1684,7 +1716,7 @@
         	}
 
         	if (this.__initialize) {
-        		this.__comp = make_extrusion({pos:this.__pos, shape:this.__shape, color:this.__color, opacity:this.__opacity})
+        		this.__comp = make_extrusion({canvas:this.canvas, pos:this.__pos, shape:this.__shape, color:this.__color, opacity:this.__opacity})
 	            this.__lastsize = this.__size
 	            this.__lastcolor = this.__color
 	            this.__lastopacity = this.__opacity
@@ -1735,7 +1767,7 @@
         	}
 
         	if (this.__initialize) {
-        		this.__comp = make_extrusion( {pos:paths.circle({make_ring:true, radius:0.5*(this.__size.y-this.__size.x)}), 
+        		this.__comp = make_extrusion( {canvas:this.canvas, pos:paths.circle({make_ring:true, radius:0.5*(this.__size.y-this.__size.x)}), 
 	            			shape:shapes.circle({radius:0.5*this.__size.x}), color:this.__color, opacity:this.__opacity} )
 	            this.__lastsize = this.__size
 	            this.__lastcolor = this.__color
@@ -1755,6 +1787,10 @@
     function vp_ring(args) { return initObject(this, vp_ring, args) }
     subclass(vp_ring, ring)
     property.declare( vp_ring.prototype, {
+        display: {
+        	get: function() { return this.canvas },
+        	set: function(value) { throw new Error('Cannot change display of existing object')}
+        },
         size: new attributeVector(null, 0.2,2,2),
         thickness: {
         	get: function() { return this.__size.__x/2 },