Fix bug in compound

Author: BruceSherwood

ForInstalledPython/glow.min.js

@@ -1,4 +1,4 @@
-GlowScript 3.0
+GlowScript 3.1
 var ver = glowscript.version
 
 console.log( glowscript.glowscript )

GlowScriptOffline/glowscript_libraries/glow.3.1.min.js

@@ -50,18 +50,15 @@ for example, GlowScript version 2.2 uses the same verdir value as 2.1 for jquery
 In untrusted/run.js, update choice of jquery library.
 Add to css/redmond a folder with the new name if necessary (sometimes no change is needed)
 
-Modify build_original.py and property.js to have version = "0.4" and
+Modify build_original.py and lib/glow/property.js to have version = "0.4" and
    run it to create the final packages for 0.4.  
-Then change build_original.py and property.js to have version = "0.5dev" and save build_original.py, 
+Then change build_original.py and lib/glow/property.js to have version = "0.5dev" and save build_original.py, 
 so that the 0.4 package doesn't get overwritten by accident.
 
-If you're just fixing a bug in 0.4, all you need to do is Deploy from the Google App Engine Launcher,
-to update the package files produced in the previous step that involved build.py and property.js.
-
 There is a Glowscript program in build-tools/Symbols.js which you need to copy into (presumably local) 
 glowscript and run to compile the symbols.  
 You have to copy and paste the results into the appropriate file (package/symbols.X.Y.min.js).
-You also have to make a change at the end of ide/index.html to point to the new Symbols file, 
+You also have to make a change at the end of ide/templates/index.html to point to the new Symbols file, 
 since the IDE doesn't yet dynamically load symbols based on the version header.
 
 Also change "G l o w S c r i p t   X.Y" appropriately in ide/index.html.
@@ -78,6 +75,18 @@ Ideally we should create a branch "version-0.4" in the repository at this point,
 in case we have to come back and patch an old version for some critical bug.  
 This has not actually been done so far.
 
+If you're just fixing a bug in 0.4, all you need to do to update the package files produced
+ in the previous step that involved build.py and property.js is this:
+
+In a terminal, cd to glowscript folder.
+Execute 'gcloud info' to check that the project is set to 'glowscript'.
+gcloud app deploy --no-promote
+   This will give a URL to use to test in the cloud, similar to this: https://20211014t164505-dot-glowscript.appspot.com
+   Alternatively, 'gcloud app browse' brings up glowscript.appspot.com, though I saw this fail (didn't see changes, but this might have been due to caching of an earlier version).
+If okay, go to https://console.cloud.google.com/appengine/versions?project=glowscript
+   You will be in App Engine > Versions; make the window wide to see MIGRATE TRAFFIC.
+   Choose the new version and then click MIGRATE TRAFFIC to update user glowscript.org
+
 ************************************************************************************
     UPDATE library files in the GlowScriptOffline package and create zip file
     UPDATE the glow library used in VPython 7; generate it with build_original_no_overload.py

GlowScriptOffline3.1.zip

@@ -328,7 +328,7 @@ <h2>G l o w S c r i p t&nbsp;&nbsp; 3.0</h2>
 <script type="text/javascript" language="javascript" src="lib/editor.js"></script>
 <script type="text/javascript" language="javascript" src="lib/ace/mode-javascript.js"></script>
 <script type="text/javascript" language="javascript" src="lib/ace/mode-python.js"></script>
-<script type="text/javascript" language="javascript" src="package/symbols.3.0.min.js"></script>
+<script type="text/javascript" language="javascript" src="package/symbols.3.1.min.js"></script>
 <script type="text/javascript" language="javascript" src="ide.js"></script>
 
 </body>

build-tools/Symbols.js

@@ -152,14 +152,12 @@
                 var name = t.name
                 if (name.substring(name.length-3)=="[0]") name = name.substring(0, name.length-3)
                 P.uniforms[name] = gls.getUniformLocation(P, name)
-                //console.log('uniforms',t.name, name)
             }
             var attributes = gls.getProgramParameter(P, gls.ACTIVE_ATTRIBUTES)
             P.attributes = {}
             for (var i = 0; i < attributes; i++) {
                 var t = gls.getActiveAttrib(P, i)
                 P.attributes[t.name] = gls.getAttribLocation(P, t.name)
-                //console.log('attributes',t.name, name)
             }
             return P
         }
@@ -472,30 +470,30 @@
             // Code is left in place for a possible later try.
 
 			if (mode == RENDER) {
-	            for (let a of cvs.arrows) { // attach_arrow
-	            	let pos
-	                if (!a.__run) continue
-	                if (a.__object !== undefined) {
-	                    if (a.__object.pos !== undefined) pos = a.__object.pos
-	                    else continue // trailed object no longer exists
-	                }
-	                a.pos = pos
-	                if (a.__object[a.__attr] !== undefined) {
+				for (let a of cvs.arrows) { // attach_arrow
+					let pos
+					if (!a.__run) continue
+					if (a.__object !== undefined) {
+						if (a.__object.pos !== undefined) pos = a.__object.pos
+						else continue // trailed object no longer exists
+					}
+					a.pos = pos
+					if (a.__object[a.__attr] !== undefined) {
 						let axis = a.__object[a.__attr]
 						if (axis.mag > 0)  {
 							if (!a.visible) a.visible = true
 							a.axis = axis.multiply(a.scale)
 						} else a.visible = false
-	                }
-	                /*
-	                // TODO: The following needs revision after further discussion of the API:
-	                if (typeof a.attr !== "function") { // a string representing an attribute
-	                    a.axis = a.__obj[a.__attr].multiply(a.__scale)
-	                } else { // a function to be called
-	                    a.axis = a.__attr().multiply(a.__scale)
-	                }
-	                */
-	            }
+					}
+					/*
+					// TODO: The following needs revision after further discussion of the API:
+					if (typeof a.attr !== "function") { // a string representing an attribute
+						a.axis = a.__obj[a.__attr].multiply(a.__scale)
+					} else { // a function to be called
+						a.axis = a.__attr().multiply(a.__scale)
+					}
+					*/
+				}
 
                 for (var i in cvs.trails) { // attach_trail
                     var pos

docs/MakingNewVersion.txt

@@ -646,7 +646,7 @@
                 Y = Y.multiply(this.__size.y)
                 Z = Z.multiply(this.__size.z)
                 var matrix = [X.x, X.y, X.z, 0, Y.x, Y.y, Y.z, 0, Z.x, Z.y, Z.z, 0, T.x, T.y, T.z, 1]
-            	return this.__model.mesh.transformed(matrix);
+            	return this.__model.mesh.transformed(matrix)
             }
         }
 	})
@@ -1498,6 +1498,7 @@
 			this.__origin = parameters.origin
 			delete parameters.origin
 		}
+		
         var mesh = new Mesh()
         var release = [] // list of vertex objects that can be released
     	var temp
@@ -1550,7 +1551,8 @@
     			if (temp === null) compound_error(i)
             	update_extent( self, temp )
             } else if (o.__components !== undefined) { // currently, only arrow has components
-            	var c = o.__components
+				var c = o.__components
+				o.__update() // ensure that all components are up to date at time of compounding
             	for (var ci=0; ci<c.length; ci++) {
             		var comp = c[ci]
             		temp = mesh.merge(comp.getTransformedMesh(), comp, 0)
@@ -1600,12 +1602,13 @@
         }
         if (parameters.make_trail !== undefined) makeTrail(self, parameters)
         for (var attr in parameters) self[attr] = parameters[attr]
+		window.__compounding = false
     }
 
     function compound(objects, parameters) {
         if (!(this instanceof compound)) return new compound(objects, parameters)
     	if (objects.length === undefined && objects.canvas === null) return // it's null if first setting up objects; see subclass function
-        parameters = parameters || {}
+		parameters = parameters || {}
 		if (objects.length === undefined) throw new Error("compound takes a list of objects")
 		if (parameters.canvas !== undefined) initObject(this, compound, {canvas:parameters.canvas})
         else initObject(this, compound, {canvas:objects[0].canvas})

ide/templates/index.html

@@ -1,7 +1,7 @@
 ;(function () {
     "use strict";
 
-    var glowscript = { version: "3.0" }
+    var glowscript = { version: "3.1" }
 
     // GlowScript uses lots of javascript properties (Object.defineProperty) with getters and setters
     // This is an attempt to create a more declarative syntax for declaring an object with lots of properties