Skip to content

Commit 19482db

Browse files
committed
chore: put ui settings together
1 parent d60de3f commit 19482db

File tree

6 files changed

+20
-10
lines changed

6 files changed

+20
-10
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "ethertia"
3-
version = "0.2.6"
3+
version = "0.2.8"
44
edition = "2021"
55
default-run = "ethertia"
66

assets/baked/atlas_dram.png

-1.36 MB
Loading

src/client/client_world.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ fn on_world_init(
167167
.insert(VolumetricFogSettings {
168168
ambient_intensity: 0.,
169169
density: 0.01,
170+
light_tint: Color::linear_rgb(0.916, 0.941, 1.000),
170171
..default()
171172
})
172173
;

src/client/ui/settings.rs

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -132,15 +132,18 @@ pub fn ui_settings(
132132
// ui_setting_line(ui, "Shape", egui::Slider::new(&mut vox_brush.shape, 0..=5));
133133

134134
ui_setting_line(ui, "Tex", egui::Slider::new(&mut vox_brush.tex, 0..=25));
135-
}
136-
SettingsPanel::CurrentWorld => {
135+
136+
137137
if let Some(worldinfo) = &mut worldinfo {
138+
139+
ui.label("World:");
140+
138141
ui_setting_line(ui, "Day Time", egui::Slider::new(&mut worldinfo.daytime, 0.0..=1.0));
139142

140143
ui_setting_line(ui, "Day Time Length", egui::Slider::new(&mut worldinfo.daytime_length, 0.0..=60.0 * 24.0));
144+
141145
}
142-
}
143-
SettingsPanel::Graphics => {
146+
144147
ui.label("Video:");
145148

146149
ui_setting_line(ui, "FOV", egui::Slider::new(&mut cfg.fov, 10.0..=170.0));
@@ -156,15 +159,21 @@ pub fn ui_settings(
156159
ui_setting_line(ui, "UI Scale", egui::Slider::new(&mut egui_settings.scale_factor, 0.5..=2.5));
157160

158161
ui_setting_line(ui, "HUD Padding", egui::Slider::new(&mut cfg.hud_padding, 0.0..=48.0));
162+
163+
ui.label("Controls");
164+
if let Ok(mut ctl) = query_char.get_single_mut() {
165+
ui_setting_line(ui, "Unfly on Grounded", egui::Checkbox::new(&mut ctl.unfly_on_ground, ""));
166+
}
167+
}
168+
SettingsPanel::CurrentWorld => {
169+
}
170+
SettingsPanel::Graphics => {
159171
}
160172
SettingsPanel::Audio => {
161173

162174
// ui_setting_line(ui, "Global Volume", egui::Slider::new(&mut global_volume.volume as &mut f32, 0.0..=1.0));
163175
}
164176
SettingsPanel::Controls => {
165-
if let Ok(mut ctl) = query_char.get_single_mut() {
166-
ui_setting_line(ui, "Unfly on Grounded", egui::Checkbox::new(&mut ctl.unfly_on_ground, ""));
167-
}
168177
}
169178
SettingsPanel::Language => {}
170179
SettingsPanel::Mods => {}

src/voxel/voxel_client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ impl Default for VoxelBrush {
411411
size: 4.,
412412
strength: 0.8,
413413
shape: VoxShape::Isosurface,
414-
tex: 21,
414+
tex: 10,
415415
}
416416
}
417417
}

0 commit comments

Comments
 (0)