32 lights plus fstring correction

Author: BruceSherwood

GlowScriptOffline/glowscript_libraries/RScompiler.3.2.min.js

@@ -335,7 +335,7 @@ where compile() was called, in untrusted/run.js.
 			backquote = false // ` used in JavaScript
 			var backslash = false
 	    	var previouscontinuedline = continuedline
-			var processedtriplequote = false
+			var fstring = false
 			for (var i=0; i<line.length; i++) { // inspect each character in the line
 				var previousquote = singlequote || doublequote || triplequote
 	    		// If there are triple quotes we stay in this loop to collect the entire string
@@ -361,25 +361,32 @@ where compile() was called, in untrusted/run.js.
 						break
 					case "(":
 						if (singlequote || doublequote || triplequote || (backquote && lang == 'javascript') ) {
+							if (braces == 1) break
 							line = line.slice(0,i)+string_insert+line.slice(i+1)
 							i += string_insert.length-1
 						}
 						break
+					case "{":
+						if (fstring) braces++
+						break
+					case "}":
+						if (fstring && braces) braces--
+						break
 		    		case "'":
 		    		case '"':
+						if (i > 0 && line[i-1] == 'f') fstring = true
 						if (i <= line.length-3 && line[i+1] == char && line[i+2] == char) { // ''' or """
 							if (lang == 'javascript') throw new Error("JavaScript doesn't recognize triple quotes.")
 		    				triplequote = !triplequote
-		    				processedtriplequote = true
 		    				i += 2
 		    			} else if (char == "'") {
-		    					if (!doublequote && !triplequote) {
-									singlequote = !singlequote
-								}
+							if (!doublequote && !triplequote) {
+								singlequote = !singlequote
+							} else fstring = false
 						} else if (char == '"') { // "
 							if (!singlequote && !triplequote) {
 								doublequote = !doublequote
-							}
+							} else fstring = false
 						} else if (char == "`") { // ` used in JavaScript
 							if (backquote) backquote = !backquote
 						}
@@ -879,7 +886,7 @@ where compile() was called, in untrusted/run.js.
 		'cone', 'pyramid', 'sphere', 'simple_sphere', 'arrow', 'curve', 'points', 'paths',
 		'shapes', 'helix', 'ring', 'compound', 'vertex', 'triangle', 'quad', 'label', 
 		'distant_light', 'local_light', 'attach_trail', 'attach_arrow', 'text', 'extrusion',
-		'wtext', 'winput', 'radio', 'checkbox', 'button', 'slider', 'menu', 'input',
+		'wtext', 'winput', 'radio', 'checkbox', 'button', 'slider', 'menu', 'input', 'js_generator', 'yield',
 		'mag', 'mag2', 'norm', 'hat', 'dot', 'cross', 'proj', 'diff_angle', 'abs', 'filter',
 		'sin', 'cos', 'tan', 'asin', 'acos', 'atan', 'atan2', 'exp', 'log', 'pow', 'sqrt', 
 		'ceil', 'floor', 'sign', 'round', 'max', 'min', 'random', "factorial", "combin"]
@@ -1178,11 +1185,9 @@ where compile() was called, in untrusted/run.js.
             program = program.slice(0,sc)+s+program.slice(sc,program.length)
 		}
 
-		// October 2021: Safari gives a CORS error when attempting to call input() in primitives.js,
-		// and it looks like Chrome will also start doing this. For now (version 3.1), we leave the
-		// copy of input() in primitives.js, to cater to existing exported programs that call input(),
-		// though those exported programs will eventually break, lacking the copy we now insert into
-		// exported code.
+		// October 2021: Safari gave a CORS error when attempting to call input() when it was in primitives.js,
+		// and it looks like Chrome will also start doing this. So starting with version 3.2, we insert the
+		// input function into the user's program:
 		if (program.indexOf('input') >= 0) { // if user code invokes input(), insert the function:
         	let s = "scene = canvas();\n"
             let sc = program.indexOf(s) + s.length

GlowScriptOffline/glowscript_libraries/compiler.3.2.min.js

@@ -35,7 +35,7 @@
 
         // Place these statements here rather than inside the render function,
         // to avoid repeated garbage collection. However, seemed to make little difference.
-        var MAX_LIGHTS = 8 // Apparently this is the maximum number of lights supported by WebGL 1
+        var MAX_LIGHTS = 32
         var light_pos = new Float32Array( MAX_LIGHTS*4 )
         var light_color = new Float32Array( MAX_LIGHTS*3 )
 		var light_ambient = new Float32Array( 3 )
@@ -608,7 +608,7 @@
 
             // Transform lights into eye space
 	        for (var i=0; i<light_color.length; i++) light_color[i] = 0 // initialize lights to black
-            var light_count = Math.min(cvs.lights.length, MAX_LIGHTS)
+            var light_count = cvs.lights.length
             for(var i=0; i<light_count; i++) {
                 var light = cvs.lights[i]
                 if (!light.visible) continue

GlowScriptOffline/glowscript_libraries/glow.3.2.min.js

@@ -2340,6 +2340,7 @@
         if (!(this instanceof distant_light)) return new distant_light(args)  // so distant_light() is like new distant_light()
         if (args.direction === undefined) throw new Error("Must specify the distant_light direction.")
         init(this, args)
+		if (this.canvas.lights.length === 32) throw new Error('The number of lights is limited to 32.')
         this.canvas.lights.push(this)
     }
     property.declare( distant_light.prototype, {
@@ -2354,6 +2355,7 @@
         if (!(this instanceof local_light)) return new local_light(args)  // so local_light() is like new local_light()
         if (args.pos === undefined) throw new Error("Must specify the local_light position.")
         init(this, args)
+		if (this.canvas.lights.length === 32) throw new Error('The number of lights is limited to 32.')
         this.canvas.lights.push(this)
     }
     property.declare( local_light.prototype, {

GlowScriptOffline3.2.zip

@@ -7,8 +7,8 @@ precision mediump float;
 #endif
 
 uniform int light_count;
-uniform vec4 light_pos[8];
-uniform vec3 light_color[8];
+uniform vec4 light_pos[32];
+uniform vec3 light_color[32];
 uniform vec3 light_ambient;
 #define LP(i) light_pos[i]
 #define LC(i) light_color[i]
@@ -69,26 +69,11 @@ void lightAt()
     }
 
     color = light_ambient * diffuse_color;
-    
-    // It was necessary to restructure this shader completely in order to
-    // run on the Samsung Galaxy S3 smartphone. Apparently its compiler
-    // does not handle for loops correctly. An Asus Android tablet was ok.
-    if (light_count == 0) return;
-    calc_color(LP(0), LC(0));
-    if (light_count == 1) return;
-    calc_color(LP(1), LC(1));
-    if (light_count == 2) return;
-    calc_color(LP(2), LC(2));
-    if (light_count == 3) return;
-    calc_color(LP(3), LC(3));
-    if (light_count == 4) return;
-    calc_color(LP(4), LC(4));
-    if (light_count == 5) return;
-    calc_color(LP(5), LC(5));
-    if (light_count == 6) return;
-    calc_color(LP(6), LC(6));
-    if (light_count == 7) return;
-    calc_color(LP(7), LC(7));
+
+    for (int i=0; i<100; i++) { // for cannot test against a variable
+        if (i == light_count) break;
+        calc_color(LP(i), LC(i));
+    }
 }
 
 void main(void) {

lib/compiling/GScompiler.js

@@ -7,8 +7,8 @@ precision mediump float;
 #endif
 
 uniform int light_count;
-uniform vec4 light_pos[8];
-uniform vec3 light_color[8];
+uniform vec4 light_pos[32];
+uniform vec3 light_color[32];
 uniform vec3 light_ambient;
 #define LP(i) light_pos[i]
 #define LC(i) light_color[i]
@@ -70,26 +70,11 @@ void lightAt()
     }
 
     color = light_ambient * diffuse_color;
-    
-    // It was necessary to restructure this shader completely in order to
-    // run on the Samsung Galaxy S3 smartphone. Apparently its compiler
-    // does not handle for loops correctly. An Asus Android tablet was ok.
-    if (light_count == 0) return;
-    calc_color(LP(0), LC(0));
-    if (light_count == 1) return;
-    calc_color(LP(1), LC(1));
-    if (light_count == 2) return;
-    calc_color(LP(2), LC(2));
-    if (light_count == 3) return;
-    calc_color(LP(3), LC(3));
-    if (light_count == 4) return;
-    calc_color(LP(4), LC(4));
-    if (light_count == 5) return;
-    calc_color(LP(5), LC(5));
-    if (light_count == 6) return;
-    calc_color(LP(6), LC(6));
-    if (light_count == 7) return;
-    calc_color(LP(7), LC(7));
+
+    for (int i=0; i<100; i++) { // for cannot test against a variable
+        if (i == light_count) break;
+        calc_color(LP(i), LC(i));
+    }
 }
 
 ivec4 encode(float k) { // assumes k is >= 0

lib/glow/WebGLRenderer.js

@@ -7,8 +7,8 @@ precision mediump float;
 #endif
 
 uniform int light_count;
-uniform vec4 light_pos[8];
-uniform vec3 light_color[8];
+uniform vec4 light_pos[32];
+uniform vec3 light_color[32];
 uniform vec3 light_ambient;
 #define LP(i) light_pos[i]
 #define LC(i) light_color[i]
@@ -73,25 +73,10 @@ void lightAt()
 
     color = light_ambient * diffuse_color;
 
-    // It was necessary to restructure this shader completely in order to
-    // run on the Samsung Galaxy S3 smartphone. Apparently its compiler
-    // does not handle for loops correctly. An Asus Android tablet was ok.
-    if (light_count == 0) return;
-    calc_color(LP(0), LC(0));
-    if (light_count == 1) return;
-    calc_color(LP(1), LC(1));
-    if (light_count == 2) return;
-    calc_color(LP(2), LC(2));
-    if (light_count == 3) return;
-    calc_color(LP(3), LC(3));
-    if (light_count == 4) return;
-    calc_color(LP(4), LC(4));
-    if (light_count == 5) return;
-    calc_color(LP(5), LC(5));
-    if (light_count == 6) return;
-    calc_color(LP(6), LC(6));
-    if (light_count == 7) return;
-    calc_color(LP(7), LC(7));
+    for (int i=0; i<100; i++) { // for cannot test against a variable
+        if (i == light_count) break;
+        calc_color(LP(i), LC(i));
+    }
 }
 
 ivec4 encode(float k) { // assumes k is >= 0

lib/glow/primitives.js

@@ -7,8 +7,8 @@ precision mediump float;
 #endif
 
 uniform int light_count;
-uniform vec4 light_pos[8];
-uniform vec3 light_color[8];
+uniform vec4 light_pos[32];
+uniform vec3 light_color[32];
 uniform vec3 light_ambient;
 #define LP(i) light_pos[i]
 #define LC(i) light_color[i]
@@ -72,26 +72,11 @@ void lightAt()
     }
 
     color = light_ambient * diffuse_color;
-    
-    // It was necessary to restructure this shader completely in order to
-    // run on the Samsung Galaxy S3 smartphone. Apparently its compiler
-    // does not handle for loops correctly. An Asus Android tablet was ok.
-    if (light_count == 0) return;
-    calc_color(LP(0), LC(0));
-    if (light_count == 1) return;
-    calc_color(LP(1), LC(1));
-    if (light_count == 2) return;
-    calc_color(LP(2), LC(2));
-    if (light_count == 3) return;
-    calc_color(LP(3), LC(3));
-    if (light_count == 4) return;
-    calc_color(LP(4), LC(4));
-    if (light_count == 5) return;
-    calc_color(LP(5), LC(5));
-    if (light_count == 6) return;
-    calc_color(LP(6), LC(6));
-    if (light_count == 7) return;
-    calc_color(LP(7), LC(7));
+
+    for (int i=0; i<100; i++) { // for cannot test against a variable
+        if (i == light_count) break;
+        calc_color(LP(i), LC(i));
+    }
 }
 
 ivec4 encode(float k) { // assumes k is >= 0

lib/glow/shaders.gen.js

@@ -7,8 +7,8 @@ precision mediump float;
 #endif
 
 uniform int light_count;
-uniform vec4 light_pos[8];
-uniform vec3 light_color[8];
+uniform vec4 light_pos[32];
+uniform vec3 light_color[32];
 uniform vec3 light_ambient;
 #define LP(i) light_pos[i]
 #define LC(i) light_color[i]
@@ -71,26 +71,11 @@ void lightAt()
     }
 
     color = light_ambient * diffuse_color;
-    
-    // It was necessary to restructure this shader completely in order to
-    // run on the Samsung Galaxy S3 smartphone. Apparently its compiler
-    // does not handle for loops correctly. An Asus Android tablet was ok.
-    if (light_count == 0) return;
-    calc_color(LP(0), LC(0));
-    if (light_count == 1) return;
-    calc_color(LP(1), LC(1));
-    if (light_count == 2) return;
-    calc_color(LP(2), LC(2));
-    if (light_count == 3) return;
-    calc_color(LP(3), LC(3));
-    if (light_count == 4) return;
-    calc_color(LP(4), LC(4));
-    if (light_count == 5) return;
-    calc_color(LP(5), LC(5));
-    if (light_count == 6) return;
-    calc_color(LP(6), LC(6));
-    if (light_count == 7) return;
-    calc_color(LP(7), LC(7));
+
+    for (int i=0; i<100; i++) { // for cannot test against a variable
+        if (i == light_count) break;
+        calc_color(LP(i), LC(i));
+    }
 }
 
 ivec4 encode(float k) { // assumes k is >= 0