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

0.7 release我觉得可以发了

Browse Source
This commit is contained in:
shenjack 2023-02-07 12:02:37 +08:00
parent c01058b14d
commit 39b93942d9
4 changed files with 75 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Difficult_Rocket/__init__.py
View File

@ -14,7 +14,6 @@ gitee: @shenjackyuanjie
import contextlib import contextlib
# import ctypes # import ctypes
import sys import sys
import logging
import warnings import warnings
import traceback import traceback
from typing import List, Dict, Union, Optional from typing import List, Dict, Union, Optional
@ -25,7 +24,7 @@ from libs.MCDR.version import Version
game_version = Version("0.7.0.0") # 游戏版本 game_version = Version("0.7.0.0") # 游戏版本
build_version = Version("1.1.0.0") # 编译文件版本(与游戏本体无关) build_version = Version("1.1.0.0") # 编译文件版本(与游戏本体无关)
DR_rust_version = Version("0.1.8.0") # DR 的 Rust 编写部分的版本 DR_rust_version = Version("0.1.9.0") # DR 的 Rust 编写部分的版本
__version__ = game_version __version__ = game_version
long_version: int = 12 long_version: int = 12

110
Difficult_Rocket/client/render/sr1_ship.py
View File

@ -5,9 +5,10 @@
# ------------------------------- # -------------------------------
import time import time
import contextlib
from xml.etree import ElementTree from xml.etree import ElementTree
from xml.etree.ElementTree import Element from xml.etree.ElementTree import Element
from typing import List, TYPE_CHECKING, Union, Dict, Optional from typing import List, TYPE_CHECKING, Union, Dict, Optional, Callable, Generator
# third party package # third party package
from defusedxml.ElementTree import parse from defusedxml.ElementTree import parse
@ -29,7 +30,7 @@ if TYPE_CHECKING:
from Difficult_Rocket.client import ClientWindow from Difficult_Rocket.client import ClientWindow
if DR_option.use_DR_rust: if DR_option.use_DR_rust:
from libs.Difficult_Rocket_rs import better_update_parts, PartDatas, Camera_rs from libs.Difficult_Rocket_rs import PartDatas, Camera_rs
def get_sr1_part(part_xml: Element) -> Optional[SR1PartData]: def get_sr1_part(part_xml: Element) -> Optional[SR1PartData]:
@ -56,16 +57,16 @@ def get_sr1_part(part_xml: Element) -> Optional[SR1PartData]:
# f'flip_x: {part_flip_x} flip_y: {part_flip_y} explode: {part_explode} ' # f'flip_x: {part_flip_x} flip_y: {part_flip_y} explode: {part_explode} '
# f'textures: {SR1PartTexture.get_textures_from_type(part_type)}') # f'textures: {SR1PartTexture.get_textures_from_type(part_type)}')
return SR1PartData(x=part_x, y=part_y, id=part_id, type_=part_type, return SR1PartData(x=part_x, y=part_y, id=part_id, type_=part_type,
active=part_activate, angle=part_angle, angle_v=part_angle_v, active=part_activate, angle=part_angle, angle_v=part_angle_v,
editor_angle=part_editor_angle, flip_x=part_flip_x, editor_angle=part_editor_angle, flip_x=part_flip_x,
flip_y=part_flip_y, explode=part_explode, textures=part_textures) flip_y=part_flip_y, explode=part_explode, textures=part_textures)
class _SR1ShipRender_Option(Options): class _SR1ShipRender_Option(Options):
# debug option # debug option
debug_d_pos: bool = True debug_d_pos: bool = False
debug_mouse_pos: bool = True debug_mouse_pos: bool = False
debug_mouse_d_pos: bool = True debug_mouse_d_pos: bool = False
SR1ShipRender_Option = _SR1ShipRender_Option() SR1ShipRender_Option = _SR1ShipRender_Option()
@ -82,6 +83,8 @@ class SR1ShipRender(BaseScreen):
self.scale = scale self.scale = scale
self.focus = True self.focus = True
self.need_draw = False self.need_draw = False
self.drawing = False
self.gen_draw: Optional[Callable] = None
self.need_update_parts = False self.need_update_parts = False
self.dx = 0 self.dx = 0
self.dy = 0 self.dy = 0
@ -116,7 +119,7 @@ class SR1ShipRender(BaseScreen):
self.parts_sprite: Dict[int, Sprite] = {} self.parts_sprite: Dict[int, Sprite] = {}
if DR_option.use_DR_rust: if DR_option.use_DR_rust:
self.camera_rs = Camera_rs(main_window, self.camera_rs = Camera_rs(main_window,
min_zoom=(1/2) ** 4, max_zoom=10) min_zoom=(1 / 2) ** 6, max_zoom=10)
self.rust_parts = None self.rust_parts = None
def load_xml(self, file_path: str) -> bool: def load_xml(self, file_path: str) -> bool:
@ -131,26 +134,10 @@ class SR1ShipRender(BaseScreen):
def load_textures(self): def load_textures(self):
self.textures = SR1Textures() self.textures = SR1Textures()
def render_ship(self): def gen_sprite(self, part_datas: Dict[int, SR1PartData], each_count: int = 100) -> Generator:
if self.textures is None: count = 0
self.load_textures() self.drawing = True
start_time = time.perf_counter_ns() for part_id, part in part_datas.items():
self.part_data: Dict[int, SR1PartData] = {}
self.parts_sprite: Dict[int, Sprite] = {}
self.camera_rs.zoom = 1.0
if DR_option.use_DR_rust:
self.camera_rs.dx = 0
self.camera_rs.dy = 0
parts = self.xml_root.find('Parts')
for part_xml in parts:
if part_xml.tag != 'Part':
continue # 如果不是部件，则跳过
# print(f"tag: {part.tag} attrib: {part.attrib}")
part_render = True
part = get_sr1_part(part_xml)
if part.id in self.part_data:
print(f'hey! warning! id{part.id}')
self.part_data[part.id] = part
# 下面就是调用 pyglet 去渲染的部分 # 下面就是调用 pyglet 去渲染的部分
# render_scale = DR_option.gui_scale # 这个是 DR 的缩放比例 可以调节的( # render_scale = DR_option.gui_scale # 这个是 DR 的缩放比例 可以调节的(
# 主要是 Windows 下有一个缩放系数嘛，我待会试试这玩意能不能获取（估计得 ctypes # 主要是 Windows 下有一个缩放系数嘛，我待会试试这玩意能不能获取（估计得 ctypes
@ -171,10 +158,41 @@ class SR1ShipRender(BaseScreen):
cache_sprite.scale = self.scale * DR_option.gui_scale cache_sprite.scale = self.scale * DR_option.gui_scale
cache_sprite.x = cache_sprite.x - cache_sprite.scale_x / 2 cache_sprite.x = cache_sprite.x - cache_sprite.scale_x / 2
cache_sprite.y = cache_sprite.y - cache_sprite.scale_y / 2 cache_sprite.y = cache_sprite.y - cache_sprite.scale_y / 2
if not part_render: # 如果不渲染(渲染有毛病)
self.parts_sprite[part.id].visible = False
self.parts_sprite[part.id] = cache_sprite self.parts_sprite[part.id] = cache_sprite
self.need_draw = False # if not part_render: # 如果不渲染(渲染有毛病)
# self.parts_sprite[part.id].visible = False
count += 1
if count >= each_count:
count = 0
yield each_count
self.drawing = False
raise GeneratorExit
def render_ship(self):
if self.textures is None:
self.load_textures()
start_time = time.perf_counter_ns()
self.part_data: Dict[int, SR1PartData] = {}
self.parts_sprite: Dict[int, Sprite] = {}
self.camera_rs.zoom = 1.0
if DR_option.use_DR_rust:
self.camera_rs.dx = 0
self.camera_rs.dy = 0
parts = self.xml_root.find('Parts')
for part_xml in parts:
if part_xml.tag != 'Part':
continue # 如果不是部件，则跳过
# print(f"tag: {part.tag} attrib: {part.attrib}")
part = get_sr1_part(part_xml)
if part.id in self.part_data:
print(f'hey! warning! id{part.id}')
self.part_data[part.id] = part
# 调用生成器 减少卡顿
with contextlib.suppress(GeneratorExit):
self.gen_draw = self.gen_sprite(self.part_data)
next(self.gen_draw)
self.need_draw = False
if DR_option.use_DR_rust: if DR_option.use_DR_rust:
print(type(self.part_data)) print(type(self.part_data))
self.rust_parts = PartDatas(self.part_data) self.rust_parts = PartDatas(self.part_data)
@ -186,11 +204,12 @@ class SR1ShipRender(BaseScreen):
def update_parts(self) -> bool: def update_parts(self) -> bool:
if not self.rendered: if not self.rendered:
return False return False
self.debug_line.x2, self.debug_line.y2 = self.camera_rs.dx + (self.window_pointer.width / 2), self.camera_rs.dy + ( self.debug_line.x2, self.debug_line.y2 = self.camera_rs.dx + (
self.window_pointer.height / 2) self.window_pointer.width / 2), self.camera_rs.dy + (
self.window_pointer.height / 2)
self.debug_d_pos_label.text = f'x: {self.camera_rs.dx} y: {self.camera_rs.dy}' self.debug_d_pos_label.text = f'x: {self.camera_rs.dx} y: {self.camera_rs.dy}'
self.debug_d_pos_label.position = self.camera_rs.dx + (self.window_pointer.width / 2), self.camera_rs.dy + ( self.debug_d_pos_label.position = self.camera_rs.dx + (self.window_pointer.width / 2), self.camera_rs.dy + (
self.window_pointer.height / 2) + 10, 0 self.window_pointer.height / 2) + 10, 0
# if DR_option.use_DR_rust: # if DR_option.use_DR_rust:
# # print(f'{self.dx=} {self.dy=} {self.scale=}') # # print(f'{self.dx=} {self.dy=} {self.scale=}')
# # from objprint import op # # from objprint import op
@ -206,12 +225,20 @@ class SR1ShipRender(BaseScreen):
def on_draw(self): def on_draw(self):
if self.need_draw: if self.need_draw:
self.render_ship() self.render_ship()
if self.drawing:
with contextlib.suppress(GeneratorExit):
next(self.gen_draw)
if self.need_update_parts: if self.need_update_parts:
self.update_parts() self.update_parts()
self.need_update_parts = False self.need_update_parts = False
with self.camera_rs: with self.camera_rs:
self.part_batch.draw() self.part_batch.draw()
self.debug_label.draw() self.debug_label.draw()
if SR1ShipRender_Option.debug_d_pos: if SR1ShipRender_Option.debug_d_pos:
self.debug_line.draw() self.debug_line.draw()
self.debug_d_pos_label.draw() self.debug_d_pos_label.draw()
@ -238,14 +265,16 @@ class SR1ShipRender(BaseScreen):
mouse_dx = x - (self.window_pointer.width / 2) mouse_dx = x - (self.window_pointer.width / 2)
mouse_dy = y - (self.window_pointer.height / 2) mouse_dy = y - (self.window_pointer.height / 2)
self.debug_mouse_line.x2, self.debug_mouse_line.y2 = x, y self.debug_mouse_line.x2, self.debug_mouse_line.y2 = x, y
if self.camera_rs.zoom * (0.5**scroll_y) < 10: if self.camera_rs.zoom * (0.5 ** scroll_y) < 10:
self.camera_rs.zoom = self.camera_rs.zoom * (0.5 ** scroll_y) self.camera_rs.zoom = self.camera_rs.zoom * (0.5 ** scroll_y)
self.camera_rs.dx += (mouse_dx - self.camera_rs.dx) * (1 - (0.5 ** scroll_y)) self.camera_rs.dx += (mouse_dx - self.camera_rs.dx) * (1 - (0.5 ** scroll_y))
self.camera_rs.dy += (mouse_dy - self.camera_rs.dy) * (1 - (0.5 ** scroll_y)) self.camera_rs.dy += (mouse_dy - self.camera_rs.dy) * (1 - (0.5 ** scroll_y))
else: else:
self.camera_rs.zoom = 10 self.camera_rs.zoom = 10
self.debug_mouse_delta_line.x2 = (mouse_dx - self.camera_rs.dx) * (1 - (0.5 ** scroll_y)) + (self.window_pointer.width / 2) self.debug_mouse_delta_line.x2 = (mouse_dx - self.camera_rs.dx) * (1 - (0.5 ** scroll_y)) + (
self.debug_mouse_delta_line.y2 = (mouse_dy - self.camera_rs.dy) * (1 - (0.5 ** scroll_y)) + (self.window_pointer.height / 2) self.window_pointer.width / 2)
self.debug_mouse_delta_line.y2 = (mouse_dy - self.camera_rs.dy) * (1 - (0.5 ** scroll_y)) + (
self.window_pointer.height / 2)
self.debug_mouse_label.text = f'x: {mouse_dx} y: {mouse_dy}' self.debug_mouse_label.text = f'x: {mouse_dx} y: {mouse_dy}'
self.debug_mouse_label.position = x, y + 10, 0 self.debug_mouse_label.position = x, y + 10, 0
self.need_update_parts = True self.need_update_parts = True
@ -259,7 +288,6 @@ class SR1ShipRender(BaseScreen):
self.camera_rs.dx = 0 self.camera_rs.dx = 0
self.camera_rs.dy = 0 self.camera_rs.dy = 0
else: else:
# self.render_ship()
self.need_draw = True self.need_draw = True
print('应该渲染飞船的') print('应该渲染飞船的')
elif command.re_match('debug'): elif command.re_match('debug'):
@ -283,8 +311,8 @@ class SR1ShipRender(BaseScreen):
def on_mouse_drag(self, x: int, y: int, dx: int, dy: int, buttons: int, modifiers: int): def on_mouse_drag(self, x: int, y: int, dx: int, dy: int, buttons: int, modifiers: int):
if not self.focus: if not self.focus:
return return
self.camera_rs.dx += dx / self.camera_rs.zoom self.camera_rs.dx += dx
self.camera_rs.dy += dy / self.camera_rs.zoom self.camera_rs.dy += dy
self.need_update_parts = True self.need_update_parts = True
# self.update_parts() # self.update_parts()

2
libs/Difficult_Rocket_rs/src/src/lib.rs
View File

@ -13,7 +13,7 @@ use pyo3::prelude::*;
#[pyfunction] #[pyfunction]
fn get_version_str() -> String { fn get_version_str() -> String {
return String::from("0.1.8.0"); return String::from("0.1.9.0");
} }
#[pyfunction] #[pyfunction]

8
libs/Difficult_Rocket_rs/src/src/render.rs
View File

@ -72,8 +72,8 @@ pub mod camera {
let x: f64 = self.window.getattr(py, intern!(py, "width"))?.extract(py)?; let x: f64 = self.window.getattr(py, intern!(py, "width"))?.extract(py)?;
let y: f64 = self.window.getattr(py, intern!(py, "height"))?.extract(py)?; let y: f64 = self.window.getattr(py, intern!(py, "height"))?.extract(py)?;
let x: f64 = x / 2.0 / self.zoom + self.dx; let x: f64 = x / 2.0 / self.zoom + (self.dx / self.zoom);
let y: f64 = y / 2.0 / self.zoom + self.dy; let y: f64 = y / 2.0 / self.zoom + (self.dy / self.zoom);
// use to get center of the screen // use to get center of the screen
let args = ((x * self.zoom, y * self.zoom, 0), ); let args = ((x * self.zoom, y * self.zoom, 0), );
@ -97,8 +97,8 @@ pub mod camera {
let x: f64 = self.window.getattr(py, intern!(py, "width"))?.extract(py)?; let x: f64 = self.window.getattr(py, intern!(py, "width"))?.extract(py)?;
let y: f64 = self.window.getattr(py, intern!(py, "height"))?.extract(py)?; let y: f64 = self.window.getattr(py, intern!(py, "height"))?.extract(py)?;
let x: f64 = x / 2.0 / self.zoom + self.dx; let x: f64 = x / 2.0 / self.zoom + (self.dx / self.zoom);
let y: f64 = y / 2.0 / self.zoom + self.dy; let y: f64 = y / 2.0 / self.zoom + (self.dy / self.zoom);
let args = ((1.0 / self.zoom, 1.0 / self.zoom, 1), ); let args = ((1.0 / self.zoom, 1.0 / self.zoom, 1), );
let view_matrix = view.call_method1(py, intern!(py, "scale"), args)?; let view_matrix = view.call_method1(py, intern!(py, "scale"), args)?;