DR_Team/Difficult-Rocket
DR_Team/Difficult-Rocket
6
2
Fork 0
Code Issues Pull Requests Projects Releases 25 Wiki Activity

继续加东西~

Browse Source
This commit is contained in:
shenjack 2024-08-04 13:35:43 +08:00
parent 0e88f8e34b
commit 411468e820
Signed by: shenjack
GPG Key ID: 7B1134A979775551
5 changed files with 119 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Difficult_Rocket/api/screen.py
View File

@ -34,6 +34,13 @@ class BaseScreen(EventDispatcher, Options):
self.focus = False
self.window_pointer = main_window
def on_cleanup(self, window: ClientWindow):
"""
页面清理
会在被移除的时候调用
添加自: 0.9.2.0
"""
if TYPE_CHECKING:
def on_command(self, command: CommandText, window: ClientWindow):

17
Difficult_Rocket/client/__init__.py
View File

@ -4,6 +4,8 @@
# All rights reserved
# -------------------------------
from __future__ import annotations
import os
import sys
import time
@ -344,11 +346,22 @@ class ClientWindow(Window):
添加自: 0.9.2.0"""
self.screen_list[sub_screen.name] = sub_screen(self)
def remove_sub_screen(self, title: str) -> BaseScreen:
def remove_sub_screen(self, title: str) -> BaseScreen | None:
"""
去除一个页面, 返回被去掉的页面
"""
return self.screen_list.pop(title)
if title in self.screen_list:
screen = self.screen_list.pop(title)
try:
screen.on_cleanup(self)
except Exception:
trace = traceback.format_exc()
self.logger.warn(
tr().window.screen.remove.error().format(title, trace), tag="screen"
)
return screen
else:
return None
"""
draws and some event

13
Difficult_Rocket/gui/widget/button.py
View File

@ -147,7 +147,7 @@ class OreuiButtonStatus:
return self.down_pad if self.popout else 0.0
class OreuiButtonShape(ShapeBase):
class OreuiShape(ShapeBase):
def __init__(
self,
x: float,
@ -682,13 +682,18 @@ class 拐角(ShapeBase):
self._update_vertices()
class OreuiSlider(WidgetBase):
"""Oreui 的滑条"""
class OreuiButton(WidgetBase):
"""Oreui 的按钮!"""
def __init__(
self,
x: int,
y: int,
width: int,
height: int,
height: int = 30,
text: str = "",
normal: OreuiButtonStatus | None = None,
select: OreuiButtonStatus | None = None,
@ -723,7 +728,7 @@ class OreuiButton(WidgetBase):
self._normal_status = normal or OreuiButtonStatus(popout=True)
self._select_status = select or OreuiButtonStatus(highlight=True, popout=True)
self._press_status = press or OreuiButtonStatus(popout=False, highlight=True)
self._shape = OreuiButtonShape(
self._shape = OreuiShape(
x=self._x,
y=self._y,
width=self._width,
@ -793,7 +798,7 @@ class OreuiButton(WidgetBase):
return self._label
@property
def shape(self) -> OreuiButtonShape:
def shape(self) -> OreuiShape:
return self._shape
@property

2
libs/pyglet

@ -1 +1 @@
Subproject commit 3ff3ecc97584fe9531143efc5bf596acf83142c8
Subproject commit f113523671ae3f3c5b0096bc01da0af924205315

103
mods/dr_game/sr1_ship.py
View File

@ -33,6 +33,7 @@ from Difficult_Rocket.api.types import Fonts, Options
from Difficult_Rocket.command.line import CommandText
from Difficult_Rocket.client.screen import BaseScreen
from Difficult_Rocket.api.camera import CenterGroupCamera, GroupCamera
from Difficult_Rocket.gui.widget.button import OreuiButton
from lib_not_dr import loggers
@ -88,7 +89,11 @@ class SR1ShipSelecter(BaseScreen):
self.main_group = GroupCamera(window=main_window)
self.width = 200
self.height = main_window.height - 100
self.slide_y = 0
self.dx = 50
self.dy = 0
self.folder_path: Path = Path("assets/ships")
self.buttons: dict[Path, OreuiButton] = {}
self.set_folder(self.folder_path)
def set_folder(self, path: Path):
@ -98,6 +103,7 @@ class SR1ShipSelecter(BaseScreen):
)
return
self.folder_path = path
self.buttons.clear()
for file in path.iterdir():
if not file.is_file:
continue
@ -106,11 +112,77 @@ class SR1ShipSelecter(BaseScreen):
logger.info(
sr_tr().sr1.ship.ship.valid().format(file), tag="ship explorer"
)
button = OreuiButton(
x=0,
y=len(self.buttons) * -(30 + 5) + self.height,
width=150,
height=30,
text=file.stem,
toggle_mode=False,
auto_release=True,
batch=self.main_batch,
group=self.main_group,
)
self.buttons[file] = button
else:
logger.warn(
sr_tr().sr1.ship.ship.invaild().format(file), tag="ship explorer"
)
def on_mouse_motion(self, x: int, y: int, dx: int, dy: int, window: ClientWindow):
for btn in self.buttons.values():
btn.on_mouse_motion(x - self.dx, y - self.dy - self.slide_y, dx, dy)
def on_mouse_press(
self, x: int, y: int, button: int, modifiers: int, window: ClientWindow
):
for btn in self.buttons.values():
btn.on_mouse_press(x - self.dx, y - self.dy - self.slide_y, button, modifiers)
def on_mouse_release(
self, x: int, y: int, button: int, modifiers: int, window: ClientWindow
):
for btn in self.buttons.values():
btn.on_mouse_release(x - self.dx, y - self.dy - self.slide_y, button, modifiers)
def on_mouse_drag(
self,
x: int,
y: int,
dx: int,
dy: int,
buttons: int,
modifiers: int,
window: ClientWindow,
):
if self.dx < x < self.dx + self.width and self.dy < y < self.dy + self.height:
self.main_group.view_y += dy
if self.main_group.view_y < 0:
self.main_group.view_y = 0
if self.main_group.view_y > len(self.buttons) * (30 + 5) - self.height:
self.main_group.view_y = len(self.buttons) * (30 + 5) - self.height
def draw_batch(self, window: ClientWindow):
gl.glEnable(gl.GL_SCISSOR_TEST)
gl.glScissor(int(self.dx), int(self.dy), int(self.width), int(self.height))
gl.glViewport(
int(self.dx),
int(self.dy),
window.width,
window.height,
)
self.main_batch.draw()
gl.glViewport(0, 0, window.width, window.height)
gl.glScissor(0, 0, window.width, window.height)
gl.glDisable(gl.GL_SCISSOR_TEST)
def on_resize(self, width: int, height: int, window: ClientWindow):
self.height = height - 100
self.width = min(200, width)
def on_cleanup(self, window: ClientWindow):
del self.buttons
class SR1ShipEditor(BaseScreen):
"""SR1 飞船编辑器"""
@ -234,7 +306,6 @@ class SR1ShipEditor(BaseScreen):
# main_window.push_handlers(self.enter_game_button)
# main_window.push_handlers(self.select_ship_button)
@property
def size(self) -> tuple[int, int]:
"""渲染器的渲染大小"""
@ -469,23 +540,23 @@ class SR1ShipEditor(BaseScreen):
gl.glDisable(gl.GL_SCISSOR_TEST)
# def on_draw(self, window: ClientWindow):
# self.draw_batch(window)
# if self.status.draw_call:
# self.render_ship()
# self.draw_batch(window)
# if self.status.draw_call:
# self.render_ship()
# if not self.status.draw_done:
# try:
# assert isinstance(
# self.gen_draw, Generator
# ), f"self.gen_graw is not a Generator, but a {type(self.gen_draw)}"
# next(self.gen_draw)
# except (GeneratorExit, StopIteration):
# self.status.draw_done = True
# self.logger.info(sr_tr().sr1.ship.ship.render.done())
# except TypeError:
# pass
# if not self.status.draw_done:
# try:
# assert isinstance(
# self.gen_draw, Generator
# ), f"self.gen_graw is not a Generator, but a {type(self.gen_draw)}"
# next(self.gen_draw)
# except (GeneratorExit, StopIteration):
# self.status.draw_done = True
# self.logger.info(sr_tr().sr1.ship.ship.render.done())
# except TypeError:
# pass
# self.debug_label.draw()
# self.debug_label.draw()
def on_resize(self, width: int, height: int, window: ClientWindow):
self.debug_label.y = height - 100