protonphoton/LJ
7
0
Fork 1
Code Issues Pull requests 1 Releases Wiki Activity

Aurora bugfixs

Browse source
This commit is contained in:
sam 2020-10-05 22:22:42 +02:00
parent fa91c00711
commit 132ea32d66
7 changed files with 86 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

17
libs3/lj23layers.py
View file

@ -27,8 +27,8 @@ Basic Draw :
High level draw :
- Text(word, integercolor, layer , xpos, ypos, resize, rotx, roty, rotz) : Display a word
- TextRGB(word, red, green, blue, ...)
- Text(word, zpos, integercolor, layer , xpos, ypos, resize, rotx, roty, rotz) : Display a word
- TextRGB(word, zpos, red, green, blue, ...)
- Embeded font1
@ -582,6 +582,8 @@ def rPolyLineOneColor(xy_list, c, layer , closed, xpos = 0, ypos =0, resize =0.7
for xy in xy_list:
if xy0 is None:
xy0 = xy
#if xy == (338.8, -20, 16777215) or xy == (338.8, -20, 255):
# print(xy, xy0, xpos, ypos, resize, rotx, roty, rotz, Pointransf(xy0, xpos, ypos, resize, rotx, roty, rotz))
LineTo(Pointransf(xy0, xpos, ypos, resize, rotx, roty, rotz), 0, layer )
LineTo(Pointransf(xy0, xpos, ypos, resize, rotx, roty, rotz), c, layer )
else:
@ -955,7 +957,7 @@ def CharDots(char,color):
dots.append((dot[0],dot[1],color))
return dots
def Text(message, c, layer, xpos, ypos, resize, rotx, roty, rotz):
def Text(message, zpos, c, layer, xpos, ypos, resize, rotx, roty, rotz):
dots =[]
@ -985,15 +987,14 @@ def Text(message, c, layer, xpos, ypos, resize, rotx, roty, rotz):
#dots.append((char_layer_list[0][0] + x_offset,char_layer_list[0][1],0))
for xy in char_layer_list:
char_draw.append((xy[0] + x_offset,xy[1],c))
i +=1
print(ch, c, xpos, ypos, resize, char_draw)
char_draw.append((xy[0] + x_offset,xy[1], zpos))
i +=1
rPolyLineOneColor(char_draw, c, layer , False, xpos, ypos, resize, rotx, roty, rotz)
#dots.append(char_draw)
def TextRGB(message,c, layer, xpos, ypos, resize, rotx, roty, rotz):
def TextRGB(message, zpos, c, layer, xpos, ypos, resize, rotx, roty, rotz):
Text(message,int('0x%02x%02x%02x' % (red,green,blue),0), layer, xpos, ypos, resize, rotx, roty, rotz)
Text(message, zpos, int('0x%02x%02x%02x' % (red,green,blue),0), layer, xpos, ypos, resize, rotx, roty, rotz)