更新 "注册为观察者(事件驱动)" 功能
This commit is contained in:
parent
a7b0373425
commit
fdf2e1a3ff
@ -1,13 +1,19 @@
|
||||
import vgl
|
||||
import time
|
||||
window = None
|
||||
|
||||
window = vgl.Window(title="Pulsar", size=(1024, 768))
|
||||
|
||||
def horizontal_indicator():
|
||||
global window
|
||||
frame = vgl.Frame().attach(window_object=window, poscale=(0, 0), clone_name="Horizontal Indicator")
|
||||
vgl.elements.Line(ends=[(0.4, 0.5), (0.6, 0.5)], color="green").attach(frame_object=frame)
|
||||
pass
|
||||
|
||||
@window.observerize
|
||||
def observer(info):
|
||||
print(info)
|
||||
def marking_lines():
|
||||
print("实例")
|
||||
global window
|
||||
frame = vgl.Frame().attach(window_object=window, poscale=(0,0), clone_name="Marking Line")
|
||||
for i in range(0, 24):
|
||||
@ -25,10 +31,10 @@ def console():
|
||||
|
||||
if __name__ == '__main__':
|
||||
print("Welcome to AiraPulsar Client")
|
||||
window = vgl.Window(title="Pulsar", size=(1024, 768))
|
||||
window.start()
|
||||
horizontal_indicator()
|
||||
marking_lines()
|
||||
observer()
|
||||
#console()
|
||||
input("任意键以退出")
|
||||
window.kill()
|
||||
|
@ -3,5 +3,5 @@ os.environ["PYGAME_HIDE_SUPPORT_PROMPT"] = "True"
|
||||
from .main import *
|
||||
from . import basic_elements as elements
|
||||
|
||||
version = '0.1.0'
|
||||
version = '0.2.0'
|
||||
print(f"Powered by Vector Graphic Layer, version {version}")
|
Binary file not shown.
80
vgl/main.py
80
vgl/main.py
@ -5,6 +5,7 @@ import uuid
|
||||
import time
|
||||
import threading
|
||||
import copy
|
||||
import queue
|
||||
|
||||
class Aux():
|
||||
def gettime():
|
||||
@ -23,7 +24,7 @@ class Aux():
|
||||
return (round(arg[0] * base[0]), round(arg[1] * base[1]))
|
||||
if len(arg) == 4:
|
||||
return (round(arg[0] * base[0]), round(arg[1] * base[1]), round(arg[2] * base[0]), round(arg[3] * base[1]))
|
||||
def eventproc(events_dict, event):
|
||||
def eventproc(events_dict, event, window_size):
|
||||
"""events = {
|
||||
"cursor": {
|
||||
"position": (15,12),
|
||||
@ -33,31 +34,31 @@ class Aux():
|
||||
},
|
||||
"wheel": 1, # 远离用户为 1, 靠近为 -1, 无动作为 0
|
||||
"click": [1, 2], # 被按下的按钮
|
||||
"focus": 1, # 或 0
|
||||
"key": ["ctrl", "k"]
|
||||
#"focus": 1, # 或 0
|
||||
"key": ["ctrl", "k"],
|
||||
"delta": ""
|
||||
}"""
|
||||
if event.type == pygame.MOUSEMOTION:
|
||||
events_dict.setdefault("cursor", {})["position"] = event.pos
|
||||
events_dict.setdefault("cursor", {})["relative"] = event.rel
|
||||
events_dict.setdefault("cursor", {})["poscale"] = (event.pos[0] / screen_width, event.pos[1] / screen_height)
|
||||
events_dict.setdefault("cursor", {})["relscale"] = (event.rel[0] / screen_width, event.rel[1] / screen_height)
|
||||
events_dict["cursor"]["position"] = event.pos
|
||||
events_dict["cursor"]["relative"] = event.rel
|
||||
events_dict["cursor"]["poscale"] = (round(event.pos[0] / window_size[0], 3), round(event.pos[1] / window_size[1],3))
|
||||
events_dict["cursor"]["relscale"] = (round(event.rel[0] / window_size[0], 3), round(event.rel[1] / window_size[1], 3))
|
||||
events_dict["delta"] = "cursor"
|
||||
elif event.type == pygame.MOUSEWHEEL:
|
||||
if "wheel" not in events_dict:
|
||||
events_dict["wheel"] = 0
|
||||
events_dict["wheel"] += event.y # 远离用户为正,靠近为负
|
||||
events_dict["wheel"] = event.y # 远离用户为正,靠近为负
|
||||
events_dict["delta"] = "wheel"
|
||||
elif event.type == pygame.MOUSEBUTTONDOWN:
|
||||
events_dict.setdefault("click", []).append(event.button)
|
||||
if event.button not in events_dict["click"]:
|
||||
events_dict.setdefault("click", []).append(event.button)
|
||||
events_dict["delta"] = "click"
|
||||
elif event.type == pygame.MOUSEBUTTONUP:
|
||||
if "click" in events_dict and event.button in events_dict["click"]:
|
||||
if event.button in events_dict["click"]:
|
||||
events_dict["click"].remove(event.button)
|
||||
elif event.type == pygame.WINDOWEVENT and hasattr(pygame, 'WINDOWEVENT_FOCUS_GAINED') and event.event == pygame.WINDOWEVENT_FOCUS_GAINED:
|
||||
events_dict["focus"] = 1
|
||||
elif event.type == pygame.WINDOWEVENT and hasattr(pygame, 'WINDOWEVENT_FOCUS_LOST') and event.event == pygame.WINDOWEVENT_FOCUS_LOST:
|
||||
events_dict["focus"] = 0
|
||||
events_dict["delta"] = "click"
|
||||
elif event.type == pygame.KEYDOWN:
|
||||
keys = events_dict.setdefault("key", [])
|
||||
key_name = pygame.key.name(event.key).lower()
|
||||
# 简单的修饰键处理,可以根据需要扩展
|
||||
# 简单的修饰键处理, 为兼容部分精简键盘 故合并左右功能键
|
||||
if key_name in ["left ctrl", "right ctrl"]:
|
||||
if "ctrl" not in keys:
|
||||
keys.append("ctrl")
|
||||
@ -69,7 +70,9 @@ class Aux():
|
||||
keys.append("alt")
|
||||
elif len(key_name) == 1: # 处理字母和数字
|
||||
keys.append(key_name)
|
||||
events_dict["delta"] = "key"
|
||||
elif event.type == pygame.KEYUP:
|
||||
events_dict["delta"] = "key"
|
||||
if "key" in events_dict:
|
||||
key_name = pygame.key.name(event.key).lower()
|
||||
if key_name in ["left ctrl", "right ctrl"] and "ctrl" in events_dict["key"]:
|
||||
@ -81,7 +84,7 @@ class Aux():
|
||||
elif len(key_name) == 1 and key_name in events_dict["key"]:
|
||||
events_dict["key"].remove(key_name)
|
||||
else:
|
||||
print("不重要事件")
|
||||
#print("不重要事件")
|
||||
return 0
|
||||
return 1
|
||||
class Element(object):
|
||||
@ -142,6 +145,19 @@ class Frame(object):
|
||||
class Window(object):
|
||||
frames = dict()
|
||||
events = {
|
||||
"cursor": {
|
||||
"position": (0,0),
|
||||
"relative": (0,0),
|
||||
"poscale": (0,0),
|
||||
"relscale": (0,0),
|
||||
},
|
||||
"wheel": 0, # 远离用户为 1, 靠近为 -1, 无动作为 0
|
||||
"click": [], # 被按下的按钮
|
||||
"focus": 1, # 或 0
|
||||
"key": [],
|
||||
"delta": [] # 变化的键值, 避免多次调用
|
||||
}
|
||||
"""{
|
||||
"cursor": {
|
||||
"position": (15,12),
|
||||
"relative": (13,11),
|
||||
@ -151,8 +167,10 @@ class Window(object):
|
||||
"wheel": 1, # 远离用户为 1, 靠近为 -1, 无动作为 0
|
||||
"click": [1, 2], # 被按下的按钮
|
||||
"focus": 1, # 或 0
|
||||
"key": ["ctrl", "k"]
|
||||
}
|
||||
"key": ["ctrl", "k"],
|
||||
"delta": ["key"]
|
||||
}"""
|
||||
observers = list()
|
||||
def __init__(self, title="Vector Graphic Layer Window", size: tuple=(1024,768)):
|
||||
self.title = title
|
||||
self.size = size
|
||||
@ -173,19 +191,21 @@ class Window(object):
|
||||
for event in pygame.event.get():
|
||||
if event.type == pygame.QUIT:
|
||||
self.running = 0
|
||||
if_matters = Aux.eventproc(self.events, event.type)
|
||||
if_matters = Aux.eventproc(self.events, event, self.size)
|
||||
if if_matters:
|
||||
pass # 消息式调用
|
||||
print(self.observers)
|
||||
for i in self.observers:
|
||||
i(self.events)
|
||||
#print(self.events)
|
||||
|
||||
for i in self.frames.values():
|
||||
i.render()
|
||||
pygame.display.flip()
|
||||
pygame.time.delay(10)
|
||||
pygame.quit()
|
||||
def observer(self):
|
||||
def decorator(func):
|
||||
def wrapper(*args, **kwargs):
|
||||
print("注册观察者")
|
||||
result = func(info=self.event, *args, **kwargs) # 调用原始函数
|
||||
return result
|
||||
return wrapper
|
||||
return decorator
|
||||
def observerize(self, func):
|
||||
def wrapper():
|
||||
self.observers.append(func)
|
||||
return wrapper
|
||||
def remove_observer(self, func):
|
||||
self.observers.remove(func)
|
Loading…
x
Reference in New Issue
Block a user