This commit is contained in:
rewin
2024-01-26 23:57:25 +03:00
parent 5c50db1072
commit ae6053cc06
3 changed files with 6 additions and 19 deletions
-1
View File
@@ -180,7 +180,6 @@ fn process_focus_inputs(
**velocity = Vec3::ZERO; **velocity = Vec3::ZERO;
info!("Setting focus to {:?}", target); info!("Setting focus to {:?}", target);
if q_interp_vel.get(ent).is_ok() { if q_interp_vel.get(ent).is_ok() {
cmd.entity(ent).remove::<InterpVelocity>(); cmd.entity(ent).remove::<InterpVelocity>();
-3
View File
@@ -187,7 +187,6 @@ pub fn start_editor(
); );
} }
#[cfg_attr(feature = "wasm", wasm_bindgen(js_name = startBvhViewer))] #[cfg_attr(feature = "wasm", wasm_bindgen(js_name = startBvhViewer))]
pub fn start_bvh_viewer( pub fn start_bvh_viewer(
bvh_path: &str, bvh_path: &str,
@@ -237,8 +236,6 @@ pub fn start(
.run(); .run();
} }
// TODO: These `start_` functiions should be refactored to better support the // TODO: These `start_` functiions should be refactored to better support the
// needs of the "reaodnly viewer" vs "full studio editor" use cases. See // needs of the "reaodnly viewer" vs "full studio editor" use cases. See
// notes in `studio-web/src/lib/viewer.element.ts` for more info. // notes in `studio-web/src/lib/viewer.element.ts` for more info.
+6 -15
View File
@@ -122,10 +122,9 @@ fn check_loading(
) { ) {
if !loading_queue.queue.is_empty() { if !loading_queue.queue.is_empty() {
//filter queue to only include notloaded assets //filter queue to only include notloaded assets
let mut not_loaded_count = 0; let mut not_loaded_count = 0;
loading_queue.queue.retain(|h| { loading_queue.queue.retain(|h| {
if let Some((load_state, dep_load_state, rec_load_state)) = if let Some((load_state, dep_load_state, rec_load_state)) =
asset_server.get_load_states(h.id()) asset_server.get_load_states(h.id())
@@ -146,8 +145,6 @@ fn check_loading(
} }
}); });
info!("Loading {} assets", loading_queue.queue.len()); info!("Loading {} assets", loading_queue.queue.len());
if loading_queue.queue.len() - not_loaded_count == 0 { if loading_queue.queue.len() - not_loaded_count == 0 {
@@ -252,10 +249,7 @@ fn spawn_test_bvh(
} }
} }
fn init_scene_loading( fn init_scene_loading(mut cmd: Commands, mut er: EventReader<LoadSceneEvent>) {
mut cmd: Commands,
mut er: EventReader<LoadSceneEvent>,
) {
if let Some(id) = er.read().last() { if let Some(id) = er.read().last() {
info!("Loading scene: {}", id.0); info!("Loading scene: {}", id.0);
cmd.spawn(( cmd.spawn((
@@ -270,7 +264,6 @@ fn init_scene_loading(
} }
} }
#[derive(Component)] #[derive(Component)]
pub struct NoMeshElement; pub struct NoMeshElement;
@@ -284,14 +277,13 @@ fn tag_scene_elements(
// leafy parts of a plant. Here we only want to tag the elements that a user // leafy parts of a plant. Here we only want to tag the elements that a user
// might want to individually address when arranging or animating a scene. // might want to individually address when arranging or animating a scene.
q_named_non_primitives: Query< q_named_non_primitives: Query<
(Entity, (Entity, &Children),
&Children),
( (
With<SceneAutoChild>, With<SceneAutoChild>,
With<Name>, With<Name>,
Without<Handle<Mesh>>, Without<Handle<Mesh>>,
Without<SceneElement>, Without<SceneElement>,
Without<NoMeshElement> Without<NoMeshElement>,
), ),
>, >,
q_skinned_meshes: Query<(Entity, &SkinnedMesh), Without<SkeletalJoint>>, q_skinned_meshes: Query<(Entity, &SkinnedMesh), Without<SkeletalJoint>>,
@@ -313,8 +305,7 @@ fn tag_scene_elements(
} }
} }
for (ent, skinned_mesh) in q_skinned_meshes.iter() for (ent, skinned_mesh) in q_skinned_meshes.iter() {
{
cmd.entity(ent).insert(NoFrustumCulling); cmd.entity(ent).insert(NoFrustumCulling);
for &joint in skinned_mesh.joints.iter() { for &joint in skinned_mesh.joints.iter() {