Drop events on focus

.github/workflows/check.yml

@@ -101,10 +101,6 @@ jobs:
           restore-keys: |
             cache-wasm32-cargo-${{ hashFiles('**/Cargo.toml') }}
             cache-wasm32-cargo
-      - uses: actions-rs/cargo@v1
-        with:
-          command: update
-          args: -p tracing-wasm --precise 0.2.0
       - uses: actions-rs/cargo@v1
         with:
           command: clippy

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.8.0] - 27-Nov-2021
+
+### Added
+
+- Upgrade Egui to 0.15.0 ([#45](https://github.com/mvlabat/bevy_egui/pull/45)).
+
 ## [0.7.1] - 06-Oct-2021
 
 ### Added

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bevy_egui"
-version = "0.7.1"
+version = "0.8.0"
 authors = ["mvlabat <[email protected]>"]
 description = "A plugin for Egui integration into Bevy"
 license = "MIT"
@@ -17,15 +17,19 @@ no-default-features = true # clipboard crate fails the build currently https://g
 default = ["manage_clipboard", "open_url"]
 manage_clipboard = ["clipboard", "thread_local"]
 open_url = ["webbrowser"]
+drop_events_on_focus = []
 
 [dependencies]
-bevy = { version = "0.5", default-features = false, features = [
-    "render",
-    "bevy_winit"
+bevy = { git = "https://github.com/bevyengine/bevy", branch = "main", default-features = false, features = [
+    "bevy_render",
+    "bevy_winit",
+    "bevy_core_pipeline"
 ] }
 egui = "0.15.0"
 webbrowser = { version = "0.5.5", optional = true }
-winit = { version = "0.24.0", features = ["x11"], default-features = false }
+winit = { version = "0.26.0", features = ["x11"], default-features = false }
+bytemuck = { version = "1.7.0", features = ["derive"] }
+wgpu = "0.12.0"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 clipboard = { version = "0.5.0", optional = true }
@@ -35,8 +39,10 @@ thread_local = { version = "1.1.0", optional = true }
 version-sync = "0.9.2"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
-bevy = { version = "0.5", default-features = false, features = [
-    "bevy_wgpu",
-    "x11",
-    "png"
+bevy = { git = "https://github.com/bevyengine/bevy", branch = "main", default-features = false, features = [
+	"x11",
+	"png"
 ] }
+
+[patch."https://github.com/bevyengine/bevy"]
+bevy = { git = "https://github.com/rezural/bevy", branch = "input-derive-clone" }

README.md

@@ -38,7 +38,7 @@ Here's a minimal usage example:
 # Cargo.toml
 [dependencies]
 bevy = "0.5"
-bevy_egui = "0.7"
+bevy_egui = "0.8"
 ```
 
 ```rust
@@ -78,5 +78,5 @@ cargo run --example ui
 
 |bevy|bevy_egui|
 |---|---|
-|0.5|0.4-0.7|
+|0.5|0.4-0.8|
 |0.4|0.1-0.3|

examples/simple.rs

@@ -2,7 +2,7 @@ use bevy::prelude::*;
 use bevy_egui::{egui, EguiContext, EguiPlugin};
 
 fn main() {
-    App::build()
+    App::new()
         .add_plugins(DefaultPlugins)
         .add_plugin(EguiPlugin)
         .add_system(ui_example.system())

examples/two_windows.rs

@@ -1,3 +1,5 @@
+fn main() {}
+/*
 use bevy::{
     prelude::*,
     render::{
@@ -17,7 +19,7 @@ const BEVY_TEXTURE_ID: u64 = 0;
 
 /// This example creates a second window and draws a mesh from two different cameras.
 fn main() {
-    App::build()
+    App::new()
         .insert_resource(Msaa { samples: 4 })
         .init_resource::<SharedUiState>()
         .add_state(AppState::CreateWindow)
@@ -117,15 +119,15 @@ fn setup_pipeline(
 
     // add a new render pass for our new window / camera
     let mut second_window_pass = PassNode::<&MainPass>::new(PassDescriptor {
-        color_attachments: vec![msaa.color_attachment_descriptor(
+        color_attachments: vec![msaa.color_attachment(
             TextureAttachment::Input("color_attachment".to_string()),
             TextureAttachment::Input("color_resolve_target".to_string()),
             Operations {
                 load: LoadOp::Clear(Color::rgb(0.5, 0.5, 0.8)),
                 store: true,
             },
         )],
-        depth_stencil_attachment: Some(RenderPassDepthStencilAttachmentDescriptor {
+        depth_stencil_attachment: Some(RenderPassDepthStencilAttachment {
             attachment: TextureAttachment::Input("depth".to_string()),
             depth_ops: Some(Operations {
                 load: LoadOp::Clear(1.0),
@@ -174,7 +176,7 @@ fn setup_pipeline(
                 window_id,
                 TextureDescriptor {
                     size: Extent3d {
-                        depth: 1,
+                        depth_or_array_layers: 1,
                         width: 1,
                         height: 1,
                     },
@@ -241,7 +243,7 @@ fn setup(
         ..Default::default()
     });
     // light
-    commands.spawn_bundle(LightBundle {
+    commands.spawn_bundle(PointLightBundle {
         transform: Transform::from_xyz(4.0, 5.0, 4.0),
         ..Default::default()
     });
@@ -325,3 +327,4 @@ fn ui_second_window(
         },
     );
 }
+*/

examples/ui.rs

@@ -8,7 +8,7 @@ const BEVY_TEXTURE_ID: u64 = 0;
 /// - toggling hidpi scaling (by pressing '/' button);
 /// - configuring egui contexts during the startup.
 fn main() {
-    App::build()
+    App::new()
         .insert_resource(ClearColor(Color::rgb(0.0, 0.0, 0.0)))
         .insert_resource(Msaa { samples: 4 })
         .init_resource::<UiState>()

src/egui.wgsl

@@ -0,0 +1,49 @@
+struct EguiTransform {
+    scale: vec2<f32>;
+    translation: vec2<f32>;
+};
+
+[[group(0), binding(0)]]
+var<uniform> egui_transform: EguiTransform;
+
+struct VertexOutput {
+    [[location(0)]] uv: vec2<f32>;
+    [[location(1)]] color: vec4<f32>;
+    [[builtin(position)]] pos: vec4<f32>;
+};
+
+fn linear_from_srgb(srgb: vec3<f32>) -> vec3<f32> {
+    let cutoff = vec3<f32>(srgb < vec3<f32>(10.31475));
+    let lower = srgb / vec3<f32>(3294.6);
+    let higher = pow((srgb + vec3<f32>(14.025)) / vec3<f32>(269.025), vec3<f32>(2.4));
+    return mix(higher, lower, cutoff);
+}
+
+fn linear_from_srgba(srgba: vec4<f32>) -> vec4<f32> {
+    return vec4<f32>(linear_from_srgb(srgba.rgb), srgba.a / 255.0);
+}
+
+[[stage(vertex)]]
+fn vs_main(
+    [[location(0)]] position: vec2<f32>,
+    [[location(1)]] uv: vec2<f32>,
+    [[location(2)]] color: vec4<f32>,
+) -> VertexOutput {
+    var out: VertexOutput;
+    out.uv = uv;
+    out.color = linear_from_srgba(color);
+    out.pos = vec4<f32>(position * egui_transform.scale + egui_transform.translation, 0.0, 1.0);
+    return out;
+}
+
+[[group(1), binding(0)]]
+var t_egui: texture_2d<f32>;
+[[group(1), binding(1)]]
+var s_egui: sampler;
+
+[[stage(fragment)]]
+fn fs_main(in: VertexOutput) -> [[location(0)]] vec4<f32> {
+    let color = in.color * textureSample(t_egui, s_egui, in.uv);
+
+    return color;
+}