Skip to content

Instantly share code, notes, and snippets.

diff --git a/examples/tools/scene_viewer/scene_viewer_plugin.rs b/examples/tools/scene_viewer/scene_viewer_plugin.rs
index 2ff6af494..52597c1bb 100644
--- a/examples/tools/scene_viewer/scene_viewer_plugin.rs
+++ b/examples/tools/scene_viewer/scene_viewer_plugin.rs
@@ -72,6 +72,7 @@ impl Plugin for SceneViewerPlugin {
Update,
(
update_lights,
+ update_materials,
camera_tracker,
diff --git a/crates/bevy_pbr/src/extended_material.rs b/crates/bevy_pbr/src/extended_material.rs
index a5c46ea6f..39ad33faf 100644
--- a/crates/bevy_pbr/src/extended_material.rs
+++ b/crates/bevy_pbr/src/extended_material.rs
@@ -1,3 +1,5 @@
+use std::marker::PhantomData;
+
use bevy_asset::{Asset, Handle};
use bevy_reflect::{impl_type_path, Reflect};
use bevy_render::{
diff --git a/crates/bevy_pbr/src/meshlet/from_mesh.rs b/crates/bevy_pbr/src/meshlet/from_mesh.rs
index 36af9c445..c6f8c6cff 100644
--- a/crates/bevy_pbr/src/meshlet/from_mesh.rs
+++ b/crates/bevy_pbr/src/meshlet/from_mesh.rs
@@ -23,14 +23,14 @@ impl MeshletMesh {
if mesh.primitive_topology() != PrimitiveTopology::TriangleList {
return Err(MeshToMeshletMeshConversionError::WrongMeshPrimitiveTopology);
}
- let vertex_buffer_layout = &mesh.get_mesh_vertex_buffer_layout();
- if vertex_buffer_layout.attribute_ids()
diff --git a/crates/bevy_pbr/src/meshlet/material_draw_prepare.rs b/crates/bevy_pbr/src/meshlet/material_draw_prepare.rs
index 1fee72d69..fb723a0d5 100644
--- a/crates/bevy_pbr/src/meshlet/material_draw_prepare.rs
+++ b/crates/bevy_pbr/src/meshlet/material_draw_prepare.rs
@@ -9,11 +9,11 @@ use bevy_core_pipeline::{
use bevy_derive::{Deref, DerefMut};
use bevy_render::{
camera::TemporalJitter,
- mesh::{InnerMeshVertexBufferLayout, Mesh, MeshVertexBufferLayout},
+ mesh::{Mesh, MeshVertexBufferLayout, MeshVertexBufferLayoutRef, MeshVertexBufferLayouts},
diff --git a/crates/bevy_pbr/src/light_probe/environment_map.wgsl b/crates/bevy_pbr/src/light_probe/environment_map.wgsl
index 7a6d660e5..2c8390f83 100644
--- a/crates/bevy_pbr/src/light_probe/environment_map.wgsl
+++ b/crates/bevy_pbr/src/light_probe/environment_map.wgsl
@@ -30,10 +30,7 @@ fn compute_radiances(
var radiances: EnvironmentMapRadiances;
// Search for a reflection probe that contains the fragment.
- var query_result = query_light_probe(
- light_probes.reflection_probes,
commit acdae9ee7d92c7bfbbe2d560a3e00039ce5a3380
Author: Patrick Walton <pcwalton@mimiga.net>
Date: Mon Feb 5 18:10:52 2024 -0800
wip
diff --git a/crates/bevy_transform/Cargo.toml b/crates/bevy_transform/Cargo.toml
index 8e5e93718..cde746d06 100644
--- a/crates/bevy_transform/Cargo.toml
+++ b/crates/bevy_transform/Cargo.toml
diff --git a/crates/bevy_transform/src/systems.rs b/crates/bevy_transform/src/systems.rs
index 8f6bac916..53c6d707e 100644
--- a/crates/bevy_transform/src/systems.rs
+++ b/crates/bevy_transform/src/systems.rs
@@ -54,8 +54,13 @@ pub fn propagate_transforms(
mut orphaned: RemovedComponents<Parent>,
transform_query: Query<(Ref<Transform>, &mut GlobalTransform, Option<&Children>), With<Parent>>,
parent_query: Query<(Entity, Ref<Parent>)>,
+ any_changes: Query<Entity, Or<(Changed<Transform>, Changed<Parent>, Changed<Children>)>>,
mut orphaned_entities: Local<Vec<Entity>>,
@pcwalton
pcwalton / backtrace.pre-ap.s
Created November 6, 2022 00:12
backtrace::symbolize::gimli::macho::Object::parse codegen, NO argument promotion
.section __TEXT,__text,regular,pure_instructions
.macosx_version_min 10, 7
.intel_syntax noprefix
.p2align 4, 0x90 ## -- Begin function _ZN4core3ptr108drop_in_place$LT$alloc..collections..btree..map..BTreeMap$LT$u64$C$gimli..read..abbrev..Abbreviation$GT$$GT$17hb552a67d31141ef1E
__ZN4core3ptr108drop_in_place$LT$alloc..collections..btree..map..BTreeMap$LT$u64$C$gimli..read..abbrev..Abbreviation$GT$$GT$17hb552a67d31141ef1E: ## @"_ZN4core3ptr108drop_in_place$LT$alloc..collections..btree..map..BTreeMap$LT$u64$C$gimli..read..abbrev..Abbreviation$GT$$GT$17hb552a67d31141ef1E"
Lfunc_begin0:
.cfi_startproc
.cfi_personality 155, _rust_eh_personality
.cfi_lsda 16, Lexception0
## %bb.0:
@pcwalton
pcwalton / backtrace.post-ap.s
Created November 6, 2022 00:10
backtrace::symbolize::gimli::macho::Object::parse codegen, max elements = 99
.section __TEXT,__text,regular,pure_instructions
.macosx_version_min 10, 7
.intel_syntax noprefix
.p2align 4, 0x90 ## -- Begin function _ZN4core3ptr108drop_in_place$LT$alloc..collections..btree..map..BTreeMap$LT$u64$C$gimli..read..abbrev..Abbreviation$GT$$GT$17hb552a67d31141ef1E
__ZN4core3ptr108drop_in_place$LT$alloc..collections..btree..map..BTreeMap$LT$u64$C$gimli..read..abbrev..Abbreviation$GT$$GT$17hb552a67d31141ef1E: ## @"_ZN4core3ptr108drop_in_place$LT$alloc..collections..btree..map..BTreeMap$LT$u64$C$gimli..read..abbrev..Abbreviation$GT$$GT$17hb552a67d31141ef1E"
Lfunc_begin0:
.cfi_startproc
.cfi_personality 155, _rust_eh_personality
.cfi_lsda 16, Lexception0
## %bb.0:
@pcwalton
pcwalton / backtrace.post-ap.ll
Created November 6, 2022 00:05
backtrace::symbolize::gimli::macho::Object::parse, 99 elements of argument promotion
; ModuleID = '/Users/pcwalton/Desktop/backtrace.preap.ll'
source_filename = "backtrace.e3abbc31-cgu.0"
target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-apple-macosx10.7.0"
%0 = type { [1 x i64], ptr, [1 x i64] }
%1 = type { %2, %3, i64 }
%2 = type {}
%3 = type { %4, %4 }
%4 = type { i64, [3 x i64] }