Cleanup and generalization of extrusion; also fixed bug in curve.origin

Author: BruceSherwood

docs/GlowScriptDocs/extrusion.html

@@ -69,6 +69,7 @@
         <p class="Normal">Currently a path must be closed. That is, the last point must be the same as the first point.</p>
       <p class="Normal"><strong>3)</strong> Create an extrusion object to extrude your shape along your path. For example, using paths and shapes defined above,</p>
         <p class="program">extrusion(pos=circpath, shape=rect) </p>
+        <p class="Normal"><strong>Point positions are relative:</strong> A point whose pos  is <span class="program">vector</span>(2, 1, 0) is of course normally displayed at location <span class="program">vector</span>(2, 1, 0). However, the position of a point is <em>relative</em> to an extrusion's own <span class="attribute">origin</span> value, which by default is <span class="program">vector</span>(0, 0, 0). If you change the extrusion's <span class="attribute">origin</span> value to <span class="program">vector</span>(10, 6, 5), the point is displayed at the location <span class="program">vector</span>(12, 7, 5); that is, the point is displayed 2 to the right, 6 above, and 0 in front of the extrusion's position <span class="program">vector</span>(10, 6, 5). Another way of saying this is that the display location is the vector sum, <span class="program">vector</span>(10, 6, 5) + <span class="program">vector</span>(2, 1, 0). This means that you can quickly and efficiently move the entire extrusion just by changing the extrusion's <span class="attribute">origin</span> value. The <span class="attribute">pos</span> value of an individual point does not change; it's just that the point is displayed in a shifted position. As a result, moving an entire extrusion is very fast.</p>
         <div>
           <div>
             <div>

docs/VPythonDocs/extrusion.html

@@ -73,6 +73,7 @@
       <p class="Normal">Currently a path must be closed. That is, the last point must be the same as the first point.</p>
       <p class="Normal"><strong>3)</strong> Create an extrusion object to extrude your shape along your path. For example, using paths and shapes defined above,</p>
       <p class="program">extrusion(pos=circpath, shape=rect)</p>
+      <p class="Normal"><strong>Point positions are relative:</strong> A point whose pos  is <span class="program">vector</span>(2, 1, 0) is of course normally displayed at location <span class="program">vector</span>(2, 1, 0). However, the position of a point is <em>relative</em> to an extrusion's own <span class="attribute">origin</span> value, which by default is <span class="program">vector</span>(0, 0, 0). If you change the extrusion's <span class="attribute">origin</span> value to <span class="program">vector</span>(10, 6, 5), the point is displayed at the location <span class="program">vector</span>(12, 7, 5); that is, the point is displayed 2 to the right, 6 above, and 0 in front of the extrusion's position <span class="program">vector</span>(10, 6, 5). Another way of saying this is that the display location is the vector sum, <span class="program">vector</span>(10, 6, 5) + <span class="program">vector</span>(2, 1, 0). This means that you can quickly and efficiently move the entire extrusion just by changing the extrusion's <span class="attribute">origin</span> value. The <span class="attribute">pos</span> value of an individual point does not change; it's just that the point is displayed in a shifted position. As a result, moving an entire extrusion is very fast.</p>
       <div>
         <div>
           <div>
@@ -84,7 +85,7 @@
                 <p class="Normal">The paths in the paths library all go counterclockwise in the xz plane, as seen from above. That is, if starting from a position on the x axis, they head in the -z direction and bend toward the left. If your shape has something sticking out on the right, it will be on the outer side of the extrusion, whereas something sticking out on the left will be on the inner side of the extrusion.</p>
               <div>
                   <div></div>
-                </div>
+          </div>
                 <p class="Normal"><strong><font color="#0000a0">Dynamic change of attributes</font></strong> </p>
                 <div>
                   <div></div>

ide/index.html

@@ -66,7 +66,7 @@ <h2>glowscript.org</h2>
     Here at glowscript.org, you can write and run GlowScript programs right in your browser, store them in the 
     cloud for free, and easily share them with others.</p>
 
-	<p><b>New in GlowScript 1.1: Extrusion object now available in limited form.</b></p>
+	<p><b>New in GlowScript 1.1: extrusion; private folders.</b></p>
     </div>
 
     The Help explains which browsers support GlowScript and provides full documentation.

lib/glow/primitives.js

@@ -110,6 +110,7 @@
     	// We have to initialize ALL vector attributes here, because they need pointers back to "this" :-(
         if (args.pos === undefined) obj.pos = obj.pos
         if (args.color === undefined) obj.color = obj.color
+        if (constructor == curve || constructor == extrusion) obj.origin = obj.origin
         if (constructor != points) {
         	if (constructor == arrow) {
         		if (args.axis !== undefined) throw new Error("arrow does not have axis; replace with axis_and_length")
@@ -1488,7 +1489,7 @@
 	    */
 	}
 
-	function extrusion(args) {
+	function make_extrusion(args) {
 	    var center, pos, shapelist, col, up, opacity
 	    pos = (args.pos === undefined) ? vec(0,0,0) : args.pos
 	    if (args.shape === undefined) {
@@ -1610,6 +1611,79 @@
 	    }
 	    return compound(quads)
 	}
+	
+	function extrusion(args) {return initObject(this, extrusion, args) }
+	subclass(extrusion, curve)
+	property.declare( extrusion.prototype, {
+        texture: {
+        	get: function() {throw new Error("Textures are not available for extrusion objects.")},
+        	set: function(val) {throw new Error("Textures are not available for extrusion objects.")}
+        },
+        radius: {
+        	get: function() {throw new Error("An extrusion has no radius.")},
+        	set: function(val) {throw new Error("An extrusion has no radius.")}
+        },
+    	origin: new attributeVector(null, 0,0,0),
+        __initialize: true,
+        pos: {
+        	get: function() {return this.__pos},
+        	set: function(p) {
+        		this.__pos = p
+        		this.__change()
+        	}
+        },
+        shape: {
+        	get: function() {return this.__shape},
+        	set: function(s) {
+        		this.__shape = s
+        		this.__change()
+        	}
+        },
+        color: {
+        	get: function() {return this.__color},
+        	set: function(value) {
+        		this.__color = value
+        		this.__change()
+        	}
+        },
+        opacity: {
+        	get: function() { return this.__opacity },
+        	set: function(value) {
+        		if (value == this.__opacity) return
+        		if ( (this.__opacity < 1 && value  == 1) || (this.__opacity == 1 && value  < 1) ) {
+            		this.__opacity_change = true
+                }
+        		this.__opacity = value
+        		this.__change()
+        	}
+        },
+        __get_extent: function (ext) {
+        	if (this.__comp) this.__comp.__get_extent()
+        },
+        __update: function() {
+        	if (!this.__initialize && (!this.__size.equals(this.__lastsize) || 
+        			!this.__color.equals(this.__lastcolor) || this.__opacity !== this.__lastopacity)) {
+        		this.__comp.visible = false
+        		delete this.__comp // Do we need to delete this model from the list of models?
+        		this.__initialize = true
+        	}
+            
+        	if (this.__initialize) {
+        		this.__comp = make_extrusion({pos:this.__pos, shape:this.__shape, color:this.__color, opacity:this.__opacity})
+	            this.__lastsize = this.__size
+	            this.__lastcolor = this.__color
+	            this.__lastopacity = this.__opacity
+	            this.__initialize = false
+        	}
+        	
+            this.__comp.__pos = this.__origin
+            this.__comp.__axis = this.__axis
+            this.__comp.__up = this.__up
+            this.__comp.__opacity = this.__opacity
+            this.__comp.visible = this.visible
+            this.__comp.__update()
+        }
+    })
 
     function ring(args) {return initObject(this, ring, args) }
     subclass(ring, box)
@@ -1622,17 +1696,19 @@
         __hasPosAtCenter: true,
         __size: new attributeVector(null, 0.1, 1, 1), // exception to size (1,1,1)
         __update: function() {
-        	if (!this.__initialize && (!this.__size.equals(this.__lastsize) || !this.__color.equals(this.__lastcolor))) {
+        	if (!this.__initialize && (!this.__size.equals(this.__lastsize) || 
+        			!this.__color.equals(this.__lastcolor) || this.__opacity !== this.__lastopacity)) {
         		this.__comp.visible = false
         		delete this.__comp // Do we need to delete this model from the list of models?
         		this.__initialize = true
         	}
 
         	if (this.__initialize) {
-        		this.__comp = extrusion( {pos:paths.circle({make_ring:true, radius:0.5*(this.__size.y-this.__size.x)}), 
+        		this.__comp = make_extrusion( {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
+	            this.__lastopacity = this.__opacity
 	            this.__initialize = false
         	}