Initial transform-gizmo structure changes

urholaukkarinen · Mar 29, 2024 · 33d4378 · 33d4378
1 parent 302d1f0
commit 33d4378
Show file tree

Hide file tree

Showing 27 changed files with 59 additions and 45 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 /target
 Cargo.lock
 /.idea
+/.vscode
 .DS_Store
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,32 +1,25 @@
-[package]
-name = "egui-gizmo"
-version = "0.16.2"
-authors = ["Urho Laukkarinen <[email protected]>"]
-edition = "2021"
-
-license-file = "LICENSE"
-readme = "README.md"
-description = "3d transform gizmo for the egui library"
-homepage = "https://github.com/urholaukkarinen/egui-gizmo"
-repository = "https://github.com/urholaukkarinen/egui-gizmo"
-categories = ["gui", "game-development", "game-engines"]
-keywords = ["egui", "gizmo"]
-exclude = ["/docs"]
-
 [workspace]
-members = ["demo"]
+resolver = "2"
+members = ["crates/*"]
 
-[dependencies]
+[workspace.package]
+version = "0.1.0"
+rust-version = "1.72"
+edition = "2021"
+license = "MIT OR Apache-2.0"
+homepage = "https://github.com/urholaukkarinen/transform-gizmo"
+repository = "https://github.com/urholaukkarinen/transform-gizmo"
+authors = ["Urho Laukkarinen <[email protected]>"]
+
+[workspace.dependencies]
+transform-gizmo = { version = "0.1.0", path = "crates/transform-gizmo", default-features = false }
 egui = "0.26.2"
 glam = { version = "0.25.0", features = ["mint"] }
 mint = "0.5"
 
 [profile.release]
 opt-level = "s"
-lto = "thin"
-
-[lints]
-workspace = true
+panic = "abort"
 
 [workspace.lints.rust]
 elided_lifetimes_in_paths = "allow"
@@ -177,5 +170,3 @@ unwrap_used = "allow"
 wildcard_imports = "allow"
 large-types-passed-by-value = "allow"
 needless-pass-by-value = "allow"
-needless_pass_by_ref_mut = "allow"
-redundant_pub_crate = "allow"
diff --git a/README.md b/README.md
@@ -1,12 +1,12 @@
-# egui-gizmo
+# transform-gizmo
 
-[![Latest version](https://img.shields.io/crates/v/egui-gizmo.svg)](https://crates.io/crates/egui-gizmo)
-[![Documentation](https://docs.rs/egui-gizmo/badge.svg)](https://docs.rs/egui-gizmo)
+[![Latest version](https://img.shields.io/crates/v/transform-gizmo.svg)](https://crates.io/crates/transform-gizmo)
+[![Documentation](https://docs.rs/transform-gizmo/badge.svg)](https://docs.rs/transform-gizmo)
 ![MIT](https://img.shields.io/badge/license-MIT-blue.svg)
 
 3d transformation gizmo built on top of the [egui](https://github.com/emilk/egui) library.
 
-[Try it out in a web demo](https://urholaukkarinen.github.io/egui-gizmo/)
+[Try it out in a web demo](https://urholaukkarinen.github.io/transform-gizmo/)
 
 ![Rotation](media/rotation.png)
 ![Translation](media/translation.png)

diff --git a/demo/.gitignore → crates/transform-gizmo-demo/.gitignore b/demo/.gitignore → crates/transform-gizmo-demo/.gitignore
diff --git a/demo/Cargo.toml → crates/transform-gizmo-demo/Cargo.toml b/demo/Cargo.toml → crates/transform-gizmo-demo/Cargo.toml
@@ -1,16 +1,18 @@
 [package]
-name = "egui-gizmo-demo"
-version = "0.2.0"
-authors = ["Urho Laukkarinen <[email protected]>"]
-edition = "2021"
-
-license = "MIT"
+name = "transform-gizmo-demo"
+version.workspace = true
+rust-version.workspace = true
+edition.workspace = true
+license.workspace = true
+homepage.workspace = true
+repository.workspace = true
+authors.workspace = true
 
 [dependencies]
+egui.workspace = true
+transform-gizmo.workspace = true
 bevy = "0.13"
 bevy_egui = "0.25.0"
-egui = "0.26.2"
-egui-gizmo = { path = ".." }
 
 [dependencies.bevy_infinite_grid]
 git = "https://github.com/XYCaptain/bevy_infinite_grid.git"

diff --git a/demo/Trunk.toml → crates/transform-gizmo-demo/Trunk.toml b/demo/Trunk.toml → crates/transform-gizmo-demo/Trunk.toml
diff --git a/demo/crate.png → crates/transform-gizmo-demo/crate.png b/demo/crate.png → crates/transform-gizmo-demo/crate.png
diff --git a/demo/index.html → crates/transform-gizmo-demo/index.html b/demo/index.html → crates/transform-gizmo-demo/index.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-    <title>egui-gizmo demo</title>
+    <title>transform-gizmo demo</title>
     <style>
         html,
         body,

diff --git a/demo/src/camera.rs → crates/transform-gizmo-demo/src/camera.rs b/demo/src/camera.rs → crates/transform-gizmo-demo/src/camera.rs
diff --git a/demo/src/main.rs → crates/transform-gizmo-demo/src/main.rs b/demo/src/main.rs → crates/transform-gizmo-demo/src/main.rs
@@ -7,7 +7,7 @@ use bevy_infinite_grid::{InfiniteGridBundle, InfiniteGridPlugin, InfiniteGridSet
 use egui::color_picker::Alpha;
 use egui::{pos2, Align2, Color32, FontId, LayerId, Ui, Widget};
 
-use egui_gizmo::{
+use transform_gizmo::{
     Gizmo, GizmoMode, GizmoOrientation, GizmoResult, GizmoVisuals, DEFAULT_SNAP_ANGLE,
     DEFAULT_SNAP_DISTANCE,
 };
@@ -16,13 +16,14 @@ use crate::camera::{setup_camera, update_camera};
 
 mod camera;
 
-const SOURCE_URL: &str = "https://github.com/urholaukkarinen/egui-gizmo/blob/main/demo/src/main.rs";
+const SOURCE_URL: &str =
+    "https://github.com/urholaukkarinen/transform-gizmo/blob/main/demo/src/main.rs";
 
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins.set(WindowPlugin {
             primary_window: Some(Window {
-                title: "egui-gizmo demo".into(),
+                title: "transform-gizmo demo".into(),
                 present_mode: PresentMode::AutoNoVsync,
                 ..default()
             }),

diff --git a/crates/transform-gizmo/Cargo.toml b/crates/transform-gizmo/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "transform-gizmo"
+version.workspace = true
+rust-version.workspace = true
+edition.workspace = true
+license.workspace = true
+homepage.workspace = true
+repository.workspace = true
+authors.workspace = true
+categories = ["gui", "game-development", "game-engines"]
+keywords = ["3d", "gizmo"]
+readme = "../../README.md"
+include = ["../../LICENSE-APACHE", "../../LICENSE-MIT", "**/*.rs", "Cargo.toml"]
+
+[dependencies]
+egui.workspace = true
+glam.workspace = true
+mint.workspace = true
+
+[lints]
+workspace = true
diff --git a/src/lib.rs → crates/transform-gizmo/src/lib.rs b/src/lib.rs → crates/transform-gizmo/src/lib.rs
@@ -3,8 +3,8 @@
 //! such as game engines and 3d modeling software.
 //!
 //! # Creating a gizmo
-//! For a more complete example, see the online demo at <https://urholaukkarinen.github.io/egui-gizmo/>.
-//! The demo sources can be found at <https://github.com/urholaukkarinen/egui-gizmo/blob/main/demo/src/main.rs>.
+//! For a more complete example, see the online demo at <https://urholaukkarinen.github.io/transform-gizmo/>.
+//! The demo sources can be found at <https://github.com/urholaukkarinen/transform-gizmo/blob/main/demo/src/main.rs>.
 //!
 //! ## A basic example
 //! ```text

diff --git a/src/math.rs → crates/transform-gizmo/src/math.rs b/src/math.rs → crates/transform-gizmo/src/math.rs
diff --git a/src/painter.rs → crates/transform-gizmo/src/painter.rs b/src/painter.rs → crates/transform-gizmo/src/painter.rs
diff --git a/src/subgizmo.rs → crates/transform-gizmo/src/subgizmo.rs b/src/subgizmo.rs → crates/transform-gizmo/src/subgizmo.rs
diff --git a/src/subgizmo/arcball.rs → ...s/transform-gizmo/src/subgizmo/arcball.rs b/src/subgizmo/arcball.rs → ...s/transform-gizmo/src/subgizmo/arcball.rs
diff --git a/src/subgizmo/common.rs → ...es/transform-gizmo/src/subgizmo/common.rs b/src/subgizmo/common.rs → ...es/transform-gizmo/src/subgizmo/common.rs
diff --git a/src/subgizmo/rotation.rs → .../transform-gizmo/src/subgizmo/rotation.rs b/src/subgizmo/rotation.rs → .../transform-gizmo/src/subgizmo/rotation.rs
diff --git a/src/subgizmo/scale.rs → crates/transform-gizmo/src/subgizmo/scale.rs b/src/subgizmo/scale.rs → crates/transform-gizmo/src/subgizmo/scale.rs
diff --git a/src/subgizmo/translation.rs → ...ansform-gizmo/src/subgizmo/translation.rs b/src/subgizmo/translation.rs → ...ansform-gizmo/src/subgizmo/translation.rs
diff --git a/docs/egui-gizmo-demo.js b/docs/egui-gizmo-demo.js
diff --git a/docs/egui-gizmo-demo_bg.wasm b/docs/egui-gizmo-demo_bg.wasm
diff --git a/docs/index.html b/docs/index.html
diff --git a/media/rotation.png b/media/rotation.png
diff --git a/media/scale.png b/media/scale.png
diff --git a/media/translation.png b/media/translation.png
diff --git a/scripts/build_demo_web.sh b/scripts/build_demo_web.sh
@@ -3,9 +3,9 @@
 set -eu
 script_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )
 
-WASM_PATH="docs/egui-gizmo-demo_bg.wasm"
+WASM_PATH="docs/transform-gizmo-demo_bg.wasm"
 
-pushd "$script_path/../demo"
+pushd "$script_path/../crates/transform-gizmo-demo"
 trunk build --config Trunk.toml --release
 popd