Skip to content

Commit

Permalink
gltf lights
Browse files Browse the repository at this point in the history
  • Loading branch information
@robtfm
robtfm committed Sep 16, 2024
1 parent 4c02fd8 commit 58d368c
Show file tree
Hide file tree
Showing 3 changed files with 155 additions and 11 deletions.
154 changes: 145 additions & 9 deletions crates/scene_runner/src/update_world/gltf_container.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// - clean up of cached colliders (when mesh is unloaded?)
use std::{
collections::BTreeMap,
f32::consts::PI,
hash::{Hash, Hasher},
};

Expand All @@ -27,15 +28,18 @@ use serde::Deserialize;

use crate::{
renderer_context::RendererSceneContext,
update_world::material::{dcl_material_from_standard_material, BaseMaterial},
update_world::{
lights::{Light, SpotlightAngles},
material::{dcl_material_from_standard_material, BaseMaterial},
},
ContainerEntity, SceneEntity, SceneSets,
};
use dcl::interface::{ComponentPosition, CrdtType};
use dcl_component::{
proto_components::sdk::components::{
common::LoadingState, pb_material, pb_mesh_collider, pb_mesh_renderer, ColliderLayer,
GltfNodeStateValue, PbGltfContainer, PbGltfContainerLoadingState, PbGltfNode,
PbGltfNodeState, PbMaterial, PbMeshCollider, PbMeshRenderer,
PbGltfNodeState, PbLight, PbMaterial, PbMeshCollider, PbMeshRenderer, PbSpotlight,
},
transform_and_parent::DclTransformAndParent,
SceneComponentId, SceneEntityId,
Expand All @@ -44,10 +48,7 @@ use ipfs::{EntityDefinition, IpfsAssetServer};
use scene_material::{SceneBound, SceneMaterial};

use super::{
animation::Clips,
mesh_collider::{MeshCollider, MeshColliderShape},
transform_and_parent::TransformHelperPub,
AddCrdtInterfaceExt, ComponentTracker,
animation::Clips, lights::LightEntity, mesh_collider::{MeshCollider, MeshColliderShape}, transform_and_parent::TransformHelperPub, AddCrdtInterfaceExt, ComponentTracker
};

pub struct GltfDefinitionPlugin;
Expand Down Expand Up @@ -219,7 +220,7 @@ fn update_gltf(
&scene_def.id,
|s| {
s.load_cameras = false;
s.load_lights = false;
s.load_lights = true;
s.load_materials = RenderAssetUsages::RENDER_WORLD;
s.include_source = true;
},
Expand Down Expand Up @@ -338,6 +339,9 @@ fn update_ready_gltfs(
Option<&SkinnedMesh>,
Option<&Handle<StandardMaterial>>,
Option<&AnimationTarget>,
Option<&DirectionalLight>,
Option<&PointLight>,
Option<&SpotLight>,
)>,
(base_mats, mut bound_mats, mut graphs, mut meshes): (
Res<Assets<StandardMaterial>>,
Expand Down Expand Up @@ -431,8 +435,37 @@ fn update_ready_gltfs(
maybe_skin,
maybe_material,
maybe_target,
maybe_directional,
maybe_point,
maybe_spot,
)) = gltf_spawned_entities.get(spawned_ent)
{
// remove directional lights
if maybe_directional.is_some() {
commands.entity(spawned_ent).despawn_recursive();
continue;
}

// enable shadows for other lights
if let Some(point) = maybe_point {
commands.entity(spawned_ent).try_insert((
PointLight {
shadows_enabled: true,
..*point
},
LightEntity { scene: dcl_scene_entity.root },
));
}
if let Some(spot) = maybe_spot {
commands.entity(spawned_ent).try_insert((
SpotLight {
shadows_enabled: true,
..*spot
},
LightEntity { scene: dcl_scene_entity.root },
));
}

// collect named nodes to push to scene on request
if let Some(name) = maybe_name {
let mut name = name.to_string();
Expand Down Expand Up @@ -1024,6 +1057,12 @@ pub struct HiddenMaterial(Handle<SceneMaterial>);
#[derive(Component)]
pub struct HiddenCollider(MeshCollider);

#[derive(Component)]
pub struct HiddenPointLight(PointLight);

#[derive(Component)]
pub struct HiddenSpotLight(SpotLight);

fn expose_gltfs(
mut commands: Commands,
new_links: Query<
Expand Down Expand Up @@ -1051,6 +1090,8 @@ fn expose_gltfs(
Option<&SkinnedMesh>,
Option<&MeshCollider>,
Option<&Name>,
Option<&PointLight>,
Option<&SpotLight>,
)>,
mats: Res<Assets<SceneMaterial>>,
images: Res<Assets<Image>>,
Expand Down Expand Up @@ -1210,6 +1251,8 @@ fn expose_gltfs(
maybe_skin,
maybe_collider,
maybe_name,
maybe_point,
maybe_spot,
) = node_data.get(gltf_entity).unwrap_or_default();

if let Some(mesh) = maybe_mesh {
Expand Down Expand Up @@ -1294,6 +1337,77 @@ fn expose_gltfs(
);
}

if let Some(point) = maybe_point {
debug!("link point light ({})", src);
// hide
commands
.entity(gltf_entity)
.remove::<PointLight>()
.insert(HiddenPointLight(*point));
// copy
commands.entity(ent).insert(Light {
enabled: true,
illuminance: Some(point.intensity / (4.0 * PI)),
shadows: Some(true),
color: Some(point.color),
});
// write to scene
scene.update_crdt(
SceneComponentId::LIGHT,
CrdtType::LWW_ANY,
scene_ent.id,
&PbLight {
enabled: None,
illuminance: Some(point.intensity / (4.0 * PI)),
shadows: Some(true),
color: Some(point.color.into()),
},
);
}

if let Some(spot) = maybe_spot {
debug!("link spot light ({})", src);
// hide
commands
.entity(gltf_entity)
.remove::<SpotLight>()
.insert(HiddenSpotLight(*spot));
// copy
commands.entity(ent).insert((
Light {
enabled: true,
illuminance: Some(spot.intensity / (4.0 * PI)),
shadows: Some(true),
color: Some(spot.color),
},
SpotlightAngles {
inner_angle: spot.inner_angle,
outer_angle: spot.outer_angle,
},
));
// write to scene
scene.update_crdt(
SceneComponentId::LIGHT,
CrdtType::LWW_ANY,
scene_ent.id,
&PbLight {
enabled: None,
illuminance: Some(spot.intensity / (4.0 * PI)),
shadows: Some(true),
color: Some(spot.color.into()),
},
);
scene.update_crdt(
SceneComponentId::SPOTLIGHT,
CrdtType::LWW_ANY,
scene_ent.id,
&PbSpotlight {
angle: spot.outer_angle,
inner_angle: Some(spot.inner_angle),
},
);
}

commands.entity(ent).insert(SceneNodeLink {
gltf_entity,
gltf_parent,
Expand All @@ -1313,6 +1427,8 @@ fn update_gltf_linked_transforms(
&Parent,
Option<&HiddenMaterial>,
Option<&HiddenCollider>,
Option<&HiddenPointLight>,
Option<&HiddenSpotLight>,
)>,
scene_nodes: Query<(&SceneEntity, Ref<Transform>, &Parent, &SceneNodeLink)>,
mut scenes: Query<&mut RendererSceneContext>,
Expand Down Expand Up @@ -1342,8 +1458,16 @@ fn update_gltf_linked_transforms(
let mut node_movement_state = HashMap::default();

// init parents and positions, check for changes
for (gltf_entity, link, container, parent, maybe_hidden_material, maybe_hidden_collider) in
gltf_nodes.iter()
for (
gltf_entity,
link,
container,
parent,
maybe_hidden_material,
maybe_hidden_collider,
maybe_hidden_point,
maybe_hidden_spot,
) in gltf_nodes.iter()
{
let unlink = |gltf_entity: Entity, commands: &mut Commands| {
// scene link removed, reset
Expand All @@ -1361,6 +1485,18 @@ fn update_gltf_linked_transforms(
.remove::<HiddenCollider>()
.insert(hidden.0.clone());
}
if let Some(hidden) = maybe_hidden_point {
commands
.entity(gltf_entity)
.remove::<HiddenPointLight>()
.insert(hidden.0);
}
if let Some(hidden) = maybe_hidden_spot {
commands
.entity(gltf_entity)
.remove::<HiddenSpotLight>()
.insert(hidden.0);
}
};

let Ok((scene_entity_id, scene_transform, scene_parent, scene_link)) =
Expand Down
2 changes: 1 addition & 1 deletion crates/scene_runner/src/update_world/lights.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ fn update_directional_light(

#[derive(Component)]
pub struct LightEntity {
scene: Entity,
pub scene: Entity,
}

fn update_point_lights(
Expand Down
10 changes: 9 additions & 1 deletion crates/user_input/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ fn manage_player_visibility(
With<PrimaryUser>,
>,
children: Query<&Children>,
spotlights: Query<Has<SpotLight>>,
) {
if let (Ok(cam_transform), Ok((player, player_transform, mut vis, is_oow, modifiers))) =
(camera.get_single(), player.get_single_mut())
Expand All @@ -114,13 +115,20 @@ fn manage_player_visibility(

#[allow(clippy::collapsible_else_if)]
if distance < 0.5 {
for child in children.iter_descendants(player) {
for child in children.iter_descendants(player) {
// don't retarget the profile texture spotlight which we've attached to the avatar directly
if spotlights.get(child).is_ok() {
continue;
}
if let Some(mut commands) = commands.get_entity(child) {
commands.insert(PRIMARY_AVATAR_LIGHT_LAYER.union(&AVATAR_TEXTURE_RENDERLAYER));
}
}
} else {
for child in children.iter_descendants(player) {
if spotlights.get(child).is_ok() {
continue;
}
if let Some(mut commands) = commands.get_entity(child) {
commands.insert(RenderLayers::default().union(&AVATAR_TEXTURE_RENDERLAYER));
}
Expand Down

0 comments on commit 58d368c

Please sign in to comment.