THREE.js with GoogleBlockly editor prototype.

hartsantler · hartsantler · commit 2f9e29b70bda · 2013-10-22T10:26:10.000-07:00
diff --git a/bindings/ace.py b/bindings/ace.py
@@ -0,0 +1,27 @@
+# PythonJS binding for Ace Editor http://ace.c9.io/
+# by Brett Hartshorn - copyright 2013
+# License: "New BSD"
+
+class AceEditor:
+	def __init__(self, div_id='editor', mode='python', theme=None):
+		with javascript: self[...] = ace.edit( div_id )
+		if mode: self.setMode( mode )
+		if theme: self.setTheme( theme )
+
+	def setMode(self, mode):
+		with javascript:
+			self[...].getSession().setMode( 'ace/mode/'+mode )
+
+	def setTheme(self, name='monokai'):
+		with javascript:
+			self[...].setTheme( 'ace/theme/'+name)
+
+	def setValue(self, txt):
+		with javascript:
+			self[...].setValue( txt )
+
+	def getValue(self):
+		with javascript:
+			return self[...].getValue()
+
+
diff --git a/bindings/blockly.py b/bindings/blockly.py
@@ -12,10 +12,10 @@ def initialize_blockly( blockly_id='blocklyDiv', toolbox_id='toolbox', on_change
 		defaults = []
 		cats = {}
 		for block_name in BlocklyBlockGenerators.keys():
+			b = BlocklyBlockGenerators[ block_name ]
 			e = document.createElement('block')
 			e.setAttribute('type', block_name)
 
-			b = BlocklyBlockGenerators[ block_name ]
 			if b.category:
 				if b.category in cats:
 					cats[ b.category ].appendChild( e )
@@ -28,6 +28,19 @@ def initialize_blockly( blockly_id='blocklyDiv', toolbox_id='toolbox', on_change
 			else:
 				defaults.append( e )
 
+			i = 0
+			#for i in range(len(b.input_values)):  ## TODO check why this got broken
+			while i < len(b.input_values):
+				input = b.input_values[i]
+				v = document.createElement('value')
+				v.setAttribute('name', input['name'])
+				e.appendChild(v)
+				nb = document.createElement('block')
+				nb.setAttribute('type', 'logic_null')
+				v.appendChild(nb)
+				i += 1
+
+
 		if len(defaults):
 			cat = document.createElement('category')
 			cat.setAttribute('name', 'Callbacks')
@@ -226,7 +239,7 @@ def generator(block):
 						code += a + ';'
 
 				if is_statement:
-					return code  ## statements can directly return
+					return code + ';'	## statements can directly return
 				else:
 					return [ code, Blockly.Python.ORDER_NONE ]  ## return Array
 
@@ -239,13 +252,13 @@ class StatementBlock( BlocklyBlock ):
 	'''
 	A statement-block has a previous and/or next statement notch: stack_input and/or stack_output
 	'''
-	def __init__(self, name, title=None, stack_input=False, stack_output=False, color=150, category=None):
+	def __init__(self, name, title=None, stack_input=False, stack_output=False, color=170, category=None):
 		self.setup( name, title=title, color=color, category=category )
 		self.make_statement( stack_input=stack_input, stack_output=stack_output)
 
 
 class ValueBlock( BlocklyBlock ):
-	def __init__(self, name, title=None, output=None, color=120, category=None):
+	def __init__(self, name, title=None, output='*', color=100, category=None):
 		if output is None: raise TypeError
 		self.setup( name, title=title, color=color, category=category )
 		self.set_output( output )
diff --git a/bindings/three.py b/bindings/three.py
@@ -1,4 +1,4 @@
-# THREE.js wrapper for PythonScript
+# THREE.js wrapper for PythonJS
 # by Brett Hartshorn - copyright 2013
 # License: "New BSD"
 
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
@@ -824,9 +824,9 @@ def visit_Assign(self, node):
                     elif type == 'dict':
                         self._global_typed_dicts[ target.id ] = set()
 
-                    writer.write('%s = %s ## global type: %s' % (target.id, node_value, type))
+                    writer.write('%s = %s' % (target.id, node_value))
                 else:
-                    writer.write('%s = %s ## type: %s' % (target.id, node_value, type))
+                    writer.write('%s = %s' % (target.id, node_value))
             else:
                 writer.write('%s = %s' % (target.id, node_value))
 
diff --git a/tests/server.py b/tests/server.py
@@ -257,6 +257,8 @@ def get(self, path=None):
 		'ace.js': os.path.expanduser( '~/ace-builds/src-noconflict/ace.js'),
 		'theme-monokai.js':os.path.expanduser( '~/ace-builds/src-noconflict/theme-monokai.js'),
 		'mode-python.js':os.path.expanduser( '~/ace-builds/src-noconflict/mode-python.js'),
+		'mode-javascript.js':os.path.expanduser( '~/ace-builds/src-noconflict/mode-javascript.js'),
+		'worker-javascript.js':os.path.expanduser( '~/ace-builds/src-noconflict/worker-javascript.js'),
 	},
 )
 
diff --git a/tests/threejs_meets_blockly_and_ace.html b/tests/threejs_meets_blockly_and_ace.html

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# THREE.js wrapper for PythonScript`
	`1`	`+# THREE.js wrapper for PythonJS`
`2`	`2`	`# by Brett Hartshorn - copyright 2013`
`3`	`3`	`# License: "New BSD"`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -257,6 +257,8 @@ def get(self, path=None):`
`257`	`257`	`'ace.js': os.path.expanduser( '~/ace-builds/src-noconflict/ace.js'),`
`258`	`258`	`'theme-monokai.js':os.path.expanduser( '~/ace-builds/src-noconflict/theme-monokai.js'),`
`259`	`259`	`'mode-python.js':os.path.expanduser( '~/ace-builds/src-noconflict/mode-python.js'),`
	`260`	`+ 'mode-javascript.js':os.path.expanduser( '~/ace-builds/src-noconflict/mode-javascript.js'),`
	`261`	`+ 'worker-javascript.js':os.path.expanduser( '~/ace-builds/src-noconflict/worker-javascript.js'),`
`260`	`262`	`},`
`261`	`263`	`)`
`262`	`264`