Skip to content
Snippets Groups Projects
Commit 6cfb2bf0 authored by StarArawn's avatar StarArawn
Browse files

Rename kayak_components to kayak_widgets

parent f7c60f8e
No related branches found
No related tags found
No related merge requests found
Showing
with 19 additions and 24 deletions
...@@ -429,10 +429,10 @@ dependencies = [ ...@@ -429,10 +429,10 @@ dependencies = [
"bevy", "bevy",
"bytemuck", "bytemuck",
"crevice", "crevice",
"kayak_components",
"kayak_core", "kayak_core",
"kayak_font", "kayak_font",
"kayak_render_macros", "kayak_render_macros",
"kayak_widgets",
"serde", "serde",
"serde_json", "serde_json",
"serde_path_to_error", "serde_path_to_error",
...@@ -1989,13 +1989,6 @@ dependencies = [ ...@@ -1989,13 +1989,6 @@ dependencies = [
"wasm-bindgen", "wasm-bindgen",
] ]
[[package]]
name = "kayak_components"
version = "0.1.0"
dependencies = [
"kayak_core",
]
[[package]] [[package]]
name = "kayak_core" name = "kayak_core"
version = "0.1.0" version = "0.1.0"
...@@ -2042,7 +2035,14 @@ version = "0.1.0" ...@@ -2042,7 +2035,14 @@ version = "0.1.0"
dependencies = [ dependencies = [
"bevy", "bevy",
"bevy_kayak_ui", "bevy_kayak_ui",
"kayak_components", "kayak_core",
"kayak_widgets",
]
[[package]]
name = "kayak_widgets"
version = "0.1.0"
dependencies = [
"kayak_core", "kayak_core",
] ]
......
...@@ -5,15 +5,10 @@ edition = "2021" ...@@ -5,15 +5,10 @@ edition = "2021"
resolver = "2" resolver = "2"
[workspace] [workspace]
members = [ members = ["kayak_widgets", "kayak_core", "kayak_render_macros", "kayak_font"]
"kayak_components",
"kayak_core",
"kayak_render_macros",
"kayak_font",
]
[dependencies] [dependencies]
kayak_components = { path = "kayak_components" } kayak_widgets = { path = "kayak_widgets" }
kayak_core = { path = "kayak_core" } kayak_core = { path = "kayak_core" }
[dev-dependencies] [dev-dependencies]
......
...@@ -7,7 +7,7 @@ edition = "2021" ...@@ -7,7 +7,7 @@ edition = "2021"
bytemuck = "1.7.2" bytemuck = "1.7.2"
bevy = { git = "https://github.com/bevyengine/bevy", rev = "38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c" } bevy = { git = "https://github.com/bevyengine/bevy", rev = "38c7d5eb9e81ab8e1aec03673599b25a9aa0c69c" }
kayak_core = { path = "../kayak_core" } kayak_core = { path = "../kayak_core" }
kayak_components = { path = "../kayak_components" } kayak_widgets = { path = "../kayak_widgets" }
kayak_render_macros = { path = "../kayak_render_macros" } kayak_render_macros = { path = "../kayak_render_macros" }
kayak_font = { path = "../kayak_font" } kayak_font = { path = "../kayak_font" }
#kayak_font = { path = "../kayak_font" } #kayak_font = { path = "../kayak_font" }
......
...@@ -5,10 +5,10 @@ use bevy::{ ...@@ -5,10 +5,10 @@ use bevy::{
PipelinedDefaultPlugins, PipelinedDefaultPlugins,
}; };
use bevy_kayak_ui::{BevyContext, BevyKayakUIPlugin, FontMapping, UICameraBundle}; use bevy_kayak_ui::{BevyContext, BevyKayakUIPlugin, FontMapping, UICameraBundle};
use kayak_components::Window;
use kayak_core::Index; use kayak_core::Index;
use kayak_ui::components::App; use kayak_ui::components::App;
use kayak_ui::core::{rsx, widget}; use kayak_ui::core::{rsx, widget};
use kayak_widgets::Window;
#[widget] #[widget]
fn TestState() { fn TestState() {
......
...@@ -5,7 +5,7 @@ use bevy::{ ...@@ -5,7 +5,7 @@ use bevy::{
PipelinedDefaultPlugins, PipelinedDefaultPlugins,
}; };
use bevy_kayak_ui::{BevyContext, BevyKayakUIPlugin, FontMapping, UICameraBundle}; use bevy_kayak_ui::{BevyContext, BevyKayakUIPlugin, FontMapping, UICameraBundle};
use kayak_components::{Button, Text, Window}; use kayak_widgets::{Button, Text, Window};
use kayak_core::{ use kayak_core::{
styles::{Style, StyleProp, Units}, styles::{Style, StyleProp, Units},
Bound, EventType, Index, MutableBound, OnEvent, Bound, EventType, Index, MutableBound, OnEvent,
......
...@@ -5,7 +5,7 @@ use bevy::{ ...@@ -5,7 +5,7 @@ use bevy::{
PipelinedDefaultPlugins, PipelinedDefaultPlugins,
}; };
use bevy_kayak_ui::{BevyContext, BevyKayakUIPlugin, FontMapping, ImageManager, UICameraBundle}; use bevy_kayak_ui::{BevyContext, BevyKayakUIPlugin, FontMapping, ImageManager, UICameraBundle};
use kayak_components::{NinePatch, Text}; use kayak_widgets::{NinePatch, Text};
use kayak_core::{ use kayak_core::{
layout_cache::Space, layout_cache::Space,
styles::{LayoutType, Style, StyleProp, Units}, styles::{LayoutType, Style, StyleProp, Units},
......
...@@ -5,7 +5,7 @@ use bevy::{ ...@@ -5,7 +5,7 @@ use bevy::{
PipelinedDefaultPlugins, PipelinedDefaultPlugins,
}; };
use bevy_kayak_ui::{BevyContext, BevyKayakUIPlugin, FontMapping, UICameraBundle}; use bevy_kayak_ui::{BevyContext, BevyKayakUIPlugin, FontMapping, UICameraBundle};
use kayak_components::{Text, Window}; use kayak_widgets::{Text, Window};
use kayak_core::{bind, Binding, Bound, Index, MutableBound}; use kayak_core::{bind, Binding, Bound, Index, MutableBound};
use kayak_ui::components::App; use kayak_ui::components::App;
use kayak_ui::core::{rsx, widget}; use kayak_ui::core::{rsx, widget};
......
...@@ -5,7 +5,7 @@ use bevy::{ ...@@ -5,7 +5,7 @@ use bevy::{
PipelinedDefaultPlugins, PipelinedDefaultPlugins,
}; };
use bevy_kayak_ui::{BevyContext, BevyKayakUIPlugin, ImageManager, UICameraBundle}; use bevy_kayak_ui::{BevyContext, BevyKayakUIPlugin, ImageManager, UICameraBundle};
use kayak_components::Image; use kayak_widgets::Image;
use kayak_core::Index; use kayak_core::Index;
use kayak_ui::components::App; use kayak_ui::components::App;
use kayak_ui::core::rsx; use kayak_ui::core::rsx;
......
...@@ -5,7 +5,6 @@ use bevy::{ ...@@ -5,7 +5,6 @@ use bevy::{
PipelinedDefaultPlugins, PipelinedDefaultPlugins,
}; };
use bevy_kayak_ui::{BevyContext, BevyKayakUIPlugin, ImageManager, UICameraBundle}; use bevy_kayak_ui::{BevyContext, BevyKayakUIPlugin, ImageManager, UICameraBundle};
use kayak_components::NinePatch;
use kayak_core::{ use kayak_core::{
layout_cache::Space, layout_cache::Space,
styles::{Style, StyleProp, Units}, styles::{Style, StyleProp, Units},
...@@ -13,6 +12,7 @@ use kayak_core::{ ...@@ -13,6 +12,7 @@ use kayak_core::{
}; };
use kayak_ui::components::App; use kayak_ui::components::App;
use kayak_ui::core::rsx; use kayak_ui::core::rsx;
use kayak_widgets::NinePatch;
fn startup( fn startup(
mut commands: Commands, mut commands: Commands,
......
File moved
[package] [package]
name = "kayak_components" name = "kayak_widgets"
version = "0.1.0" version = "0.1.0"
edition = "2021" edition = "2021"
resolver = "2" resolver = "2"
......
File moved
File moved
File moved
File moved
File moved
File moved
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment