mirror of
https://github.com/danbulant/cushy
synced 2026-06-17 05:21:17 +00:00
Updated to wgpu 0.19.0
Most of the changes were figures-related. Go figure.
This commit is contained in:
parent
570cfc6d94
commit
76a42e2788
15 changed files with 192 additions and 247 deletions
407
Cargo.lock
generated
407
Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -24,7 +24,7 @@ plotters = ["dep:plotters", "kludgine/plotters"]
|
|||
kludgine = { git = "https://github.com/khonsulabs/kludgine", features = [
|
||||
"app",
|
||||
] }
|
||||
figures = "0.2.1"
|
||||
figures = { version = "0.2.1", git = "https://github.com/khonsulabs/figures" }
|
||||
alot = "0.3"
|
||||
interner = "0.2.1"
|
||||
kempt = "0.2.1"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ use cushy::widgets::container::ContainerShadow;
|
|||
use cushy::widgets::slider::Slidable;
|
||||
use cushy::Run;
|
||||
use figures::units::Lp;
|
||||
use figures::{Point, Size};
|
||||
use figures::{Point, Size, Zero};
|
||||
use kludgine::shapes::CornerRadii;
|
||||
|
||||
fn main() -> cushy::Result {
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ use cushy::widgets::container::ContainerShadow;
|
|||
use cushy::window::ThemeMode;
|
||||
use cushy::Run;
|
||||
use figures::units::Lp;
|
||||
use figures::Point;
|
||||
use figures::{Point, Zero};
|
||||
|
||||
fn main() -> cushy::Result {
|
||||
let theme_mode = Dynamic::default();
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ use cushy::widgets::container::ContainerShadow;
|
|||
use cushy::widgets::layers::{OverlayBuilder, OverlayLayer};
|
||||
use cushy::Run;
|
||||
use figures::units::Lp;
|
||||
use figures::Point;
|
||||
use figures::{Point, Zero};
|
||||
use kludgine::Color;
|
||||
use rand::{thread_rng, Rng};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
use cushy::context::{GraphicsContext, LayoutContext, Trackable};
|
||||
use cushy::figures::units::{Px, UPx};
|
||||
use cushy::figures::{IntoSigned, IntoUnsigned, Point, Rect, ScreenScale, Size};
|
||||
use cushy::figures::{IntoSigned, IntoUnsigned, Point, Rect, ScreenScale, Size, Zero};
|
||||
use cushy::kludgine::text::{MeasuredText, TextOrigin};
|
||||
use cushy::styles::components::IntrinsicPadding;
|
||||
use cushy::value::{Dynamic, IntoValue, Value};
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
use cushy::context::{GraphicsContext, LayoutContext, Trackable};
|
||||
use cushy::figures::units::{Px, UPx};
|
||||
use cushy::figures::{IntoSigned, IntoUnsigned, Point, Rect, ScreenScale, Size};
|
||||
use cushy::figures::{IntoSigned, IntoUnsigned, Point, Rect, ScreenScale, Size, Zero};
|
||||
use cushy::kludgine::text::{MeasuredText, TextOrigin};
|
||||
use cushy::styles::components::IntrinsicPadding;
|
||||
use cushy::value::{Dynamic, IntoValue, Value};
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ use std::ops::{Add, AddAssign, Sub, SubAssign};
|
|||
|
||||
pub use app::{App, Application, Cushy, Open, PendingApp, Run};
|
||||
use figures::units::UPx;
|
||||
use figures::{Fraction, ScreenUnit, Size};
|
||||
use figures::{Fraction, ScreenUnit, Size, Zero};
|
||||
use kludgine::app::winit::error::EventLoopError;
|
||||
pub use names::Name;
|
||||
pub use utils::{Lazy, WithClone};
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ use std::{slice, vec};
|
|||
|
||||
use alot::LotId;
|
||||
use figures::units::{Px, UPx};
|
||||
use figures::{IntoSigned, IntoUnsigned, Point, Rect, Size};
|
||||
use figures::{IntoSigned, IntoUnsigned, Point, Rect, Size, Zero};
|
||||
use intentional::Assert;
|
||||
use kludgine::app::winit::event::{Ime, MouseButton, MouseScrollDelta, TouchPhase};
|
||||
use kludgine::app::winit::window::CursorIcon;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
use std::time::Duration;
|
||||
|
||||
use figures::units::Px;
|
||||
use figures::Size;
|
||||
use figures::{Size, Zero};
|
||||
|
||||
use crate::animation::easings::{EaseInQuadradic, EaseOutQuadradic};
|
||||
use crate::animation::{AnimationHandle, AnimationTarget, EasingFunction, Spawn};
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ use std::ops::{Deref, DerefMut};
|
|||
|
||||
use alot::{LotId, OrderedLots};
|
||||
use figures::units::{Lp, UPx};
|
||||
use figures::{Fraction, IntoSigned, IntoUnsigned, Point, Rect, Round, ScreenScale, Size};
|
||||
use figures::{Fraction, IntoSigned, IntoUnsigned, Point, Rect, Round, ScreenScale, Size, Zero};
|
||||
use intentional::{Assert, Cast};
|
||||
|
||||
use crate::context::{AsEventContext, EventContext, GraphicsContext, LayoutContext, Trackable};
|
||||
|
|
@ -583,7 +583,7 @@ mod tests {
|
|||
use std::cmp::Ordering;
|
||||
|
||||
use figures::units::UPx;
|
||||
use figures::{Fraction, IntoSigned, Size};
|
||||
use figures::{Fraction, IntoSigned, Size, Zero};
|
||||
|
||||
use super::{GridDimension, GridLayout, Orientation};
|
||||
use crate::styles::Dimension;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ use std::time::Duration;
|
|||
|
||||
use figures::units::{Lp, Px, UPx};
|
||||
use figures::{
|
||||
Abs, FloatConversion, IntoSigned, IntoUnsigned, Point, Rect, Round, ScreenScale, Size,
|
||||
Abs, FloatConversion, IntoSigned, IntoUnsigned, Point, Rect, Round, ScreenScale, Size, Zero,
|
||||
};
|
||||
use intentional::Cast;
|
||||
use kludgine::app::winit::event::{ElementState, Ime};
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ use std::mem;
|
|||
use std::ops::RangeInclusive;
|
||||
|
||||
use figures::units::{Lp, Px, UPx};
|
||||
use figures::{FloatConversion, IntoSigned, Point, Ranged, Rect, Round, ScreenScale, Size};
|
||||
use figures::{FloatConversion, IntoSigned, Point, Ranged, Rect, Round, ScreenScale, Size, Zero};
|
||||
use intentional::{Assert, Cast as _};
|
||||
use kludgine::app::winit::event::{MouseButton, MouseScrollDelta, TouchPhase};
|
||||
use kludgine::app::winit::keyboard::{Key, NamedKey};
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
//! A widget that combines a collection of [`WidgetList`] widgets into one.
|
||||
|
||||
use figures::units::UPx;
|
||||
use figures::{IntoSigned, Rect, Round, ScreenScale, Size};
|
||||
use figures::{IntoSigned, Rect, Round, ScreenScale, Size, Zero};
|
||||
|
||||
use crate::context::{AsEventContext, EventContext, GraphicsContext, LayoutContext, Trackable};
|
||||
use crate::styles::components::IntrinsicPadding;
|
||||
|
|
|
|||
|
|
@ -3168,8 +3168,8 @@ where
|
|||
let (device, queue) = pollster::block_on(adapter.request_device(
|
||||
&wgpu::DeviceDescriptor {
|
||||
label: None,
|
||||
features: Kludgine::REQURED_FEATURES,
|
||||
limits: Kludgine::adjust_limits(wgpu::Limits::downlevel_webgl2_defaults()),
|
||||
required_features: Kludgine::REQURED_FEATURES,
|
||||
required_limits: Kludgine::adjust_limits(wgpu::Limits::downlevel_webgl2_defaults()),
|
||||
},
|
||||
None,
|
||||
))?;
|
||||
|
|
|
|||
Loading…
Reference in a new issue