diff --git a/LJ.conf b/LJ.conf index 5bac5b6..5b2ebba 100644 --- a/LJ.conf +++ b/LJ.conf @@ -2,7 +2,7 @@ lasernumber = 4 debug = 0 ljayserverip = 0.0.0.0 -wwwip = 192.168.2.43 +wwwip = 192.168.2.44 nozoscip = 127.0.0.1 bhoroscip = 127.0.0.1 autostart = artnet @@ -12,12 +12,12 @@ wsport = 9001 [laser0] color = -1 type = DS1000 -ip = 192.168.2.43 +ip = 192.168.2.3 kpps = 25000 -centerx = -5485 -centery = -11392 -zoomx = 80.0 -zoomy = 86.0 +centerx = 0 +centery = 0 +zoomx = 50.0 +zoomy = 50.0 sizex = 32000 sizey = 32000 finangle = 0.0 @@ -34,10 +34,10 @@ color = -1 type = LOCAL ip = 192.168.2.5 kpps = 25000 -centerx = -17720 -centery = 419 -zoomx = 35.0 -zoomy = 35.0 +centerx = 0 +centery = 0 +zoomx = 80.0 +zoomy = 80.0 sizex = 32000 sizey = 32000 finangle = 0.0 @@ -54,13 +54,13 @@ color = -1 type = LUKE400 ip = 192.168.2.6 kpps = 25000 -centerx = -3798 -centery = -13079 -zoomx = 73.0 -zoomy = 70.0 +centerx = 0 +centery = 0 +zoomx = 50.0 +zoomy = 50.0 sizex = 32000 sizey = 32000 -finangle = 0.2792526803190927 +finangle = 0.0 swapx = -1 swapy = -1 lsteps = [(1.0, 8),(0.25, 3), (0.75, 3), (1.0, 10)] @@ -74,10 +74,10 @@ color = -1 type = LUKE400 ip = 192.168.2.4 kpps = 25000 -centerx = 2531 -centery = -1 -zoomx = 85.0 -zoomy = 70.0 +centerx = 0 +centery = 0 +zoomx = 50.0 +zoomy = 50.0 sizex = 32000 sizey = 32000 finangle = 0.0 diff --git a/LJ_template.conf b/LJ_template.conf index 3d5cc3d..002fe4c 100644 --- a/LJ_template.conf +++ b/LJ_template.conf @@ -12,7 +12,7 @@ wsport = 9001 [laser0] color = -1 type = DS1000 -ip = 192.168.2.4 +ip = 192.168.2.3 kpps = 25000 centerx = 0 centery = 0 @@ -32,7 +32,7 @@ warpdest = [[-1500., 1500.], [laser1] color = -1 type = LOCAL -ip = 192.168.2.43 +ip = 192.168.2.5 kpps = 25000 centerx = 0 centery = 0 diff --git a/plugins/aurora/anim.py b/plugins/aurora/anim.py index 5874451..1bf4943 100644 --- a/plugins/aurora/anim.py +++ b/plugins/aurora/anim.py @@ -478,7 +478,8 @@ def MaxOneSide(LAY, Cux, Cuy, Cuz): ''' dots = [] - #print("X", Cux['type'], Cux['phaseoffset'], Cux['inv'], Cux['amp']) + + print("X", LAY['scandots'],Cux['type'], Cux['phaseoffset'], Cux['inv'], Cux['amp']) if Cux['type'] ==0: xsteps = ssine(LAY['scandots'], Cux['freq'], Cux['phaseoffset'] + Cux['inv'], Cux['amp']) if Cux['type'] ==33: @@ -488,7 +489,7 @@ def MaxOneSide(LAY, Cux, Cuy, Cuz): if Cux['type'] == 127: xsteps = slinear(LAY['scandots'], 0, Cux['amp']) - #print("Y", Cuy['type'], Cuy['phaseoffset'], Cuy['inv'], Cuy['amp']) + print("Y", LAY['scandots'], Cuy['type'], Cuy['phaseoffset'], Cuy['inv'], Cuy['amp']) if Cuy['type'] ==0: ysteps = ssine(LAY['scandots'], Cuy['freq'], Cuy['phaseoffset'] + Cuy['inv'], Cuy['amp']) if Cuy['type'] ==33: @@ -512,13 +513,14 @@ def MaxOneSide(LAY, Cux, Cuy, Cuz): return dots -CurveLX = [{'type': 0, 'freq': 1, 'amp': 150, 'phasemod': 0, 'phaseoffset': 0, 'inv': 0}] * 3 -CurveLY = [{'type': 0, 'freq': 1, 'amp': 150, 'phasemod': 0, 'phaseoffset': 0, 'inv': np.pi/2}] * 3 -CurveLZ = [{'type': 0, 'freq': 1, 'amp': 150, 'phasemod': 0, 'phaseoffset': 0, 'inv': 0}] * 3 +CurveLX = [{'type': 0, 'freq': 1, 'amp': 100, 'phasemod': 0, 'phaseoffset': 0, 'inv': 0}] * 3 +CurveLY = [{'type': 0, 'freq': 1, 'amp': 100, 'phasemod': 0, 'phaseoffset': 0, 'inv': np.pi/2}] * 3 +#CurveLY = [{'type': 0, 'freq': 1, 'amp': 100, 'phasemod': 0, 'phaseoffset': 0, 'inv': np.pi/2}] * 3 +CurveLZ = [{'type': 0, 'freq': 1, 'amp': 1, 'phasemod': 0, 'phaseoffset': 0, 'inv': 0}] * 1 -CurveRX = [{'type': 0, 'freq': 1, 'amp': 150, 'phasemod': 0, 'phaseoffset': 0, 'inv': 0}] * 3 -CurveRY = [{'type': 0, 'freq': 1, 'amp': 150, 'phasemod': 0, 'phaseoffset': 0, 'inv': np.pi/2}] * 3 -CurveRZ = [{'type': 0, 'freq': 1, 'amp': 150, 'phasemod': 0, 'phaseoffset': 0, 'inv': 0}] * 3 +CurveRX = [{'type': 0, 'freq': 1, 'amp': 100, 'phasemod': 0, 'phaseoffset': 0, 'inv': 0}] * 3 +CurveRY = [{'type': 0, 'freq': 1, 'amp': 100, 'phasemod': 0, 'phaseoffset': 0, 'inv': np.pi/2}] * 3 +CurveRZ = [{'type': 0, 'freq': 1, 'amp': 1, 'phasemod': 0, 'phaseoffset': 0, 'inv': 0}] * 3 def Maxwell(LAY): diff --git a/plugins/aurora/aurora.py b/plugins/aurora/aurora.py index aed5f3d..303baa0 100644 --- a/plugins/aurora/aurora.py +++ b/plugins/aurora/aurora.py @@ -181,7 +181,7 @@ log.infog("Aurora v0.1b") OSCinPort = 8090 ljscene = 0 -StartFXs = ["anim.Trckr","anim.Starfield","anim.Starfield", "anim.Word"] +StartFXs = ["anim.Maxwell","anim.Starfield","anim.Starfield", "anim.Word"] # Useful variables init. white = lj.rgb2int(255,255,255) @@ -291,7 +291,7 @@ currentlayer = 0 for l in range(lasernumber): Layer.append({'number': 0, 'FX': "user.User4", - 'Xcoord': 45, 'Ycoord': 45, 'Zcoord': 0, + 'Xcoord': 300, 'Ycoord': 300, 'Zcoord': 0, 'scandots': 64, 'scale': 45, 'color': white, "run": False, 'intensity': 255, 'closed': False, 'lineSize': 64, 'radius': 45, 'wavefreq': 3,