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

[fix] clitools: multiple fixes and enhancements

Browse source
This commit is contained in:
alban 2020-09-30 19:52:31 +02:00
parent e794ee2c5e
commit cebdc67c54
5 changed files with 127 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
clitools/generators/dummy.py
View file

@ -41,8 +41,8 @@ debug(name+" optimal looptime "+str(optimal_looptime))
while True:
start = time.time()
#print("[(100.0, 100.0, 65280), (100.0, 500.0, 65280), (500.0, 500.0, 65280), (500.0, 100.0, 65280), (100.0, 100.0, 65280)]", flush=True);
print("[[100.0, 100.0, 65280], [110.0, 500.0, 65280], [510.0, 500.0, 65280], [510.0, 100.0, 65280], [100.0, 110.0, 65280]]", flush=True);
print("[[100.0, 100.0, 65280], [100.0, 500.0, 65280], [500.0, 500.0, 65280], [500.0, 100.0, 65280], [100.0, 100.0, 65280]]", flush=True);
#print("[[100.0, 100.0, 65280], [110.0, 500.0, 65280], [510.0, 500.0, 65280], [510.0, 100.0, 65280], [100.0, 110.0, 65280]]", flush=True);
looptime = time.time() - start
if( looptime < optimal_looptime ):
time.sleep( optimal_looptime - looptime)

83
clitools/generators/tunnel.py
View file

@ -17,9 +17,11 @@ by cocoa
'''
from __future__ import print_function
import time
import argparse
import math
import random
import sys
import time
name="generator::tunnel"
def debug(*args, **kwargs):
@ -29,25 +31,28 @@ def debug(*args, **kwargs):
argsparser = argparse.ArgumentParser(description="tunnel generator")
argsparser.add_argument("-x","--centerX",help="geometrical center X position",default=300,type=int)
argsparser.add_argument("-y","--centerY",help="geometrical center Y position",default=300,type=int)
argsparser.add_argument("-s","--speed",help="point per frame progress",default=3,type=int)
argsparser.add_argument("-i","--interval",help="point per form interval",default=30,type=int)
argsparser.add_argument("-m","--max-size",help="maximum size for objects",default=300,type=int)
argsparser.add_argument("-f","--fps",help="Frame Per Second",default=30,type=int)
argsparser.add_argument("-c","--color",help="Color",default=65280,type=int)
argsparser.add_argument("-f","--fps",help="Frame Per Second",default=30,type=int)
argsparser.add_argument("-i","--interval",help="point per shape interval",default=30,type=int)
argsparser.add_argument("-m","--max-size",help="maximum size for objects",default=500,type=int)
argsparser.add_argument("-r","--randomize",help="center randomization",default=5,type=int)
argsparser.add_argument("-s","--speed",help="point per frame progress",default=3,type=int)
argsparser.add_argument("-v","--verbose",action="store_true",help="Verbose output")
argsparser.add_argument("-x","--centerX",help="geometrical center X position",default=400,type=int)
argsparser.add_argument("-y","--centerY",help="geometrical center Y position",default=400,type=int)
args = argsparser.parse_args()
color = args.color
fps = args.fps
centerX = args.centerX
centerY = args.centerY
color = args.color
fps = args.fps
interval = args.interval
max_size = args.max_size
randomize = args.randomize
speed = args.speed
verbose = args.verbose
origSpeed = speed
optimal_looptime = 1 / fps
square = [
[-1,1],
@ -57,38 +62,71 @@ square = [
[-1,1]
]
shape = square
currentCenter = [centerX, centerY]
centerVector= [0,0]
# tweak random basis
if randomize % 2 == 1:
randomize += 1
debug(name,"randomize:{}".format(randomize))
centerRand = int(math.sqrt(randomize) / 4 ) + 1
debug( name, "centerRand:{}".format(centerRand ) )
class polylineGenerator( object ):
def __init__( self ):
self.polylineList = [0]
self.polylineList = [[0,[currentCenter[0],currentCenter[1]]]]
self.buf = []
def draw( self ):
self.buf = []
for it_pl, size in enumerate(self.polylineList):
for it_sqr, point in enumerate(square):
x = centerX + point[0]*size
y = centerY + point[1]*size
for it_pl, infoList in enumerate(self.polylineList):
size = infoList[0]
center = infoList[1]
for it_sqr, point in enumerate(shape):
x = center[0] + point[0]*size
y = center[1] + point[1]*size
# Add an invisible point in first location
if 0 == it_sqr:
self.buf.append([x,y,0])
self.buf.append([x,y,color])
debug( name, "buf size:", str(len(self.buf)) )
#debug( name, "buf size:", str(len(self.buf)) )
return self.buf
def increment(self):
global speed
self.buffer = []
min_size = 9999
delList = []
for i, size in enumerate(self.polylineList):
if randomize :
# Change the vector
centerVector[0] += random.randrange( -centerRand,centerRand )
centerVector[1] += random.randrange( -centerRand,centerRand )
# Modify the vector if it is over the limit
if currentCenter[0] + centerVector[0] >= centerX + randomize or currentCenter[0] + centerVector[0] <= centerX - randomize:
centerVector[0] = 0
if currentCenter[1] + centerVector[1] >= centerY + randomize or currentCenter[1] +centerVector[1] <= centerY - randomize:
centerVector[1] = 0
currentCenter[0] += centerVector[0]
currentCenter[1] += centerVector[1]
# Change speed
speed += int( random.randrange( int(-origSpeed),origSpeed ) )
if speed < origSpeed :
speed = origSpeed
elif speed > (origSpeed + randomize / 2) :
speed = origSpeed + randomize / 2
debug(name, "currentCenter:{} speed:{}".format(currentCenter,speed))
for i, shapeInfo in enumerate(self.polylineList):
size = shapeInfo[0]
size += speed
if size < min_size : min_size = size
if size > max_size : delList.append(i)
self.polylineList[i] = size
self.polylineList[i][0] = size
for i in delList:
del self.polylineList[i]
if min_size >= interval: self.polylineList.append(0)
debug(name, "polyline:",self.polylineList)
if min_size >= interval: self.polylineList.append([0,[currentCenter[0],currentCenter[1]]])
#debug(name, "polyline:",self.polylineList)
pgen = polylineGenerator()
@ -100,12 +138,13 @@ while True:
pgen.increment()
# send
print(pgen.draw(), flush=True);
pl = pgen.draw()
print(pl, flush=True)
debug(name,"output:{}".format(pl))
looptime = time.time() - start
if( looptime < optimal_looptime ):
time.sleep( optimal_looptime - looptime)
debug(name+" micro sleep:"+str( optimal_looptime - looptime))
#debug(name+" micro sleep:"+str( optimal_looptime - looptime))