diff --git a/OFL.txt b/OFL.txt new file mode 100755 index 00000000..daa25d00 --- /dev/null +++ b/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2011 The Comfortaa Project Authors (https://github.com/alexeiva/comfortaa), with Reserved Font Name "Comfortaa". + +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. diff --git a/README.md b/README.md index d83a5acd..7744040d 100644 --- a/README.md +++ b/README.md @@ -51,5 +51,6 @@ Features: ## Credits / Licenses Fonts: +* Comfortaa: Open Font License, see OFT.txt * ProggyClean.ttf, Copyright (c) 2004, 2005 Tristan Grimmer. MIT License. http://www.proggyfonts.net/ * Roboto-Regular.ttf: Apache License, Version 2.0 diff --git a/emigui/fonts/Comfortaa-Regular.ttf b/emigui/fonts/Comfortaa-Regular.ttf new file mode 100755 index 00000000..a2d19d59 Binary files /dev/null and b/emigui/fonts/Comfortaa-Regular.ttf differ diff --git a/emigui/src/fonts.rs b/emigui/src/fonts.rs index 3233d4d9..af2a6ddd 100644 --- a/emigui/src/fonts.rs +++ b/emigui/src/fonts.rs @@ -65,9 +65,10 @@ impl Fonts { let atlas = Arc::new(Mutex::new(atlas)); // TODO: figure out a way to make the wasm smaller despite including a font. Zip it? - // let typeface_data = include_bytes!("../fonts/ProggyClean.ttf"); // Use 13 for this. NOTHING ELSE. + let typeface_data = include_bytes!("../fonts/Comfortaa-Regular.ttf"); // let typeface_data = include_bytes!("../fonts/DejaVuSans.ttf"); - let typeface_data = include_bytes!("../fonts/Roboto-Regular.ttf"); + // let typeface_data = include_bytes!("../fonts/ProggyClean.ttf"); // Use 13 for this. NOTHING ELSE. + // let typeface_data = include_bytes!("../fonts/Roboto-Regular.ttf"); self.sizes = sizes.clone(); self.fonts = sizes .into_iter() diff --git a/emigui/src/lib.rs b/emigui/src/lib.rs index 6c979c4c..6f92484e 100644 --- a/emigui/src/lib.rs +++ b/emigui/src/lib.rs @@ -24,5 +24,5 @@ pub use crate::{ mesher::{Mesh, Vertex}, style::Style, texture_atlas::Texture, - types::RawInput, + types::{Color, RawInput}, }; diff --git a/emigui_wasm/src/webgl.rs b/emigui_wasm/src/webgl.rs index 0735d306..6cdedfff 100644 --- a/emigui_wasm/src/webgl.rs +++ b/emigui_wasm/src/webgl.rs @@ -4,7 +4,7 @@ use { web_sys::{WebGlBuffer, WebGlProgram, WebGlRenderingContext, WebGlShader, WebGlTexture}, }; -use emigui::{Mesh, Texture}; +use emigui::{Color, Mesh, Texture}; type Gl = WebGlRenderingContext; @@ -145,6 +145,7 @@ impl Painter { pub fn paint( &mut self, + bg_color: Color, mesh: Mesh, texture: &Texture, pixels_per_point: f32, @@ -186,7 +187,12 @@ impl Painter { self.canvas.width() as i32, self.canvas.height() as i32, ); - gl.clear_color(0.05, 0.05, 0.05, 1.0); + gl.clear_color( + bg_color.r as f32 / 255.0, + bg_color.g as f32 / 255.0, + bg_color.b as f32 / 255.0, + bg_color.a as f32 / 255.0, + ); gl.clear(Gl::COLOR_BUFFER_BIT); for mesh in mesh.split_to_u16() { diff --git a/example_wasm/src/lib.rs b/example_wasm/src/lib.rs index c20acba0..8e4b8652 100644 --- a/example_wasm/src/lib.rs +++ b/example_wasm/src/lib.rs @@ -7,7 +7,7 @@ extern crate emigui; extern crate emigui_wasm; use { - emigui::{label, widgets::Label, Align, Emigui, RawInput}, + emigui::{label, types::srgba, widgets::Label, Align, Emigui, RawInput}, emigui_wasm::now_sec, }; @@ -50,10 +50,14 @@ impl State { region.add(label!("Everything: {:.1} ms", self.everything_ms)); + let bg_color = srgba(16, 16, 16, 255); let mesh = self.emigui.paint(); - let result = - self.webgl_painter - .paint(mesh, self.emigui.texture(), raw_input.pixels_per_point); + let result = self.webgl_painter.paint( + bg_color, + mesh, + self.emigui.texture(), + raw_input.pixels_per_point, + ); self.everything_ms = 1000.0 * (now_sec() - everything_start);