p5-python 0.6.12__tar.gz → 0.6.29__tar.gz

{p5-python-0.6.12 → p5-python-0.6.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p5-python
-Version: 0.6.12
+Version: 0.6.29
 Summary: A package wrapping pygame functionality in p5.js calling conventions.
 Home-page: https://github.com/gromko/p5-python
 Author: Grygoriy Gromko

{p5-python-0.6.12 → p5-python-0.6.29}/p5/__init__.py

@@ -4,7 +4,7 @@ os.environ['PYGAME_HIDE_SUPPORT_PROMPT'] = "hide"
 from p5.corefunctions import (run, createCanvas, saveCanvas, angleMode, rectMode, ellipseMode,
                               line, ellipse, circle, rect, quad, arc, triangle, bezier,
                               point, beginShape, vertex, curveVertex, curve, bezierVertex,
-                              endShape, cursor, strokeWeight, noStroke, 
+                              endShape, cursor, strokeWeight, noStroke, loadPixels, updatePixels, 
                               loadImage, image, keyIsDown, frameRate, loop, noLoop,  
                               background,text,textFont, textSize, textStyle, textAlign)
 
@@ -26,7 +26,8 @@ from p5.timedata import (hour, minute, second, day, month, year, milli_sec,  mil
 
 from p5.transform import (scale, rotate, translate,  push, pop, resetMatrix)
 
-__all__ = ["run", "createCanvas", "translate", "background", "fill", "noFill", "line", "ellipse", "circle", "rect", "triangle", "quad", "arc",
+
+__all__ = ["run", "createCanvas", "translate", "background", "fill", "noFill", "line", "ellipse", "circle", "rect", "triangle", "quad", "arc", 
     "push", "pop", "cursor", "TWO_PI", "HALF_PI", "PI", "QUARTER_PI", "TAU", "CURSOR_ARROW", "CURSOR_DIAMOND", "CURSOR_BROKEN_X", "CURSOR_TRI_LEFT",
     "CURSOR_TRI_RIGHT", "BOLD", "ITALIC", "BOLDITALIC", "NORMAL", "strokeWeight", "stroke", "noStroke", "loadImage", "image", "point", "CORNER", "CORNERS", "RADIUS",
      "frameRate", "random", "constrain", "floor", "ceil", "dist", "exp", "lerp", "log", "log10", "log2", "logb", "mag", "textAlign", "CHORD", "PIE", "OPEN", "ARC",
@@ -37,11 +38,11 @@ __all__ = ["run", "createCanvas", "translate", "background", "fill", "noFill", "
     "UNDERSCORE","BACKQUOTE","UP","DOWN","RIGHT","LEFT","UP_ARROW","DOWN_ARROW","LEFT_ARROW","RIGHT_ARROW","INSERT","HOME","END","PAGEUP","PAGEDOWN","PGUP",
     "PGDN","KP0","KP1","KP2","KP3","KP4","KP5","KP6","KP7","KP8","KP9","KP_PERIOD","KP_DIVIDE","KP_MULTIPLY","KP_MINUS","KP_PLUS","F1","F2","F3","F4","F5",
     "F6","F7","F8","F9","F10","F11","F12","NUMLOCK","CAPSLOCK","SCROLLOCK","RSHIFT","LSHIFT","RCTRL","LCTRL","RALT","LALT","RMETA","LMETA","CONTEXTMENU",
-    "PRINT","SYSREQ","BREAK","MENU","CENTER","CLOSE", "pow", "map", "angleMode", "curveVertex", "randomSeed", "resetMatrix",
-    "hour", "minute", "second", "day", "month", "year", "milli_sec", "millis", "curve", "bezierVertex", "bezier"
+    "PRINT","SYSREQ","BREAK","MENU","CENTER","CLOSE", "RADIANS","DEGREES", "pow", "map", "angleMode", "curveVertex", "randomSeed", "resetMatrix", 
+    "hour", "minute", "second", "day", "month", "year", "milli_sec", "millis", "curve", "bezierVertex", "bezier", "loadPixels", "updatePixels"
 ]
 
-__version__ = "0.6.12"
+__version__ = "0.5.84"
 
 print("Thank you for using p5\n")
 

{p5-python-0.6.12 → p5-python-0.6.29}/p5/corefunctions.py

@@ -364,21 +364,44 @@ def textAlign(align):
         raise ValueError("textAlign() was expecting LEFT|CENTER|RIGHT")
       
 # ---- IMAGE AND PIXEL ----
-
-def loadImage(path):
-    return pygame.image.load(path)
-
-def image(img, x, y):
-    pg_Screen.blit(img, (x, y))
-        
+def bgra_surf_to_rgba_string(surface):
+    # convert raw data from BGRA to RGBA
+    img = surface.get_data()
+    rgba= img
+    for i in range(0,len(rgba),4):
+               rgba[i],rgba[i+2]=rgba[i+2],rgba[i]
+    return rgba
+    
+def loadImage(path): # load image to IMAGE_SURFACE
+    img_surface = cairo.ImageSurface.create_from_png(path)
+    rgba= bgra_surf_to_rgba_string(img_surface)
+    return img_surface
+
+def image(image, x, y):
+    ctx = cairo.Context(CAIRO_SURFACE)
+    ctx.set_source_surface(image, x, y)    
+    ctx.paint()
+     
 def saveCanvas(filename):        
     pygame.image.save(pg_Screen, filename)
 
-def loadPixels(image):
-    return pygame.PixelArray(image)
-
-def updatePixels(pixels):
-    pixels.close()
+def loadPixels():
+    surface = CAIRO_SURFACE
+    img = surface.get_data()
+    rgba= img
+    for i in range(0,len(rgba),4):
+               rgba[i],rgba[i+2]=rgba[i+2],rgba[i]
+    builtins.pixels = list(rgba)
+   
+def updatePixels():
+    rgba= builtins.pixels
+    for i in range(0,len(rgba),4):
+               rgba[i],rgba[i+2]=rgba[i+2],rgba[i]
+    img = bytearray(rgba)
+    img_surface = cairo.ImageSurface.create_for_data(img, cairo.FORMAT_ARGB32, builtins.width, builtins.height)
+    ctx = cairo.Context(CAIRO_SURFACE)
+    ctx.set_source_surface(img_surface, 0, 0)    
+    ctx.paint()
 
 # ---- ----
 def createCanvas(w=100, h=100):

{p5-python-0.6.12 → p5-python-0.6.29}/p5/renderer.py

@@ -18,9 +18,9 @@ def a_radians(a):
     if builtins.ANGLEMODE == DEGREES:
         return a * math.pi/180
     else:
-        return a  
-def clear_background(surface, width, height, color):
-    
+        return a
+        
+def clear_background(surface, width, height, color):    
     ctx = cairo.Context(surface)
     ctx.set_source_rgba(*bgra(color))
     ctx.rectangle(0, 0, width, height)
@@ -29,6 +29,7 @@ def clear_background(surface, width, height, color):
 def draw_line(surface, x1, y1, x2, y2):
     rotate_angle = a_radians(settings["rotate_amnt"])
     scale_xy     = settings["scale_amnt"]
+    if scale_xy == 0: scale_xy = 1
     origin_x     = settings["real_ox"]
     origin_y     = settings["real_oy"]
     stroke_color = settings["stroke_color"] 
@@ -36,6 +37,7 @@ def draw_line(surface, x1, y1, x2, y2):
     fill_color   = settings["fill_color"]
     ctx = cairo.Context(surface)
     ctx.translate(origin_x, origin_y)
+    ctx.scale(scale_xy, scale_xy)
     ctx.rotate(rotate_angle)
     ctx.set_line_width(thickness)
     ctx.move_to(x1, y1)
@@ -47,6 +49,7 @@ def draw_line(surface, x1, y1, x2, y2):
 def draw_rect(surface, x, y, width, height):
     rotate_angle = a_radians(settings["rotate_amnt"])
     scale_xy     = settings["scale_amnt"]
+    if scale_xy == 0: scale_xy = 1 
     origin_x     = settings["real_ox"]
     origin_y     = settings["real_oy"]
     stroke_color = settings["stroke_color"] 
@@ -54,6 +57,7 @@ def draw_rect(surface, x, y, width, height):
     fill_color   = settings["fill_color"]
     ctx = cairo.Context(surface)
     ctx.translate(origin_x, origin_y)
+    ctx.scale(scale_xy, scale_xy)
     ctx.rotate(rotate_angle)
     ctx.rectangle(x, y, width, height)
     ctx.set_line_width(thickness)
@@ -67,6 +71,7 @@ def draw_rect(surface, x, y, width, height):
 def draw_polygon(surface, vertices):
     rotate_angle = a_radians(settings["rotate_amnt"])
     scale_xy     = settings["scale_amnt"]
+    if scale_xy == 0: scale_xy = 1
     origin_x     = settings["real_ox"]
     origin_y     = settings["real_oy"]
     stroke_color = settings["stroke_color"] 
@@ -74,6 +79,7 @@ def draw_polygon(surface, vertices):
     fill_color   = settings["fill_color"]
     ctx = cairo.Context(surface)
     ctx.translate(origin_x, origin_y)
+    ctx.scale(scale_xy, scale_xy)
     ctx.rotate(rotate_angle)
     ctx.move_to(*vertices[0])
     for n in range(1,len(vertices)):
@@ -90,12 +96,14 @@ def draw_polygon(surface, vertices):
 def draw_lines(surface, vertices):
     rotate_angle = a_radians(settings["rotate_amnt"])
     scale_xy     = settings["scale_amnt"]
+    if scale_xy == 0: scale_xy = 1
     origin_x     = settings["real_ox"]
     origin_y     = settings["real_oy"]
     stroke_color = settings["stroke_color"] 
     thickness    = settings["stroke_weight"]
     ctx = cairo.Context(surface)
     ctx.translate(origin_x, origin_y)
+    ctx.scale(scale_xy, scale_xy)
     ctx.rotate(rotate_angle)
     ctx.move_to(*vertices[0])
     for n in range(1,len(vertices)):
@@ -108,6 +116,7 @@ def draw_lines(surface, vertices):
 def draw_circle(surface, x, y, radius):
     rotate_angle = a_radians(settings["rotate_amnt"])
     scale_xy     = settings["scale_amnt"]
+    if scale_xy == 0: scale_xy = 1
     origin_x     = settings["real_ox"]
     origin_y     = settings["real_oy"]
     stroke_color = settings["stroke_color"] 
@@ -116,6 +125,7 @@ def draw_circle(surface, x, y, radius):
     ctx = cairo.Context(surface)    
     ctx.translate(origin_x, origin_y)
     ctx.rotate(rotate_angle)
+    ctx.scale(scale_xy, scale_xy)
     ctx.arc(x, y, radius, 0, 2.0 * math.pi)
     ctx.set_line_width(thickness)
     if not(settings["no_fill"]):
@@ -128,6 +138,7 @@ def draw_circle(surface, x, y, radius):
 def draw_ellipse(surface, x, y, width, height):
     rotate_angle = a_radians(settings["rotate_amnt"])
     scale_xy     = settings["scale_amnt"]
+    if scale_xy == 0: scale_xy = 1
     origin_x     = settings["real_ox"]
     origin_y     = settings["real_oy"]
     stroke_color = settings["stroke_color"] 
@@ -135,6 +146,7 @@ def draw_ellipse(surface, x, y, width, height):
     fill_color   = settings["fill_color"]
     ctx = cairo.Context(surface)
     ctx.translate(origin_x, origin_y)
+    ctx.scale(scale_xy, scale_xy)
     ctx.rotate(rotate_angle)   
     radius = width/2
     scale_x = 1.0
@@ -154,6 +166,7 @@ def draw_ellipse(surface, x, y, width, height):
 def draw_arc(surface, x, y, width, height, angle1, angle2, mode):           
     rotate_angle = a_radians(settings["rotate_amnt"])
     scale_xy     = settings["scale_amnt"]
+    if scale_xy == 0: scale_xy = 1
     origin_x     = settings["real_ox"]
     origin_y     = settings["real_oy"]
     stroke_color = settings["stroke_color"] 
@@ -161,6 +174,7 @@ def draw_arc(surface, x, y, width, height, angle1, angle2, mode):
     fill_color   = settings["fill_color"]
     ctx = cairo.Context(surface)
     ctx.translate(origin_x, origin_y)
+    ctx.scale(scale_xy, scale_xy)
     ctx.rotate(rotate_angle)   
     if mode == "pie":
         ctx.move_to(x, y)
@@ -184,6 +198,7 @@ def draw_arc(surface, x, y, width, height, angle1, angle2, mode):
 def draw_text(surface, txt, x, y, style):
     rotate_angle = a_radians(settings["rotate_amnt"])
     scale_xy     = settings["scale_amnt"]
+    if scale_xy == 0: scale_xy = 1
     origin_x     = settings["real_ox"]
     origin_y     = settings["real_oy"]
     stroke_color = settings["text_outline"] 
@@ -193,6 +208,7 @@ def draw_text(surface, txt, x, y, style):
     font_size    = settings["text_size"]
     ctx = cairo.Context(surface)
     ctx.translate(origin_x, origin_y)
+    ctx.scale(scale_xy, scale_xy)
     ctx.rotate(rotate_angle)    
     font_options = cairo.FontOptions()
     font_options.set_antialias(cairo.ANTIALIAS_DEFAULT)
@@ -235,6 +251,7 @@ def draw_spline(surface, curvevertices, mode):
     vertices =[]
     rotate_angle = a_radians(settings["rotate_amnt"])
     scale_xy     = settings["scale_amnt"]
+    if scale_xy == 0: scale_xy = 1
     origin_x     = settings["real_ox"]
     origin_y     = settings["real_oy"]
     stroke_color = settings["text_outline"] 
@@ -244,6 +261,7 @@ def draw_spline(surface, curvevertices, mode):
     font_size    = settings["text_size"]
     ctx = cairo.Context(surface)
     ctx.translate(origin_x, origin_y)
+    ctx.scale(scale_xy, scale_xy)
     ctx.rotate(rotate_angle)
     ctx.set_line_width(thickness)  
     vertices = list(curvevertices)
@@ -296,6 +314,7 @@ def draw_bezier(surface, x, y, bezier_vertices, mode):
   
     rotate_angle = a_radians(settings["rotate_amnt"])
     scale_xy     = settings["scale_amnt"]
+    if scale_xy == 0: scale_xy = 1
     origin_x     = settings["real_ox"]
     origin_y     = settings["real_oy"]
     stroke_color = settings["stroke_color"] 
@@ -303,6 +322,7 @@ def draw_bezier(surface, x, y, bezier_vertices, mode):
     fill_color   = settings["fill_color"]
     ctx = cairo.Context(surface)
     ctx.translate(origin_x, origin_y)
+    ctx.scale(scale_xy, scale_xy)
     ctx.rotate(rotate_angle)
     ctx.set_line_width(thickness)
     ctx.move_to(x, y)

{p5-python-0.6.12 → p5-python-0.6.29}/p5/settings.py

@@ -1,9 +1,6 @@
 import builtins
 from p5.constants import *
 
-pg_Screen = None
-clock = None
-
 builtins.mouseX         = 0
 builtins.mouseY         = 0
 builtins.pmouseX        = None
@@ -26,10 +23,14 @@ builtins.MILLIS         = 0
 builtins.frameCount     = 0
 builtins.ellipse_mode   = CENTER
 builtins.rect_mode      = CORNER
+builtins.pixels         = [] # store for pixels
+
+pg_Screen = None
+clock     = None
+# ----
 
+stack  = [] # store for settings
 
-# variables
-stack = [] # store for settings
 settings = {
     "fill_color"    : [255,255,255,255],
     "no_fill"       : False,
@@ -37,7 +38,7 @@ settings = {
     "stroke_weight" : 1,
     "stroke_color"  : [0,0,0,255],
     "rotate_amnt"   : 0,
-    "scale_amnt"    : 1,
+    "scale_amnt"    : 0,
     "text_size"     : 12,
     "text_font"     : "Arial",
     "text_bold"     : False,

{p5-python-0.6.12 → p5-python-0.6.29}/p5/transform.py

@@ -1,11 +1,12 @@
 # TRANSFORM
 from p5.settings import *
 import math
+import builtins
 
 def transform_canvas_reset(): # Transformations are reset at the beginning of the draw loop.
     global settings
     settings["rotate_amnt"] = 0
-    settings["scale_amnt"]  = 1
+    settings["scale_amnt"]  = 0
     settings["origin_x"]    = 0
     settings["origin_y"]    = 0
     settings["real_ox"]     = 0
@@ -18,15 +19,16 @@ def resetMatrix():
 def rotate(angle):
     current_angle = settings["rotate_amnt"]
     current_angle += angle
-    if current_angle < 0:
-        current_angle = 360 + current_angle
-    if current_angle > 359:
-        current_angle = current_angle % 360
-    settings["rotate_amnt"] = current_angle          
+    if builtins.ANGLEMODE == DEGREES:
+        if current_angle < 0:
+            current_angle = 360 + current_angle
+        if current_angle > 359:
+            current_angle = current_angle % 360
+        settings["rotate_amnt"] = current_angle          
     pass
 
 def scale(amnt):
-    settings["scale_amnt"] = amnt
+    settings["scale_amnt"] = settings["scale_amnt"] + amnt
     pass    
 
 def real_oxy(xx,yy):   # calulate real x,y coordinate    

{p5-python-0.6.12 → p5-python-0.6.29}/p5_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p5-python
-Version: 0.6.12
+Version: 0.6.29
 Summary: A package wrapping pygame functionality in p5.js calling conventions.
 Home-page: https://github.com/gromko/p5-python
 Author: Grygoriy Gromko

{p5-python-0.6.12 → p5-python-0.6.29}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "p5"
-version = "0.6.12"
+version = "0.6.29"
 readme = "README.md"
 license = "MIT"
 homepage = "https://github.com/gromko/p5-python"

{p5-python-0.6.12 → p5-python-0.6.29}/setup.py

@@ -12,7 +12,7 @@ install_requires = \
 
 setup_kwargs = {
     'name': 'p5-python',
-    'version': '0.6.12',
+    'version': '0.6.29',
     'description': 'A package wrapping pygame functionality in p5.js calling conventions.',
     'long_description': '#p5 is a friendly tool for learning to code and make art. It is a free and open-source Python library built by an inclusive, nurturing community. p5 is a Python library that provides high level drawing functionality to help you quickly create simulations and interactive art using Python.',
     'author': 'Grygoriy Gromko',