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

4
plugins/aurora/anim.py
View file

@ -22,6 +22,7 @@ import live
ljpath = r'%s' % os.getcwd().replace('\\','/')
# import from shell
sys.path.append(ljpath +'/../../libs3/')
sys.path.append(ljpath +'/../../libs3')
sys.path.append(ljpath +'/../libs3/')
#import from LJ
@ -29,7 +30,6 @@ sys.path.append(ljpath +'/libs3/')
sys.path.append('../libs3')
sys.path.append(ljpath +'/../../libs3')
import lj23layers as lj
import gstt
@ -321,7 +321,7 @@ def Circle(LAY):
def Word(LAY):
lj.Text(LAY['word'], c = LAY['color'], layer = LAY['number'], xpos = 300, ypos = 300, resize = LAY['scale']*20, rotx = LAY['Xrotdirec'], roty = LAY['Yrotdirec'], rotz = LAY['Zrotdirec'])
lj.Text(LAY['word'], zpos=0, c = LAY['color'], layer = LAY['number'], xpos = 300, ypos = 300, resize = LAY['scale']*0.6, rotx = LAY['Xrotdirec'], roty = LAY['Yrotdirec'], rotz = LAY['Zrotdirec'])
#lj.Text(LAY['word'], c = LAY['color'], layer = LAY['number'], xpos = LAY['Xcoord'], ypos = LAY['Ycoord'], resize = LAY['scale']*10, rotx = LAY['Xrotdirec'], roty = LAY['Yrotdirec'], rotz = LAY['Zrotdirec'])
#lj.rPolyLineOneColor([(x/2,y/2),((x+1)/2,(y+1)/2)], c = LAY['color'], layer = l, xpos = 0, ypos = 0, resize = LAY['scale'], rotx = LAY['Xrotdirec'], roty = LAY['Yrotdirec'], rotz = LAY['Zrotdirec'])
#lj.rPolyLineOneColor([(x/2,y/2,0),((x+1)/2,(y+1)/2,0)], c = z2color(Field['stars'][starnumber][2], LAY['color']), layer = LAY['number'], closed = False, xpos = -200, ypos = 0, resize = LAY['scale'], rotx = LAY['Xrotdirec'], roty = LAY['Yrotdirec'], rotz = LAY['Zrotdirec'])

15
plugins/aurora/aurora.py
View file

@ -179,9 +179,9 @@ print()
log.infog("Aurora v0.1b")
OSCinPort = 8090
ljscene = 1
ljscene = 0
StartFXs = ["anim.Word", "anim.Word","anim.Starfield","anim.Starfield"]
StartFXs = ["anim.Trckr","anim.Starfield","anim.Starfield", "anim.Word"]
# Useful variables init.
white = lj.rgb2int(255,255,255)
@ -191,7 +191,7 @@ green = lj.rgb2int(0,255,0)
cyan = lj.rgb2int(255,0,255)
yellow = lj.rgb2int(255,255,0)
StartColors = [blue, blue, green, red]
StartColors = [white, white,white, white]
screen_size = [700,700]
xy_center = [screen_size[0]/2,screen_size[1]/2]
@ -291,7 +291,7 @@ for l in range(lasernumber):
'scandots': 64, 'scale': 45, 'color': white, "run": False,
'intensity': 255, 'closed': False,
'lineSize': 64, 'radius': 45, 'wavefreq': 3,
'word': "Sonoptik",
'word': "SonoptiK",
'step': 0, 'steps': 60, 'stepmax': 60, 'stepvals': [],
'Xtransamt': 0, 'Ytransamt': 0, 'Ztransamt': 0,
'Xtranspeed': 0, 'Ytranspeed': 0, 'Ztranspeed': 0,
@ -366,6 +366,7 @@ def OSChandler(path, tags, args, source):
oscaddress = ''.join(path.split("/"))
#print()
print("Aurora default OSC Handler : " + str(path) + " from Client : " + str(source[0]))
#print(args)
if len(args) > 0:
pass
@ -453,7 +454,7 @@ def OSChandler(path, tags, args, source):
if debug != 0:
print("Aurora default OSC got trckr frame", args[1], "for layer", args[0], "with path", path)
print(len(args),"args", args)
counter =0
'''
@ -463,10 +464,10 @@ def OSChandler(path, tags, args, source):
TrckrPts.append([float(args[dot]), float(args[dot+1])])
'''
TrckrPts[args[0]] = []
TrckrPts[int(args[0])] = []
for dot in range(2,len(args)-1,2):
TrckrPts[args[0]].append([float(args[dot]), float(args[dot+1])])
TrckrPts[int(args[0])].append([float(args[dot]), float(args[dot+1])])
# /aurora/word/layer word