forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gizmos: Replace PositionItem with Vec3 (#12401)

Browse Source 
# Objective
Fix #12145.

## Solution
Replace `PositionItem` with Vec3. Clean up the code.
This commit is contained in:
James Liu 2024-03-11 12:28:05 -07:00 committed by GitHub
parent 2d29954034
commit a0897428e2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
crates/bevy_gizmos/src/gizmos.rs
View File

@ -18,13 +18,11 @@ use crate::{
prelude::GizmoConfig, prelude::GizmoConfig,
}; };
type PositionItem = [f32; 3];
#[derive(Resource, Default)] #[derive(Resource, Default)]
pub(crate) struct GizmoStorage<T: GizmoConfigGroup> { pub(crate) struct GizmoStorage<T: GizmoConfigGroup> {
pub(crate) list_positions: Vec<PositionItem>, pub(crate) list_positions: Vec<Vec3>,
pub(crate) list_colors: Vec<LinearRgba>, pub(crate) list_colors: Vec<LinearRgba>,
pub(crate) strip_positions: Vec<PositionItem>, pub(crate) strip_positions: Vec<Vec3>,
pub(crate) strip_colors: Vec<LinearRgba>, pub(crate) strip_colors: Vec<LinearRgba>,
marker: PhantomData<T>, marker: PhantomData<T>,
} }
@ -102,9 +100,9 @@ where
#[derive(Default)] #[derive(Default)]
struct GizmoBuffer<T: GizmoConfigGroup> { struct GizmoBuffer<T: GizmoConfigGroup> {
list_positions: Vec<PositionItem>, list_positions: Vec<Vec3>,
list_colors: Vec<LinearRgba>, list_colors: Vec<LinearRgba>,
strip_positions: Vec<PositionItem>, strip_positions: Vec<Vec3>,
strip_colors: Vec<LinearRgba>, strip_colors: Vec<LinearRgba>,
marker: PhantomData<T>, marker: PhantomData<T>,
} }
@ -297,11 +295,11 @@ impl<'w, 's, T: GizmoConfigGroup> Gizmos<'w, 's, T> {
strip_colors.reserve(min); strip_colors.reserve(min);
for (position, color) in points { for (position, color) in points {
strip_positions.push(position.to_array()); strip_positions.push(position);
strip_colors.push(LinearRgba::from(color.into())); strip_colors.push(LinearRgba::from(color.into()));
} }
strip_positions.push([f32::NAN; 3]); strip_positions.push(Vec3::NAN);
strip_colors.push(LinearRgba::NAN); strip_colors.push(LinearRgba::NAN);
} }
@ -607,9 +605,7 @@ impl<'w, 's, T: GizmoConfigGroup> Gizmos<'w, 's, T> {
#[inline] #[inline]
fn extend_list_positions(&mut self, positions: impl IntoIterator<Item = Vec3>) { fn extend_list_positions(&mut self, positions: impl IntoIterator<Item = Vec3>) {
self.buffer self.buffer.list_positions.extend(positions);
.list_positions
.extend(positions.into_iter().map(|vec3| vec3.to_array()));
} }
#[inline] #[inline]
@ -633,12 +629,8 @@ impl<'w, 's, T: GizmoConfigGroup> Gizmos<'w, 's, T> {
#[inline] #[inline]
fn extend_strip_positions(&mut self, positions: impl IntoIterator<Item = Vec3>) { fn extend_strip_positions(&mut self, positions: impl IntoIterator<Item = Vec3>) {
self.buffer.strip_positions.extend( self.buffer.strip_positions.extend(positions);
positions self.buffer.strip_positions.push(Vec3::NAN);
.into_iter()
.map(|vec3| vec3.to_array())
.chain(iter::once([f32::NAN; 3])),
);
} }
} }

3
crates/bevy_gizmos/src/lib.rs
View File

@ -70,6 +70,7 @@ use bevy_ecs::{
Commands, Res, ResMut, Resource, SystemParamItem, Commands, Res, ResMut, Resource, SystemParamItem,
}, },
}; };
use bevy_math::Vec3;
use bevy_reflect::TypePath; use bevy_reflect::TypePath;
use bevy_render::{ use bevy_render::{
extract_component::{ComponentUniforms, DynamicUniformIndex, UniformComponentPlugin}, extract_component::{ComponentUniforms, DynamicUniformIndex, UniformComponentPlugin},
@ -344,7 +345,7 @@ struct LineGizmoUniform {
#[derive(Asset, Debug, Default, Clone, TypePath)] #[derive(Asset, Debug, Default, Clone, TypePath)]
struct LineGizmo { struct LineGizmo {
positions: Vec<[f32; 3]>, positions: Vec<Vec3>,
colors: Vec<LinearRgba>, colors: Vec<LinearRgba>,
/// Whether this gizmo's topology is a line-strip or line-list /// Whether this gizmo's topology is a line-strip or line-list
strip: bool, strip: bool,