forked from protonphoton/LJ
missing file
This commit is contained in:
parent
e321bdcde0
commit
0cb5d947a6
124
README.md
124
README.md
@ -8,7 +8,6 @@ LICENCE : CC BY
|
||||
|
||||
|
||||
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, ...
|
||||
|
||||
|
||||
|
||||
LJ has 5 main components :
|
||||
@ -16,41 +15,15 @@ LJ has 5 main components :
|
||||
- "Plugins" are points generators (to one or more lasers). Lot examples comes with LJ : planetarium, 3D anaglyph animations,... See plugins directory.
|
||||
- A "tracer" per etherdream/laser that take its given point list, correct geometry, recompute in laser controller coordinates, send it to its controller and report its status to the "manager".
|
||||
- A "manager" that talk to all tracers (which client number point lists to draw, new geometry correction,...), handle IOs (webui functions, OSC commands,...) and plugins.
|
||||
- A web GUI in html, css, and vanilla js. No html server or js framework here : it's complex enough. This GUI has a (currently slow) simulator, but one can also use an etherdream/laser emulator (from nannou) to work without physical lasers !!
|
||||
- A network available database (redis). "Plugins" can send directly their pointlists to redis and each "tracer" is instructed to get one of the avalaible pointlist in redis.
|
||||
|
||||
|
||||
|
||||
|
||||
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 :
|
||||
|
||||
Erica needs 4 lasers, that's the 4 pointlists of "scene" 0.
|
||||
Paula and Jennifer use only 2 lasers each, so they can share "scene" 1.
|
||||
And so on..
|
||||
|
||||
The server/network/webUI idea allows to spread cpu intensive tasks on different cpu cores and especially give tracers enough cpu to feed etherdreams DACs smoothly. Of course all this can happen in one computer. There is no real limits : 4 everything is tested and works smoothly if *you have enough cpu/computers/network ressources*.
|
||||
|
||||
It's obviously overkill for one laser in a garage, but for several laserS games events, laserS art, laserS competition, laserS planetarium,... LJ will handle the complexity. Content providers like artists, demomakers,... just need create plugin in whatever langage, send the points to redis.
|
||||
|
||||
To change current scene used by lasers/tracers use the command : /scene/scenenumber/start 1
|
||||
|
||||
|
||||
Registering the plugin in LJ.conf is absolutely not mandatory.
|
||||
|
||||
Needs at least : an etherdream DAC connected to an ILDA laser, RJ 45 IP network (gigabits only !! wifi and wired 100 mpbs doesn't work well with several lasers). Seriously : if you experience frame drops you need to upgrade your network and use a dedicated computer to run seperately main program from plugins, youtube,...
|
||||
|
||||
LJ is tested with Firefox, supports Linux and OS X. Windows is unkown but welcome, if someone want to jump in.
|
||||
|
||||
LJ is in dev : versions in this repository will always be core functionnal : accept and draw pointlists. New features can be not fully implemented, wait for the next commit. Any feedback is welcome at any time.
|
||||
|
||||
- A web GUI in html, css, and vanilla js. This UI can be used in a tablet, computer, whatever. LJ does not come with an html server but absolutely can . This GUI has a (currently slow) simulator, but one can also use an etherdream/laser emulator (see nannou simulator below) to work without physical lasers !!
|
||||
- A network available database (redis). "Plugins" can send directly their pointlists to redis. Each "tracer" is instructed to get one of the avalaible pointlist in redis.
|
||||
|
||||
Important : for best performance LJ is meant to run in a dedicated computer especially with multiple lasers and highly multitasked load : if you watch video, use live webcam face recognition, webui simulator,... and run LJ on the same computer, well you need a bunch of cores. If you don't, spread the load : you can use webui on a tablet, the livecam on a phone, run pointlists generators on another computer,...
|
||||
|
||||
#
|
||||
# Features among many others.
|
||||
#
|
||||
|
||||
(Doc in progress)
|
||||
|
||||
- Intensity and kpps live modification.
|
||||
- Some Lasermapping ('alignment') like in videomapping.
|
||||
- OSC and websocket commands. Very cool : LJ can script or be scripted.
|
||||
@ -71,6 +44,34 @@ LJ is in dev : versions in this repository will always be core functionnal : acc
|
||||
- Plugins list auto start, see line in LJ.conf : autostart = artnet
|
||||
- user.py plugin code example
|
||||
|
||||
#
|
||||
# Scenes and pointlists.
|
||||
#
|
||||
|
||||
|
||||
|
||||
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 :
|
||||
|
||||
Erica needs 4 lasers, that's the 4 pointlists of "scene" 0.
|
||||
Paula and Jennifer use only 2 lasers each, so they can share "scene" 1.
|
||||
And so on..
|
||||
|
||||
The server/network/webUI idea allows to spread cpu intensive tasks on different cpu cores and especially give tracers enough cpu to feed etherdreams DACs smoothly. Of course all this can happen in one computer if *you have enough cpu/computers/network ressources*.
|
||||
|
||||
It's obviously overkill for one laser in a garage, but for several laserS games events, laserS art, laserS competition, laserS planetarium,... LJ will handle the complexity. Content providers like artists, demomakers,... just need create plugin in whatever langage, send the points to redis.
|
||||
|
||||
To change current scene used by lasers/tracers use the command : /scene/scenenumber/start 1
|
||||
|
||||
|
||||
Registering the plugin in LJ.conf is absolutely not mandatory.
|
||||
|
||||
Needs at least : an etherdream DAC connected to an ILDA laser, RJ 45 IP network (gigabits only !! wifi and wired 100 mpbs doesn't work well with several lasers). Seriously : if you experience frame drops you need to upgrade your network and use a dedicated computer to run seperately main program from plugins, youtube,...
|
||||
|
||||
LJ is tested with Firefox, supports Linux and OS X. Windows is unkown but welcome, if someone want to jump in.
|
||||
|
||||
LJ is in dev : versions in this repository will always be core functionnal : accept and draw pointlists. New features can be not fully implemented, wait for the next commit. Any feedback is welcome at any time.
|
||||
|
||||
|
||||
|
||||
#
|
||||
# Install
|
||||
@ -113,14 +114,14 @@ Correct launch order is :
|
||||
- Redis server, usually automatically start at boot if redis is a service or you launched manually : redis-server &
|
||||
- This program. see below.
|
||||
- Load/reload webUI page from disk in a browser (www/index.html). Javascript must be enabled.
|
||||
- Run a builtin plugin or your generator, to send pointlists in redis. See in clients/plugins folder for examples.
|
||||
- Run a builtin plugin or your generator, to send pointlists in redis.
|
||||
|
||||
|
||||
A typical LJ start is :
|
||||
|
||||
python3 main.py -L numberoflasers.
|
||||
|
||||
Use also -h to display all possible arguments, like -v for debug informations.
|
||||
Use also -h to display all possible arguments, like -v 1 (or 2) for debug informations.
|
||||
|
||||
|
||||
CASE 1 : the laser server computer, where LJ runs, is the same that the computer running a generator/plugin :
|
||||
@ -198,10 +199,11 @@ First open square.py and learn how to declare different objects. square.py is a
|
||||
|
||||
1/ How to have another laser drawing the same thing ?
|
||||
|
||||
That's a destination problem : just add another destination !
|
||||
That's a destination problem : just add another destination :
|
||||
|
||||
Dest1 = lj.DestObject('1', 1, True, 0 , 1, 1) # Dest1 will also send layer 0 points to scene 1, laser 1
|
||||
Dest1 = lj.DestObject('1', 1, True, 0 , 1, 1)
|
||||
|
||||
Dest1 will also send layer 0 points to scene 1, laser 1
|
||||
|
||||
|
||||
|
||||
@ -255,11 +257,12 @@ DrawDests() will take care of all your declared drawn elements/"objects" and Des
|
||||
|
||||
|
||||
#
|
||||
# Nannou etherdeam simulator
|
||||
# Nannou etherdeam simulator aka visualiser
|
||||
#
|
||||
|
||||
2 compiled nannou visualisers are included, one for Linux, one for macOS. It's pretty old version but much more compatible with "old" builtin processors GPU.
|
||||
2 compiled nannou visualisers are included, one for Linux, one for macOS. It's pretty old version but much more compatible with "old" processors/computer.
|
||||
|
||||
To use this visualiser as one of LJ's lasers, in LJ.conf edit one of line ip = someipaddress with the IP of the computer running the visualiser. Relaunch LJ. One visualiser per computer.
|
||||
|
||||
#
|
||||
# Todo
|
||||
@ -317,10 +320,10 @@ For glitching experience you can change resampling strategy live with "resampler
|
||||
# Colors
|
||||
#
|
||||
|
||||
LJ is compatible with TLL and analog modulation. Each point color if an int value, wich is simply the hex color in decimal. Example : white #fffff will be 65535.
|
||||
LJ is compatible with TLL and analog modulation. Each point color is an int value, wich is simply the hex color in decimal. Example : white = #fffff = 65535.
|
||||
|
||||
#
|
||||
# Ether dream configuration
|
||||
# Ether dream DAC
|
||||
#
|
||||
|
||||
|
||||
@ -337,18 +340,40 @@ This program suppose that the ether dream is configured in a certain way especia
|
||||
|
||||
/ilda/fps 25
|
||||
|
||||
About hardware setup, especially if you have several lasers : ILDA cables are insanely expensive. You may consider the Power Over Ethernet 'POE' option. Buy a very small ILDA cable, a POE splitter and connect everything to the ether dream fixed near your laser. You can have then a simple and very long network cable and use a Power Over Ethernet injector or switch close to the driving computer. Beware some vendors use 24V POE Injector : POE injectors and splitters must match.
|
||||
See links section for great etherdream managing tools.
|
||||
|
||||
About hardware setup, especially if you have several lasers : ILDA cables are insanely expensive. For each DAC, buy a very small ILDA cable and RJ 45 cable, all DAC goes to a local switch and only one long cable to your
|
||||
You may also consider the Power Over Ethernet 'POE' option. Buy a POE splitter and connect everything to the ether dream fixed near your laser. You can have then a simple and very long network cable and use a Power Over Ethernet injector or switch close to the driving computer. Beware some vendors use 24V POE Injector : POE injectors and splitters must match.
|
||||
|
||||
|
||||
#
|
||||
# Links
|
||||
#
|
||||
|
||||
Tools :
|
||||
|
||||
Display all connected etherdreams on the network : 
|
||||
python sitter.py
|
||||
|
||||
Draw simple square : 
|
||||
|
||||
python talk.py
|
||||
|
||||
|
||||
Generic :
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#
|
||||
# LJ commands reference
|
||||
#
|
||||
|
||||
All commands are available via OSC or websocket.
|
||||
|
||||
8002 OSC incoming
|
||||
|
||||
9001 Websocket
|
||||
All commands are available via OSC (port 8002) or websocket (port 9001)
|
||||
|
||||
|
||||
/pl/scenenumber/lasernumber value : value is the pointlist to draw as string. Example :
|
||||
@ -400,24 +425,33 @@ All command beginning with a declared plugin name are forwarded automatically to
|
||||
and second line (/line1 or /redline1). Examples of "uicommand arg" :
|
||||
|
||||
/status hello
|
||||
|
||||
/redline1 Error
|
||||
/laser 0
|
||||
|
||||
|
||||
|
||||
|
||||
Leds colors for each DACs
|
||||
|
||||
DAC state "stt" :
|
||||
|
||||
Laser not requested -> led is not lit
|
||||
|
||||
IDLE -> blue
|
||||
|
||||
PREPARE -> cyan
|
||||
|
||||
PLAYING -> green
|
||||
|
||||
DAC answers (ack) :
|
||||
|
||||
replied ACK -> green
|
||||
|
||||
replied FULL -> orange
|
||||
|
||||
replied INVALID -> yellow
|
||||
|
||||
no connection to dac -> leds are red (6)
|
||||
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
Launchpad
|
||||
v0.7.0
|
||||
|
||||
Maunchpad mini Handler.
|
||||
Launchpad mini Handler.
|
||||
Start a dedicated thread to handle incoming events from launchpad.
|
||||
|
||||
Cls()
|
||||
|
||||
2
main.py
2
main.py
@ -4,7 +4,7 @@
|
||||
'''
|
||||
LJ Laser Server v0.8.2
|
||||
|
||||
Inspiration for new WebUI icon menu :
|
||||
Inspiration for a future WebUI icon menu :
|
||||
https://codepen.io/AlbertFeynman/pen/mjXeMV
|
||||
|
||||
Laser server + webUI servers (ws + OSC)
|
||||
|
||||
316
www/LJ.js
Normal file
316
www/LJ.js
Normal file
@ -0,0 +1,316 @@
|
||||
//
|
||||
// LJ.js v0.7.1
|
||||
//
|
||||
|
||||
// LJ websocket address. IP will be updated at LJ startup according to LJ.conf wwwIP
|
||||
|
||||
var LJ = 'ws://192.168.2.43:9001/'
|
||||
|
||||
|
||||
//
|
||||
// Central horizontal menu
|
||||
//
|
||||
|
||||
|
||||
function noMenu() {
|
||||
var x = document.getElementById("align");
|
||||
x.value = 0 ;
|
||||
var x = document.getElementById("run");
|
||||
x.value = 0 ;
|
||||
var x = document.getElementById("simu");
|
||||
x.value = 0 ;
|
||||
var x = document.getElementById("live");
|
||||
x.value = 0 ;
|
||||
|
||||
// Hide all possible main central grids.
|
||||
var x = document.getElementById("mgalign");
|
||||
x.style.display = "none";
|
||||
var x = document.getElementById("mgsimu");
|
||||
x.style.display = "none";
|
||||
var x = document.getElementById("mgrun");
|
||||
x.style.display = "none";
|
||||
var x = document.getElementById("mglive");
|
||||
x.style.display = "none";
|
||||
|
||||
}
|
||||
|
||||
function showAlign() {
|
||||
noMenu();
|
||||
var x = document.getElementById("mgalign");
|
||||
x.style.display = "grid";
|
||||
var x = document.getElementById("align");
|
||||
x.value = 1 ;
|
||||
}
|
||||
|
||||
function showRun() {
|
||||
noMenu();
|
||||
var x = document.getElementById("mgrun");
|
||||
x.style.display = "grid";
|
||||
var x = document.getElementById("run");
|
||||
x.value = 1 ;
|
||||
}
|
||||
|
||||
function showCanvas() {
|
||||
noMenu();
|
||||
var x = document.getElementById("mgsimu");
|
||||
x.style.display = "grid";
|
||||
var x = document.getElementById("cnvbuttons");
|
||||
x.style.display = "grid";
|
||||
var x = document.getElementById("simu");
|
||||
x.value = 1 ;
|
||||
}
|
||||
|
||||
function showLive() {
|
||||
noMenu();
|
||||
var x = document.getElementById("mglive");
|
||||
x.style.display = "grid";
|
||||
var x = document.getElementById("live");
|
||||
x.value = 1 ;
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
// SimuUIs
|
||||
//
|
||||
|
||||
function nosimuUI() {
|
||||
// Hide all possible main central grids.
|
||||
var x = document.getElementById("planetUI");
|
||||
x.style.display = "none";
|
||||
var x = document.getElementById("nozoidUI");
|
||||
x.style.display = "none";
|
||||
var x = document.getElementById("aiUI");
|
||||
x.style.display = "none";
|
||||
var x = document.getElementById("lissaUI");
|
||||
x.style.display = "none";
|
||||
var x = document.getElementById("vjUI");
|
||||
x.style.display = "none";
|
||||
var x = document.getElementById("poseUI");
|
||||
x.style.display = "none";
|
||||
var x = document.getElementById("wordsUI");
|
||||
x.style.display = "none";
|
||||
var x = document.getElementById("pluginsUI");
|
||||
x.style.display = "none";
|
||||
}
|
||||
|
||||
function showplanetUI() {
|
||||
nosimuUI();
|
||||
var x = document.getElementById("planetUI");
|
||||
x.style.display = "grid";
|
||||
_WS.send("/planet/ping");
|
||||
}
|
||||
|
||||
function shownozoidUI() {
|
||||
nosimuUI();
|
||||
var x = document.getElementById("nozoidUI");
|
||||
x.style.display = "grid";
|
||||
_WS.send("/nozoid/ping");
|
||||
}
|
||||
|
||||
function showaiUI() {
|
||||
nosimuUI();
|
||||
var x = document.getElementById("aiUI");
|
||||
x.style.display = "grid";
|
||||
}
|
||||
|
||||
function showlissaUI() {
|
||||
nosimuUI();
|
||||
var x = document.getElementById("lissaUI");
|
||||
x.style.display = "grid";
|
||||
}
|
||||
|
||||
function showvjUI() {
|
||||
nosimuUI();
|
||||
var x = document.getElementById("vjUI");
|
||||
x.style.display = "grid";
|
||||
_WS.send("/bank0/ping");
|
||||
}
|
||||
|
||||
|
||||
function showposeUI() {
|
||||
nosimuUI();
|
||||
var x = document.getElementById("poseUI");
|
||||
x.style.display = "grid";
|
||||
_WS.send("/pose/ping");
|
||||
}
|
||||
|
||||
|
||||
function showwordsUI() {
|
||||
nosimuUI();
|
||||
var x = document.getElementById("wordsUI");
|
||||
x.style.display = "grid";
|
||||
_WS.send("/words/ping");
|
||||
}
|
||||
|
||||
function showpluginsUI() {
|
||||
nosimuUI();
|
||||
var x = document.getElementById("pluginsUI");
|
||||
x.style.display = "grid";
|
||||
//_WS.send("/words/ping");
|
||||
}
|
||||
|
||||
//
|
||||
// Button clicked
|
||||
//
|
||||
|
||||
function buttonClicked(clicked_id) {
|
||||
|
||||
_WS.send("/" + clicked_id);
|
||||
|
||||
// update Canvas right part of maingrid
|
||||
if (clicked_id === "planet/planetUI") {
|
||||
showplanetUI();
|
||||
}
|
||||
if (clicked_id === "nozoid/nozoidUI") {
|
||||
shownozoidUI();
|
||||
}
|
||||
if (clicked_id === "ai/aiUI") {
|
||||
showaiUI();
|
||||
}
|
||||
if (clicked_id === "lissa/lissaUI") {
|
||||
showlissaUI();
|
||||
}
|
||||
if (clicked_id === "bank0/vjUI") {
|
||||
showvjUI();
|
||||
}
|
||||
if (clicked_id === "pose/poseUI") {
|
||||
showposeUI();
|
||||
}
|
||||
if (clicked_id === "words/wordsUI") {
|
||||
showwordsUI();
|
||||
}
|
||||
if (clicked_id === "lj/pluginsUI") {
|
||||
showpluginsUI();
|
||||
}
|
||||
if (clicked_id === "nozoid/down 50") {
|
||||
var x = document.getElementById("nozoid/down 50");
|
||||
x.value = 0 ;
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// Matrix selection
|
||||
//
|
||||
|
||||
|
||||
function MatrixSelect(clicked_value) {
|
||||
|
||||
console.log("/" + clicked_value);
|
||||
_WS.send("/" + clicked_value);
|
||||
}
|
||||
|
||||
//
|
||||
// Forms submits
|
||||
//
|
||||
|
||||
function onSubmit(clicked_id) {
|
||||
var input = document.getElementById(clicked_id);
|
||||
console.log("/" + clicked_id + " " + input.value);
|
||||
_WS.send("/" + clicked_id + " " + input.value);
|
||||
_WS.showout("/" + clicked_id + " " + input.value);
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
// Websocket handler
|
||||
//
|
||||
|
||||
var pl = "";
|
||||
var pl2 = new Array();
|
||||
var _WS = {
|
||||
uri: LJ,
|
||||
ws: null,
|
||||
|
||||
init : function (e) {
|
||||
_WS.s = new WebSocket(_WS.uri);
|
||||
_WS.s.onopen = function (e) { _WS.onOpen(e); };
|
||||
_WS.s.onclose = function (e) { _WS.onClose(e); };
|
||||
_WS.s.onmessage = function (e) { _WS.onMessage(e); };
|
||||
_WS.s.onerror = function (e) { _WS.onError(e); };
|
||||
},
|
||||
|
||||
onOpen: function () {
|
||||
_WS.showout(_WS.uri);
|
||||
_WS.showout('CONNECTED');
|
||||
document.getElementById("on").value = 1;
|
||||
},
|
||||
|
||||
onClose: function () {
|
||||
_WS.showout('DISCONNECTED');
|
||||
document.getElementById("on").value = 0;
|
||||
document.getElementById("lstt/0").value = 0;
|
||||
document.getElementById("lstt/1").value = 0;
|
||||
document.getElementById("lstt/2").value = 0;
|
||||
document.getElementById("lstt/3").value = 0;
|
||||
document.getElementById("lack/0").value = 0;
|
||||
document.getElementById("lack/1").value = 0;
|
||||
document.getElementById("lack/2").value = 0;
|
||||
document.getElementById("lack/3").value = 0;
|
||||
},
|
||||
|
||||
onMessage: function (e) {
|
||||
var res = e.data.split(" ");
|
||||
//console.log(e.data)
|
||||
//console.log(res[0].substring(0,6))
|
||||
//console.log(res)
|
||||
//console.log(res[0].slice(1))
|
||||
|
||||
switch (res[0].substring(0,6)) {
|
||||
|
||||
case "/statu":
|
||||
_WS.showstatus(e.data.slice(8));
|
||||
break;
|
||||
case "/simul":
|
||||
pl = e.data.slice(7);
|
||||
//console.log(pl)
|
||||
pl2 = eval(pl.replace(/[()]/g, ''));
|
||||
break;
|
||||
case "/plpoi":
|
||||
//console.log("plpoint");
|
||||
break;
|
||||
default:
|
||||
//console.log(e);
|
||||
document.getElementById(res[0].slice(1)).value = res[1];
|
||||
_WS.showin(e.data);
|
||||
}
|
||||
},
|
||||
|
||||
onError: function (e) {
|
||||
_WS.showin('<span style="color: red;">ERROR:</span> ' + e.data);
|
||||
},
|
||||
|
||||
showin: function (message) {
|
||||
var divtext = document.getElementById('showin');
|
||||
divtext.innerHTML="";
|
||||
divtext.innerHTML= message.toString();
|
||||
},
|
||||
|
||||
showout: function (message) {
|
||||
var divtext = document.getElementById('showout');
|
||||
divtext.innerHTML="";
|
||||
divtext.innerHTML= message.toString();
|
||||
},
|
||||
|
||||
showstatus: function (message) {
|
||||
var divtext = document.getElementById('showstatus');
|
||||
divtext.innerHTML="";
|
||||
divtext.innerHTML= message.toString();
|
||||
},
|
||||
|
||||
send: function (message) {
|
||||
if (!message.length) {
|
||||
alert('Empty message not allowed !');
|
||||
} else {
|
||||
_WS.showout(message);
|
||||
_WS.s.send(message);
|
||||
}
|
||||
},
|
||||
|
||||
close: function () {
|
||||
_WS.showout('GOODBYE !');
|
||||
_WS.s.close();
|
||||
}
|
||||
};
|
||||
|
||||
window.addEventListener('load', _WS.init, false);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user