Fix bug in extrusion; advance version number to 2.5 because bug fix could affect existing programs

Author: BruceSherwood

build-tools/Symbols.js

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

build_original.py

@@ -33,7 +33,7 @@
 shader_file = "\n".join(shader_file)
 open("lib/glow/shaders.gen.js", "wb").write(shader_file)
 
-version = "2.4"
+version = "2.5"
 # TODO: Extract this information from run.js
 
 glowscript_libraries = {

docs/VPythonDocs/index.html

@@ -112,7 +112,7 @@
 <blockquote>
   <p class="Normal">* You will see the sentence &quot;You are signed in as &lt;your user name&gt; and your programs are <strong>here</strong>.&quot; Click on <strong>here</strong>.</p>
   <p class="Normal">* Click<strong> Create New Program</strong>. (You may wish to click on the <strong>Public</strong> tab before creating your program, as programs in your <strong>Private</strong> folder are not accessible to others.) Choose a name for the program, which should not include spaces or underscores.</p>
-  <p class="Normal">* Below the line <strong>GlowScript 2.4 VPython</strong>, type <strong>box()</strong>. Click <strong>Run this program</strong> to run your program. You will see a white box on a black background.</p>
+  <p class="Normal">* Below the line <strong>GlowScript 2.5 VPython</strong>, type <strong>box()</strong>. Click <strong>Run this program</strong> to run your program. You will see a white box on a black background.</p>
   <p class="Normal">* Use the right button (or CTRL-drag left button) of the mouse to rotate the camera to view the scene from different angles.</p>
   <p class="Normal">* To zoom in and out use two buttons, or ALT/OPTION-drag, or the mouse scrollwheel. Touch screen: swipe or two-finger rotate; pinch/extend to zoom.<br />
   </p>

ide/api.py

@@ -332,8 +332,8 @@ def post(self):
         self.respond( {"processed":len(programs), "changed":changeCount} )
 
     def upgradeProgram(self, p):
-        if not p.source.startswith("GlowScript 2.4\n"):
-            p.source = "GlowScript 2.4 VPython\n" + p.source
+        if not p.source.startswith("GlowScript 2.5\n"):
+            p.source = "GlowScript 2.5 VPython\n" + p.source
             return True
 
 app = web.WSGIApplication(

ide/ide.js

@@ -63,7 +63,7 @@ $(function () {
         }
     }
 
-    parseVersionHeader.defaultVersion = "2.4"
+    parseVersionHeader.defaultVersion = "2.5"
     parseVersionHeader.defaultHeader = "GlowScript " + parseVersionHeader.defaultVersion+' VPython'
     parseVersionHeader.errorMessage = "GlowScript " + parseVersionHeader.defaultVersion
     // Map each version that can be loaded to a packaged version (usually itself), or "unpackaged" if it is the current development version
@@ -81,6 +81,7 @@ $(function () {
         "2.2": "2.2",
         "2.3": "2.3",
         "2.4": "2.4",
+        "2.5": "2.5",
         "0.4dev" : "0.4",
         "0.5dev" : "0.5",
         "0.6dev" : "0.6",
@@ -92,7 +93,8 @@ $(function () {
         "2.2dev" : "2.2",
         "2.3dev" : "2.3",
         "2.4dev" : "2.4",
-        "2.5dev" : "unpackaged",
+        "2.5dev" : "2.5",
+        "2.6dev" : "unpackaged",
     }
 
     /******** Functions to talk to the API on the server ***********/

ide/index.html

@@ -66,7 +66,7 @@ <h2>glowscript.org</h2>
     Thanks to the <a href="https://github.com/kovidgoyal/rapydscript-ng" target="_blank">RapydScript-NG</a>
     compiler, you can use VPython here.</p>
 
-	<p><b>New version 2.4:</b> axis and up are now always perpendicular to each other</p>
+	<p><b>New version 2.5:</b> fix bug in extrusion object</p>
     </div>
 
     The Help provides full documentation.
@@ -86,7 +86,7 @@ <h2>glowscript.org</h2>
 
 <div id="footerWrap"> 
 <div id="footerInner">
-<h2>G l o w S c r i p t&nbsp;&nbsp; 2.4</h2>
+<h2>G l o w S c r i p t&nbsp;&nbsp; 2.5</h2>
     <a href="/#/user/GlowScriptDemos/folder/Examples/" target="_blank">Example programs</a> |
     <a href="https://groups.google.com/forum/?fromgroups#!forum/glowscript-users" target="_blank">Forum</a></div>
 </div>
@@ -243,7 +243,7 @@ <h2>G l o w S c r i p t&nbsp;&nbsp; 2.4</h2>
 <script type="text/javascript" language="javascript" src="lib/ace/mode-javascript.js"></script>
 <script type="text/javascript" language="javascript" src="lib/ace/mode-coffee.js"></script>
 <script type="text/javascript" language="javascript" src="lib/ace/mode-python.js"></script>
-<script type="text/javascript" language="javascript" src="package/symbols.2.4.min.js"></script>
+<script type="text/javascript" language="javascript" src="package/symbols.2.5.min.js"></script>
 <script type="text/javascript" language="javascript" src="ide.js"></script>
 
 </body>

lib/glow/property.js

@@ -1,7 +1,7 @@
 ;(function () {
     "use strict";
 
-    var glowscript = { version: "2.4" }
+    var glowscript = { version: "2.5" }
 
     // 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

lib/glow/shapespaths.js

@@ -1140,6 +1140,9 @@ shape_object.prototype.gear = function gear(args) {
     		continue
     	}
     }
+	g1 = pts[0]
+	g2 = pts[pts.length-1]
+	if (!(g1[0] === g2[0] && g1[1] === g2[1])) pts.push(g1)
     return pts
 }
 shape_object.prototype.rackgear = function rackgear(args) {
@@ -1206,6 +1209,9 @@ shape_object.prototype.rackgear = function rackgear(args) {
     }
     if (args.scale !== 1) gear2 = this.scale(gear2, args.scale, args.scale)
     if (args.rotate !== 0) gear2 = this.rotate(gear2, args.pos, args.rotate)
+	var g1 = gear2[0]
+	var g2 = gear2[gear2.length-1]
+	if (!(g1[0] === g2[0] && g1[1] === g2[1])) gear2.push(g1)
     return gear2
 }