Skip to content

Commit

Permalink
Merge pull request #78 from bytestring-net/dev
Browse files Browse the repository at this point in the history
version bump
  • Loading branch information
IDEDARY authored Sep 21, 2024
2 parents 61b663b + 18f47d8 commit 51d39bc
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 79 deletions.
57 changes: 30 additions & 27 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,38 +1,40 @@
#======================#
#=== WORKSPACE INFO ===#

[workspace]
resolver = "2"
members = [
"crates/*",
"examples/*",
]
exclude = [
"promo/*",
"examples/*",
"docs/*",
".gitignore",
".vscode",
]
members = ["crates/*", "examples/*"]
exclude = [".vscode", "docs/*", "examples/*", "promo/*", ".gitignore"]

[workspace.package]
authors = ["IDEDARY"]
version = "0.2.4"
edition = "2021"
license = "MIT OR Apache-2.0"
repository = "https://github.com/bytestring-net/bevy-lunex"
keywords = ["ui", "layout", "bevy", "lunex", "bevy-lunex"]
categories = ["gui", "mathematics", "game-development"]

#========================#
#=== PACKAGE SETTINGS ===#

[profile.dev]
opt-level = 1

[workspace.package]
authors = ["IDEDARY"]
version = "0.2.3"
edition = "2021"
license = "MIT OR Apache-2.0"
repository = "https://github.com/bytestring-net/bevy-lunex"
keywords = ["ui", "layout", "bevy", "lunex", "bevy-lunex"]
categories = ["gui", "mathematics", "game-development"]
#===============================#
#=== DEPENDENCIES & FEATURES ===#

[workspace.dependencies]
# LOCAL CRATES
bevy_lunex = { path = "crates/bevy_lunex", version = "0.2.4" }
lunex_engine = { path = "crates/lunex_engine", version = "0.2.4" }

bevy_lunex = { path = "crates/bevy_lunex", version = "0.2.3" }
lunex_engine = { path = "crates/lunex_engine", version = "0.2.3" }

colored = { version = "^2.1" }
indexmap = { version = "^2.1" }
thiserror = { version = "^1.0" }
# STANDART DEPENDENCIES
colored = { version = "^2.1" }
indexmap = { version = "^2.1" }
thiserror = { version = "^1.0" }

# GAME ENGINE
bevy = { version = "^0.14", default-features = false, features = [
"bevy_pbr",
"bevy_sprite",
Expand All @@ -41,5 +43,6 @@
"bevy_gizmos",
] }

bevy_kira_audio = { version = "^0.20" }
bevy_mod_picking = { version = "^0.20", default-features = false, features = ["selection", "backend_raycast"] }
# 3RD-PARTY GAME ENGINE CRATES
bevy_kira_audio = { version = "^0.20" }
bevy_mod_picking = { version = "^0.20", default-features = false, features = ["selection", "backend_raycast"] }
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ For production ready example/template check out [`Bevypunk source code`](https:/

| Bevy | Bevy Lunex |
|--------|-----------------|
| ^ 0.14 | 0.2.0 - 0.2.3 |
| ^ 0.14 | 0.2.0 - 0.2.4 |
| 0.13.2 | 0.1.0 |
| 0.12.1 | 0.0.10 - 0.0.11 |
| 0.12.0 | 0.0.7 - 0.0.9 |
Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_lunex/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ For production ready example/template check out [`Bevypunk source code`](https:/

| Bevy | Bevy Lunex |
|--------|-----------------|
| ^ 0.14 | 0.2.0 - 0.2.3 |
| ^ 0.14 | 0.2.0 - 0.2.4 |
| 0.13.2 | 0.1.0 |
| 0.12.1 | 0.0.10 - 0.0.11 |
| 0.12.0 | 0.0.7 - 0.0.9 |
Expand Down
8 changes: 6 additions & 2 deletions crates/lunex_engine/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#====================#
#=== PACKAGE INFO ===#

[package]
name = "lunex_engine"
description = "This crate is not inteded to be used standalone. It is a dependency of Bevy_Lunex"
Expand All @@ -9,10 +12,11 @@
keywords.workspace = true
categories.workspace = true

#===============================#
#=== DEPENDENCIES & FEATURES ===#

[dependencies]
bevy.workspace = true
colored.workspace = true
indexmap.workspace = true
thiserror.workspace = true

[features]
47 changes: 0 additions & 47 deletions crates/lunex_engine/src/core/traits.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ use std::borrow::Borrow;
use bevy::ecs::component::Component;

use crate::nodes::prelude::*;
//use crate::layout;
use crate::MasterData;
use crate::import::*;

Expand Down Expand Up @@ -287,49 +286,3 @@ impl <T, N: Default + Component> UiNodeTreeInitTrait for UiTree<T, N> {
tree
}
}


// #=======================#
// #=== TAILORED TRAITS ===#

// Trait that [Layout] types implement so they can be build as new node.
/* pub trait BuildAsNode {
/// Build the widget inside the [`UiTree`] at the given path.
fn build<T: Component, N: Default + Component>(self, ui: &mut UiTree<T, N>, path: impl Borrow<str>) -> Result<(), NodeError> where Self: Sized;
}
impl BuildAsNode for layout::Boundary {
fn build<T: Component, N: Default + Component>(self, ui: &mut UiTree<T, N>, path: impl Borrow<str>) -> Result<(), NodeError> where Self: Sized {
ui.create_node(path.borrow())?;
let mut container: NodeData<N> = NodeData::new();
container.layout = self.into();
ui.insert_data(path, container)?;
Ok(())
}
}
impl BuildAsNode for layout::Window {
fn build<T: Component, N: Default + Component>(self, ui: &mut UiTree<T, N>, path: impl Borrow<str>) -> Result<(), NodeError> where Self: Sized {
ui.create_node(path.borrow())?;
let mut container: NodeData<N> = NodeData::new();
container.layout = self.into();
ui.insert_data(path, container)?;
Ok(())
}
}
impl BuildAsNode for layout::Solid {
fn build<T: Component, N: Default + Component>(self, ui: &mut UiTree<T, N>, path: impl Borrow<str>) -> Result<(), NodeError> where Self: Sized {
ui.create_node(path.borrow())?;
let mut container: NodeData<N> = NodeData::new();
container.layout = self.into();
ui.insert_data(path, container)?;
Ok(())
}
}
impl BuildAsNode for layout::Div {
fn build<T: Component, N: Default + Component>(self, ui: &mut UiTree<T, N>, path: impl Borrow<str>) -> Result<(), NodeError> where Self: Sized {
ui.create_node(path.borrow())?;
let mut container: NodeData<N> = NodeData::new();
container.layout = self.into();
ui.insert_data(path, container)?;
Ok(())
}
} */
2 changes: 1 addition & 1 deletion docs/src/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Add the following to your `Cargo.toml`:

```toml
[dependencies]
bevy_lunex = { version = "0.2.3" }
bevy_lunex = { version = "0.2.4" }
```

Alternatively, you can use the latest bleeding edge version from the Git repository:
Expand Down

0 comments on commit 51d39bc

Please sign in to comment.