Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 27 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,33 @@ jobs:
uses: dtolnay/rust-toolchain@stable

- name: Install dependencies
run: sudo apt-get update; sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
run: |
sudo apt-get update
sudo apt-get install --no-install-recommends libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev

# Uninstall unneeded tools
# .NET
sudo rm -rf /usr/share/dotnet || true
sudo apt-get remove -y '^aspnetcore-.*' || true
sudo apt-get remove -y '^dotnet-.*' --fix-missing || true
# Haskell
sudo rm -rf /opt/ghc || true
sudo rm -rf /usr/local/.ghcup || true
# Android
sudo rm -rf /usr/local/lib/android || true
# PHP
sudo apt-get remove -y 'php.*' --fix-missing || true
# Database
sudo apt-get remove -y '^mongodb-.*' --fix-missing || true
sudo apt-get remove -y '^mysql-.*' --fix-missing || true
# Cloud
sudo apt-get remove -y azure-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri --fix-missing || true
sudo apt-get remove -y google-cloud-sdk --fix-missing || true
sudo apt-get remove -y google-cloud-cli --fix-missing || true

# Clean up unused packages
sudo apt-get autoremove -y
sudo apt-get clean

- name: Populate target directory from cache
uses: Leafwing-Studios/cargo-cache@v2
Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ serde = { version = "1", features = ["derive"] }
tracing-test = "0.2.5"
tracing = "0.1.41"
atomicow = "1.1.0"
rfd = "0.15.3"
ron = "0.10.1"
rfd = "0.17.2"
ron = "0.12.0"
variadics_please = "1.0"

# local crates
Expand Down
2 changes: 1 addition & 1 deletion bevy_widgets/bevy_text_editing/src/char_position.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use bevy::prelude::*;

/// A component that stores a character position in a text
/// Separated from `usize` to make it clear that it is a character position, not a byte position.
/// And prevents accidental usage as a byte position in string[..`byte_position`]
/// And prevents accidental usage as a byte position in `string[..byte_position]`
#[derive(Reflect, Default, Clone, Copy, Debug)]
pub struct CharPosition(pub usize);

Expand Down
9 changes: 2 additions & 7 deletions bevy_widgets/bevy_toolbar/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,10 @@ pub struct ToolbarButton {
}

/// Available editor tools.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
#[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
pub enum EditorTool {
/// Selection tool for picking entities.
#[default]
Select,
/// Move tool for translating entities.
Move,
Expand Down Expand Up @@ -74,12 +75,6 @@ pub enum EditorTool {
#[derive(Resource, Default)]
pub struct ActiveTool(pub EditorTool);

impl Default for EditorTool {
fn default() -> Self {
Self::Select
}
}

/// Marker component for the gizmo mode status text.
#[derive(Component)]
pub struct GizmoModeStatus;
Expand Down
9 changes: 2 additions & 7 deletions crates/bevy_transform_gizmos/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,22 +71,17 @@ pub struct ScaleGizmo;
pub struct InternalGizmoCamera;

/// Available gizmo modes.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
#[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
pub enum GizmoMode {
/// Translation mode (W key).
#[default]
Translate,
/// Rotation mode (E key).
Rotate,
/// Scale mode (R key).
Scale,
}

impl Default for GizmoMode {
fn default() -> Self {
Self::Translate
}
}

/// Settings for the [`TransformGizmoPlugin`].
#[derive(Resource, Clone, Debug)]
pub struct TransformGizmoSettings {
Expand Down