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

New aurora defaults FXs

Browse source
This commit is contained in:
Sam Neurohack 2020-10-04 19:46:45 +02:00
parent 4b07dfc263
commit 07f5cfff73
14 changed files with 75 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

28
libs3/commands.py
View file

@ -65,6 +65,8 @@ lsteps is a string like "[ (1.0, 8),(0.25, 3), (0.75, 3), (1.0, 10)]"
/regen : regen webui index html page.
/plugins/start pluginame
/plugins/stop pluginame
/pl/clientnumber/lasernumber value : value is the pointlist to draw as string type. For string format see code in clients directory.
@ -99,7 +101,7 @@ r = redis.StrictRedis(host=gstt.LjayServerIP , port=6379, db=0)
#r = redis.StrictRedis(host=gstt.LjayServerIP , port=6379, db=0, password='-+F816Y+-')
GenericCommands = ["start","align","ljclient","scene","addest","deldest","dest","clientnumber","vcvrack","fft","mitraille","faceosc","midigen","viewgen","audiogen","noteon","cc","ljpong","ljwars","mouse","emergency","simu","status","run","nozoid","planet","live","words","ai","bank0","pose","lj","cycl","glyph","pong","maxw","custom1","square","regen","trckr","aurora","line1","ForwardUI","settings","debug","pl"]
GenericCommands = ["start","align","ljclient","scene","addest","deldest","dest","clientnumber","vcvrack","fft","mitraille","faceosc","midigen","viewgen","audiogen","noteon","cc","ljpong","ljwars","mouse","emergency","simu","status","run","nozoid","planet","live","words","ai","bank0","pose","lj","cycl","glyph","pong","maxw","custom1","square","regen","trckr","aurora","line1","ForwardUI","settings","debug","pl","plugins"]
def UserOn(laser):
@ -326,6 +328,30 @@ def handler(oscpath, args):
for laser in range(gstt.lasernumber):
print("Back to normal for laser ", laser)
UserOn(laser)
# Plugins commands :
elif oscpath[1] == "plugins":
# /plugins/start pluginame
if oscpath[2] == "start":
print()
print("Starting plugin :",args[0])
print()
plugins.Start(args[0])
# /plugins/stop pluginame
if oscpath[2] == "stop":
print()
print("Stopping plugin :",args[0])
print()
plugins.Kill(args[0])
# /plugins/restart pluginame
if oscpath[2] == "restart":
print()
print("Restarting plugin :",args[0])
print()
plugins.Restart(args[0])
# Settings commands :
elif oscpath[1] == "settings":

4
libs3/gstt.py
View file

@ -1,6 +1,6 @@
# coding=UTF-8
'''
nozoscip
LJ Global state
v0.8.0
@ -34,7 +34,7 @@ xy_center = [screen_size[0]/2,screen_size[1]/2]
LjayServerIP = '192.168.1.13'
oscIPin = '192.168.1.15'
nozoscip = '192.168.1.15'
nozoscIP = '192.168.1.15'
wwwIP = '192.168.1.15'
# gstt.Laser select to what laser modifcation will occur.

2
libs3/lj23layers.py
View file

@ -987,7 +987,7 @@ def Text(message, c, layer, xpos, ypos, resize, rotx, roty, rotz):
for xy in char_layer_list:
char_draw.append((xy[0] + x_offset,xy[1],c))
i +=1
#print ch,char_layer_list,char_draw
print(ch, c, xpos, ypos, resize, char_draw)
rPolyLineOneColor(char_draw, c, layer , False, xpos, ypos, resize, rotx, roty, rotz)
#dots.append(char_draw)

5
libs3/plugins.py
View file

@ -182,12 +182,11 @@ def OSCsend(name, oscaddress, oscargs =''):
# for each plugin will automatically add /pluginame before oscpath to send like /aurora/scim 1, if oscpath = "/scim 1"
def SendAll(oscpath):
if gstt.debug > 0:
print("Sending to all plugins ", oscpath)
print("Sending to all plugins ", "/pluginame"+oscpath)
for plugin in list(gstt.plugins.keys()):
if gstt.debug > 0:
print("sending ",oscpath,"to", plugin)
print("sending ","/"+plugin+oscpath,"to", plugin)
#sendWSall("/"+ plugin + "/start 0")
Send(plugin, "/"+plugin+oscpath)