diff --git a/LJ.conf b/LJ.conf index 166d0f7..538c147 100644 --- a/LJ.conf +++ b/LJ.conf @@ -1,5 +1,5 @@ [General] -lasernumber = -1 +lasernumber = 2 debug = 0 ljayserverip = 0.0.0.0 wwwip = 192.168.2.43 @@ -10,12 +10,12 @@ autostart = artnet [laser0] color = -1 type = DS1000 -ip = 192.168.2.43 +ip = 192.168.2.4 kpps = 30156 -centerx = 46500 +centerx = 0 centery = 0 -zoomx = 294.0 -zoomy = 50.0 +zoomx = 40.0 +zoomy = 40.0 sizex = 32000 sizey = 32000 finangle = 0.0 @@ -23,19 +23,19 @@ swapx = 1 swapy = -1 lsteps = [ (1.0, 8),(0.25, 3), (0.75, 3), (1.0, 10)] warpdest = [[-1500., 1500.], - [ 1500., 1500.], - [ 1500.,-1500.], - [-1500.,-1500.]] + [ 1500., 1500.], + [ 1500.,-1500.], + [-1500.,-1500.]] [laser1] color = -1 type = LOCAL -ip = 192.168.2.5 +ip = 192.168.2.43 kpps = 0 -centerx = -5707 -centery = -838 -zoomx = 20.0 -zoomy = 20.0 +centerx = 0 +centery = 0 +zoomx = 40.0 +zoomy = 40.0 sizex = 32000 sizey = 32000 finangle = -30.0 @@ -43,9 +43,9 @@ swapx = -1 swapy = -1 lsteps = [ (1.0, 2),(0.25, 1), (0.75, 1), (1.0, 5)] warpdest = [[-1500., 1500.], - [ 1500., 1500.], - [ 1500.,-1500.], - [-1500.,-1500.]] + [ 1500., 1500.], + [ 1500.,-1500.], + [-1500.,-1500.]] [laser2] color = -1 @@ -54,8 +54,8 @@ ip = 192.168.2.4 kpps = 25000 centerx = 0 centery = 0 -zoomx = 37.8 -zoomy = 13.3 +zoomx = 40.0 +zoomy = 40.0 sizex = 30600 sizey = 32000 finangle = -4.0 @@ -74,8 +74,8 @@ ip = 192.168.1.5 kpps = 25000 centerx = 0 centery = 0 -zoomx = 57.0 -zoomy = 63.0 +zoomx = 40.0 +zoomy = 40.0 sizex = 32000 sizey = 32000 finangle = 0.0 diff --git a/README.md b/README.md index 05a7805..c550b4c 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ By Sam Neurohack, Loloster, Cocoa LICENCE : CC BY -![LJ](http://www.teamlaser.tk/lj/images/lj2.png) +![LJ](https://www.teamlaser.tk/lj/images/lj2.png) A software laser framework with GUI, for up to 4 lasers live actions with ethedreams DACs. Think creative like Laser "battles", planetarium, sharing available lasers in demoparties for competition, ... @@ -45,7 +45,7 @@ Important : for best performance LJ is meant to run in a dedicated computer espe # Scenes and pointlists. # -![Scenes](http://www.teamlaser.tk/lj/images/scenes.png) +![Scenes](https://www.teamlaser.tk/lj/images/scenes.png) LJ accept up to 4 groups = virtual "scenes" of 4 "pointlists" each (= one pointlist per laser), so up to 16 pointlists can be sent to redis at anytime from anywhere in the network. The idea behind this is to easily share actual lasers. Imagine in demo party : @@ -205,7 +205,7 @@ Dest1 = lj.DestObject('1', 1, True, 0 , 1, 1) Dest1 will also send layer 0 points to scene 1, laser 1 -![Layers](http://www.teamlaser.tk/lj/images/layer.png) +![Layers](https://www.teamlaser.tk/lj/images/layer.png) 2/ Different layers to different lasers ? @@ -458,4 +458,4 @@ INVALID -> yellow -![LJ](http://www.teamlaser.tk/lj/images/calig.png) \ No newline at end of file +![LJ](https://www.teamlaser.tk/lj/images/calig.png) \ No newline at end of file diff --git a/libs3/tracer3.py b/libs3/tracer3.py index 1140be3..78ceaff 100644 --- a/libs3/tracer3.py +++ b/libs3/tracer3.py @@ -116,26 +116,31 @@ def pack_point(laser, intensity, x, y, r, g, b, i = -1, u1 = 0, u2 = 0, flags = #print("Tracer ", laser, ": packing", x, y, r, g, b, "intensity", intensity, "i", i) + if x < -32767: - x = -32767 if gstt.debug >1: - log.err("Tracer "+ str(laser) +" : x coordinates was below -32767") + log.err("Tracer "+ str(laser) +" : x coordinates " + str(x) + " was below -32767") + x = -32000 if x > 32767: - x = 32767 if gstt.debug >1: - log.err("Tracer "+ str(laser) +" : x coordinates was bigger than 32767") + log.err("Tracer "+ str(laser) +" : x coordinates "+ str(x) + " was bigger than 32767") + x = 32000 if y < -32767: - y = -32767 + if gstt.debug >1: - log.err("Tracer "+ str(laser) +" : y coordinates was below -32767") + log.err("Tracer "+ str(laser) +" : y coordinates "+ str(y) + " was below -32767") + y = -32000 + if y > 32767: - y = 32767 + if gstt.debug >1: - log.err("Tracer "+ str(laser) +" : y coordinates was bigger than 32767") + log.err("Tracer "+ str(laser) +" : y coordinates "+ str(y) + " was bigger than 32767") + y = 32000 + return struct.pack("