Skip to content

Commit

Permalink
add yakui support and start reimplementing assets_gui over it
Browse files Browse the repository at this point in the history
this required an upgrade to winit 0.29 which is why
it's a big commit since we had to support egui's master

getting acclimated with yakui made me do a few PR to them
  • Loading branch information
Uriopass committed Dec 20, 2023
1 parent 045cbed commit 3102119
Show file tree
Hide file tree
Showing 20 changed files with 1,496 additions and 1,024 deletions.
806 changes: 608 additions & 198 deletions Cargo.lock

Large diffs are not rendered by default.

8 changes: 3 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ resolver = "2"
default-members = ["native_app"]

[workspace.dependencies]
egui = "0.24.1"
egui = { git = "https://github.com/emilk/egui" }
flat_spatial = "0.6"
egui_extras = "0.24.1"
egui-winit = { version = "0.24.1", default-features = false }
egui_plot = "0.24.1"
egui_extras = { git = "https://github.com/emilk/egui" }
egui_plot = { git = "https://github.com/emilk/egui" }
ordered-float = { version = "4.2.0", default-features = false }
winit = "0.28.7"
oddio = "0.6.2"
derive_more = "0.99.17"

Expand Down
2 changes: 1 addition & 1 deletion assets/shaders/pbr/render.wgsl
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ fn render(sun: vec3<f32>,
color += atmo;
#endif

let autoexposure = 1.0 + smoothstep(0.0, 0.1, -sun.z) * 5.0;
let autoexposure = 1.0 + smoothstep(0.0, 0.1, -sun.z) * 10.0;

color = tonemap(autoexposure * color);

Expand Down
7 changes: 5 additions & 2 deletions assets_gui/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@ edition = "2021"
[dependencies]
common = { path = "../common" }
geom = { path = "../geom" }
engine = { path = "../engine" }
engine = { path = "../engine", features=["yakui"] }
egui-inspect = { path = "../egui-inspect" }
log = { version = "0.4.11", features=["max_level_info", "release_max_level_info"] }
inline_tweak = "1.0.8"
egui_dock = "0.9.0"
egui = { workspace = true }
yakui = { git = "https://github.com/SecondHalfGames/yakui" }
yakui-wgpu = { git = "https://github.com/SecondHalfGames/yakui" }
yakui-winit = { git = "https://github.com/SecondHalfGames/yakui" }
yakui-widgets = { git = "https://github.com/SecondHalfGames/yakui" }
1 change: 1 addition & 0 deletions assets_gui/src/companies.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ impl Companies {
})
}

#[allow(dead_code)]
pub fn save(&self) {
common::saveload::JSONPretty::save(&self.companies, "companies");
}
Expand Down
Loading

0 comments on commit 3102119

Please sign in to comment.