Skip to content
Snippets Groups Projects
Commit 87fc02f9 authored by StaffEngineer's avatar StaffEngineer
Browse files

move converter color to userland

parent c199a6a3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
examples/bevy_api_testing.rs
+ 10
− 4
View file @ 87fc02f9
use bevy::prelude::*;
use bevy_cosmic_edit::{
bevy_color_to_cosmic, change_active_editor_sprite, change_active_editor_ui, Attrs, AttrsOwned,
CosmicAttrs, CosmicEditPlugin, CosmicEditSpriteBundle, CosmicEditUiBundle, Focus,
};
use bevy_cosmic_edit::*;
fn setup(mut commands: Commands) {
commands.spawn(Camera2dBundle::default());
......@@ -39,6 +36,15 @@ fn setup(mut commands: Commands) {
commands.insert_resource(Focus(Some(sprite_editor)));
}
pub fn bevy_color_to_cosmic(color: bevy::prelude::Color) -> CosmicColor {
cosmic_text::Color::rgba(
(color.r() * 255.) as u8,
(color.g() * 255.) as u8,
(color.b() * 255.) as u8,
(color.a() * 255.) as u8,
)
}
fn main() {
App::new()
.add_plugins(DefaultPlugins)
......
examples/every_option.rs
+ 10
− 6
View file @ 87fc02f9
use bevy::{prelude::*, ui::FocusPolicy, window::PrimaryWindow};
use bevy_cosmic_edit::{
bevy_color_to_cosmic, change_active_editor_sprite, change_active_editor_ui, get_x_offset,
Attrs, AttrsOwned, CosmicAttrs, CosmicBackground, CosmicEditPlugin, CosmicEditUiBundle,
CosmicEditor, CosmicMaxChars, CosmicMaxLines, CosmicMetrics, CosmicText, CosmicTextPosition,
Edit, Focus,
};
use bevy_cosmic_edit::*;
#[derive(Resource)]
struct TextChangeTimer(pub Timer);
......@@ -61,6 +56,15 @@ fn setup(mut commands: Commands, windows: Query<&Window, With<PrimaryWindow>>) {
)));
}
pub fn bevy_color_to_cosmic(color: bevy::prelude::Color) -> CosmicColor {
cosmic_text::Color::rgba(
(color.r() * 255.) as u8,
(color.g() * 255.) as u8,
(color.b() * 255.) as u8,
(color.a() * 255.) as u8,
)
}
// Test for update_buffer_text
fn text_swapper(
mut timer: ResMut<TextChangeTimer>,
......
examples/font_per_widget.rs
+ 10
− 5
View file @ 87fc02f9
#![allow(clippy::type_complexity)]
use bevy::{prelude::*, window::PrimaryWindow};
use bevy_cosmic_edit::{
bevy_color_to_cosmic, change_active_editor_sprite, change_active_editor_ui, Attrs, AttrsOwned,
CosmicAttrs, CosmicEditPlugin, CosmicEditUiBundle, CosmicFontConfig, CosmicMetrics, CosmicText,
CosmicTextPosition, Family, Focus, FontStyle, FontWeight,
};
use bevy_cosmic_edit::*;
fn setup(mut commands: Commands, windows: Query<&Window, With<PrimaryWindow>>) {
commands.spawn(Camera2dBundle::default());
......@@ -262,6 +258,15 @@ fn setup(mut commands: Commands, windows: Query<&Window, With<PrimaryWindow>>) {
commands.insert_resource(Focus(id));
}
pub fn bevy_color_to_cosmic(color: bevy::prelude::Color) -> CosmicColor {
cosmic_text::Color::rgba(
(color.r() * 255.) as u8,
(color.g() * 255.) as u8,
(color.b() * 255.) as u8,
(color.a() * 255.) as u8,
)
}
fn main() {
let font_config = CosmicFontConfig {
fonts_dir_path: None,
......
examples/image_background.rs
+ 10
− 4
View file @ 87fc02f9
use bevy::prelude::*;
use bevy_cosmic_edit::{
bevy_color_to_cosmic, change_active_editor_sprite, change_active_editor_ui, Attrs, AttrsOwned,
CosmicAttrs, CosmicBackground, CosmicEditPlugin, CosmicEditUiBundle, Focus,
};
use bevy_cosmic_edit::*;
fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
commands.spawn(Camera2dBundle::default());
......@@ -29,6 +26,15 @@ fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
commands.insert_resource(Focus(Some(editor)));
}
pub fn bevy_color_to_cosmic(color: bevy::prelude::Color) -> CosmicColor {
cosmic_text::Color::rgba(
(color.r() * 255.) as u8,
(color.g() * 255.) as u8,
(color.b() * 255.) as u8,
(color.a() * 255.) as u8,
)
}
fn main() {
App::new()
.add_plugins(DefaultPlugins)
......
examples/multiple_sprites.rs
+ 10
− 5
View file @ 87fc02f9
use bevy::{core_pipeline::clear_color::ClearColorConfig, prelude::*, window::PrimaryWindow};
use bevy_cosmic_edit::{
bevy_color_to_cosmic, change_active_editor_sprite, change_active_editor_ui, Attrs, AttrsOwned,
CosmicAttrs, CosmicEditPlugin, CosmicEditSpriteBundle, CosmicFontConfig, CosmicMetrics,
CosmicText, CosmicTextPosition, Family, Focus,
};
use bevy_cosmic_edit::*;
fn setup(mut commands: Commands, windows: Query<&Window, With<PrimaryWindow>>) {
let primary_window = windows.single();
......@@ -69,6 +65,15 @@ fn setup(mut commands: Commands, windows: Query<&Window, With<PrimaryWindow>>) {
commands.spawn(cosmic_edit_2);
}
pub fn bevy_color_to_cosmic(color: bevy::prelude::Color) -> CosmicColor {
cosmic_text::Color::rgba(
(color.r() * 255.) as u8,
(color.g() * 255.) as u8,
(color.b() * 255.) as u8,
(color.a() * 255.) as u8,
)
}
fn main() {
let font_bytes: &[u8] = include_bytes!("../assets/fonts/VictorMono-Regular.ttf");
let font_config = CosmicFontConfig {
......
examples/readonly.rs
+ 10
− 4
View file @ 87fc02f9
use bevy::{prelude::*, window::PrimaryWindow};
use bevy_cosmic_edit::{
bevy_color_to_cosmic, Attrs, AttrsOwned, CosmicAttrs, CosmicEditPlugin, CosmicEditUiBundle,
CosmicFontConfig, CosmicMetrics, CosmicText, CosmicTextPosition, Family, Focus, ReadOnly,
};
use bevy_cosmic_edit::*;
fn setup(mut commands: Commands, windows: Query<&Window, With<PrimaryWindow>>) {
let primary_window = windows.single();
......@@ -51,6 +48,15 @@ fn setup(mut commands: Commands, windows: Query<&Window, With<PrimaryWindow>>) {
commands.insert_resource(Focus(id));
}
pub fn bevy_color_to_cosmic(color: bevy::prelude::Color) -> CosmicColor {
cosmic_text::Color::rgba(
(color.r() * 255.) as u8,
(color.g() * 255.) as u8,
(color.b() * 255.) as u8,
(color.a() * 255.) as u8,
)
}
fn main() {
let font_bytes: &[u8] = include_bytes!("../assets/fonts/VictorMono-Regular.ttf");
let font_config = CosmicFontConfig {
......
examples/restricted_input.rs
+ 10
− 5
View file @ 87fc02f9
use bevy::{prelude::*, window::PrimaryWindow};
use bevy_cosmic_edit::{
bevy_color_to_cosmic, change_active_editor_sprite, change_active_editor_ui, Attrs, AttrsOwned,
CosmicAttrs, CosmicEditPlugin, CosmicEditUiBundle, CosmicMaxChars, CosmicMaxLines,
CosmicMetrics, CosmicText, Focus,
};
use bevy_cosmic_edit::*;
fn setup(mut commands: Commands, windows: Query<&Window, With<PrimaryWindow>>) {
commands.spawn(Camera2dBundle::default());
......@@ -43,6 +39,15 @@ fn setup(mut commands: Commands, windows: Query<&Window, With<PrimaryWindow>>) {
commands.insert_resource(Focus(Some(editor)));
}
pub fn bevy_color_to_cosmic(color: bevy::prelude::Color) -> CosmicColor {
cosmic_text::Color::rgba(
(color.r() * 255.) as u8,
(color.g() * 255.) as u8,
(color.b() * 255.) as u8,
(color.a() * 255.) as u8,
)
}
fn main() {
App::new()
.add_plugins(DefaultPlugins)
......
src/lib.rs
+ 0
− 9
View file @ 87fc02f9
......@@ -655,15 +655,6 @@ fn save_edit_history(
};
}
pub fn bevy_color_to_cosmic(color: bevy::prelude::Color) -> cosmic_text::Color {
cosmic_text::Color::rgba(
(color.r() * 255.) as u8,
(color.g() * 255.) as u8,
(color.b() * 255.) as u8,
(color.a() * 255.) as u8,
)
}
fn get_text_size(buffer: &Buffer) -> (f32, f32) {
let width = buffer.layout_runs().map(|run| run.line_w).reduce(f32::max);
let height = buffer.layout_runs().count() as f32 * buffer.metrics().line_height;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment