Merge branch 'master' of github.com:skykooler/Lightningbeam

lightningbeam.py

@@ -308,14 +308,14 @@ root.onMouseUp = onMouseUpGroup
 root.onMouseMove = onMouseMoveGroup
 root.onMouseDrag = onMouseDragGroup
 root.onKeyDown = onKeyDownGroup
-'''
+
-e=ellipse(100,100,10,10,None)
+e=ellipse(100,100,100,50,None)
 e.onMouseDown = onMouseDownObj
 e.onMouseMove = onMouseMoveObj
 e.onMouseDrag = onMouseDragObj
 e.onMouseUp = onMouseUpObj
 e.onKeyDown = onKeyDownObj
-root.add(e)'''
+root.add(e)
 
 
 

misc_funcs.py

@@ -59,6 +59,12 @@ def update_tooloptions():
 			else:
 				i.setvisible(False)
 	
+def ave(x, y, fac):
+	"""Weighted average. 
+	fac is the weight - 0.5 gives a standard average"""
+	return y - fac*(y-x)
+
+	
 def box(x, y, width, height, fill):
 	global objects
 	box = svlgui.Shape(x, y)

svlgui.py

@@ -44,6 +44,9 @@ FRAMERATE=50
 #Width and height are the width and height of the document
 WIDTH, HEIGHT = 500, 500
 
+#Whether we are using OpenGL for rendering.
+USING_GL = True
+
 #Object which has the keyboard focus.
 FOCUS = None
 
@@ -170,6 +173,14 @@ if sys.platform=="linux2":
 	from GUI.StdMenus import basic_menus, file_cmds, print_cmds
 	from GUI.StdButtons import DefaultButton, CancelButton
 	from GUI.Files import FileType
+	if USING_GL:
+		from OpenGL.GL import *
+		from OpenGL.GLU import *
+		from GUI import GL
+		try:
+			from PIL import Image as PILImage
+		except ImportError as err:
+			import Image as PILImage
 	from GUI.Geometry import offset_rect, rect_sized
 	
 	#If we can import this, we are in the install directory. Mangle media paths accordingly.
@@ -246,6 +257,7 @@ elif sys.platform=="darwin":
 	FONT = u'Times New Roman'
 	media_path = ""
 	#app = GUI.application()
+	SYSTEM="osx"
 	TEMPDIR="/tmp"
 	sep = "/"
 	
@@ -581,6 +593,7 @@ class Label(Widget):
 		elif SYSTEM=="pyglet":
 			self.label = pyglet.text.Label(text)
 	def _int(self):
+		if SYSTEM=="osx":
 			return self.label
 	def disable(self):
 		if SYSTEM=="osx":
@@ -831,6 +844,76 @@ class CheckBox(Widget):
 		self.box.value = value
 	value = property(get_value, set_value)
 		
+class _CR(object):
+	"""Internal use only. This is a class that only exists for GLViews 
+	to pass window dimensions on to their children."""
+	def __init__(self):
+		self.x = 0
+		self.y = 0
+		self.stack = []
+	def save(self):
+		glPushAttrib(GL_ALL_ATTRIB_BITS);
+		glPushMatrix()
+		self.stack.append((self.x, self.y))
+	def restore(self):
+		self.x, self.y = self.stack.pop()
+		glPopMatrix()
+		glPopAttrib()
+	def translate(self, x, y):
+		glTranslatef(x, y, 0);
+	def rotate(self, r):
+		pass
+	def scale(self, sx, sy):
+		pass
+	def drawCurve(self, points, precision=20):
+		npoints = []
+		ave = misc_funcs.ave
+		s = range(0, len(points)-2, 2)
+		for i in s:
+			for j in range(precision):
+				k=1.0*(precision-j)
+				x=ave(	ave(ave(self.x, 
+								points[i][0], 
+								k/precision), 
+							ave(points[i][0], 
+								points[i+1][0], 
+								k/precision), 
+							k/precision),
+						ave(ave(points[i][0],
+								points[i+1][0],
+								k/precision), 
+							ave(points[i+1][0],
+								points[i+2][0], 
+								k/precision), 
+							k/precision),
+						k/precision)
+							
+				
+				y=ave(	ave(ave(self.y, 
+								points[i][1], 
+								k/precision), 
+							ave(points[i][1], 
+								points[i+1][1], 
+								k/precision), 
+							k/precision),
+						ave(ave(points[i][1],
+								points[i+1][1],
+								k/precision), 
+							ave(points[i+1][1],
+								points[i+2][1], 
+								k/precision), 
+							k/precision),
+						k/precision)
+				npoints.append((x, y))
+		glVertex2f(self.x, self.y)
+		glVertex2f(npoints[0][0], npoints[0][1])
+		for i in range(len(npoints)-1):
+			#drawLine(gc, drawable, npoints[i][0], npoints[i][1], npoints[i+1][0], npoints[i+1][1])
+			print npoints[i][0],npoints[i][1],npoints[i+1][0],npoints[i+1][1]
+			glVertex2f(npoints[i][0], npoints[i][1])
+			glVertex2f(npoints[i+1][0], npoints[i+1][1])
+		glVertex2f(npoints[-1][0],npoints[-1][1])
+		glVertex2f(*points[2])
 
 class Canvas(Widget):
 	def __init__(self,width=False,height=False):
@@ -863,6 +946,30 @@ class Canvas(Widget):
 			self.canvas.connect("button-release-event", onMouseUp)
 			self.canvas.connect("motion_notify_event", onMouseMove)
 		elif SYSTEM=="osx":
+			if USING_GL:
+				class OSXCanvas(GL.GLView):
+					def init_context(self):
+						glClearColor(0.75,0.75,0.75,0.0)
+					def init_projection(self):
+						glViewport(0, 0, width, height);
+						glEnable( GL_TEXTURE_2D );
+						glEnable (GL_BLEND);
+						#glDisable( GL_LIGHTING) 
+						glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+					def render(self):
+						glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+						glLoadIdentity();
+						gluOrtho2D(0, width, 0, height); #TODO: width, height
+						glMatrixMode(GL_MODELVIEW);
+						cr = _CR()
+						cr.width = self.width
+						cr.height = self.height
+						for i in self.objs:
+							i.draw(cr)
+				
+				self.canvas = OSXCanvas()
+				self.canvas.update()
+			else:
 				class OSXCanvas (ScrollableView):
 					def draw(self, canvas, update_rect):
 						canvas.erase_rect(update_rect)
@@ -1060,6 +1167,10 @@ class Image(object):
 		self.path = image
 		self.pilimage = PILimage.open(image)
 		self.type="Image"
+		if USING_GL:
+			# This is an OpenGL texture ID.
+			self.gltexture = self.loadGLImage(file = image)
+			
 		if animated:
 			self.animated = True
 			self.htiles = htiles
@@ -1101,6 +1212,41 @@ class Image(object):
 		if SYSTEM=="android":
 			pass
 		elif SYSTEM=="osx":
+			if USING_GL:
+				pass
+				glEnable(GL_TEXTURE_2D);
+				glColor3f(0.5,0.5,0.5);
+				#self.gltexture.bind()
+				#self.gltexture.gl_tex_image_2d(self.image, with_mipmaps=True)
+				
+				glBindTexture(GL_TEXTURE_2D, self.gltexture)
+				
+				if self.animated:
+					src_rect = [(1.0/self.htiles)*(self.pointer%self.htiles),
+								(1.0/self.vtiles)*(self.pointer/self.htiles),
+								(1.0/self.htiles)*(self.pointer%self.htiles+1),
+								(1.0/self.vtiles)*(self.pointer/self.htiles+1)]
+					width = self.image.bounds[2]/self.htiles
+					height = self.image.bounds[3]/self.vtiles
+				else:
+					src_rect = [0.0, 0.0, 1.0, 1.0]
+					width, height = self.image.bounds
+				glBegin(GL_QUADS);
+				glTexCoord2f(0.0, 0.0);
+				#glTexCoord2f(src_rect[0], src_rect[1]);
+				glVertex2f( self.x, cr.height-(self.y));
+				glTexCoord2f(1.0, 0.0);
+				#glTexCoord2f(src_rect[2], src_rect[1]);
+				glVertex2f(width+self.x, cr.height-(self.y));
+				glTexCoord2f(1.0, 1.0);
+				#glTexCoord2f(src_rect[2], src_rect[3]);
+				glVertex2f( width+self.x, cr.height-(height+self.y));
+				glTexCoord2f(0.0, 1.0);
+				#glTexCoord2f(src_rect[0], src_rect[3]);
+				glVertex2f( self.x, cr.height-(height+self.y));
+				print src_rect
+				glEnd();
+			else:
 				cr.gsave()
 				if sep=="\\":
 					# Very ugly hack for Windows. :(
@@ -1138,6 +1284,25 @@ class Image(object):
 	def set_image(self,img):
 		if SYSTEM=="osx":
 			self.image = GUI.Image(file = img)
+			if USING_GL:
+				self.gltexture = self.loadGLImage(file = img)
+	def loadGLImage(self, file = None ):
+		"""Load an image file as a 2D texture using PIL"""
+		if not file:
+			file = self.path
+		im = PILImage.open(file)
+		try:
+			ix, iy, image = im.size[0], im.size[1], im.tostring("raw", "RGBA", 0, -1)
+		except SystemError:
+			ix, iy, image = im.size[0], im.size[1], im.tostring("raw", "RGBX", 0, -1)
+		ID = glGenTextures(1)
+		glBindTexture(GL_TEXTURE_2D, ID)
+		glPixelStorei(GL_UNPACK_ALIGNMENT,1)
+		glTexImage2D(
+			GL_TEXTURE_2D, 0, 3, ix, iy, 0,
+			GL_RGBA, GL_UNSIGNED_BYTE, image
+		)
+		return ID
 	def hitTest(self,x,y):
 		hits = False
 		# points "a" and "b" forms the anchored segment.
@@ -1187,6 +1352,7 @@ class Shape (object):
 		self.yscale = 1
 		self.linecolor = linecolor if linecolor else LINECOLOR
 		self.fillcolor = fillcolor if fillcolor else FILLCOLOR
+		self.linewidth = 2
 		self.shapedata=[]
 		self.filled=False
 		self.type="Shape"
@@ -1202,6 +1368,7 @@ class Shape (object):
 			cr.rotate(self.rotation*math.pi/180)
 			cr.scale(self.xscale*1.0, self.yscale*1.0)
 			cr.set_source(self.linecolor.cairo)
+			cr.set_line_width(max(self.linewidth,1))
 			for i in self.shapedata:
 				if i[0]=="M":
 					cr.move_to(i[1],i[2])
@@ -1222,6 +1389,7 @@ class Shape (object):
 			tb+="cr.translate("+str(self.x)+","+str(self.y)+")\n"
 			tb+="cr.rotate("+str(self.rotation*math.pi/180)+")\n"
 			tb+="cr.scale("+str(self.xscale)+"*1.0, "+str(self.yscale)+"*1.0)\n"
+			tb+="cr.lineWidth = "+str(max(self.linewidth,1))+"\n"
 			if type(self.fill)==type([]):
 				tb+="cr.fillStyle = \""+rgb2hex(self.fill[0],self.fill[1],self.fill[2])+"\"\n"
 			for i in self.shapedata:
@@ -1238,6 +1406,79 @@ class Shape (object):
 				tb+="cr.stroke()\n"
 			tb+="cr.restore()\n"
 		elif SYSTEM=="osx":
+
+			if USING_GL:
+				cr.save()
+				cr.translate(self.x, cr.height-self.y)
+				cr.rotate(self.rotation)
+				cr.scale(self.xscale*1.0, self.yscale*1.0)
+				
+				#pencolor, fillcolor, pensize
+				#Temporary.
+				glColor3f(1.0,0.0,0.0)
+				
+				glBegin(GL_LINES)
+				for i in self.shapedata:
+					if i[0]=="M":
+						point = (i[1], i[2])
+						#glVertex2f(point[0], cr.height-point[1])
+						cr.x, cr.y = point
+					elif i[0]=="L":
+						point = (i[1], i[2])
+						#glVertex2f(point[0], cr.height-point[1])
+						glVertex2f(cr.x, -cr.y)
+						glVertex2f(point[0], -point[1])
+						cr.x, cr.y = point
+					elif i[0]=="C":
+						pointa = (i[1], i[2])
+						pointb = (i[3], i[4])
+						pointc = (i[5], i[6])
+						#TODO: curve
+						#glVertex2f(pointc[0], -pointc[1])
+						#glVertex2f(pointc[0], -pointc[1])
+						cr.drawCurve([ pointa, pointb, pointc])
+						cr.x, cr.y = pointc
+				glEnd()
+				
+				cr.restore()
+			else:
+				cr.gsave()
+				if sep=="\\":
+					# Very ugly hack for Windows. :(
+					# Windows doesn't respect coordinate transformations
+					# with respect to translation, so we have to do this
+					# bit ourselves.
+					
+					# Rotation in radians
+					radrot = parent.group.rotation*math.pi/180 
+					# Coordinate transform: multiplication by a rotation matrix
+					cr.translate(self.x*math.cos(radrot)-self.y*math.sin(radrot), self.x*math.sin(radrot)+self.y*math.cos(radrot))
+				else:
+					cr.translate(self.x,self.y)
+				cr.rotate(self.rotation)
+				cr.scale(self.xscale*1.0, self.yscale*1.0)
+				cr.newpath()
+				cr.pencolor = self.linecolor.pygui
+				cr.fillcolor = self.fillcolor.pygui
+				cr.pensize = max(self.linewidth,1)
+				for i in self.shapedata:
+					if i[0]=="M":
+						point = (i[1], i[2])
+						cr.moveto(point[0],point[1])
+					elif i[0]=="L":
+						point = (i[1], i[2])
+						cr.lineto(point[0],point[1])
+					elif i[0]=="C":
+						pointa = (i[1], i[2])
+						pointb = (i[3], i[4])
+						pointc = (i[5], i[6])
+						### Mac OSX needs custom PyGUI for this to work ###
+						cr.curveto((pointa[0],pointa[1]),(pointb[0],pointb[1]),(pointc[0],pointc[1]))
+				if self.filled:
+					cr.closepath()
+					cr.fill_stroke()
+
+				else:
 					cr.gsave()
 					if sep=="\\":
 						# Very ugly hack for Windows. :(
@@ -1281,6 +1522,7 @@ class Shape (object):
 			tb+="cr.translate("+str(self.x)+","+str(self.y)+")\n"
 			tb+="cr.rotate("+str(self.rotation*math.pi/180)+")\n"
 			tb+="cr.scale("+str(self.xscale)+"*1.0, "+str(self.yscale)+"*1.0)\n"
+			tb+="cr.lineWidth = "+str(max(self.linewidth,1))+"\n"
 			if type(self.fill)==type([]):
 				tb+="cr.fillStyle = \""+rgb2hex(self.fill[0],self.fill[1],self.fill[2])+"\"\n"
 			for i in self.shapedata:
@@ -1388,9 +1630,9 @@ class Shape (object):
 		retval+=".outline "+self.name+"outline:\n"
 		retval+=" ".join([" ".join([str(x) for x in a]) for a in self.shapedata])+"\n.end\n"
 		if self.filled:
-			retval+=".filled "+self.name+" outline="+self.name+"outline fill="+self.fillcolor.rgb+" color="+self.linecolor.rgb+"\n"
+			retval+=".filled "+self.name+" outline="+self.name+"outline fill="+self.fillcolor.rgb+" color="+self.linecolor.rgb+" line="+str(self.linewidth)+"\n"
 		else:
-			retval+=".filled "+self.name+" outline="+self.name+"outline fill=#00000000 color="+self.linecolor.rgb+"\n"
+			retval+=".filled "+self.name+" outline="+self.name+"outline fill=#00000000 color="+self.linecolor.rgb+" line="+str(self.linewidth)+"\n"
 		return retval
 	def print_html(self):
 		retval = "var "+self.name+" = new Shape();\n"+self.name+"._shapedata = "+str(self.shapedata)+";\n"
@@ -1429,6 +1671,9 @@ class Text (object):
 		SITER+=1
 	def draw(self,cr=None,parent=None,rect=None):
 		if SYSTEM=="osx":
+			if USING_GL:
+				pass
+			else:
 				cr.font = self.font
 				cr.textcolor = self.fill.pygui
 				cr.gsave()
@@ -1629,6 +1874,25 @@ class frame:
 				tb+="cr.restore()\n"
 			elif SYSTEM=="osx":
 				self.group = group
+				if USING_GL:
+					#cr.gsave()
+					#cr.rotate(group.rotation)
+					#cr.translate(group.x,group.y)
+					#cr.scale(group.xscale,group.yscale)
+					def dodraw(obj, cr):
+						obj.draw(cr, self)
+					result = [dodraw(obj, cr) for obj in self.objs]
+					#if currentselect:
+						#cr.gsave()
+						#cr.newpath()
+						#cr.pencolor = Colors.rgb(0,0,1)
+						#cr.rect([currentselect.minx-1,currentselect.miny-1,
+						#				currentselect.maxx+currentselect.x+2,
+						#				currentselect.maxy+currentselect.y+2])
+						#cr.stroke()
+						#cr.grestore()
+					#cr.grestore()
+				else:
 					cr.gsave()
 					cr.rotate(group.rotation)
 					cr.translate(group.x,group.y)