From 876876de247d8fc80163e269dd8d72f307e7d75f Mon Sep 17 00:00:00 2001 From: Paris DOUADY Date: Mon, 18 Dec 2023 19:31:10 +0100 Subject: [PATCH] cleanup demo + fix assets_gui lighting --- assets_gui/src/main.rs | 4 +++- engine_demo/src/main.rs | 8 ++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/assets_gui/src/main.rs b/assets_gui/src/main.rs index aba8fc6d..9de84596 100644 --- a/assets_gui/src/main.rs +++ b/assets_gui/src/main.rs @@ -4,7 +4,7 @@ use egui::FontFamily::{Monospace, Proportional}; use egui::FontId; use engine::meshload::load_mesh_with_properties; -use engine::{Context, FrameContext, GfxContext, SpriteBatchBuilder}; +use engine::{Context, FrameContext, GfxContext, GfxSettings, SpriteBatchBuilder}; use geom::{vec3, InfiniteFrustrum, LinearColor, Plane, Vec2, Vec3}; use crate::gui::{Gui, Inspected, Shown}; @@ -79,6 +79,8 @@ impl engine::framework::State for State { ) .try_into() .unwrap(); + + gfx.update_settings(GfxSettings::default()); } fn render(&mut self, fc: &mut FrameContext) { diff --git a/engine_demo/src/main.rs b/engine_demo/src/main.rs index 6a76da95..ef90f0ae 100644 --- a/engine_demo/src/main.rs +++ b/engine_demo/src/main.rs @@ -1,8 +1,8 @@ use common::{AudioKind, History}; use engine::meshload::load_mesh; use engine::{ - Context, FrameContext, GfxContext, GfxSettings, InstancedMeshBuilder, KeyCode, MeshInstance, - MouseButton, ShadowQuality, + Context, FrameContext, GfxSettings, InstancedMeshBuilder, KeyCode, MeshInstance, MouseButton, + ShadowQuality, }; use geom::{ vec3, Camera, Degrees, InfiniteFrustrum, LinearColor, Matrix4, Plane, Radians, Vec2, Vec3, @@ -51,10 +51,6 @@ impl engine::framework::State for State { fn new(ctx: &mut Context) -> Self { let gfx = &mut ctx.gfx; - gfx.render_params.value_mut().shadow_mapping_resolution = 2048; - gfx.sun_shadowmap = GfxContext::mk_shadowmap(&gfx.device, 2048); - gfx.update_simplelit_bg(); - let mut meshes = vec![]; if let Ok(m) = load_mesh(gfx, "DamagedHelmet.glb") {