fix errors after sync with main (types and imports)

Author: rambip

crates/bevy_gizmos/src/config.rs

@@ -4,7 +4,7 @@ use crate::{self as bevy_gizmos};
 pub use bevy_gizmos_macros::GizmoConfigGroup;
 
 #[cfg(feature = "bevy_render")]
-use {crate::LineGizmo, bevy_asset::Handle, bevy_ecs::component::Component};
+use {crate::GizmoAsset, bevy_asset::Handle, bevy_ecs::component::Component};
 
 use bevy_ecs::{reflect::ReflectResource, resource::Resource};
 use bevy_reflect::{std_traits::ReflectDefault, Reflect, TypePath};

crates/bevy_gizmos/src/lib.rs

@@ -42,7 +42,7 @@ pub mod grid;
 pub mod primitives;
 pub mod retained;
 pub mod rounded_box;
-//#[cfg(feature = "bevy_render")]
+#[cfg(feature = "bevy_render")]
 pub mod view;
 
 #[cfg(all(feature = "bevy_pbr", feature = "bevy_render"))]
@@ -86,6 +86,7 @@ use bevy_ecs::{
 };
 use bevy_math::{Vec3, Vec4};
 use bevy_reflect::TypePath;
+#[cfg(feature = "bevy_render")]
 use view::OnlyViewLayout;
 
 #[cfg(feature = "bevy_render")]
@@ -95,7 +96,6 @@ use crate::{config::ErasedGizmoConfigGroup, gizmos::GizmoBuffer};
 
 #[cfg(feature = "bevy_render")]
 use {
-    crate::retained::extract_linegizmos,
     bevy_ecs::{
         component::Component,
         entity::Entity,
@@ -645,9 +645,9 @@ impl<const I: usize, P: PhaseItem> RenderCommand<P> for SetLineGizmoBindGroup<I>
 }
 
 #[cfg(feature = "bevy_render")]
-struct DrawLineGizmo;
+struct DrawLineGizmo<const STRIP: bool>;
 #[cfg(feature = "bevy_render")]
-impl<P: PhaseItem> RenderCommand<P> for DrawLineGizmo {
+impl<P: PhaseItem, const STRIP: bool> RenderCommand<P> for DrawLineGizmo<STRIP> {
     type Param = SRes<RenderAssets<GpuLineGizmo>>;
     type ViewQuery = ();
     type ItemQuery = Read<GizmoMeshConfig>;

crates/bevy_gizmos/src/view.rs

@@ -1,7 +1,8 @@
 use bevy_ecs::{
     component::Component,
     entity::Entity,
-    system::{lifetimeless::Read, Commands, Query, Res, Resource},
+    resource::Resource,
+    system::{lifetimeless::Read, Commands, Query, Res},
     world::FromWorld,
 };
 use bevy_render::{