webCLgl: fixed args passed to gpu main (webclgl parser is white space sensitive)

hartsantler · hartsantler · commit fff9f6051aa0 · 2014-06-19T14:48:58.000-07:00
diff --git a/pythonjs/pythonjs.py b/pythonjs/pythonjs.py
@@ -250,7 +250,7 @@ def _visit_function(self, node):
 
 			if is_main:
 				lines.append( 'var __shader__ = [];')  ## dynamic
-				lines.append( '__shader__.push("void main( %s ) {");' %', '.join(x) )
+				lines.append( '__shader__.push("void main(%s) {");' %','.join(x) )  ## if shader failed to compile with error like "uniform float float" syntax error something likely went wrong here.
 			elif return_type:
 				lines.append( '__shader_header__.push("%s %s( %s ) {");' %(return_type, node.name, ', '.join(x)) )
 			else:
diff --git a/regtests/webclgl/inline_objects.py b/regtests/webclgl/inline_objects.py
@@ -1,12 +1,12 @@
 """inline dynamic object data"""
 class A:
 	def __init__(self):
-		self.myattr = 0.4
+		self.myattr = 22/7.0
 
 def main():
 	def my_wrapper(a,b, x,y,z,w):
 
-		@returns( vec4=[32,32] )
+		@returns( array=[32,32] )
 		@gpu.main
 		def gpufunc(x,y,z,w):
 			float x
@@ -15,9 +15,9 @@ def gpufunc(x,y,z,w):
 			float w
 			float D = a.myattr
 			vec4 V = vec4( x+D, y+D,z,w)
-			return V
+			return x+y+z+w+D
 
-		return gpufunc( x,y,z,w )
+		return gpufunc(x,y,z,w)
 
 	ai = A()
 	bi = A()
