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

[fix] clitools many tweaks and changes batch

Browse source
This commit is contained in:
alban 2020-10-03 17:50:28 +02:00
parent 4b07dfc263
commit 371003fce2
4 changed files with 380 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

42
clitools/generators/tunnel.py
View file

@ -34,7 +34,7 @@ argsparser = argparse.ArgumentParser(description="tunnel generator")
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("-m","--max-size",help="maximum size for objects",default=400,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")
@ -77,14 +77,19 @@ class polylineGenerator( object ):
self.polylineList = [[0,[currentCenter[0],currentCenter[1]]]]
self.buf = []
def init(self):
finished = False
while not finished:
finished = self.increment()
debug(name,"init done:{}".format(self.polylineList))
def draw( self ):
self.buf = []
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
x = int( center[0] + point[0]*size )
y = int( center[1] + point[1]*size )
# Add an invisible point in first location
if 0 == it_sqr:
self.buf.append([x,y,0])
@ -114,22 +119,43 @@ class polylineGenerator( object ):
speed = origSpeed
elif speed > (origSpeed + randomize / 2) :
speed = origSpeed + randomize / 2
debug(name, "currentCenter:{} speed:{}".format(currentCenter,speed))
#debug(name, "currentCenter:{} speed:{}".format(currentCenter,speed))
for i, shapeInfo in enumerate(self.polylineList):
size = shapeInfo[0]
size += speed
# Augment speed with size
"""
size = 0 : += sqrt(speed)
size = half max size : +=speed
"""
if size < max_size / 4:
size += math.pow(speed, 0.1)
elif size < max_size / 3:
size += math.pow(speed, 0.25)
elif size < max_size / 2:
size += math.pow(speed, 0.5)
else:
size += math.pow(speed, 1.25)
if size < min_size : min_size = size
if size > max_size : delList.append(i)
self.polylineList[i][0] = size
for i in delList:
del self.polylineList[i]
if min_size >= interval: self.polylineList.append([0,[currentCenter[0],currentCenter[1]]])
#debug(name, "polyline:",self.polylineList)
if min_size >= interval:
debug(name, "new shape")
self.polylineList.append([0,[currentCenter[0],currentCenter[1]]])
# Return True if we delete a shape
if len(delList):
return True
return False
pgen = polylineGenerator()
pgen.init()
while True:
start = time.time()
@ -140,7 +166,7 @@ while True:
# send
pl = pgen.draw()
print(pl, flush=True)
debug(name,"output:{}".format(pl))
#debug(name,"output:{}".format(pl))
looptime = time.time() - start
if( looptime < optimal_looptime ):