From 32ed22254ca61afb4d61efb448ecfedf2d2edd6a Mon Sep 17 00:00:00 2001 From: shenjack <3695888@qq.com> Date: Sun, 12 Feb 2023 15:17:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- docs/README-en.md | 4 ++-- libs/Difficult_Rocket_rs/src/src/types.rs | 23 ++++++++++++++++++++++- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 5f11204..d5bd026 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ 996.icu [![Generic badge](https://img.shields.io/badge/SemVer-2.0.0-blue.svg)](https://Semver.org/) [![Generic badge](https://img.shields.io/badge/编写于_Python_版本-3.8.10-blue.svg)](https://Python.org) -[![Generic badge](https://img.shields.io/badge/编写于_Pyglet_版本-2.0.2.1-blue.svg)](https://pyglet.org) +[![Generic badge](https://img.shields.io/badge/编写于_Pyglet_版本-2.0.4-blue.svg)](https://pyglet.org) [![Generic badge](https://img.shields.io/badge/Python-_3.8_|_3.9_|_3.10_|_3.11_-blue.svg)](https://Python.org) ## 版本 @@ -55,7 +55,7 @@ - `rtoml` - `tomlkit` -- `pyglet` (已经内置 V2.0.2.1 路径：`./libs/pyglet`) +- `pyglet` (已经内置 V2.0.4 路径：`./libs/pyglet`) - `xmltodict` (已经内置 V0.12.0 路径:`./libs/xmltodict`) - `pyperclip` (已经内置 V1.8.2 路径: `./libs/pyperclip`) - `pillow` diff --git a/docs/README-en.md b/docs/README-en.md index d816e9d..6ea1f2b 100644 --- a/docs/README-en.md +++ b/docs/README-en.md @@ -12,7 +12,7 @@ 996.icu [![Generic badge](https://img.shields.io/badge/SemVer-2.0.0-blue.svg)](https://Semver.org/) [![Generic badge](https://img.shields.io/badge/Write_with_Python-3.8.10-blue.svg)](https://Python.org) -[![Generic badge](https://img.shields.io/badge/Write_with_Pyglet-2.0.2.1-blue.svg)](https://pyglet.org) +[![Generic badge](https://img.shields.io/badge/Write_with_Pyglet-2.0.4-blue.svg)](https://pyglet.org) [![Generic badge](https://img.shields.io/badge/Python-_3.8_|_3.9_|_3.10_|_3.11_-blue.svg)](https://Python.org) ## Version @@ -55,7 +55,7 @@ - `rtoml` - `tomlkit` -- `pyglet` (pre-installed V2.0.2.1 path:`./libs/pyglet`) +- `pyglet` (pre-installed V2.0.4 path:`./libs/pyglet`) - `xmltodict` (pre-installed V0.12.0 path:`./libs/xmltodict`) - `pyperclip` (pre-installed V1.8.2 path: `./libs/pyperclip`) - `pillow` diff --git a/libs/Difficult_Rocket_rs/src/src/types.rs b/libs/Difficult_Rocket_rs/src/src/types.rs index 176c304..0e2e6e1 100644 --- a/libs/Difficult_Rocket_rs/src/src/types.rs +++ b/libs/Difficult_Rocket_rs/src/src/types.rs @@ -68,6 +68,17 @@ pub mod sr1 { #[allow(dead_code)] pub mod dr { + pub enum ConnectType { + Stick, + FixedPoint {dx: f64, angle: f64}, + RotatePoint {dx: f64, angle: f64} + } + + pub struct Connect { + pub c_type: ConnectType, + + } + pub enum PartType { Pod, Separator, @@ -88,12 +99,22 @@ pub mod dr { pub struct DRPartData { pub x: f64, pub y: f64, + pub dx: f64, + pub dy: f64, pub id: i64, pub p_type: PartType, pub active: bool, pub angle: f64, // 角度制 pub angle_v: f64, - pub editor_angle: usize, + pub flip_x: bool, + pub flip_y: bool, + pub connections: Option> + } + + impl DRPartData { + pub fn get_textures(&self) -> String { + "aaa".to_string() + } } }