diff --git a/CHANGELOG.md b/CHANGELOG.md index bb581b0..57adde4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,11 @@ This release supports Bevy version 0.14 and has an [MSRV][] of 1.80. - `VelloAssetBundle` has been separated into `VelloSvgBundle` and `VelloLottieBundle` - `Handle` has been separated into `VelloSvgHandle` and `VelloLottieHandle` - `VelloAssetAnchor` has been separated into `VelloSvgAnchor` and `VelloLottieAnchor` +- The license on bevy_vello no longer includes OFL 1.1 + +### Fixed + +- We no longer bundle the default font twice when the `default_font` feature is active. ## [0.6.1] - 2024-08-14 diff --git a/Cargo.toml b/Cargo.toml index 9f4134b..81b9552 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ members = [ [workspace.package] edition = "2021" version = "0.6.1" -license = "(MIT OR Apache-2.0) AND OFL-1.1" +license = "MIT OR Apache-2.0" repository = "https://github.com/linebender/bevy_vello" [workspace.dependencies] @@ -68,4 +68,4 @@ default = ["default_font"] svg = [] lottie = [] experimental-dotLottie = ["lottie"] -default_font = [] +default_font = ["bevy/default_font"] diff --git a/src/plugin.rs b/src/plugin.rs index 0140d16..6b73f9b 100644 --- a/src/plugin.rs +++ b/src/plugin.rs @@ -4,7 +4,7 @@ use crate::{ text::VelloFontLoader, VelloFont, VelloRenderSettings, }; -use bevy::{asset::load_internal_binary_asset, prelude::*, render::view::RenderLayers}; +use bevy::{prelude::*, render::view::RenderLayers}; use vello::AaConfig; #[derive(Clone)] @@ -52,11 +52,15 @@ impl Plugin for VelloPlugin { #[cfg(feature = "experimental-dotLottie")] app.add_plugins(crate::integrations::dot_lottie::DotLottieIntegrationPlugin); #[cfg(feature = "default_font")] - load_internal_binary_asset!( - app, - Handle::default(), - "text/FiraMono/FiraMono-subset.ttf", - |bytes: &[u8], _path: String| { VelloFont::new(bytes.to_vec()) } - ); + { + let mut fonts = app + .world_mut() + .get_resource_mut::>() + .unwrap(); + fonts.insert( + Handle::default().id(), + VelloFont::new(bevy::text::DEFAULT_FONT_DATA.to_vec()), + ); + } } } diff --git a/src/text/FiraMono/FiraMono-subset.ttf b/src/text/FiraMono/FiraMono-subset.ttf deleted file mode 100644 index 6989c2e..0000000 Binary files a/src/text/FiraMono/FiraMono-subset.ttf and /dev/null differ diff --git a/src/text/FiraMono/LICENSE b/src/text/FiraMono/LICENSE deleted file mode 100644 index 77b1731..0000000 --- a/src/text/FiraMono/LICENSE +++ /dev/null @@ -1,91 +0,0 @@ -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE.