Build renderer and material component foundations

Add dedicated skinned rendering, pose restoration, shared Material and Material Instance slots, registry-driven components, Surface/Solari integration, transactional schema upgrades, navigation authoring, documentation, and evaluation evidence.
This commit is contained in:
Rbanh committed 2026-07-12 00:24:06 -04:00
1 parent 0553a85220
commit 0798aa5d57
169 files changed
+27098 -3469

No files matched your search

+112 -48
View File
@@ -6,17 +6,19 @@ use bevy::ecs::system::SystemState;
use bevy::prelude::*;
use bevy::window::PrimaryWindow;
use bevy::world_serialization::serde::WorldDeserializer;
use bevy::world_serialization::{DynamicWorld, DynamicWorldBuilder, WorldInstance};
use bevy::world_serialization::{DynamicWorld, DynamicWorldBuilder, WorldFilter, WorldInstance};
use scene::{document::SceneDocument, strip_schema_version, validate_level_text};
use serde::de::DeserializeSeed;
use shared::{
infer_actor_kind, validate_actor, ActorId, ActorKind, ActorName, ActorValidationError,
AnimationControllerDesc, AudioListenerDesc, AudioSourceDesc, BrushDesc, ColliderDesc,
EditorVisibility, HierarchySiblingIndex, HydratedPrefabMember, HydratedPrefabReady,
InspectorOrder, LevelObject, LightDesc, MaterialDesc, MaterialOverride, ModelRef,
ObjectiveMarker, PhysicsBody, PlayerSpawn, PostProcessVolumeDesc, PrefabHydrationBlocked,
PrefabInstance, PrefabRef, Primitive, RigidBodyDesc, SceneComposition, StaticMeshRenderer,
TeamSpawn, TriggerVolume, WeaponSpawn,
AuthoringComponentStates, EditorVisibility, HierarchySiblingIndex, HydratedPrefabMember,
HydratedPrefabReady, InspectorOrder, LevelObject, LightDesc, PrefabHydrationBlocked,
PrefabInstance, PrefabRef, SceneComposition,
};
#[cfg(test)]
use shared::{
AnimationControllerDesc, AudioSourceDesc, BrushDesc, ColliderDesc, SkinnedMeshRenderer,
};
use crate::assets::{import_external_assets, EditorAssets, IMPORTABLE_ASSET_EXTENSIONS};
@@ -1006,6 +1008,27 @@ fn format_actor_validation(err: ActorValidationError) -> String {
ActorValidationError::ImportedModelHasStaticMeshRenderer => {
"Save failed: ImportedModel actor cannot have StaticMeshRenderer".into()
}
ActorValidationError::SkinnedMeshMissingRenderer => {
"Save failed: SkinnedMesh actor requires SkinnedMeshRenderer".into()
}
ActorValidationError::SkinnedMeshInvalidRenderer => {
"Save failed: SkinnedMeshRenderer requires a model source path".into()
}
ActorValidationError::SkinnedMeshHasPrimitive => {
"Save failed: SkinnedMesh actor cannot have Primitive".into()
}
ActorValidationError::SkinnedMeshHasStaticMeshRenderer => {
"Save failed: SkinnedMesh actor cannot have StaticMeshRenderer".into()
}
ActorValidationError::SkinnedMeshHasModelRef => {
"Save failed: SkinnedMesh actor cannot have ModelRef".into()
}
ActorValidationError::SkinnedMeshRendererActorKindMismatch => {
"Save failed: SkinnedMeshRenderer requires ActorKind::SkinnedMesh".into()
}
ActorValidationError::ConflictingGeometrySources => {
"Save failed: actor has more than one primary geometry source component".into()
}
ActorValidationError::LightMissingLightDesc => {
"Save failed: Light actor requires LightDesc".into()
}
@@ -1048,8 +1071,9 @@ fn format_actor_validation(err: ActorValidationError) -> String {
ActorValidationError::AudioListenerInvalidEarGap => {
"Save failed: audio listener ear gap must be positive and finite".into()
}
ActorValidationError::AnimationControllerMissingModelRef => {
"Save failed: animation controller requires ModelRef on the same actor".into()
ActorValidationError::AnimationControllerMissingSkinnedMeshRenderer => {
"Save failed: animation controller requires SkinnedMeshRenderer on the same actor"
.into()
}
ActorValidationError::AnimationControllerMissingSkeleton => {
"Save failed: animation controller requires an assigned skeleton".into()
@@ -1093,6 +1117,9 @@ fn format_actor_validation(err: ActorValidationError) -> String {
ActorValidationError::PostProcessVolumeInvalidOverrideScalar => {
"Save failed: post-process volume override contains invalid scalar".into()
}
ActorValidationError::InvalidNavigation(message) => {
format!("Save failed: invalid navigation authoring: {message}")
}
}
}
@@ -1179,39 +1206,26 @@ fn serialize_entities_inner_with_resources(
let result = (|| {
let ron = {
let registry = world.resource::<AppTypeRegistry>().read();
let mut component_filter = WorldFilter::deny_all()
.allow::<Name>()
.allow::<Transform>()
.allow::<ChildOf>()
.allow::<LevelObject>()
.allow::<ActorId>()
.allow::<ActorName>()
.allow::<HierarchySiblingIndex>()
.allow::<EditorVisibility>();
let component_registry = world
.get_resource::<crate::ui::component_registry::EditorComponentRegistry>()
.cloned()
.unwrap_or_default();
for descriptor in &component_registry.descriptors {
if let Some(registration) = registry.get_with_type_path(descriptor.type_name) {
component_filter = component_filter.allow_by_id(registration.type_id());
}
}
let builder = DynamicWorldBuilder::from_world(world, &registry)
.deny_all()
.allow_component::<Name>()
.allow_component::<Transform>()
.allow_component::<ChildOf>()
.allow_component::<LevelObject>()
.allow_component::<ActorId>()
.allow_component::<ActorName>()
.allow_component::<ActorKind>()
.allow_component::<InspectorOrder>()
.allow_component::<Primitive>()
.allow_component::<BrushDesc>()
.allow_component::<StaticMeshRenderer>()
.allow_component::<MaterialDesc>()
.allow_component::<MaterialOverride>()
.allow_component::<RigidBodyDesc>()
.allow_component::<ColliderDesc>()
.allow_component::<PhysicsBody>()
.allow_component::<LightDesc>()
.allow_component::<AnimationControllerDesc>()
.allow_component::<AudioSourceDesc>()
.allow_component::<AudioListenerDesc>()
.allow_component::<PlayerSpawn>()
.allow_component::<ModelRef>()
.allow_component::<PrefabRef>()
.allow_component::<PrefabInstance>()
.allow_component::<WeaponSpawn>()
.allow_component::<TriggerVolume>()
.allow_component::<PostProcessVolumeDesc>()
.allow_component::<TeamSpawn>()
.allow_component::<ObjectiveMarker>()
.allow_component::<HierarchySiblingIndex>()
.allow_component::<EditorVisibility>()
.with_component_filter(component_filter)
.extract_entities(entities.into_iter());
let scene = if include_scene_resources {
builder
@@ -1781,7 +1795,14 @@ fn finalize_scene_load(world: &mut World) {
let mut state: SystemState<(
Res<settings::ProjectSettings>,
Query<(&LightDesc, Option<&InspectorOrder>), With<LevelObject>>,
Query<
(
&LightDesc,
Option<&AuthoringComponentStates>,
Option<&InspectorOrder>,
),
With<LevelObject>,
>,
Query<(&mut DirectionalLight, &mut Visibility), With<shared::ProjectSun>>,
)> = SystemState::new(world);
@@ -1801,10 +1822,8 @@ fn backfill_missing_actor_kinds(world: &mut World) {
let Ok(entity_ref) = world.get_entity(entity) else {
continue;
};
if entity_ref.get::<ActorKind>().is_some() {
continue;
}
if let Some(kind) = infer_actor_kind(entity_ref) {
let current = entity_ref.get::<ActorKind>().copied();
if let Some(kind) = infer_actor_kind(entity_ref).filter(|kind| current != Some(*kind)) {
world.entity_mut(entity).insert(kind);
}
}
@@ -1856,6 +1875,12 @@ mod tests {
struct NoAssetLoads;
#[derive(Component, Reflect, Default)]
#[reflect(Component, Default)]
struct RegisteredSceneExtension {
value: u32,
}
impl LoadFromPath for NoAssetLoads {
fn load_from_path_erased(
&mut self,
@@ -1866,6 +1891,43 @@ mod tests {
}
}
#[test]
fn registry_registered_extension_is_included_in_scene_persistence() {
let mut app = App::new();
app.register_type::<Name>()
.register_type::<Transform>()
.register_type::<LevelObject>()
.register_type::<ActorKind>()
.register_type::<SceneComposition>()
.register_type::<RegisteredSceneExtension>();
let mut component_registry =
crate::ui::component_registry::EditorComponentRegistry::default();
let mut descriptor = component_registry.descriptors[0].clone();
descriptor.id = "game.registered_scene_extension";
descriptor.type_name = std::any::type_name::<RegisteredSceneExtension>();
descriptor.display_name = "Registered Scene Extension";
descriptor.recommended = &[];
descriptor.conflicts_with = &[];
component_registry.register(descriptor).unwrap();
app.insert_resource(component_registry);
app.insert_resource(SceneComposition::default());
let entity = app
.world_mut()
.spawn((
Name::new("Extension"),
Transform::default(),
LevelObject,
ActorKind::Empty,
RegisteredSceneExtension { value: 73 },
))
.id();
let text = serialize_entities_inner(app.world_mut(), vec![entity]).unwrap();
assert!(text.contains(std::any::type_name::<RegisteredSceneExtension>()));
assert!(text.contains("value: 73") || text.contains("value:73"));
}
#[test]
fn restored_recovery_remains_available_until_save_or_discard() {
let authored = PathBuf::from("assets/levels/authored.scn.ron");
@@ -2152,8 +2214,8 @@ mod tests {
Transform::IDENTITY,
LevelObject,
ActorId::new("animated-model"),
ActorKind::ImportedModel,
ModelRef::new(source_path),
ActorKind::SkinnedMesh,
SkinnedMeshRenderer::new(source_path),
controller.clone(),
AnimationPlayer::default(),
AnimationGraphHandle::default(),
@@ -2171,6 +2233,8 @@ mod tests {
let decoded: AnimationControllerDesc = ron::from_str(&component.ron).unwrap();
assert_eq!(decoded, controller);
assert!(text.contains("shared::animation::SkinnedMeshRenderer"));
assert!(!text.contains("shared::components::ModelRef"));
assert!(!text.contains("AnimationPlayer"));
assert!(!text.contains("AnimationGraphHandle"));
assert!(!text.contains("AnimationTransitions"));