minor improvements
This commit is contained in:
parent
b86ffd9f5b
commit
84372e6dd8
31
testfield/vgl/default.vgld
Normal file
31
testfield/vgl/default.vgld
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
{'method': 'rect', 'pos': (12, 45), 'size': (25, 15), 'color': (34, 200, 150)}
|
||||||
|
{'method': 'rect', 'pos': (67, 22), 'size': (18, 28), 'color': (255, 100, 50)}
|
||||||
|
{'method': 'rect', 'pos': (5, 78), 'size': (30, 20), 'color': (0, 0, 255)}
|
||||||
|
{'method': 'rect', 'pos': (90, 10), 'size': (15, 25), 'color': (200, 50, 100)}
|
||||||
|
{'method': 'rect', 'pos': (33, 60), 'size': (20, 30), 'color': (150, 200, 255)}
|
||||||
|
{'method': 'rect', 'pos': (50, 50), 'size': (10, 10), 'color': (255, 0, 0)}
|
||||||
|
{'method': 'rect', 'pos': (80, 40), 'size': (22, 18), 'color': (100, 255, 100)}
|
||||||
|
{'method': 'rect', 'pos': (15, 15), 'size': (28, 12), 'color': (255, 255, 0)}
|
||||||
|
{'method': 'rect', 'pos': (70, 70), 'size': (20, 20), 'color': (0, 255, 255)}
|
||||||
|
{'method': 'rect', 'pos': (40, 30), 'size': (25, 25), 'color': (255, 0, 255)}
|
||||||
|
{'method': 'rect', 'pos': (24, 88), 'size': (15, 25), 'color': (123, 45, 67)}
|
||||||
|
{'method': 'rect', 'pos': (56, 12), 'size': (20, 30), 'color': (200, 150, 100)}
|
||||||
|
{'method': 'rect', 'pos': (3, 55), 'size': (10, 20), 'color': (0, 128, 255)}
|
||||||
|
{'method': 'rect', 'pos': (77, 33), 'size': (18, 18), 'color': (255, 165, 0)}
|
||||||
|
{'method': 'rect', 'pos': (39, 72), 'size': (22, 14), 'color': (75, 0, 130)}
|
||||||
|
{'method': 'rect', 'pos': (90, 5), 'size': (30, 10), 'color': (255, 20, 147)}
|
||||||
|
{'method': 'rect', 'pos': (11, 44), 'size': (25, 25), 'color': (135, 206, 235)}
|
||||||
|
{'method': 'rect', 'pos': (62, 29), 'size': (15, 15), 'color': (255, 99, 71)}
|
||||||
|
{'method': 'rect', 'pos': (48, 60), 'size': (20, 20), 'color': (0, 255, 127)}
|
||||||
|
{'method': 'rect', 'pos': (34, 10), 'size': (28, 12), 'color': (255, 228, 196)}
|
||||||
|
{'method': 'rect', 'pos': (70, 80), 'size': (12, 22), 'color': (255, 0, 0)}
|
||||||
|
{'method': 'rect', 'pos': (15, 15), 'size': (20, 30), 'color': (0, 0, 0)}
|
||||||
|
{'method': 'rect', 'pos': (88, 44), 'size': (18, 18), 'color': (255, 215, 0)}
|
||||||
|
{'method': 'rect', 'pos': (5, 90), 'size': (30, 20), 'color': (0, 0, 139)}
|
||||||
|
{'method': 'rect', 'pos': (40, 40), 'size': (25, 25), 'color': (255, 105, 180)}
|
||||||
|
{'method': 'rect', 'pos': (60, 20), 'size': (15, 25), 'color': (255, 140, 0)}
|
||||||
|
{'method': 'rect', 'pos': (20, 70), 'size': (22, 18), 'color': (0, 191, 255)}
|
||||||
|
{'method': 'rect', 'pos': (30, 30), 'size': (10, 10), 'color': (255, 20, 147)}
|
||||||
|
{'method': 'rect', 'pos': (75, 50), 'size': (20, 20), 'color': (255, 0, 255)}
|
||||||
|
{'method': 'rect', 'pos': (10, 10), 'size': (28, 12), 'color': (128, 0, 128)}
|
||||||
|
{'method': 'rect', 'pos': (45, 55), 'size': (15, 15), 'color': (255, 69, 0)}
|
@ -2,6 +2,8 @@
|
|||||||
# vgllib.py
|
# vgllib.py
|
||||||
import pygame
|
import pygame
|
||||||
import uuid
|
import uuid
|
||||||
|
import time
|
||||||
|
import threading
|
||||||
|
|
||||||
class Graph:
|
class Graph:
|
||||||
@staticmethod
|
@staticmethod
|
||||||
@ -48,12 +50,26 @@ class Graph:
|
|||||||
class Frame(object):
|
class Frame(object):
|
||||||
components = dict()
|
components = dict()
|
||||||
components_stat = dict()
|
components_stat = dict()
|
||||||
|
thread = None
|
||||||
|
motion_queue = None
|
||||||
def __init__(self, name: str, size: tuple):
|
def __init__(self, name: str, size: tuple):
|
||||||
self.name = name
|
self.name = name
|
||||||
self.size = size
|
self.size = size
|
||||||
self.surface = pygame.Surface(size, flags=pygame.HWSURFACE)
|
self.surface = pygame.Surface(size, flags=pygame.HWSURFACE)
|
||||||
self.is_hide = False
|
self.is_hide = False
|
||||||
print("初始化子模块")
|
print("初始化子模块")
|
||||||
|
self.thread = threading.Thread(target=self.render)
|
||||||
|
|
||||||
|
def move(self, subname, direction, duration, effect="linear"): # our powerful move!
|
||||||
|
# direction: 使用角度制, 以直角笛卡尔坐标系的x正半轴方向为0度, 逆时针为加, 接受负数
|
||||||
|
# duration: "动画"时间, 为0则即时
|
||||||
|
# effect: "动画"效果, linear为线性移动, 或许会在未来增加贝塞尔曲线
|
||||||
|
# TODO: 增加 bezier 曲线
|
||||||
|
pass
|
||||||
|
|
||||||
|
def render(self):
|
||||||
|
while 1:
|
||||||
|
self.draw_all()
|
||||||
|
|
||||||
def show(self, window, position: tuple):
|
def show(self, window, position: tuple):
|
||||||
if not self.is_hide:
|
if not self.is_hide:
|
||||||
@ -68,28 +84,48 @@ class Frame(object):
|
|||||||
def register(self, subname="", attr=None):
|
def register(self, subname="", attr=None):
|
||||||
if subname == "":
|
if subname == "":
|
||||||
subname = uuid.uuid4()
|
subname = uuid.uuid4()
|
||||||
|
# use percent of frame size instead of pixels :)
|
||||||
|
attr['pos'] = list(attr['pos'])
|
||||||
|
attr['pos'][0] = round(attr['pos'][0] / 100 * self.size[0])
|
||||||
|
attr['pos'][1] = round(attr['pos'][1] / 100 * self.size[1])
|
||||||
|
attr['size'] = list(attr['size'])
|
||||||
|
attr['size'][0] = round(attr['size'][0] / 100 * self.size[0])
|
||||||
|
attr['size'][1] = round(attr['size'][1] / 100 * self.size[1])
|
||||||
self.components[subname] = attr
|
self.components[subname] = attr
|
||||||
self.components_stat[subname] = 1 # by default, not hiding
|
self.components_stat[subname] = 1 # by default, not hiding
|
||||||
|
|
||||||
def draw(self, attr):
|
def draw(self, attr):
|
||||||
attr['pos'][0] = round(attr['pos'][0] / 100 * self.size[1])
|
|
||||||
attr['pos'][0] = round(attr['pos'][0] / 100 * self.size[1])
|
|
||||||
attr['pos'][0] = round(attr['pos'][0] / 100 * self.size[1])
|
|
||||||
attr['pos'][0] = round(attr['pos'][0] / 100 * self.size[1])
|
|
||||||
Graph.call(self, **attr)
|
Graph.call(self, **attr)
|
||||||
|
|
||||||
def set_component_visible(self, subname, newstat):
|
def set_component_visible(self, subname, newstat):
|
||||||
self.components_stat[subname] = newstat
|
self.components_stat[subname] = newstat
|
||||||
|
|
||||||
def drawall(self, attr):
|
def draw_all(self):
|
||||||
for i in self.components.keys():
|
for i in self.components.keys():
|
||||||
if self.components_stat[i]:
|
if self.components_stat[i]:
|
||||||
self.draw(self.components[i])
|
self.draw(self.components[i])
|
||||||
|
|
||||||
def clear(self, color=(0,0,0)):
|
def refresh(self, color=(0,0,0)):
|
||||||
self.surface.fill(color)
|
self.surface.fill(color)
|
||||||
|
|
||||||
def loads(self, ):
|
def clear(self):
|
||||||
|
components = dict()
|
||||||
|
components_stat = dict()
|
||||||
|
|
||||||
|
def loads(self, grap_str):
|
||||||
|
# TODO: 将会重写 以替代不安全的 eval
|
||||||
|
self.register(subname="", attr=(eval(grap_str)))
|
||||||
|
|
||||||
|
def load(self, file="default.vgld", mode="a"):
|
||||||
|
# a: 增量加载 (默认)
|
||||||
|
# w: 覆盖式加载
|
||||||
|
# 文件扩展名: vgld (矢量图形层描述文件)
|
||||||
|
if mode == 'w':
|
||||||
|
self.clear()
|
||||||
|
with open(file=file, mode="r+", encoding="UTF-8") as f:
|
||||||
|
for i in f.readlines():
|
||||||
|
#print(i)
|
||||||
|
self.loads(i)
|
||||||
|
|
||||||
|
|
||||||
# 示例
|
# 示例
|
||||||
@ -97,18 +133,17 @@ if __name__ == "__main__":
|
|||||||
pygame.init()
|
pygame.init()
|
||||||
window = pygame.display.set_mode((800, 600))
|
window = pygame.display.set_mode((800, 600))
|
||||||
frame = Frame("Test", (800, 600))
|
frame = Frame("Test", (800, 600))
|
||||||
|
input()
|
||||||
frame.draw({'method':'rect', 'pos':(50, 50), 'size':(200, 100), 'color':(255, 0, 0)}) # 绘制红色矩形
|
frame.load()
|
||||||
|
|
||||||
# 主循环
|
|
||||||
running = True
|
running = True
|
||||||
while running:
|
while running:
|
||||||
for event in pygame.event.get():
|
for event in pygame.event.get():
|
||||||
if event.type == pygame.QUIT:
|
if event.type == pygame.QUIT:
|
||||||
running = False
|
running = False
|
||||||
|
|
||||||
window.fill((0, 0, 0)) # 清空窗口
|
window.fill((0, 0, 0))
|
||||||
frame.show(window, (0, 0)) # 显示帧
|
frame.draw_all()
|
||||||
pygame.display.flip() # 更新显示
|
frame.show(window, (0, 0))
|
||||||
|
pygame.display.flip()
|
||||||
|
pygame.time.delay(10)
|
||||||
pygame.quit()
|
pygame.quit()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user